diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4afdf76f7..c1a30bb05 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -10,23 +10,24 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](adm-zip/adm-zip.d.ts) [adm-zip](https://github.com/cthackers/adm-zip) by [John Vilk](https://github.com/jvilk)
 * [:link:](alertify/alertify.d.ts) [alertify](http://fabien-d.github.io/alertify.js) by [John Jeffery](http://github.com/jjeffery)
 * [:link:](alt/alt.d.ts) [Alt](https://github.com/goatslacker/alt) by [Michael Shearer](https://github.com/Shearerbeard)
+* [:link:](amazon-product-api/amazon-product-api.d.ts) [amazon-product-api](https://github.com/t3chnoboy/amazon-product-api) by [Matti Lehtinen](https://github.com/MattiLehtinen)
 * [:link:](amcharts/AmCharts.d.ts) [amCharts](http://www.amcharts.com) by [aleksey-bykov](https://github.com/aleksey-bykov)
 * [:link:](amplifyjs/amplifyjs.d.ts) [AmplifyJs](http://amplifyjs.com) by [Jonas Eriksson](https://github.com/joeriks)
+* [:link:](amplify-deferred/amplify-deferred.d.ts) [AmplifyJs 1.1.0 using JQuery Deferred](http://amplifyjs.com) by [Jonas Eriksson](https://github.com/joeriks), [Laurentiu Stamate](https://github.com/laurentiustamate94)
 * [:link:](amqp-rpc/amqp-rpc.d.ts) [amqp-rpc](https://github.com/demchenkoe/node-amqp-rpc) by [Wonshik Kim](https://github.com/wokim)
 * [:link:](amqplib/amqplib.d.ts) [amqplib 0.3.x](https://github.com/squaremo/amqp.node) by [Michael Nahkies](https://github.com/mnahkies)
-* [:link:](angular2/angular2.d.ts) [Angular](http://angular.io) by [angular team](https://github.com/angular)
-* [:link:](angular2/router.d.ts) [Angular](http://angular.io) by [angular team](https://github.com/angular)
-* [:link:](angular-file-upload/angular-file-upload.d.ts) [Angular File Upload](https://github.com/danialfarid/ng-file-upload) by [John Reilly](https://github.com/johnnyreilly)
 * [:link:](ng-file-upload/ng-file-upload.d.ts) [Angular File Upload](https://github.com/danialfarid/ng-file-upload) by [John Reilly](https://github.com/johnnyreilly)
+* [:link:](angular-file-upload/angular-file-upload.d.ts) [Angular File Upload](https://github.com/danialfarid/ng-file-upload) by [John Reilly](https://github.com/johnnyreilly)
 * [:link:](angular-growl-v2/angular-growl-v2.d.ts) [Angular Growl 2 v.0.7.3](http://janstevens.github.io/angular-growl-2) by [Tadeusz Hucal](https://github.com/mkp05)
 * [:link:](angularjs/angular.d.ts) [Angular JS](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar)
 * [:link:](angularjs/angular-animate.d.ts) [Angular JS (ngAnimate module)](http://angularjs.org) 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)
 * [:link:](angularjs/angular-cookies.d.ts) [Angular JS (ngCookies module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Anthony Ciccarello](http://github.com/aciccarello)
-* [:link:](angularjs/angular-mocks.d.ts) [Angular JS (ngMock, ngMockE2E module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar)
+* [:link:](angularjs/angular-mocks.d.ts) [Angular JS (ngMock, ngMockE2E module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Tony Curtis](http://github.com/daltin)
 * [:link:](angularjs/angular-resource.d.ts) [Angular JS (ngResource module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar), [Michael Jess](http://github.com/miffels)
 * [:link:](angularjs/angular-route.d.ts) [Angular JS (ngRoute module)](http://angularjs.org) by [Jonathan Park](https://github.com/park9140)
 * [:link:](angularjs/angular-sanitize.d.ts) [Angular JS (ngSanitize module)](http://angularjs.org) by [Diego Vilar](http://github.com/diegovilar)
 * [:link:](angular-ui-router/angular-ui-router.d.ts) [Angular JS (ui.router module)](https://github.com/angular-ui/ui-router) by [Michel Salib](https://github.com/michelsalib)
+* [:link:](angular-ui-scroll/angular-ui-scroll.d.ts) [Angular JS (ui.scroll module)](https://github.com/angular-ui/ui-scroll) by [Mark Nadig](https://github.com/marknadig)
 * [:link:](angular-meteor/angular-meteor.d.ts) [Angular JS Meteor (angular.meteor module)](https://github.com/Urigo/angular-meteor) by [Peter Grman](https://github.com/pgrm)
 * [:link:](angular-material/angular-material.d.ts) [Angular Material (angular.material module)](https://github.com/angular/material) by [Matt Traynham](https://github.com/mtraynham)
 * [:link:](angular-protractor/angular-protractor.d.ts) [Angular Protractor](https://github.com/angular/protractor) by [Bill Armstrong](https://github.com/BillArmstrong)
@@ -34,10 +35,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angular-toasty/angular-toasty.d.ts) [Angular Toasty](https://github.com/invertase/angular-toasty) by [Dominik Muench](https://github.com/muenchdo)
 * [:link:](angular-translate/angular-translate.d.ts) [Angular Translate (pascalprecht.translate module)](https://github.com/PascalPrecht/angular-translate) by [Michel Salib](https://github.com/michelsalib)
 * [:link:](angular-ui-bootstrap/angular-ui-bootstrap.d.ts) [Angular UI Bootstrap](https://github.com/angular-ui/bootstrap) by [Brian Surowiec](https://github.com/xt0rted)
+* [:link:](angular2/router.d.ts) [Angular v2.0.0-39](http://angular.io) by [angular team](https://github.com/angular)
+* [:link:](angular2/angular2.d.ts) [Angular v2.0.0-39](http://angular.io) by [angular team](https://github.com/angular)
+* [:link:](angular2/http.d.ts) [Angular v2.0.0-local_sha.7d5c3eb](http://angular.io) by [angular team](https://github.com/angular)
+* [:link:](angular2/test_lib.d.ts) [Angular v2.0.0-local_sha.7d5c3eb](http://angular.io) by [angular team](https://github.com/angular)
 * [:link:](angular-wizard/angular-wizard.d.ts) [Angular Wizard](https://github.com/mgonto/angular-wizard) by [Marko Jurisic](https://github.com/mjurisic)
 * [:link:](angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts) [angular-bootstrap-lightbox](https://github.com/compact/angular-bootstrap-lightbox) by [Roland Zwaga](https://github.com/rolandzwaga)
 * [:link:](angular-dynamic-locale/angular-dynamic-locale.d.ts) [angular-dynamic-locale](https://github.com/lgalfaso/angular-dynamic-locale) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](angular-formly/angular-formly.d.ts) [angular-formly](https://github.com/formly-js/angular-formly) by [Scott Hatcher](https://github.com/scatcher)
+* [:link:](angular-gettext/angular-gettext.d.ts) [angular-gettext](https://angular-gettext.rocketeer.be) by [Ákos Lukács](https://github.com/AkosLukacs)
 * [:link:](angular-hotkeys/angular-hotkeys.d.ts) [angular-hotkeys](https://github.com/chieffancypants/angular-hotkeys) by [Jason Zhao](https://github.com/jlz27), [Stefan Steinhart](https://github.com/reppners)
 * [:link:](angular-http-auth/angular-http-auth.d.ts) [angular-http-auth](https://github.com/witoldsz/angular-http-auth) by [vvakame](https://github.com/vvakame)
 * [:link:](angular-jwt/angular-jwt.d.ts) [angular-jwt](https://github.com/auth0/angular-jwt) by [Reto Rezzonico](https://github.com/rerezz)
@@ -49,6 +55,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angular-signalr-hub/angular-signalr-hub.d.ts) [angular-signalr-hub](https://github.com/JustMaier/angular-signalr-hub) by [Adam Santaniello](https://github.com/AdamSantaniello)
 * [:link:](angular-spinner/angular-spinner.d.ts) [angular-spinner.js](https://github.com/urish/angular-spinner) by [Marcin Biegała](https://github.com/Biegal)
 * [:link:](angular-storage/angular-storage.d.ts) [angular-storage](https://github.com/auth0/angular-storage) by [Matthew DeKrey](https://github.com/mdekrey)
+* [:link:](angular-ui-tree/angular-ui-tree.d.ts) [angular-ui-tree](https://github.com/angular-ui-tree/angular-ui-tree) by [Calvin Fernandez](https://github.com/CalvinFernandez)
 * [:link:](angular.throttle/angular.throttle.d.ts) [angular.throttle](https://github.com/BaggersIO/angular.throttle) by [Stefan Steinhart](https://github.com/reppners)
 * [:link:](angular-ui-sortable/angular-ui-sortable.d.ts) [angular.ui.sortable module](https://github.com/angular-ui/ui-sortable) by [Thodoris Greasidis](https://github.com/thgreasi)
 * [:link:](angular-agility/angular-agility.d.ts) [AngularAgility](https://github.com/AngularAgility/AngularAgility) by [Roland Zwaga](https://github.com/rolandzwaga)
@@ -66,9 +73,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](cordova-plugin-email-composer/cordova-plugin-email-composer.d.ts) [Apache Cordova Email Composer plugin](https://github.com/katzer/cordova-plugin-email-composer) by [Dave Taylor](http://davetayls.me)
 * [:link:](api-error-handler/api-error-handler.d.ts) [api-error-handler](https://github.com/expressjs/api-error-handler) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](appframework/appframework.d.ts) [AppFramework](http://app-framework-software.intel.com) by [kyo_ago](https://github.com/kyo-ago)
+* [:link:](appletvjs/appletvjs.d.ts) [AppleTVJS](https://developer.apple.com/library/prerelease/tvos/documentation/TVMLJS/Reference/TVJSFrameworkReference/index.html) by [Adam Valverde](https://github.com/brainded)
 * [:link:](applicationinsights/applicationinsights.d.ts) [Application Insights](https://github.com/Microsoft/ApplicationInsights-node.js) by [Scott Southwood](https://github.com/scsouthw)
 * [:link:](arbiter/Arbiter.d.ts) [Arbiter.js](http://arbiterjs.com) by [Arash Shakery](https://github.com/arash16)
 * [:link:](arcgis-js-api/arcgis-js-api.d.ts) [ArcGIS API for JavaScript](http://js.arcgis.com) by [Esri](http://www.esri.com)
+* [:link:](archiver/archiver.d.ts) [archiver](https://github.com/archiverjs/node-archiver) by [Esri](https://github.com/archiverjs/node-archiver)
 * [:link:](archy/archy.d.ts) [archy](https://github.com/substack/node-archy) by [vvakame](https://github.com/vvakame)
 * [:link:](asciify/asciify.d.ts) [asciify](https://www.npmjs.org/package/asciify) by [Alan Norbauer](http://alan.norbauer.com)
 * [:link:](aspnet-identity-pw/aspnet-identity-pw.d.ts) [aspnet-identity-pw](https://github.com/Syncbak-Git/aspnet-identity-pw) by [jt000](https://github.com/jt000)
@@ -84,6 +93,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](auth0/auth0.d.ts) [Auth0.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
 * [:link:](auth0.lock/auth0.lock.d.ts) [Auth0Widget.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
 * [:link:](auth0.widget/auth0.widget.d.ts) [Auth0Widget.js](http://auth0.com) by [Robert McLaws](https://github.com/advancedrei)
+* [:link:](auto-launch/auto-launch.d.ts) [auto-launch](https://github.com/Teamwork/node-auto-launch) by [rhysd](https://github.com/rhysd)
 * [:link:](autobahn/autobahn.d.ts) [AutobahnJS](http://autobahn.ws/js) by [Elad Zelingher](https://github.com/darkl), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com)
 * [:link:](autoprefixer-core/autoprefixer-core.d.ts) [Autoprefixer Core](https://github.com/postcss/autoprefixer-core) by [Asana](https://asana.com)
 * [:link:](aws-sdk/aws-sdk.d.ts) [aws-sdk](https://github.com/aws/aws-sdk-js) by [midknight41](https://github.com/midknight41)
@@ -98,8 +108,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](backgrid/backgrid.d.ts) [Backgrid](http://backgridjs.com) by [Jeremy Lujan](https://github.com/jlujan)
 * [:link:](baconjs/baconjs.d.ts) [Bacon.js](https://baconjs.github.io) by [Alexander Matsievsky](https://github.com/alexander-matsievsky)
 * [:link:](bardjs/bardjs.d.ts) [bardjs](https://github.com/wardbell/bardjs) by [Andrew Archibald](https://github.com/TepigMC)
+* [:link:](basic-auth/basic-auth.d.ts) [basic-auth](https://github.com/jshttp/basic-auth) by [Clément Bourgeois](https://github.com/moonpyk)
 * [:link:](batch-stream/batch-stream.d.ts) [batch-stream](https://github.com/segmentio/batch-stream) by [Nicholas Penree](http://github.com/drudge)
 * [:link:](bcrypt/bcrypt.d.ts) [bcrypt](https://www.npmjs.org/package/bcrypt) by [Peter Harris](https://github.com/codeanimal)
+* [:link:](better-curry/better-curry.d.ts) [better-curry](https://github.com/pocesar/js-bettercurry) by [Paulo Cesar](https://github.com/pocesar)
 * [:link:](bgiframe/typescript.bgiframe.d.ts) [bgiframe](https://github.com/sumegizoltan/BgiFrame) by [Zoltan Sumegi](https://github.com/sumegizoltan)
 * [:link:](big.js/big.js.d.ts) [big.js](https://github.com/MikeMcl/big.js) by [Steve Ognibene](https://github.com/nycdotnet)
 * [:link:](bigint/bigint.d.ts) [BigInt](https://github.com/Evgenus/BigInt) by [Eugene Chernyshov](https://github.com/Evgenus)
@@ -108,6 +120,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](bitwise-xor/bitwise-xor.d.ts) [bitwise-xor](https://github.com/czzarr/node-bitwise-xor) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](blob-stream/blob-stream.d.ts) [blob-stream](https://github.com/devongovett/blob-stream) by [Eric Hillah](https://github.com/erichillah)
 * [:link:](bluebird/bluebird.d.ts) [bluebird](https://github.com/petkaantonov/bluebird) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](bluebird-retry/bluebird-retry.d.ts) [bluebird-retry](https://github.com/jut-io/bluebird-retry) by [Pascal Vomhoff](https://github.com/pvomhoff)
 * [:link:](blueimp-md5/blueimp-md5.d.ts) [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) by [Ray Martone](https://github.com/rmartone)
 * [:link:](body-parser/body-parser.d.ts) [body-parser](http://expressjs.com) by [Santi Albo](https://github.com/santialbo), [VILIC VANE](https://vilic.info), [Jonathan Häberle](https://github.com/dreampulse)
 * [:link:](boom/boom.d.ts) [boom](http://github.com/hapijs/boom) by [Igor Rogatty](http://github.com/rogatty)
@@ -115,12 +128,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](bootstrap/bootstrap.d.ts) [Bootstrap](http://twitter.github.com/bootstrap) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts) [Bootstrap datetimepicker v3](http://eonasdan.github.io/bootstrap-datetimepicker) by [Jesica N. Fera](https://github.com/bayitajesi)
 * [:link:](bootstrap-touchspin/bootstrap-touchspin.d.ts) [Bootstrap TouchSpin](http://www.virtuosoft.eu/code/bootstrap-touchspin) by [Albin Sunnanbo](https://github.com/albinsunnanbo)
-* [:link:](bootstrap-notify/bootstrap-notify.d.ts) [bootstrap-notify](https://github.com/Nijikokun/bootstrap-notify) by [Blake Niemyjski](https://github.com/niemyjski)
+* [:link:](bootstrap-notify/bootstrap-notify.d.ts) [bootstrap-notify](http://bootstrap-notify.remabledesigns.com) by [Blake Niemyjski](https://github.com/niemyjski), [Robert McIntosh](https://github.com/mouse0270), [Robert Voica](https://github.com/robert-voica)
 * [:link:](bootstrap-slider/bootstrap-slider.d.ts) [bootstrap-slider.js](https://github.com/seiyria/bootstrap-slider) by [Daniel Beckwith](https://github.com/dbeckwith)
 * [:link:](bootstrap.datepicker/bootstrap.datepicker.d.ts) [bootstrap.datepicker](https://github.com/eternicode/bootstrap-datepicker) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](bootstrap.paginator/bootstrap.paginator.d.ts) [bootstrap.paginator](https://github.com/lyonlai/bootstrap-paginator) by [derikwhittaker](https://github.com/derikwhittaker)
 * [:link:](box2d/box2dweb.d.ts) [bootstrap.timepicker](http://code.google.com/p/box2dweb) by [jbaldwin](https://github.com/jbaldwin)
 * [:link:](bootstrap.timepicker/bootstrap.timepicker.d.ts) [bootstrap.timepicker](https://github.com/jdewit/bootstrap-timepicker) by [derikwhittaker](https://github.com/derikwhittaker)
+* [:link:](bowser/bowser.d.ts) [Bowser 1.x](https://github.com/ded/bowser) by [Paulo Cesar](https://github.com/pocesar)
 * [:link:](breeze/breeze.d.ts) [Breeze 1.5.x](http://www.breezejs.com) by [Boris Yankov](https://github.com/borisyankov), [IdeaBlade](https://github.com/IdeaBlade/Breeze)
 * [:link:](browser-harness/browser-harness.d.ts) [Browser Harness](https://github.com/scriby/browser-harness) by [Chris Scribner](https://github.com/scriby)
 * [:link:](browser-sync/browser-sync.d.ts) [browser-sync](http://www.browsersync.io) by [Asana](https://asana.com)
@@ -139,8 +153,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](camljs/camljs.d.ts) [camljs](http://camljs.codeplex.com) by [Andrey Markeev](http://markeev.com)
 * [:link:](canvasjs/canvasjs.d.ts) [CanvasJS](http://canvasjs.com) by [Mark Overholt](https://github.com/mover5)
 * [:link:](casperjs/casperjs.d.ts) [CasperJS](http://casperjs.org) by [Jed Mao](https://github.com/jedmao)
-* [:link:](chai/chai.d.ts) [chai](http://chaijs.com) by [Jed Mao](https://github.com/jedmao), [Bart van der Schoor](https://github.com/Bartvds), [Andrew Brown](https://github.com/AGBrown)
-* [:link:](chai-as-promised/chai-as-promised.d.ts) [chai-as-promised](https://github.com/domenic/chai-as-promised) by [jt000](https://github.com/jt000)
+* [:link:](chai/chai.d.ts) [chai](http://chaijs.com) by [Jed Mao](https://github.com/jedmao), [Bart van der Schoor](https://github.com/Bartvds), [Andrew Brown](https://github.com/AGBrown), [Olivier Chevet](https://github.com/olivr70)
+* [:link:](chai-as-promised/chai-as-promised.d.ts) [chai-as-promised](https://github.com/domenic/chai-as-promised) by [jt000](https://github.com/jt000), [Yuki Kokubun](https://github.com/Kuniwak)
 * [:link:](chai-datetime/chai-datetime.d.ts) [chai-datetime](https://github.com/gaslight/chai-datetime.git) by [Cliff Burger](https://github.com/cliffburger)
 * [:link:](chai-fuzzy/chai-fuzzy.d.ts) [chai-fuzzy](http://chaijs.com/plugins/chai-fuzzy) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](chai-http/chai-http.d.ts) [chai-http](https://github.com/chaijs/chai-http) by [Wim Looman](https://github.com/Nemo157)
@@ -150,6 +164,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](chance/chance.d.ts) [Chance](http://chancejs.com) by [Chris Bowdon](https://github.com/cbowdon)
 * [:link:](change-case/change-case.d.ts) [change-case](https://github.com/blakeembrey/change-case) by [Asana](https://asana.com)
 * [:link:](chartjs/chart.d.ts) [Chart.js](https://github.com/nnnick/Chart.js) by [Steve Fenton](https://github.com/Steve-Fenton)
+* [:link:](chartist/chartist.d.ts) [Chartist](https://github.com/gionkunz/chartist-js) by [Matt Gibbs](https://github.com/mtgibbs)
 * [:link:](checksum/checksum.d.ts) [checksum](https://github.com/dshaw/checksum) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](cheerio/cheerio.d.ts) [Cheerio](https://github.com/cheeriojs/cheerio) by [Bret Little](https://github.com/blittle), [VILIC VANE](http://vilic.info), [Wayne Maurer](https://github.com/wmaurer)
 * [:link:](chocolatechipjs/chocolatechipjs.d.ts) [chocolatechip](https://github.com/chocolatechipui/ChocolateChipJS) by [Robert Biggs](http://chocolatechip-ui.com)
@@ -162,10 +177,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](chui/chui.d.ts) [chui](https://github.com/chocolatechipui/chocolatechip-ui) by [Robert Biggs](http://chocolatechip-ui.com)
 * [:link:](circular-json/circular-json.d.ts) [circular-json](https://github.com/WebReflection/circular-json) by [Jonathan Pevarnek](https://github.com/jpevarnek)
 * [:link:](ckeditor/ckeditor.d.ts) [CKEditor](http://ckeditor.com) by [Ondrej Sevcik](https://github.com/ondrejsevcik)
-* [:link:](classnames/classnames.d.ts) [classnames](https://github.com/JedWatson/classnames) by [Dave Keen](http://www.keendevelopment.ch)
+* [:link:](classnames/classnames.d.ts) [classnames](https://github.com/JedWatson/classnames) by [Dave Keen](http://www.keendevelopment.ch), [Adi Dahiya](https://github.com/adidahiya), [Jason Killian](https://github.com/JKillian)
 * [:link:](cli-color/cli-color.d.ts) [cli-color](https://github.com/medikoo/cli-color) by [Joel Spadin](https://github.com/ChaosinaCan)
 * [:link:](clone/clone.d.ts) [clone](https://github.com/pvorb/node-clone) by [Kieran Simpson](https://github.com/kierans/DefinitelyTyped)
+* [:link:](codemirror/codemirror-matchbrackets.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Sixin Li](https://github.com/sixinli)
+* [:link:](codemirror/codemirror-showhint.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt), [basarat](https://github.com/basarat)
 * [:link:](codemirror/codemirror.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [mihailik](https://github.com/mihailik)
+* [:link:](codemirror/searchcursor.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt)
+* [:link:](coffeeify/coffeeify.d.ts) [coffeeify](https://github.com/jnordberg/coffeeify) by [Qubo](https://github.com/tkQubo)
 * [:link:](colorbrewer/colorbrewer.d.ts) [colorbrewer](https://github.com/jeanlauliac/colorbrewer) by [Matt Traynham](https://github.com/mtraynham)
 * [:link:](colors/colors.d.ts) [Colors.js 0.6.0-1](https://github.com/Marak/colors.js) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](cometd/cometd.d.ts) [CometD](http://cometd.org) by [Derek Cicerone](https://github.com/derekcicerone)
@@ -175,6 +194,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](configstore/configstore.d.ts) [configstore](https://github.com/yeoman/configstore) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](connect-flash/connect-flash.d.ts) [connect-flash](https://github.com/jaredhanson/connect-flash) by [Andreas Gassmann](https://github.com/AndreasGassmann)
 * [:link:](connect-modrewrite/connect-modrewrite.d.ts) [connect-modrewrite](https://github.com/tinganho/connect-modrewrite) by [Tingan Ho](https://github.com/tinganho)
+* [:link:](connect-mongo/connect-mongo.d.ts) [connect-mongo](https://github.com/kcbanner/connect-mongo) by [Mizuki Yamamoto](https://github.com/Syati)
 * [:link:](connect-slashes/connect-slashes.d.ts) [connect-slashes](https://github.com/avinoamr/connect-slashes) by [Sam Herrmann](https://github.com/samherrmann)
 * [:link:](consolidate/consolidate.d.ts) [consolidate](https://github.com/visionmedia/consolidate.js) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](constant-case/constant-case.d.ts) [constant-case](https://github.com/blakeembrey/constant-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
@@ -185,7 +205,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](cookie-parser/cookie-parser.d.ts) [cookie-parser](https://github.com/expressjs/cookie-parser) by [Santi Albo](https://github.com/santialbo)
 * [:link:](cookiejs/cookiejs.d.ts) [cookie.js](https://github.com/js-coder/cookie.js) by [Boltmade](https://github.com/Boltmade)
 * [:link:](cordova-ionic/plugins/keyboard.d.ts) [Cordova Keyboard plugin](https://github.com/driftyco/ionic-plugins-keyboard) by [Hendrik Maus](https://github.com/hendrikmaus)
+* [:link:](cordova-plugin-app-version/cordova-plugin-app-version.d.ts) [cordova-plugin-app-version](https://github.com/whiteoctober/cordova-plugin-app-version) by [Markus Wagner](https://github.com/Ritzlgrmft)
+* [:link:](cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts) [cordova-plugin-ibeacon](https://github.com/petermetz/cordova-plugin-ibeacon) by [Markus Wagner](https://github.com/Ritzlgrmft)
+* [:link:](cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts) [cordova-plugin-ouralabs](https://github.com/Justin-Credible/cordova-plugin-ouralabs) by [Justin Unterreiner](https://github.com/Justin-Credible)
 * [:link:](cordovarduino/cordovarduino.d.ts) [Cordovarduino plugin](https://github.com/stereolux/cordovarduino) by [Hendrik Maus](https://github.com/hendrikmaus)
+* [:link:](core-decorators/core-decorators.d.ts) [core-decorators.js](https://github.com/jayphelps/core-decorators.js) by [Qubo](https://github.com/tkqubo)
 * [:link:](core-js/core-js.d.ts) [core-js](https://github.com/zloirock/core-js) by [Ron Buckton](http://github.com/rbuckton)
 * [:link:](cors/cors.d.ts) [cors](https://github.com/troygoode/node-cors) by [Mihhail Lapushkin](https://github.com/mihhail-lapushkin)
 * [:link:](couchbase/couchbase.d.ts) [Couchbase Couchnode](https://github.com/couchbase/couchnode) by [Basarat Ali Syed](https://github.com/basarat)
@@ -229,8 +253,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](docCookies/docCookies.d.ts) [docCookies](https://developer.mozilla.org/en-US/docs/Web/API/document.cookie) by [Jon Egerton](https://github.com/jonegerton)
 * [:link:](dock-spawn/dock-spawn.d.ts) [Dock Spawn](http://dockspawn.com) by [Drew Noakes](https://drewnoakes.com)
 * [:link:](documentdb/documentdb.d.ts) [DocumentDB](https://github.com/Azure/azure-documentdb-node) by [Noel Abrahams](https://github.com/NoelAbrahams), [Brett Gutstein](https://github.com/brettferdosi)
+* [:link:](documentdb-server/documentdb-server.d.ts) [DocumentDB server side JavaScript SDK](http://dl.windowsazure.com/documentDB/jsserverdocs) by [François Nguyen](https://github.com/lith-light-g)
 * [:link:](dojo/dojo.d.ts) [Dojo](http://dojotoolkit.org) by [Michael Van Sickle](https://github.com/vansimke)
-* [:link:](dompurify/dompurify.d.ts) [DOM Purify](https://github.com/cure53/DOMPurify) by [Dave Taylor](http://davetayls.me)
+* [:link:](dompurify/dompurify.d.ts) [DOM Purify](https://github.com/cure53/DOMPurify) by [Dave Taylor](http://davetayls.me), [Samira Bazuzi](https://github.com/bazuzi)
 * [:link:](domo/domo.d.ts) [Domo](http://domo-js.com) by [Steve Fenton](https://github.com/Steve-Fenton)
 * [:link:](domready/domready.d.ts) [domready](https://github.com/ded/domready) by [Christian Holm Nielsen](https://github.com/dotnetnerd)
 * [:link:](donna/donna.d.ts) [donna](https://github.com/atom/donna) by [vvakame](https://github.com/vvakame)
@@ -239,9 +264,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](dotdotdot/dotdotdot.d.ts) [dotdotdot](http://dotdotdot.frebsite.nl) by [Milan Jaros](https://github.com/milanjaros)
 * [:link:](doublearray/doublearray.d.ts) [doublearray](https://github.com/takuyaa/doublearray) by [MIZUSHIMA Junki](https://github.com/mzsm)
 * [:link:](dragula/dragula.d.ts) [dragula](http://bevacqua.github.io/dragula) by [Paul Welter](https://github.com/pwelter34)
+* [:link:](hystrixjs/hystrixjs.d.ts) [dragula](https://bitbucket.org/igor_sechyn/hystrixjs) by [Igor Sechyn](https://github.com/igorsechyn)
 * [:link:](drop/drop.d.ts) [Drop](http://github.hubspot.com/drop) by [Adi Dahiya](https://github.com/adidahiya)
 * [:link:](dropboxjs/dropboxjs.d.ts) [dropbox-js](https://github.com/dropbox/dropbox-js) by [Steve Fenton](https://github.com/Steve-Fenton), [Pedro Casaubon](https://github.com/xperiments)
-* [:link:](dropzone/dropzone.d.ts) [Dropzone](http://www.dropzonejs.com) by [Natan Vivo](https://github.com/nvivo), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com)
+* [:link:](dropzone/dropzone.d.ts) [Dropzone](http://www.dropzonejs.com) by [Natan Vivo](https://github.com/nvivo), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com), [Vasya Aksyonov](https://github.com/outring)
 * [:link:](dsv/dsv.d.ts) [dsv](https://www.npmjs.com/package/dsv) by [Jason Swearingen](https://jasonswearingen.github.io)
 * [:link:](dts-bundle/dts-bundle.d.ts) [dts-bundle](https://github.com/TypeStrong/dts-bundle) by [Asana](https://asana.com)
 * [:link:](durandal/durandal.d.ts) [Durandal](http://durandaljs.com) by [Blue Spire](https://github.com/BlueSpire)
@@ -254,9 +280,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](easy-xapi-supertest/easy-xapi-supertest.d.ts) [easy-x-headers](https://github.com/DeadAlready/easy-x-headers) by [Karl Düüna](https://github.com/DeadAlready)
 * [:link:](easy-x-headers/easy-x-headers.d.ts) [easy-x-headers](https://github.com/DeadAlready/easy-x-headers) by [Karl Düüna](https://github.com/DeadAlready)
 * [:link:](easy-xapi/easy-xapi.d.ts) [easy-xapi](https://github.com/DeadAlready/easy-xapi) by [Karl Düüna](https://github.com/DeadAlready)
+* [:link:](easy-xapi-utils/easy-xapi-utils.d.ts) [easy-xapi-utils](https://github.com/DeadAlready/easy-xapi-utils) by [Karl Düüna](https://github.com/DeadAlready)
 * [:link:](easystarjs/easystarjs.d.ts) [EasyStar.js](http://easystarjs.com) by [Magnus Gustafsson](https://github.com/borundin)
 * [:link:](egg.js/egg.js.d.ts) [Egg.js](https://github.com/mikeflynn/egg.js) by [Markus Peloso](https://github.com/ToastHawaii)
 * [:link:](ejs-locals/ejs-locals.d.ts) [ejs-locals](https://github.com/randometc/ejs-locals) by [jt000](https://github.com/jt000)
+* [:link:](ejs/ejs.d.ts) [ejs.js](http://ejs.co) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
 * [:link:](jquery.elang/jquery.elang.d.ts) [eLang](https://github.com/sumegizoltan/ELang) by [Zoltan Sumegi](https://github.com/sumegizoltan)
 * [:link:](github-electron/github-electron.d.ts) [Electron (shared between main and rederer processes)](http://electron.atom.io) by [jedmao](https://github.com/jedmao)
 * [:link:](github-electron/electron-prebuilt.d.ts) [electron-prebuilt](https://github.com/mafintosh/electron-prebuilt) by [rhysd](https://github.com/rhysd)
@@ -266,6 +294,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](emissary/emissary.d.ts) [emissary](https://github.com/atom/emissary) by [vvakame](https://github.com/vvakame)
 * [:link:](empower/empower.d.ts) [empower](https://github.com/twada/empower) by [vvakame](https://github.com/vvakame)
 * [:link:](emscripten/emscripten.d.ts) [Emscripten](http://kripken.github.io/emscripten-site/index.html) by [Kensuke Matsuzaki](https://github.com/zakki)
+* [:link:](envify/envify.d.ts) [envify](https://github.com/hughsk/envify) by [Qubo](https://github.com/tkQubo)
 * [:link:](epiceditor/epiceditor.d.ts) [EpicEditor](http://epiceditor.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](eq.js/eq.js.d.ts) [eq.js](https://github.com/Snugug/eq.js) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](errorhandler/errorhandler.d.ts) [errorhandler](https://github.com/expressjs/errorhandler) by [Santi Albo](https://github.com/santialbo)
@@ -287,21 +316,26 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](express/express.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](express-debug/express-debug.d.ts) [express-debug](https://github.com/devoidfury/express-debug) by [Federico Bond](https://github.com/federicobond)
 * [:link:](express-jwt/express-jwt.d.ts) [express-jwt](https://www.npmjs.org/package/express-jwt) by [Wonshik Kim](https://github.com/wokim)
+* [:link:](express-less/express-less.d.ts) [express-less](https://www.npmjs.com/package/express-less) by [xyb](https://github.com/xieyubo)
 * [:link:](express-myconnection/express-myconnection.d.ts) [express-myconnection](https://www.npmjs.org/package/express-myconnection) by [Michael Ferris](https://github.com/Cellule)
 * [:link:](express-partials/express-partials.d.ts) [express-partials](https://github.com/publicclass/express-partials) by [jt000](https://github.com/jt000)
+* [:link:](express-route-fs/express-route-fs.d.ts) [express-route-fs](https://github.com/kripod/express-route-fs) by [Kristóf Poduszló](https://github.com/kripod)
 * [:link:](express-session/express-session.d.ts) [express-session](https://www.npmjs.org/package/express-session) by [Hiroki Horiuchi](https://github.com/horiuchi)
 * [:link:](express-unless/express-unless.d.ts) [express-unless](https://www.npmjs.org/package/express-unless) by [Wonshik Kim](https://github.com/wokim)
 * [:link:](express-validator/express-validator.d.ts) [express-validator](https://github.com/ctavan/express-validator) by [Nathan Ridley](https://github.com/axefrog), [Jonathan Häberle](http://dreampulse.de)
 * [:link:](extend/extend.d.ts) [extend](https://www.npmjs.com/package/extend) by [Stefan Steinhart](https://github.com/reppners)
 * [:link:](extjs/ExtJS.d.ts) [ExtJS](http://www.sencha.com/products/extjs) by [Brian Kotek](https://github.com/brian428)
 * [:link:](eyes/eyes.d.ts) [eyes](https://github.com/cloudhead/eyes.js) by [bryn austin bellomy](https://github.com/brynbellomy)
-* [:link:](fabricjs/fabricjs.d.ts) [FabricJS](http://fabricjs.com) by [Oliver Klemencic](https://github.com/oklemencic), [Joseph Livecchi](https://github.com/joewashear007)
+* [:link:](fabricjs/fabricjs.d.ts) [FabricJS](http://fabricjs.com) by [Oliver Klemencic](https://github.com/oklemencic), [Joseph Livecchi](https://github.com/joewashear007), [Michael Randolph](https://github.com/mrand01)
 * [:link:](fbsdk/fbsdk.d.ts) [Facebook Javascript SDK](https://developers.facebook.com/docs/javascript) by [Joshua Strobl](https://github.com/JoshStrobl)
+* [:link:](faker/faker.d.ts) [faker](http://marak.com/faker.js) by [Bas Pennings](https://github.com/basp), [Yuki Kokubun](https://github.com/Kuniwak)
 * [:link:](famous/famous.d.ts) [Famous Engine](http://famous.org) by [Boris Vasilenko](https://github.com/borisvasilenko)
 * [:link:](fancybox/fancybox.d.ts) [fancyBox](https://github.com/fancyapps/fancyBox) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](farbtastic/farbtastic.d.ts) [Farbtastic: jQuery Color Wheel](http://mattfarina.github.io/farbtastic) by [Matt Brooks](https://github.com/EnableSoftware)
 * [:link:](fast-stats/fast-stats.d.ts) [fast-stats](https://github.com/bluesmoon/node-faststats) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](fastclick/fastclick.d.ts) [FastClick](https://github.com/ftlabs/fastclick) by [Shinnosuke Watanabe](https://github.com/shinnn)
+* [:link:](favico.js/favico.js.d.ts) [favico.js](http://lab.ejci.net/favico.js) by [Yu Matsushita](https://github.com/drowse314-dev-ymat)
+* [:link:](featherlight/featherlight.d.ts) [Featherlight](https://noelboss.github.io/featherlight) by [Kaur Kuut](https://github.com/xStrom)
 * [:link:](whatwg-fetch/whatwg-fetch.d.ts) [fetch API](https://github.com/github/fetch) by [Ryan Graham](https://github.com/ryan-codingintrigue)
 * [:link:](fhir/fhir.d.ts) [FHIR DSTU2](http://www.hl7.org/fhir/2015May/index.html) by [Artifact Health](www.artifacthealth.com)
 * [:link:](fibers/fibers.d.ts) [fibers](https://github.com/laverdet/node-fibers) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
@@ -309,26 +343,33 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](filesystem/filesystem.d.ts) [File System API](http://www.w3.org/TR/file-system-api) by [Kon](http://phyzkit.net)
 * [:link:](FileSaver/FileSaver.d.ts) [FileSaver.js](https://github.com/eligrey/FileSaver.js) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](Finch/Finch.d.ts) [Finch](https://github.com/stoodder/finchjs) by [David Sichau](https://github.com/DavidSichau)
-* [:link:](findup-sync/findup-sync.d.ts) [findup-sync](https://github.com/cowboy/node-findup-sync) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](findup-sync/findup-sync.d.ts) [findup-sync](https://github.com/cowboy/node-findup-sync) by [Bart van der Schoor](https://github.com/Bartvds), [Nathan Brown](https://github.com/ngbrown)
 * [:link:](fingerprintjs/fingerprint.d.ts) [fingerprintjs](https://github.com/Valve/fingerprintjs) by [Shunsuke Ohtani](https://github.com/zaneli)
 * [:link:](state-machine/state-machine.d.ts) [Finite State Machine](https://github.com/jakesgordon/javascript-state-machine) by [Boris Yankov](https://github.com/borisyankov), [Maarten Docter](https://github.com/mdocter), [William Sears](https://github.com/MrBigDog2U)
 * [:link:](firebase/firebase.d.ts) [Firebase API](https://www.firebase.com/docs/javascript/firebase) by [Vincent Botone](https://github.com/vbortone), [Shin1 Kashimura](https://github.com/in-async)
 * [:link:](firebase-client/firebase-client.d.ts) [Firebase Client](https://www.github.com/jpstevens/firebase-client) by [Andrew Breen](https://github.com/fpsscarecrow)
 * [:link:](firebase/firebase-simplelogin.d.ts) [Firebase Simple Login](https://www.firebase.com/docs/security/simple-login-overview.html) by [Wilker Lucio](http://github.com/wilkerlucio)
 * [:link:](first-mate/first-mate.d.ts) [first-mate](https://github.com/atom/first-mate) by [Vadim Macagon](https://github.com/enlight)
+* [:link:](flake-idgen/flake-idgen.d.ts) [flakge-idgen](https://github.com/T-PWK/flake-idgen) by [Yuce Tekol](http://yuce.me)
 * [:link:](flexSlider/flexSlider.d.ts) [FlexSlider 2 jquery plugin](https://github.com/woothemes/FlexSlider) by [Diullei Gomes](https://github.com/diullei)
 * [:link:](flight/flight.d.ts) [Flight](http://flightjs.github.com/flight) by [Jonathan Hedrén](https://github.com/jonathanhedren)
 * [:link:](flipsnap/flipsnap.d.ts) [flipsnap.js](http://pxgrid.github.io/js-flipsnap) by [kubosho](https://github.com/kubosho), [gsino](https://github.com/gsino), [Mayuki Sawatari](https://github.com/mayuki)
 * [:link:](flot/jquery.flot.d.ts) [Flot](http://www.flotcharts.org) by [Matt Burland](https://github.com/burlandm)
+* [:link:](flowjs/flowjs.d.ts) [flowjs](https://github.com/flowjs/flow.js) by [Ryan McNamara](https://github.com/ryan10132)
 * [:link:](flux/flux.d.ts) [Flux](http://facebook.github.io/flux) by [Steve Baker](https://github.com/stkb)
 * [:link:](fluxxor/fluxxor.d.ts) [Fluxxor](https://github.com/BinaryMuse/fluxxor) by [Yuichi Murata](https://github.com/mrk21)
+* [:link:](fontoxml/fontoxml.d.ts) [FontoXML](http://www.fontoxml.com) by [Roland Zwaga](https://github.com/rolandzwaga)
 * [:link:](ion.rangeSlider/ion.rangeSlider.d.ts) [for Ion.RangeSlider](https://github.com/IonDen/ion.rangeSlider) by [Sixin Li](https://github.com/sixinli)
 * [:link:](forge-di/forge-di.d.ts) [forge-di](https://github.com/nkohari/forge) by [Adam Carr](https://github.com/adamcarr)
 * [:link:](form-data/form-data.d.ts) [form-data](https://github.com/felixge/node-form-data) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](formidable/formidable.d.ts) [Formidable](https://github.com/felixge/node-formidable) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](foundation/foundation.d.ts) [Foundation](http://foundation.zurb.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](fpsmeter/FPSMeter.d.ts) [FPSmeter](http://darsa.in/fpsmeter) by [Aaron Lampros](http://github.com/alampros)
+* [:link:](freedom/freedom-core-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
+* [:link:](freedom/freedom-module-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
+* [:link:](freedom/freedom.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
 * [:link:](from/from.d.ts) [from](https://github.com/dominictarr/from) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](fs-ext/fs-ext.d.ts) [fs-ext](https://github.com/baudehlo/node-fs-ext) by [Oguzhan Ergin](https://github.com/OguzhanE)
 * [:link:](fs-extra/fs-extra.d.ts) [fs-extra](https://github.com/jprichardson/node-fs-extra) by [midknight41](https://github.com/midknight41)
 * [:link:](fs-finder/fs-finder.d.ts) [fs-finder](https://github.com/sakren/node-fs-finder) by [Michael Zabka](https://github.com/misak113)
 * [:link:](fs-mock/fs-mock.d.ts) [fs-mock](https://github.com/sakren/node-fs-mock) by [Rogier Schouten](https://github.com/rogierschouten)
@@ -341,6 +382,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gamepad/gamepad.d.ts) [Gamepad API](http://www.w3.org/TR/gamepad) by [Kon](http://phyzkit.net)
 * [:link:](gamequery/gamequery.d.ts) [gameQuery](http://gamequeryjs.com) by [David Laubreiter](https://github.com/Laubi)
 * [:link:](gently/gently.d.ts) [gently](https://www.npmjs.org/package/gently) by [bonnici](https://github.com/bonnici)
+* [:link:](geoip-lite/geoip-lite.d.ts) [GeoIP-lite](https://github.com/bluesmoon/node-geoip) by [Yuce Tekol](http://yuce.me)
 * [:link:](geojson/geojson.d.ts) [GeoJSON Format Specification](http://geojson.org) by [Jacob Bruun](https://github.com/cobster)
 * [:link:](geometry-dom/geometry-dom.d.ts) [Geometry Format Specification](http://www.w3.org/TR/geometry-1) by [Toshiya Nakakura](https://github.com/nakakura)
 * [:link:](giraffe/giraffe.d.ts) [Giraffe](https://github.com/barc/backbone.giraffe) by [Matt McCray](https://github.com/darthapo)
@@ -368,9 +410,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](google.visualization/google.visualization.d.ts) [Google Visualisation Apis](https://developers.google.com/chart) by [Dan Ludwig](https://github.com/danludwig)
 * [:link:](gae.channel.api/gae.channel.api.d.ts) [GoogleAppEngine's Channel API](https://developers.google.com/appengine/docs/java/channel/javascript) by [vvakame](https://github.com/vvakame)
 * [:link:](graceful-fs/graceful-fs.d.ts) [graceful-fs](https://github.com/cowboy/graceful-fs) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](graphviz/graphviz.d.ts) [Graphviz](git://github.com/glejeune/node-graphviz.git) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](greasemonkey/greasemonkey.d.ts) [Greasemonkey](http://www.greasespot.net) by [Kota Saito](https://github.com/kotas)
 * [:link:](greensock/greensock.d.ts) [GreenSock Animation Platform](http://www.greensock.com/get-started-js) by [Robert S](https://github.com/codebelt)
 * [:link:](gridfs-stream/gridfs-stream.d.ts) [gridfs-stream](https://github.com/aheckmann/gridfs-stream) by [Lior Mualem](https://github.com/liorm)
+* [:link:](gridstack/gridstack.d.ts) [Gridstack](http://troolee.github.io/gridstack.js) by [Pascal Senn](https://github.com/PascalSenn)
 * [:link:](gruntjs/gruntjs.d.ts) [Grunt 0.4.x](http://gruntjs.com) by [Jeff May](https://github.com/jeffmay), [Basarat Ali Syed](https://github.com/basarat)
 * [:link:](gsap/TweenLite.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
 * [:link:](gsap/Ease.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
@@ -378,13 +422,21 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gulp/gulp.d.ts) [Gulp v3.8.x](http://gulpjs.com) by [Drew Noakes](https://drewnoakes.com)
 * [:link:](gulp-autoprefixer/gulp-autoprefixer.d.ts) [gulp-autoprefixer](https://github.com/sindresorhus/gulp-autoprefixer) by [Asana](https://asana.com)
 * [:link:](gulp-cached/gulp-cached.d.ts) [gulp-cached](https://github.com/wearefractal/gulp-cached) by [Thomas Corbière](https://github.com/tomc974)
+* [:link:](gulp-changed/gulp-changed.d.ts) [gulp-changed](https://github.com/sindresorhus/gulp-changed) by [Thomas Corbière](https://github.com/tomc974)
+* [:link:](gulp-cheerio/gulp-cheerio.d.ts) [gulp-cheerio](https://github.com/KenPowers/gulp-cheerio) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-coffeeify/gulp-coffeeify.d.ts) [gulp-coffeeify](https://github.com/nariyu/gulp-coffeeify) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-coffeelint/gulp-coffeelint.d.ts) [gulp-coffeelint](https://github.com/janraasch/gulp-coffeelint) by [Qubo](https://github.com/tkQubo)
 * [:link:](gulp-concat/gulp-concat.d.ts) [gulp-concat](http://github.com/wearefractal/gulp-concat) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
-* [:link:](gulp-rev/gulp-rev.d.ts) [gulp-csso](https://github.com/sindresorhus/gulp-rev) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](gulp-csso/gulp-csso.d.ts) [gulp-csso](https://github.com/ben-eb/gulp-csso) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [:link:](gulp-rev/gulp-rev.d.ts) [gulp-csso](https://github.com/sindresorhus/gulp-rev) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](gulp-debug/gulp-debug.d.ts) [gulp-debug](https://github.com/sindresorhus/gulp-debug) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [:link:](gulp-dtsm/gulp-dtsm.d.ts) [gulp-dtsm](https://github.com/9joneg/gulp-dtsm) by [Aya Morisawa](https://github.com/AyaMorisawa)
+* [:link:](gulp-espower/gulp-espower.d.ts) [gulp-espower](https://github.com/power-assert-js/gulp-espower) by [Qubo](https://github.com/tkQubo)
 * [:link:](gulp-flatten/gulp-flatten.d.ts) [gulp-flatten](https://github.com/armed/gulp-flatten) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](gulp-gh-pages/gulp-gh-pages.d.ts) [gulp-gh-pages](https://github.com/rowoot/gulp-gh-pages) by [Asana](https://asana.com)
-* [:link:](gulp-if/gulp-if.d.ts) [gulp-if](https://github.com/robrich/gulp-if) by [Asana](https://asana.com)
+* [:link:](gulp-gzip/gulp-gzip.d.ts) [gulp-gzip](https://github.com/jstuckey/gulp-gzip) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-help/gulp-help.d.ts) [gulp-help](https://github.com/chmontgomery/gulp-help) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-if/gulp-if.d.ts) [gulp-if](https://github.com/robrich/gulp-if) by [Asana](https://asana.com), [Joe Skeen](http://github.com/joeskeen)
 * [:link:](gulp-inject/gulp-inject.d.ts) [gulp-inject](https://github.com/klei/gulp-inject) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](gulp-istanbul/gulp-istanbul.d.ts) [gulp-istanbul](https://github.com/SBoudrias/gulp-istanbul) by [Asana](https://asana.com)
 * [:link:](gulp-jasmine-browser/gulp-jasmine-browser.d.ts) [gulp-jasmine-browser](https://github.com/jasmine/gulp-jasmine-browser) by [Tanguy Krotoff](https://github.com/tkrotoff)
@@ -393,6 +445,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gulp-minify-css/gulp-minify-css.d.ts) [gulp-minify-css](https://github.com/jonathanepollack/gulp-minify-css) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](gulp-minify-html/gulp-minify-html.d.ts) [gulp-minify-html](https://github.com/murphydanger/gulp-minify-html) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](gulp-mocha/gulp-mocha.d.ts) [gulp-mocha](https://github.com/sindresorhus/gulp-mocha) by [Asana](https://asana.com)
+* [:link:](gulp-newer/gulp-newer.d.ts) [gulp-newer](https://github.com/tschaub/gulp-newer) by [Thomas Corbière](https://github.com/tomc974)
+* [:link:](gulp-ng-annotate/gulp-ng-annotate.d.ts) [gulp-ng-annotate](https://github.com/Kagami/gulp-ng-annotate) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-nodemon/gulp-nodemon.d.ts) [gulp-nodemon](https://github.com/JacksonGariety/gulp-nodemon) by [Qubo](https://github.com/tkQubo)
+* [:link:](gulp-plumber/gulp-plumber.d.ts) [gulp-plumber](https://github.com/floatdrop/gulp-plumber) by [Joe Skeen](http://github.com/joeskeen)
 * [:link:](gulp-protractor/gulp-protractor.d.ts) [gulp-protractor](https://github.com/mllrsohn/gulp-protractor) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](gulp-remember/gulp-remember.d.ts) [gulp-remember](https://github.com/ahaurw01/gulp-remember) by [Thomas Corbière](https://github.com/tomc974)
 * [:link:](gulp-rename/gulp-rename.d.ts) [gulp-rename](https://github.com/hparra/gulp-rename) by [Asana](https://asana.com)
@@ -400,8 +456,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gulp-rev-replace/gulp-rev-replace.d.ts) [gulp-rev-replace](https://github.com/jamesknelson/gulp-rev-replace) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](gulp-ruby-sass/gulp-ruby-sass.d.ts) [gulp-ruby-sass](https://github.com/sindresorhus/gulp-ruby-sass) by [Agnislav Onufrijchuk](https://github.com/agnislav)
 * [:link:](gulp-sass/gulp-sass.d.ts) [gulp-sass](https://github.com/dlmanning/gulp-sass) by [Asana](https://asana.com)
+* [:link:](gulp-shell/gulp-shell.d.ts) [gulp-shell](https://github.com/sun-zheng-an/gulp-shell) by [Qubo](https://github.com/tkqubo)
 * [:link:](gulp-size/gulp-size.d.ts) [gulp-size](https://github.com/sindresorhus/gulp-size) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [:link:](gulp-sort/gulp-sort.d.ts) [gulp-sort](https://github.com/pgilad/gulp-sort) by [Joe Skeen](http://github.com/joeskeen)
 * [:link:](gulp-sourcemaps/gulp-sourcemaps.d.ts) [gulp-sourcemaps](https://github.com/floridoo/gulp-sourcemaps) by [Asana](https://asana.com)
+* [:link:](gulp-svg-sprite/gulp-svg-sprite.d.ts) [gulp-svg-sprite](https://github.com/jkphl/gulp-svg-sprite) by [Qubo](https://github.com/tkqubo)
+* [:link:](gulp-task-listing/gulp-task-listing.d.ts) [gulp-task-listing](https://github.com/OverZealous/gulp-task-listing) by [Joe Skeen](http://github.com/joeskeen)
 * [:link:](gulp-tsd/gulp-tsd.d.ts) [gulp-tsd](https://github.com/moznion/gulp-tsd) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](gulp-tslint/gulp-tslint.d.ts) [gulp-tslint](https://github.com/panuhorsmalahti/gulp-tslint) by [Asana](https://asana.com)
 * [:link:](gulp-typedoc/gulp-typedoc.d.ts) [gulp-typedoc](https://github.com/rogierschouten/gulp-typedoc) by [Asana](https://asana.com)
@@ -422,6 +482,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](heatmap.js/heatmap.d.ts) [heatmap.js](https://github.com/pa7/heatmap.js) by [Yang Guan](https://github.com/lookuptable)
 * [:link:](hellojs/hellojs.d.ts) [hello.js](http://adodson.com/hello.js) by [Pavel Zika](https://github.com/PavelPZ)
 * [:link:](highcharts/highcharts.d.ts) [Highcharts](http://www.highcharts.com) by [Damiano Gambarotto](http://github.com/damianog)
+* [:link:](highcharts-ng/highcharts-ng.d.ts) [highcharts-ng](https://github.com/pablojim/highcharts-ng) by [Scott Hatcher](https://github.com/scatcher)
 * [:link:](highland/highland.d.ts) [Highland](http://highlandjs.org) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](highlightjs/highlightjs.d.ts) [highlight.js](https://github.com/isagalaev/highlight.js) by [Niklas Mollenhauer](https://github.com/nikeee), [Jeremy Hull](https://github.com/sourrust)
 * [:link:](highcharts/highstock.d.ts) [Highstock](http://www.highcharts.com) by [David Deutsch](http://github.com/DavidKDeutsch)
@@ -435,6 +496,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](statuses/statuses.d.ts) [http-errors](https://github.com/jshttp/statuses) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](http-status/http-status.d.ts) [http-status](https://github.com/wdavidw/node-http-status) by [Michael Zabka](https://github.com/misak113)
 * [:link:](http-string-parser/http-string-parser.d.ts) [http-string-parser](https://github.com/apiaryio/http-string-parser) by [MIZUNE Pine](https://github.com/pine613)
+* [:link:](httperr/httperr.d.ts) [httperr](https://github.com/pluma/httperr) by [Troy Gerwien](https://github.com/yortus)
 * [:link:](humane/humane.d.ts) [Humane](http://wavded.github.com/humane-js) by [jmvrbanac](https://github.com/jmvrbanac)
 * [:link:](hypertext-application-language/hypertext-application-language.d.ts) [Hypertext Application Language Draft 6](https://tools.ietf.org/html/draft-kelly-json-hal-06) by [Maks3w](https://github.com/maks3w)
 * [:link:](i18n-node/i18n-node.d.ts) [i18n-node](https://github.com/mashpie/i18n-node) by [Maxime LUCE](https://github.com/SomaticIT)
@@ -451,6 +513,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](incremental-dom/incremental-dom.d.ts) [Incremetal DOM](https://github.com/google/incremental-dom) by [Basarat Ali Syed](https://github.com/basarat)
 * [:link:](inflection/inflection.d.ts) [inflection](https://github.com/dreamerslab/node.inflection) by [Shogo Iwano](https://github.com/shiwano)
 * [:link:](ini/ini.d.ts) [ini](https://github.com/isaacs/ini) by [Marcin Porębski](https://github.com/marcinporebski)
+* [:link:](inquirer/inquirer.d.ts) [Inquirer.js](https://github.com/SBoudrias/Inquirer.js) by [Qubo](https://github.com/tkQubo)
 * [:link:](insight/insight.d.ts) [insight](https://github.com/yeoman/insight) by [vvakame](http://github.com/vvakame)
 * [:link:](interactjs/interact.d.ts) [Interacting for interact.js](https://github.com/taye/interact.js) by [Douglas Eichelberger](https://github.com/dduugg), [Adi Dahiya](https://github.com/adidahiya), [Tom Hasner](https://github.com/thasner)
 * [:link:](intercomjs/intercom.d.ts) [intercom.js](https://github.com/diy/intercom.js) by [spencerwi](http://github.com/spencerwi)
@@ -468,14 +531,17 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](iso8601-localizer/iso8601-localizer.d.ts) [ISO8601-Localizer](https://github.com/avielfedida/ISO8601-Localizer) by [Aviel Fedida](https://github.com/avielfedida)
 * [:link:](ix.js/ix.d.ts) [IxJS 1.0.6 / ix.js](https://github.com/Reactive-Extensions/IxJS) by [Igor Oleinikov](https://github.com/Igorbek)
 * [:link:](ix.js/l2o.d.ts) [IxJS 1.0.6 / l2o.js](https://github.com/Reactive-Extensions/IxJS) by [Igor Oleinikov](https://github.com/Igorbek)
+* [:link:](jade/jade.d.ts) [jade](https://github.com/jadejs/jade) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
 * [:link:](jake/jake.d.ts) [jake](https://github.com/mde/jake) by [Kon](http://phyzkit.net)
 * [:link:](jasmine/jasmine.d.ts) [Jasmine](http://jasmine.github.io) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb), [David Pärsson](https://github.com/davidparsson)
 * [:link:](jasmine-data_driven_tests/jasmine-data_driven_tests.d.ts) [Jasmine Data Driven Tests](https://github.com/gburghardt/jasmine-data_driven_tests) by [Anthony MacKinnon](https://github.com/AnthonyMacKinnon)
 * [:link:](jasmine-ajax/jasmine-ajax.d.ts) [jasmine-ajax](https://github.com/jasmine/jasmine-ajax) by [Louis Grignon](https://github.com/lgrignon)
+* [:link:](jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts) [jasmine-es6-promise-matchers](https://github.com/bvaughn/jasmine-es6-promise-matchers) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](jasmine-fixture/jasmine-fixture.d.ts) [Jasmine-fixture](https://github.com/searls/jasmine-fixture) by [Craig Brett](https://github.com/craigbrett17)
 * [:link:](jasmine-jquery/jasmine-jquery.d.ts) [Jasmine-JQuery](https://github.com/velesin/jasmine-jquery) by [Gregor Stamac](https://github.com/gstamac)
 * [:link:](jasmine-matchers/jasmine-matchers.d.ts) [jasmine-matchers](https://github.com/uxebu/jasmine-matchers) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](jasmine-promise-matchers/jasmine-promise-matchers.d.ts) [jasmine-promise-matchers](https://github.com/bvaughn/jasmine-promise-matchers) by [Matthew Hill](https://github.com/matthewjh)
+* [:link:](java/java.d.ts) [java](https://github.com/joeferner/java) by [Jim Lloyd](https://github.com/jimlloyd)
 * [:link:](java-applet/java-applet.d.ts) [Java Applet](https://www.java.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](hooker/hooker.d.ts) [JavaScript Hooker](https://github.com/cowboy/javascript-hooker) by [Michael Zabka](https://github.com/misak113)
 * [:link:](oauth.js/oauth.js.d.ts) [JavaScript software for implementing an OAuth consumer](https://code.google.com/p/oauth) by [NOBUOKA Yu](https://github.com/nobuoka)
@@ -486,7 +552,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jjve/jjve.d.ts) [JJVE](https://github.com/silas/jjve) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](joData/joData.d.ts) [joData](https://github.com/mccow002/joData) by [Chris Wrench](https://github.com/cgwrench)
 * [:link:](johnny-five/johnny-five.d.ts) [johnny-five](https://github.com/rwaldron/johnny-five) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](joi/joi.d.ts) [joi](https://github.com/spumko/joi) by [Bart van der Schoor](https://github.com/Bartvds), [Laurence Dougal Myers](https://github.com/laurence-myers)
+* [:link:](joi/joi.d.ts) [joi](https://github.com/spumko/joi) by [Bart van der Schoor](https://github.com/Bartvds), [Laurence Dougal Myers](https://github.com/laurence-myers), [Christopher Glantschnig](https://github.com/cglantschnig)
 * [:link:](jointjs/jointjs.d.ts) [Joint JS](http://www.jointjs.com) by [Aidan Reel](http://github.com/areel), [David Durman](http://github.com/DavidDurman), [Ewout Van Gossum](https://github.com/DenEwout)
 * [:link:](jqrangeslider/jqrangeslider.d.ts) [jQRangeSlider](http://ghusse.github.com/jQRangeSlider) by [Dániel Tar](https://github.com/qcz)
 * [:link:](jquery/jquery.d.ts) [jQuery 1.10.x / 2.0.x](http://jquery.com) by [Boris Yankov](https://github.com/borisyankov), [Christian Hoffmeister](https://github.com/choffmeister), [Steve Fenton](https://github.com/Steve-Fenton), [Diullei Gomes](https://github.com/Diullei), [Tass Iliopoulos](https://github.com/tasoili), [Jason Swearingen](https://github.com/jasons-novaleaf), [Sean Hill](https://github.com/seanski), [Guus Goossens](https://github.com/Guuz), [Kelly Summerlin](https://github.com/ksummerlin), [Basarat Ali Syed](https://github.com/basarat), [Nicholas Wolverson](https://github.com/nwolverson), [Derek Cicerone](https://github.com/derekcicerone), [Andrew Gaspar](https://github.com/AndrewGaspar), [James Harrison Fisher](https://github.com/jameshfisher), [Seikichi Kondo](https://github.com/seikichi), [Benjamin Jackman](https://github.com/benjaminjackman), [Poul Sorensen](https://github.com/s093294), [Josh Strobl](https://github.com/JoshStrobl), [John Reilly](https://github.com/johnnyreilly), [Dick van den Brink](https://github.com/DickvdBrink)
@@ -494,7 +560,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jquery.cleditor/jquery.cleditor.d.ts) [jQuery CLEditor Plugin](http://premiumsoftware.net/CLEditor) by [Jeffery Grajkowski](https://github.com/pushplay)
 * [:link:](jquery.colorpicker/jquery.colorpicker.d.ts) [jQuery Colorpicker Plugin](https://github.com/vanderlee/colorpicker) by [Jeffery Grajkowski](https://github.com/pushplay)
 * [:link:](jquery.contextMenu/jquery.contextMenu.d.ts) [jQuery contextMenu](http://medialize.github.com/jQuery-contextMenu) by [Natan Vivo](https://github.com/nvivo)
-* [:link:](jquery.cookie/jquery.cookie.d.ts) [jQuery Cookie Plugin](https://github.com/carhartl/jquery-cookie) by [Roy Goode](https://github.com/RoyGoode)
+* [:link:](jquery.cookie/jquery.cookie.d.ts) [jQuery Cookie Plugin](https://github.com/carhartl/jquery-cookie) by [Roy Goode](https://github.com/RoyGoode), [Ben Lorantfy](https://github.com/BenLorantfy)
+* [:link:](jquery-cropbox/jquery-cropbox.d.ts) [jQuery cropbox](https://github.com/acornejo/jquery-cropbox) by [Per Kastman](https://github.com/PerKastman)
 * [:link:](jquery.cycle2/jquery.cycle2.d.ts) [jQuery Cycle2 version (build 20140216)](http://jquery.malsup.com/cycle2) by [Donny Nadolny](https://github.com/dnadolny)
 * [:link:](jquery.dataTables/jquery.dataTables.d.ts) [JQuery DataTables](http://www.datatables.net) by [Kiarash Ghiaseddin](https://github.com/Silver-Connection/DefinitelyTyped), [Omid Rad](https://github.com/omidkrad), [Armin Sander](https://github.com/pragmatrix)
 * [:link:](jquery.fileupload/jquery.fileupload.d.ts) [jQuery File Upload Plugin](https://github.com/blueimp/jQuery-File-Upload) by [Rob Alarcon](https://github.com/rob-alarcon)
@@ -518,11 +585,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jquery.ui.datetimepicker/jquery.ui.datetimepicker.d.ts) [jQuery UI DateTimePicker](http://trentrichardson.com/examples/timepicker) by [dougajmcdonald](https://github.com/dougajmcdonald)
 * [:link:](jquery.ui.layout/jquery.ui.layout.d.ts) [jQuery UI Layout Plug-in](http://layout.jquery-dev.net) by [Steve Fenton](https://github.com/Steve-Fenton)
 * [:link:](jquery.timepicker/jquery.timepicker.d.ts) [jQuery UI Timepicker](http://fgelinas.com/code/timepicker) by [Anwar Javed](https://github.com/anwarjaved)
+* [:link:](jquery-ajax-chain/jquery-ajax-chain.d.ts) [jquery-ajax-chain v](https://github.com/humana-fragilitas/jQuery-Ajax-Chain) by [Andrea Blasio](https://github.com/humana-fragilitas)
 * [:link:](jquery-fullscreen/jquery-fullscreen.d.ts) [jquery-fullscreen](https://github.com/kayahr/jquery-fullscreen-plugin) by [Bruno Grieder](https://github.com/bgrieder)
 * [:link:](jquery-handsontable/jquery-handsontable.d.ts) [jquery-handsontable](http://handsontable.com) by [Ted John](https://github.com/intelorca)
 * [:link:](jquery.menuaim/jquery.menuaim.d.ts) [jQuery-menu-aim](https://github.com/kamens/jQuery-menu-aim) by [Robert Fonseca-Ensor](http://www.robfe.com)
 * [:link:](jquery.pjax/jquery.pjax.d.ts) [jquery-pjax](https://github.com/defunkt/jquery-pjax) by [Junle Li](https://github.com/lijunle)
+* [:link:](jquery-timeentry/jquery-timeentry.d.ts) [jQuery-timeentry.js](https://github.com/kbwood/timeentry) by [Mark Nadig](https://github.com/marknadig)
+* [:link:](jquery-urlparam/jquery-urlparam.d.ts) [jquery-urlparam](https://gist.github.com/stpettersens/e1f4478f299b6f4905c1) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](jquery.address/jquery.address.d.ts) [jQuery.Address](https://github.com/asual/jquery-address) by [Martin Duparc](https://github.com/martinduparc), [Tim Klingeleers](https://github.com/mardaneus86)
+* [:link:](jquery.ajaxfile/jquery.ajaxFile.d.ts) [jquery.ajaxfile](https://github.com/fpellet/jquery.ajaxFile) by [Florent PELLET](https://github.com/fpellet)
 * [:link:](jquery.are-you-sure/jquery.are-you-sure.d.ts) [jquery.are-you-sure.js](https://github.com/codedance/jquery.AreYouSure) by [Jon Egerton](https://github.com/jonegerton)
 * [:link:](jquery.autosize/jquery.autosize.d.ts) [jquery.autosize](http://www.jacklmoore.com/autosize) by [Aaron T. King](https://github.com/kingdango)
 * [:link:](jquery.bbq/jquery.bbq.d.ts) [jquery.bbq](http://benalman.com/projects/jquery-bbq-plugin) by [Adam R. Smith](https://github.com/sunetos)
@@ -548,6 +619,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jquery.scrollTo/jquery.scrollTo.d.ts) [jQuery.scrollTo.js](https://github.com/flesler/jquery.scrollTo) by [Neil Stalker](https://github.com/nestalk)
 * [:link:](jquery.simulate/jquery.simulate.d.ts) [jquery.simulate.js](https://github.com/jquery/jquery-simulate) by [Derek Cicerone](https://github.com/derekcicerone)
 * [:link:](jquery.slimScroll/jquery.slimScroll.d.ts) [jQuery.slimScroll](https://github.com/rochal/jQuery-slimScroll) by [Chintan Shah](https://github.com/Promact)
+* [:link:](jquery.soap/jquery.soap.d.ts) [jQuery.SOAP](https://github.com/doedje/jquery.soap) by [Roland Greim](https://github.com/tigerxy)
 * [:link:](jquery.sortElements/jquery.sortElement.d.ts) [jQuery.sortElements](http://james.padolsey.com/javascript/sorting-elements-with-jquery) by [Tim Bureck](https://github.com/tbureck)
 * [:link:](jquery.superLink/jquery.superLink.d.ts) [jquery.superLink](http://james.padolsey.com/demos/plugins/jQuery/superLink/superlink.jquery.js) by [Blake Niemyjski](https://github.com/niemyjski)
 * [:link:](jquery.tile/jquery.tile.d.ts) [jquery.tile.js](https://github.com/urin/jquery.tile.js) by [Shunsuke Ohtani](https://github.com/zaneli)
@@ -558,13 +630,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jquery.timer/jquery.timer.d.ts) [jQueryTimer](https://github.com/jchavannes/jquery-timer) by [Joshua Strobl](https://github.com/JoshStrobl)
 * [:link:](jquery.total-storage/jquery.total-storage.d.ts) [jQueryTotalStorage](https://github.com/Upstatement/jquery-total-storage) by [Jeremy Brooks](https://github.com/JeremyCBrooks)
 * [:link:](jqueryui/jqueryui.d.ts) [jQueryUI](http://jqueryui.com) by [Boris Yankov](https://github.com/borisyankov), [John Reilly](https://github.com/johnnyreilly)
-* [:link:](js-cookie/js-cookie.d.ts) [js-cookie](https://github.com/js-cookie/js-cookie) by [Theodore Brown](https://github.com/theodorejb)
+* [:link:](js-beautify/js-beautify.d.ts) [js_beautify](https://github.com/beautify-web/js-beautify) by [Josh Goldberg](https://github.com/JoshuaKGoldberg)
 * [:link:](ua-parser-js/ua-parser-js.d.ts) [js-cookie](https://github.com/faisalman/ua-parser-js) by [Viktor Miroshnikov](https://github.com/superduper)
+* [:link:](js-cookie/js-cookie.d.ts) [js-cookie](https://github.com/js-cookie/js-cookie) by [Theodore Brown](https://github.com/theodorejb)
 * [:link:](js-fixtures/fixtures.d.ts) [js-fixtures](https://github.com/badunk/js-fixtures) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid)
 * [:link:](js-git/js-git.d.ts) [js-git](https://github.com/creationix/js-git) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](js-md5/md5.d.ts) [js-md5](https://github.com/emn178/js-md5) by [Roland Greim](https://github.com/tigerxy)
 * [:link:](js-signals/js-signals.d.ts) [JS-Signals](http://millermedeiros.github.io/js-signals) by [Diullei Gomes](https://github.com/diullei)
 * [:link:](js-yaml/js-yaml.d.ts) [js-yaml](https://github.com/nodeca/js-yaml) by [Bart van der Schoor](https://github.com/Bartvds)
-* [:link:](js-beautify/js-beautify.d.ts) [js_beautify](https://github.com/beautify-web/js-beautify) by [Josh Goldberg](https://github.com/JoshuaKGoldberg)
 * [:link:](blocks/blocks.d.ts) [jsblocks](http://jsblocks.com) by [Krzysztof Śmigiel](https://github.com/ksmigiel)
 * [:link:](jsbn/jsbn.d.ts) [jsbn](http://www-cs-students.stanford.edu/%7Etjw/jsbn) by [Eugene Chernyshov](https://github.com/Evgenus)
 * [:link:](jscrollpane/jscrollpane.d.ts) [jScrollPane](http://jscrollpane.kelvinluck.com) by [Dániel Tar](https://github.com/qcz)
@@ -581,6 +654,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jsnox/jsnox.d.ts) [JSnoX](https://github.com/af/jsnox) by [Steve Baker](https://github.com/stkb)
 * [:link:](json-patch/json-patch.d.ts) [json-patch](https://github.com/bruth/jsonpatch-js) by [vvakame](https://github.com/vvakame)
 * [:link:](json-pointer/json-pointer.d.ts) [json-pointer 1.0 l](https://www.npmjs.org/package/json-pointer) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](json-stable-stringify/json-stable-stringify.d.ts) [json-stable-stringify](https://github.com/substack/json-stable-stringify) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](json5/json5.d.ts) [JSON5](http://json5.org) by [Jason Swearingen](https://jasonswearingen.github.io)
 * [:link:](jsoneditoronline/jsoneditoronline.d.ts) [JSONEditorOnline](https://github.com/josdejong/jsoneditoronline) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](jsonpath/jsonpath.d.ts) [jsonpath](https://www.npmjs.org/package/jsonpath) by [Hiroki Horiuchi](https://github.com/horiuchi)
@@ -593,12 +667,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jstree/jstree.d.ts) [jsTree](http://www.jstree.com) by [Adam Pluciński](https://github.com/adaskothebeast)
 * [:link:](jsuri/jsuri.d.ts) [jsUri](https://github.com/derek-watson/jsUri) by [Chris Charabaruk](http://github.com/coldacid)
 * [:link:](jszip/jszip.d.ts) [JSZip](http://stuk.github.com/jszip) by [mzeiher](https://github.com/mzeiher)
+* [:link:](jug/jug.d.ts) [jug](https://github.com/kaiquewdev/Graph) by [yevt](https://github.com/yevt)
 * [:link:](jwplayer/jwplayer.d.ts) [JW Player](http://developer.longtailvideo.com/trac) by [Martin Duparc](https://github.com/martinduparc)
 * [:link:](jwt-simple/jwt-simple.d.ts) [jwt-simple](https://github.com/hokaccha/node-jwt-simple) by [Ken Fukuyama](https://github.com/kenfdev)
 * [:link:](kafka-node/kafka-node.d.ts) [kafka-node](https://github.com/SOHU-Co/kafka-node) by [Daniel Imrie-Situnayake](https://github.com/dansitu)
 * [:link:](karma/karma.d.ts) [karma](https://github.com/karma-runner/karma) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](karma-jasmine/karma-jasmine.d.ts) [karma-jasmine plugin](https://github.com/karma-runner/karma-jasmine) by [Michel Salib](https://github.com/michelsalib)
 * [:link:](katex/katex.d.ts) [KaTeX v.0.5.0](http://khan.github.io/KaTeX) by [Michael Randolph](https://github.com/mrand01)
+* [:link:](kefir/kefir.d.ts) [Kefir](http://rpominov.github.io/kefir) by [Aya Morisawa](https://github.com/AyaMorisawa)
 * [:link:](kendo-ui/kendo-ui.d.ts) [Kendo UI Professional](http://www.telerik.com/kendo-ui) by [Telerik](https://github.com/telerik)
 * [:link:](keyboardjs/keyboardjs.d.ts) [KeyboardJS](https://github.com/RobertWHurst/KeyboardJS) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](keymaster/keymaster.d.ts) [keymaster](https://github.com/madrobby/keymaster) by [Martin W. Kirst](https://github.com/nitram509)
@@ -639,6 +715,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](leapmotionTS/LeapMotionTS.d.ts) [Leap Motion TS](https://github.com/logotype/LeapMotionTS) by [Victor Norgren](https://github.com/logotype)
 * [:link:](less/less.d.ts) [LESS](http://lesscss.org) by [Tom Hasner](https://github.com/thasner)
 * [:link:](less-middleware/less-middleware.d.ts) [less-middleware](https://github.com/emberfeather/less.js-middleware) by [Federico Bond](https://github.com/federicobond)
+* [:link:](level-sublevel/level-sublevel.d.ts) [level-sublevel](https://github.com/dominictarr/level-sublevel) by [Bas Pennings](https://github.com/basp)
 * [:link:](levelup/levelup.d.ts) [LevelUp](https://github.com/rvagg/node-levelup) by [Bret Little](https://github.com/blittle)
 * [:link:](libxmljs/libxmljs.d.ts) [Libxmljs](https://github.com/polotek/libxmljs) by [François de Campredon](https://github.com/fdecampredon)
 * [:link:](dustjs-linkedin/dustjs-linkedin.d.ts) [linkedin dustjs](https://github.com/linkedin/dustjs) by [Marcelo Dezem](http://github.com/mdezem)
@@ -647,6 +724,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jquery.livestampjs/jquery.livestampjs.d.ts) [Livestamp.js](http://mattbradley.github.com/livestampjs) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](lodash/lodash.d.ts) [Lo-Dash](http://lodash.com) by [Brian Zengel](https://github.com/bczengel), [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](lockfile/lockfile.d.ts) [lockfile](https://github.com/isaacs/lockfile) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](lodash-decorators/lodash-decorators.d.ts) [lodash-decorators](https://github.com/steelsojka/lodash-decorators) by [Qubo](https://github.com/tkqubo)
 * [:link:](log4javascript/log4javascript.d.ts) [log4javascript](http://log4javascript.org) by [Markus Wagner](https://github.com/Ritzlgrmft)
 * [:link:](log4js/log4js.d.ts) [log4js](https://github.com/nomiddlename/log4js-node) by [Kentaro Okuno](http://github.com/armorik83)
 * [:link:](logg/logg.d.ts) [logg](https://github.com/dpup/node-logg) by [Bret Little](https://github.com/blittle)
@@ -669,6 +747,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](magicsuggest/magicsuggest.d.ts) [MagicSuggest](http://nicolasbize.com/magicsuggest) by [Leonardo Chaia](http://github.com/leonardochaia)
 * [:link:](mailcheck/mailcheck.d.ts) [Mailcheck](https://github.com/mailcheck/mailcheck) by [Paulo Cesar](http://github.com/pocesar)
 * [:link:](maildev/maildev.d.ts) [maildev](https://github.com/djfarrelly/maildev) by [Cyril Schumacher](https://github.com/cyrilschumacher)
+* [:link:](mailparser/mailparser.d.ts) [mailparser](https://www.npmjs.com/package/mailparser) by [Peter Snider](https://github.com/psnider)
 * [:link:](main-bower-files/main-bower-files.d.ts) [main-bower-files](https://github.com/ck86/main-bower-files) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](maker.js/makerjs.d.ts) [Maker.js](https://github.com/Microsoft/maker.js) by [Dan Marshall](https://github.com/danmarshall)
 * [:link:](mandrill-api/mandrill-api.d.ts) [Mandrill API 1.x](http://mandrill.com) by [Paulo Cesar](https://github.com/pocesar)
@@ -679,16 +758,21 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](marionette/marionette.d.ts) [Marionette](https://github.com/marionettejs) by [Zeeshan Hamid](https://github.com/zhamid), [Natan Vivo](https://github.com/nvivo), [Sven Tschui](https://github.com/sventschui)
 * [:link:](marked/marked.d.ts) [Marked](https://github.com/chjj/marked) by [William Orr](https://github.com/worr)
 * [:link:](markerclustererplus/markerclustererplus.d.ts) [MarkerClustererPlus for Google Maps V3](http://github.com/mahnunchik/markerclustererplus) by [Mathias Rodriguez](http://github.com/enanox)
+* [:link:](markitup/markitup.d.ts) [markitup 1.x](https://github.com/markitup/1.x) by [drillbits](https://github.com/drillbits)
 * [:link:](maskedinput/maskedinput.d.ts) [Masked Input plugin for jQuery](http://digitalbush.com/projects/masked-input-plugin) by [Lokesh Peta](https://github.com/lokeshpeta)
+* [:link:](material-ui/material-ui.d.ts) [material-ui](https://github.com/callemall/material-ui) by [Nathan Brown](https://github.com/ngbrown)
 * [:link:](mathjax/mathjax.d.ts) [MathJax](https://github.com/mathjax/MathJax) by [Roland Zwaga](https://github.com/rolandzwaga)
 * [:link:](matter-js/matter-js.d.ts) [Matter.js](https://github.com/liabru/matter-js) by [Ivane Gegia](https://twitter.com/ivanegegia)
 * [:link:](mCustomScrollbar/mCustomScrollbar.d.ts) [mCustomScrollbar](https://github.com/malihu/malihu-custom-scrollbar-plugin) by [Sarah Williams](https://github.com/flurg)
 * [:link:](memory-cache/memory-cache.d.ts) [memory-cache](http://github.com/ptarjan/node-cache) by [Jeff Goddard](https://github.com/jedigo)
+* [:link:](mendixmodelsdk/mendixmodelsdk.d.ts) [mendixmodelsdk](http://www.mendix.com) by [Mendix](https://github.com/mendix)
 * [:link:](merge-stream/merge-stream.d.ts) [merge-stream](https://github.com/grncdr/merge-stream) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](merge2/merge2.d.ts) [merge2](https://github.com/teambition/merge2) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [:link:](meshblu/meshblu.d.ts) [meshblu.js](https://github.com/octoblu/meshblu-npm) by [Felipe Nipo](https://github.com/fnipo)
 * [:link:](mess/mess.d.ts) [mess](https://github.com/bobrik/node-mess) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](messenger/messenger.d.ts) [Messenger.js](https://github.com/HubSpot/messenger) by [Derek Cicerone](https://github.com/derekcicerone)
 * [:link:](meteor/meteor.d.ts) [Meteor](http://www.meteor.com) by [Dave Allen](https://github.com/fullflavedave)
+* [:link:](node-mysql-wrapper/my-meteor.d.ts) [meteorjs for node-mysql-wrapper which helps in development](https://github.com/nodets/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
 * [:link:](method-override/method-override.d.ts) [method-override](https://github.com/expressjs/method-override) by [Santi Albo](https://github.com/santialbo)
 * [:link:](metismenu/metismenu.d.ts) [metisMenu](http://github.com/onokumus/metisMenu) by [onokums](https://github.com/onokumus)
 * [:link:](microsoft-ajax/microsoft.ajax.d.ts) [Microsoft ASP.NET Ajax client side library](http://msdn.microsoft.com/en-us/library/ee341002(v=vs.100).aspx) by [Patrick Magee](https://github.com/pjmagee)
@@ -709,15 +793,17 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](mime/mime.d.ts) [mime](https://github.com/broofa/node-mime) by [Jeff Goddard](https://github.com/jedigo)
 * [:link:](minilog/minilog.d.ts) [minilog v2](https://github.com/mixu/minilog) by [Guido](http://guido.io)
 * [:link:](minimatch/minimatch.d.ts) [Minimatch](https://github.com/isaacs/minimatch) by [vvakame](https://github.com/vvakame)
-* [:link:](minimist/minimist.d.ts) [minimist](https://github.com/substack/minimist) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](minimist/minimist.d.ts) [minimist](https://github.com/substack/minimist) by [Bart van der Schoor](https://github.com/Bartvds), [Necroskillz](https://github.com/Necroskillz)
 * [:link:](mithril/mithril.d.ts) [Mithril](http://lhorie.github.io/mithril) by [Leo Horie](https://github.com/lhorie), [Chris Bowdon](https://github.com/cbowdon)
 * [:link:](mixpanel/mixpanel.d.ts) [Mixpanel](https://mixpanel.com) by [Knut Eirik Leira Hjelle](https://github.com/hjellek)
 * [:link:](mixto/mixto.d.ts) [mixto](https://github.com/atom/mixto) by [vvakame](https://github.com/vvakame)
 * [:link:](mkdirp/mkdirp.d.ts) [mkdirp](http://github.com/substack/node-mkdirp) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](mkpath/mkpath.d.ts) [mkpath](https://www.npmjs.com/package/mkpath) by [Jared Klopper](https://github.com/optical)
 * [:link:](mobile-detect/mobile-detect.d.ts) [mobile-detect](http://hgoebl.github.io/mobile-detect.js) by [Martin McWhorter](https://github.com/martinmcwhorter)
-* [:link:](mocha/mocha-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
+* [:link:](mobservable/mobservable.d.ts) [mobservable](https://mweststrate.github.io/mobservable) by [Michel Weststrate](https://github.com/mweststrate)
+* [:link:](mobservable-react/mobservable-react.d.ts) [mobservable](https://github.com/mweststrate/mobservable-react) by [Michel Weststrate](https://github.com/mweststrate)
 * [:link:](mocha/mocha.d.ts) [mocha](http://mochajs.org) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid), [otiai10](https://github.com/otiai10), [jt000](https://github.com/jt000), [Vadim Macagon](https://github.com/enlight)
+* [:link:](mocha/mocha-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
 * [:link:](mocha-phantomjs/mocha-phantomjs.d.ts) [mocha-phantomjs](http://metaskills.net/mocha-phantomjs) by [Erik Schierboom](https://github.com/ErikSchierboom)
 * [:link:](mock-fs/mock-fs.d.ts) [mock-fs](https://github.com/tschaub/mock-fs) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](mockery/mockery.d.ts) [mockery](https://github.com/mfncooper/mockery) by [jt000](https://github.com/jt000)
@@ -738,7 +824,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](mpromise/mpromise.d.ts) [mpromise](https://github.com/aheckmann/mpromise) by [Seulgi Kim](https://github.com/sgkim126)
 * [:link:](msgpack/msgpack.d.ts) [msgpack.js - MessagePack JavaScript Implementation](https://github.com/uupaa/msgpack.js) by [Shinya Mochizuki](https://github.com/enrapt-mochizuki)
 * [:link:](msnodesql/msnodesql.d.ts) [msnodesql](https://github.com/WindowsAzure/node-sqlserver) by [Boris Yankov](https://github.com/borisyankov), [Maxime LUCE](https://github.com/SomaticIT)
-* [:link:](mssql/mssql.d.ts) [mssql](https://www.npmjs.com/package/mssql) by [COLSA Corporation](http://www.colsa.com)
+* [:link:](msportalfx-test/msportalfx-test.d.ts) [msportalfx-test](https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test) by [Julio Casal](https://github.com/julioct)
+* [:link:](mssql/mssql.d.ts) [mssql](https://www.npmjs.com/package/mssql) by [COLSA Corporation](http://www.colsa.com), [Ben Farr](https://github.com/jaminfarr)
 * [:link:](mu2/mu2.d.ts) [mu2](http://github.com/raycmorgan/mu) by [Jeff Goddard](https://github.com/jedigo)
 * [:link:](multer/multer.d.ts) [multer](https://github.com/expressjs/multer) by [jt000](https://github.com/jt000), [vilicvane](https://vilic.github.io)
 * [:link:](multiplexjs/multiplexjs.d.ts) [Multiplex.js](http://github.com/multiplex/multiplex.js) by [Kamyar Nazeri](http://github.com/KamyarNazeri)
@@ -749,10 +836,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ncp/ncp.d.ts) [ncp](https://github.com/AvianFlu/ncp) by [Bart van der Schoor](https://github.com/bartvds)
 * [:link:](nedb/nedb.d.ts) [NeDB](https://github.com/louischatriot/nedb) by [Stefan Steinhart](https://github.com/reppners)
 * [:link:](needle/needle.d.ts) [needle](https://github.com/tomas/needle) by [San Chen](https://github.com/bigsan)
+* [:link:](netmask/netmask.d.ts) [Netmask](https://github.com/rs/node-netmask) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](nexpect/nexpect.d.ts) [nexpect](https://github.com/nodejitsu/nexpect) by [vvakame](http://github.com/vvakame)
 * [:link:](ng-command/ng-command.d.ts) [ng-command](https://github.com/stephenlautier/ng-command) by [Stephen Lautier](https://github.com/stephenlautier)
+* [:link:](ng-flow/ng-flow.d.ts) [ng-flow](https://github.com/flowjs/ng-flow) by [Ryan McNamara](https://github.com/ryan10132)
 * [:link:](ng-grid/ng-grid.d.ts) [ng-grid](http://angular-ui.github.io/ng-grid) by [Ken Smith](https://github.com/smithkl42), [Roland Zwaga](https://github.com/rolandzwaga), [Kent Cooper](https://github.com/kentcooper)
 * [:link:](angular-idle/angular-idle.d.ts) [ng-idle](http://hackedbychinese.github.io/ng-idle) by [mthamil](https://github.com/mthamil)
+* [:link:](ng-dialog/ng-dialog.d.ts) [ngDialog](https://github.com/likeastore/ngDialog) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](ngkookies/ngkookies.d.ts) [ngKookes](https://github.com/voronianski/ngKookies) by [Martin McWhorter](https://github.com/martinmcwhorter)
 * [:link:](ngprogress/ngprogress.d.ts) [ngProgress](http://victorbjelkholm.github.io/ngProgress) by [Martin McWhorter](https://github.com/martinmcwhorter)
 * [:link:](ngprogress-lite/ngprogress-lite.d.ts) [ngprogress-lite](https://github.com/voronianski/ngprogress-lite) by [Luke Forder](https://github.com/LukeForder)
@@ -761,9 +851,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](nock/nock.d.ts) [nock](https://github.com/pgte/nock) by [bonnici](https://github.com/bonnici)
 * [:link:](node-imap/imap.d.ts) [node imap](https://github.com/mscdex/node-imap) by [Steve Fenton](https://github.com/Steve-Fenton)
 * [:link:](node-sass/node-sass.d.ts) [Node Sass](https://github.com/sass/node-sass) by [Asana](https://asana.com)
+* [:link:](acl/acl.d.ts) [node_acl](https://github.com/optimalbits/node_acl) by [Qubo](https://github.com/tkQubo)
+* [:link:](mdns/mdns.d.ts) [node_mdns](https://github.com/agnat/node_mdns) by [Stefan Steinhart](https://github.com/reppners)
+* [:link:](node_redis/node_redis.d.ts) [node_redis](https://github.com/mranney/node_redis) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](apn/apn.d.ts) [node-apn](https://github.com/argon/node-apn) by [Zenorbi](https://github.com/zenorbi)
 * [:link:](bunyan/bunyan.d.ts) [node-bunyan](https://github.com/trentm/node-bunyan) by [Alex Mikhalev](https://github.com/amikhalev)
 * [:link:](bunyan-logentries/bunyan-logentries.d.ts) [node-bunyan-logentries](https://github.com/nemtsov/node-bunyan-logentries) by [Aymeric Beaumet](http://aymericbeaumet.me)
+* [:link:](node-cache/node-cache.d.ts) [node-cache](https://github.com/tcs-de/nodecache) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](node-calendar/node-calendar.d.ts) [node-calendar](https://www.npmjs.com/package/node-calendar) by [Luzian Zagadinow](https://github.com/luzianz)
+* [:link:](config/config.d.ts) [node-config](https://github.com/lorenwest/node-config) by [Roman Korneev](https://github.com/RWander)
+* [:link:](node-config-manager/node-config-manager.d.ts) [node-config-manager](https://www.npmjs.com/package/node-config-manager) by [TANAKA Koichi](https://gitnub.com/mugeso)
 * [:link:](convict/convict.d.ts) [node-convict](https://github.com/mozilla/node-convict) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](node-ffi/node-ffi.d.ts) [node-ffi](https://github.com/rbranson/node-ffi) by [Paul Loyd](https://github.com/loyd)
 * [:link:](node-fibers/node-fibers.d.ts) [node-fibers](https://github.com/laverdet/node-fibers) by [Cary Haynie](https://github.com/caryhaynie)
@@ -772,27 +869,32 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](node-getopt/node-getopt.d.ts) [node-getopt](https://github.com/jiangmiao/node-getopt) by [Karl.M.Cauchy](https://github.com/kcauchy)
 * [:link:](node-git/node-git.d.ts) [node-git](https://github.com/christkv/node-git) by [vvakame](https://github.com/vvakame)
 * [:link:](ip/ip.d.ts) [node-ip](https://github.com/indutny/node-ip) by [Peter Harris](https://github.com/codeanimal)
+* [:link:](node-jsfl-runner/node-jsfl-runner.d.ts) [node-jsfl-runner](https://www.npmjs.com/package/node-jsfl-runner) by [Michael Randolph](https://github.com/mrand01)
 * [:link:](multiparty/multiparty.d.ts) [node-multiparty](https://github.com/andrewrk/node-multiparty) by [Ken Fukuyama](https://github.com/kenfdev)
 * [:link:](mysql/mysql.d.ts) [node-mysql](https://github.com/felixge/node-mysql) by [William Johnston](https://github.com/wjohnsto)
-* [:link:](node-mysql-wrapper/node-mysql-wrapper.d.ts) [node-mysql-wrapper](https://github.com/kataras/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
+* [:link:](node-mysql-wrapper/node-mysql-wrapper.d.ts) [node-mysql-wrapper](https://github.com/nodets/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
+* [:link:](node-notifier/node-notifier.d.ts) [node-notifier](https://github.com/mikaelbr/node-notifier) by [Qubo](https://github.com/tkQubo)
 * [:link:](node-persist/node-persist.d.ts) [node-persist](https://github.com/simonlast/node-persist) by [Spencer Williams](http://spencerwi.com)
 * [:link:](node-polyglot/node-polyglot.d.ts) [node-polyglot](https://github.com/airbnb/polyglot.js) by [Tim Jackson-Kiely](https://github.com/timjk)
+* [:link:](progress/progress.d.ts) [node-progress](https://github.com/tj/node-progress) by [Sebastian Lenz](https://github.com/sebastian-lenz)
 * [:link:](promptly/promptly.d.ts) [node-promptly](https://github.com/IndigoUnited/node-promptly) by [Dan Spencer](https://github.com/danrspencer)
 * [:link:](radius/radius.d.ts) [node-radius](https://github.com/retailnext/node-radius) by [Peter Harris](https://github.com/codeanimal)
 * [:link:](node-schedule/node-schedule.d.ts) [node-schedule](https://github.com/tejasmanohar/node-schedule) by [Cyril Schumacher](https://github.com/cyrilschumacher)
+* [:link:](node-slack/node-slack.d.ts) [node-slack](https://github.com/xoxco/node-slack) by [Qubo](https://github.com/tkQubo)
 * [:link:](stack-trace/stack-trace.d.ts) [node-stack-trace](https://github.com/felixge/node-stack-trace) by [Exceptionless](https://github.com/exceptionless)
+* [:link:](node-uuid/node-uuid-global.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
 * [:link:](node-uuid/node-uuid.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [:link:](node-uuid/node-uuid-base.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [:link:](node-uuid/node-uuid-cjs.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [:link:](node-validator/node-validator.d.ts) [node-validator](https://www.npmjs.com/package/node-validator) by [Ken Gorab](https://github.com/kengorab)
 * [:link:](node-webkit/node-webkit.d.ts) [node-webkit](https://github.com/rogerwang/node-webkit) by [Pedro Casaubon](https://github.com/xperiments)
 * [:link:](xml2js/xml2js.d.ts) [node-xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) by [Michel Salib](https://github.com/michelsalib), [Jason McNeil](https://github.com/jasonrm)
 * [:link:](node/node.d.ts) [Node.js](http://nodejs.org) by [Microsoft TypeScript](http://typescriptlang.org), [DefinitelyTyped](https://github.com/borisyankov/DefinitelyTyped)
 * [:link:](_debugger/_debugger.d.ts) [Node.js debugger API](http://nodejs.org) by [Basarat Ali Syed](https://github.com/basarat)
 * [:link:](restify/restify.d.ts) [node.js REST framework](https://github.com/mcavage/node-restify) by [Bret Little](https://github.com/blittle)
-* [:link:](acl/acl.d.ts) [node_acl](https://github.com/optimalbits/node_acl) by [Qubo](https://github.com/tkQubo)
-* [:link:](mdns/mdns.d.ts) [node_mdns](https://github.com/agnat/node_mdns) by [Stefan Steinhart](https://github.com/reppners)
-* [:link:](node_redis/node_redis.d.ts) [node_redis](https://github.com/mranney/node_redis) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](each/each.d.ts) [NodeEach](http://www.adaltas.com/projects/node-each) by [Michael Zabka](https://github.com/misak113)
-* [:link:](nodemailer/nodemailer-types.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](nodemailer/nodemailer.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
+* [:link:](nodemailer/nodemailer-types.d.ts) [Nodemailer](https://github.com/andris9/Nodemailer) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](nodemailer-direct-transport/nodemailer-direct-transport.d.ts) [nodemailer-direct-transport](https://github.com/andris9/nodemailer-direct-transport) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts) [nodemailer-pickup-transport](https://www.npmjs.com/package/nodemailer-pickup-transport) by [Peter Snider](https://github.com/psnider)
 * [:link:](nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts) [nodemailer-smtp-pool](https://github.com/andris9/nodemailer-smtp-pool) by [Rogier Schouten](https://github.com/rogierschouten)
@@ -802,24 +904,32 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](nopt/nopt.d.ts) [nopt](https://github.com/npm/nopt) by [jbondc](https://github.com/jbondc)
 * [:link:](notifyjs/notifyjs.d.ts) [notify.js](https://github.com/alexgibson/notify.js) by [soundTricker](https://github.com/soundTricker)
 * [:link:](notify/notify.d.ts) [Notify.js](https://github.com/jpillora/notifyjs) by [Xiaohan Zhang](https://github.com/hellochar)
-* [:link:](nouislider/nouislider.d.ts) [nouislider](https://github.com/leongersen/noUiSlider) by [Patrick Davies](https://github.com/bleuarg)
 * [:link:](wnumb/wnumb.d.ts) [nouislider](https://github.com/leongersen/wnumb) by [Corey Jepperson](https://github.com/acoreyj)
+* [:link:](nouislider/nouislider.d.ts) [nouislider](https://github.com/leongersen/noUiSlider) by [Patrick Davies](https://github.com/bleuarg)
 * [:link:](noVNC/noVNC.d.ts) [noVNC](https://github.com/kanaka/noVNC) by [Ken Smith](https://github.com/smithkl42)
 * [:link:](npm/npm.d.ts) [npm](https://github.com/npm/npm) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](nprogress/NProgress.d.ts) [NProgress](https://github.com/rstacruz/nprogress) by [Judah Gabriel Himango](http://debuggerdotbreak.wordpress.com)
 * [:link:](numbro/numbro.d.ts) [Numbro.js](https://github.com/foretagsplatsen/numbro) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](numeraljs/numeraljs.d.ts) [Numeral.js](https://github.com/adamwdraper/Numeral-js) by [Vincent Bortone](https://github.com/vbortone)
+* [:link:](obelisk.js/obelisk.js.d.ts) [obelisk.js](https://github.com/nosir/obelisk.js) by [Brian Drupieski](https://github.com/bdrupieski)
+* [:link:](object-assign/object-assign.d.ts) [object-assign](https://github.com/sindresorhus/object-assign) by [Christopher Brown](https://github.com/chbrown)
 * [:link:](object-hash/object-hash.d.ts) [object-hash](https://github.com/puleos/object-hash) by [Michael Zabka](https://github.com/misak113)
 * [:link:](object-path/object-path.d.ts) [objectPath v0.9.x](https://github.com/mariocasciaro/object-path) by [Paulo Cesar](https://github.com/pocesar)
+* [:link:](oblo-util/oblo-util.d.ts) [oblo-util](https://github.com/Oblosys/oblo-util) by [Martijn Schrage](https://github.com/Oblosys)
 * [:link:](oboe/oboe.d.ts) [oboe](https://github.com/jimhigson/oboe.js) by [Jared Klopper](https://github.com/optical)
+* [:link:](observe-js/observe-js.d.ts) [observe-js](https://github.com/Polymer/observe-js) by [Oliver Herrmann](https://github.com/herrmanno)
 * [:link:](oclazyload/oclazyload.d.ts) [oc.LazyLoad](https://github.com/ocombe/ocLazyLoad) by [Roland Zwaga](https://github.com/rolandzwaga)
 * [:link:](angular-odata-resources/angular-odata-resources.d.ts) [OData Angular Resources](https://github.com/devnixs/ODataAngularResources) by [Raphael ATALLAH](http://raphael.atallah.me)
+* [:link:](offline-js/offline-js.d.ts) [Offline](https://github.com/HubSpot/offline) by [Chris Wrench](https://github.com/cgwrench)
 * [:link:](on-finished/on-finished.d.ts) [on-finished](https://github.com/jshttp/on-finished) by [Honza Dvorsky](http://github.com/czechboy0)
 * [:link:](onsenui/onsenui.d.ts) [Onsen UI](http://onsen.io) by [Fran Dios](https://github.com/frankdiox)
 * [:link:](open/open.d.ts) [open](https://github.com/jjrdn/node-open) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](openlayers/openlayers.d.ts) [OpenLayers](http://openlayers.org) by [Wouter Goedhart](https://github.com/woutergd)
+* [:link:](openpgp/openpgp.d.ts) [openpgpjs](http://openpgpjs.org) by [Guillaume Lacasa](https://blog.lacasa.fr)
 * [:link:](opn/opn.d.ts) [opn](https://github.com/sindresorhus/opn) by [Shinnosuke Watanabe](https://github.com/shinnn)
 * [:link:](optimist/optimist.d.ts) [optimist](https://github.com/substack/node-optimist) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
+* [:link:](orchestrator/orchestrator.d.ts) [Orchestrator](https://github.com/orchestrator/orchestrator) by [Qubo](https://github.com/tkQubo)
+* [:link:](os-locale/os-locale.d.ts) [os-locale](https://github.com/sindresorhus/os-locale) by [Aya Morisawa](https://github.com/AyaMorisawa)
 * [:link:](owlcarousel/owlcarousel.d.ts) [OwlCarousel v.1.3.3](https://github.com/OwlFonk/OwlCarousel) by [Damian Piątkowski](https://github.com/dpiatkowski)
 * [:link:](packery/packery.d.ts) [Packery](http://packery.metafizzy.co) by [Piraveen Kamalathas from Kilix](https://github.com/piraveen)
 * [:link:](page/page.d.ts) [page](http://visionmedia.github.io/page.js) by [Alan Norbauer](http://alan.norbauer.com)
@@ -852,6 +962,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](phantom/phantom.d.ts) [PhantomJS bridge for NodeJS](https://github.com/sgentle/phantomjs-node) by [horiuchi](https://github.com/horiuchi)
 * [:link:](phantomjs/phantomjs.d.ts) [PhantomJS v1.9.0 API](https://github.com/ariya/phantomjs/wiki/API-Reference) by [Jed Hunsaker](https://github.com/jedhunsaker), [Mike Keesey](https://github.com/keesey)
 * [:link:](phonegap/phonegap.d.ts) [PhoneGap](http://phonegap.com) by [Boris Yankov](https://github.com/borisyankov), [Dick van den Brink](https://github.com/DickvdBrink)
+* [:link:](phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts) [phonegap-facebook-plugin](https://github.com/Wizcorp/phonegap-facebook-plugin) by [Justin Unterreiner](https://github.com/Justin-Credible)
+* [:link:](phonegap-plugin-push/phonegap-plugin-push.d.ts) [phonegap-plugin-push](https://github.com/phonegap/phonegap-plugin-push) by [Frederico Galvão](https://github.com/fredgalvao)
+* [:link:](urbanairship-cordova/urbanairship-cordova.d.ts) [phonegap-ua-push](https://github.com/urbanairship/phonegap-ua-push) by [Justin Unterreiner](https://github.com/Justin-Credible)
 * [:link:](photonui/photonui.d.ts) [PhotonUI](https://github.com/wanadev/PhotonUI) by [Florent Poujol](https://github.com/florentpoujol)
 * [:link:](photoswipe/photoswipe.d.ts) [PhotoSwipe](http://photoswipe.com) by [Xiaohan Zhang](https://github.com/hellochar)
 * [:link:](physijs/physijs.d.ts) [Physijs](http://chandlerprall.github.io/Physijs) by [Satoru Kimura](https://github.com/gyohk)
@@ -876,9 +989,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](power-assert/power-assert.d.ts) [power-assert](https://github.com/twada/power-assert) by [vvakame](https://github.com/vvakame)
 * [:link:](power-assert-formatter/power-assert-formatter.d.ts) [power-assert-formatter](https://github.com/twada/power-assert-formatter) by [vvakame](https://github.com/vvakame)
 * [:link:](precise/precise.d.ts) [precise](https://www.npmjs.org/package/precise) by [Peter Harris](https://github.com/codeanimal)
+* [:link:](precond/precond.d.ts) [precond](https://github.com/MathieuTurcotte/node-precond) by [Oliver Schneider](https://github.com/olsio)
 * [:link:](preloadjs/preloadjs.d.ts) [PreloadJS](http://www.createjs.com/#!/PreloadJS) by [Pedro Ferreira](https://bitbucket.org/drk4)
 * [:link:](prelude-ls/prelude-ls.d.ts) [prelude.ls](http://www.preludels.com) by [Aya Morisawa](https://github.com/AyaMorisawa)
 * [:link:](progressjs/progress.d.ts) [ProgressJs](http://usablica.github.io/progress.js) by [Shunsuke Ohtani](https://github.com/zaneli)
+* [:link:](project-oxford/project-oxford.d.ts) [project-oxford](https://github.com/felixrieseberg/project-oxford) by [Scott Southwood](https://github.com/scsouthw)
 * [:link:](promise-pool/promise-pool.d.ts) [promise-pool](https://github.com/vilic/promise-pool) by [VILIC VANE](https://github.com/vilic)
 * [:link:](promises-a-plus/promises-a-plus.d.ts) [promises-a-plus](http://promisesaplus.com) by [Igor Oleinikov](https://github.com/Igorbek)
 * [:link:](protobufjs/protobufjs.d.ts) [ProtoBuf.js](https://github.com/dcodeIO/ProtoBuf.js) by [Panu Horsmalahti](https://github.com/panuhorsmalahti)
@@ -886,10 +1001,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](pty.js/pty.js.d.ts) [pty.js 0.2.7-1](https://github.com/chjj/pty.js) by [Vadim Macagon](https://github.com/enlight)
 * [:link:](pubsubjs/pubsub.d.ts) [PubSubJS](https://github.com/mroderick/PubSubJS) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](purl/purl.d.ts) [Purl](https://github.com/allmarkedup/purl) by [Daniel Ferreira Monteiro Alves](https://github.com/danfma)
+* [:link:](pusher-js/pusher-js.d.ts) [pusher-js](https://github.com/pusher/pusher-js) by [Qubo](https://github.com/tkqubo)
 * [:link:](q/Q.d.ts) [Q](https://github.com/kriskowal/q) by [Barrie Nemetchek](https://github.com/bnemetchek), [Andrew Gaspar](https://github.com/AndrewGaspar), [John Reilly](https://github.com/johnnyreilly)
 * [:link:](q-io/Q-io.d.ts) [Q-io](https://github.com/kriskowal/q-io) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](q-retry/q-retry.d.ts) [q-retry](https://github.com/vilic/q-retry) by [VILIC VANE](https://github.com/vilic)
 * [:link:](qajax/qajax.d.ts) [Qajax](https://github.com/gre/qajax) by [Boltmade](https://github.com/Boltmade)
+* [:link:](qs/qs.d.ts) [qs](https://github.com/hapijs/qs) by [Roman Korneev](https://github.com/RWander)
 * [:link:](qtip2/qtip2.d.ts) [qtip2](http://qtip2.com) by [Nathan Pitman](https://github.com/Seltzer)
 * [:link:](quixote/quixote.d.ts) [quixote](http://quixote-css.com) by [Aleksandr Filatov](https://github.com/greybax)
 * [:link:](qunit/qunit.d.ts) [QUnit](http://qunitjs.com) by [Diullei Gomes](https://github.com/diullei)
@@ -897,42 +1014,57 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](rabbit.js/rabbit.js.d.ts) [rabbit.js](https://github.com/squaremo/rabbit.js) by [Wonshik Kim](https://github.com/wokim)
 * [:link:](ractive/ractive.d.ts) [Ractive](http://ractivejs.org) by [Han Lin Yap](http://yap.nu)
 * [:link:](random-string/random-string.d.ts) [random-string](https://github.com/valiton/node-random-string) by [Sam Saint-Pettersen](https://github.com/stpettersens)
+* [:link:](rangy/rangy.d.ts) [Rangy](https://github.com/timdown/rangy) by [Rudolph Gottesheim](http://www.midnight-design.at)
 * [:link:](raphael/raphael.d.ts) [Raphael](http://raphaeljs.com) by [CheCoxshall](https://github.com/CheCoxshall)
 * [:link:](rappid/rappid.d.ts) [Rappid](http://jointjs.com/about-rappid) by [Ewout Van Gossum](https://github.com/DenEwout)
 * [:link:](ravenjs/ravenjs.d.ts) [Raven.js](https://github.com/getsentry/raven-js) by [Santi Albo](https://github.com/santialbo)
 * [:link:](raygun4js/raygun4js.d.ts) [raygun4js](https://github.com/MindscapeHQ/raygun4js) by [Brian Surowiec](https://github.com/xt0rted)
-* [:link:](react/react.d.ts) [React (external module)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
-* [:link:](react/react-global.d.ts) [React (internal module)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
+* [:link:](react/react.d.ts) [React](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
+* [:link:](react/react-global.d.ts) [React (namespace)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com), [Microsoft](https://microsoft.com)
 * [:link:](react-dnd/react-dnd.d.ts) [React DnD](https://github.com/gaearon/react-dnd) by [Asana](https://asana.com)
 * [:link:](react-router/react-router.d.ts) [React Router](https://github.com/rackt/react-router) by [Yuichi Murata](https://github.com/mrk21), [Václav Ostrožlík](https://github.com/vasek17)
+* [:link:](react-bootstrap/react-bootstrap.d.ts) [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) by [Walker Burgin](https://github.com/walkerburgin)
+* [:link:](react-mixin/react-mixin.d.ts) [react-mixin](https://github.com/brigand/react-mixin) by [Qubo](https://github.com/tkqubo)
+* [:link:](react-props-decorators/react-props-decorators.d.ts) [react-props-decorators](https://github.com/popkirby/react-props-decorators) by [Qubo](https://github.com/tkqubo)
+* [:link:](react-redux/react-redux.d.ts) [react-redux](https://github.com/rackt/react-redux) by [Qubo](https://github.com/tkqubo)
+* [:link:](react-spinkit/react-spinkit.d.ts) [react-spinkit](https://github.com/KyleAMathews/react-spinkit) by [Qubo](https://github.com/tkqubo)
 * [:link:](react-swf/react-swf.d.ts) [react-swf](https://github.com/syranide/react-swf) by [Stepan Mikhaylyuk](https://github.com/stepancar)
-* [:link:](react/react-addons.d.ts) [ReactWithAddons (external module)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com)
-* [:link:](react/react-addons-global.d.ts) [ReactWithAddons (internal module)](http://facebook.github.io/react) by [Asana](https://asana.com), [AssureSign](http://www.assuresign.com)
 * [:link:](readdir-stream/readdir-stream.d.ts) [readdir-stream](https://github.com/logicalparadox/readdir-stream) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](recursive-readdir/recursive-readdir.d.ts) [recursive-readdir](https://github.com/jergason/recursive-readdir) by [Elisée Maurer](https://github.com/elisee)
-* [:link:](redis/redis.d.ts) [redis](https://github.com/mranney/node_redis) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Peter Harris](https://github.com/CodeAnimal)
+* [:link:](redis/redis.d.ts) [redis](https://github.com/mranney/node_redis) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Peter Harris](https://github.com/CodeAnimal), [TANAKA Koichi](https://github.com/MugeSo)
+* [:link:](redlock/redlock.d.ts) [Redlock](https://github.com/mike-marcacci/node-redlock) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](redux/redux.d.ts) [Redux](https://github.com/rackt/redux) by [William Buchwalter](https://github.com/wbuchwalter), [Vincent Prouillet](https://github.com/Keats)
+* [:link:](redux-action-utils/redux-action-utils.d.ts) [redux-action-utils](https://github.com/insin/redux-action-utils) by [Qubo](https://github.com/tkqubo)
+* [:link:](redux-actions/redux-actions.d.ts) [redux-actions](https://github.com/acdlite/redux-actions) by [Jack Hsu](https://github.com/jaysoo)
+* [:link:](redux-devtools/redux-devtools.d.ts) [redux-devtools](https://github.com/gaearon/redux-devtools) by [Qubo](https://github.com/tkqubo)
+* [:link:](redux-logger/redux-logger.d.ts) [redux-logger](https://github.com/fcomb/redux-logger) by [Alexander Rusakov](https://github.com/arusakov)
+* [:link:](redux-thunk/redux-thunk.d.ts) [redux-thunk](https://github.com/gaearon/redux-thunk) by [Qubo](https://github.com/tkqubo)
 * [:link:](ref/ref.d.ts) [ref](https://github.com/TooTallNate/ref) by [Paul Loyd](https://github.com/loyd)
 * [:link:](ref-array/ref-array.d.ts) [ref-array](https://github.com/TooTallNate/ref-array) by [Paul Loyd](https://github.com/loyd)
 * [:link:](ref-struct/ref-struct.d.ts) [ref-struct](https://github.com/TooTallNate/ref-struct) by [Paul Loyd](https://github.com/loyd)
 * [:link:](ref-union/ref-union.d.ts) [ref-union](https://github.com/TooTallNate/ref-union) by [Paul Loyd](https://github.com/loyd)
 * [:link:](request/request.d.ts) [request](https://github.com/mikeal/request) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [bonnici](https://github.com/bonnici), [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](request-ip/request-ip.d.ts) [request-ip](https://github.com/pbojinov/request-ip) by [Adam Babcock](https://github.com/mrhen)
 * [:link:](request-promise/request-promise.d.ts) [request-promise](https://www.npmjs.com/package/request-promise) by [Christopher Glantschnig](https://github.com/cglantschnig)
 * [:link:](requirejs/require.d.ts) [RequireJS](http://requirejs.org) by [Josh Baldwin](https://github.com/jbaldwin)
 * [:link:](resemblejs/resemblejs.d.ts) [Resemble.js](http://huddle.github.io/Resemble.js) by [Tim Perry](https://github.com/pimterry)
 * [:link:](response-time/response-time.d.ts) [response-time](https://github.com/expressjs/response-time) by [Uros Smolnik](https://github.com/urossmolnik)
+* [:link:](rest-io/rest-io.d.ts) [rest-io](https://github.com/EnoF/rest-io) by [Andy Tang](https://github.com/EnoF), [Stefan Schacherl](https://github.com/TheBay0r)
 * [:link:](rest/rest.d.ts) [rest.js](https://github.com/cujojs/rest) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](restangular/restangular.d.ts) [Restangular](https://github.com/mgonto/restangular) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](restful.js/restful.js.d.ts) [restful.js](https://github.com/marmelab/restful.js) by [Qubo](https://github.com/tkqubo)
 * [:link:](rethinkdb/rethinkdb.d.ts) [Rethinkdb](http://rethinkdb.com) by [Sean Hess](https://seanhess.github.io)
 * [:link:](reveal/reveal.d.ts) [Reveal](https://github.com/hakimel/reveal.js) by [grapswiz](https://github.com/grapswiz)
 * [:link:](rickshaw/rickshaw.d.ts) [Rickshaw](http://code.shutterstock.com/rickshaw) by [Blake Niemyjski](https://github.com/niemyjski)
 * [:link:](rimraf/rimraf.d.ts) [rimraf](https://github.com/isaacs/rimraf) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](riotjs/riotjs.d.ts) [riot.js](https://github.com/moot/riotjs) by [vvakame](https://github.com/vvakame)
+* [:link:](riotcontrol/riotcontrol.d.ts) [RiotControl](https://github.com/jimsparkman/RiotControl) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](rivets/rivets.d.ts) [rivets](http://rivetsjs.com) by [Trevor Baron](https://github.com/TrevorDev)
+* [:link:](rosie/rosie.d.ts) [rosie](https://github.com/rosiejs/rosie) by [Abner Oliveira](https://github.com/abner)
 * [:link:](route-recognizer/route-recognizer.d.ts) [route-recognizer](https://github.com/tildeio/route-recognizer) by [Dave Keen](http://www.keendevelopment.ch)
 * [:link:](routie/routie.d.ts) [routie](https://github.com/jgallen23/routie) by [Adilson](https://github.com/Adilson)
 * [:link:](rsmq/rsmq.d.ts) [rsmq](http://smrchy.github.io/rsmq) by [Qubo](https://github.com/MugeSo)
-* [:link:](rsmq-worker/rsmq-worker.d.ts) [rsmq-worker](http://smrchy.github.io/rsmq/rsmq-worker) by [Qubo](https://github.com/MugeSo)
+* [:link:](rsmq-worker/rsmq-worker.d.ts) [rsmq-worker](http://smrchy.github.io/rsmq/rsmq-worker) by [TANAKA Koichi](https://github.com/MugeSo)
 * [:link:](rtree/rtree.d.ts) [rtree](https://github.com/leaflet-extras/RTree) by [Omede Firouz](https://github.com/oefirouz)
 * [:link:](run-sequence/run-sequence.d.ts) [run-sequence](https://github.com/OverZealous/run-sequence) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](rx/rx.d.ts) [RxJS](http://rx.codeplex.com) by [gsino](http://www.codeplex.com/site/users/view/gsino), [Igor Oleinikov](https://github.com/Igorbek)
@@ -954,17 +1086,21 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](sanitize-filename/sanitize-filename.d.ts) [sanitize-filename](https://github.com/parshap/node-sanitize-filename) by [Wim Looman](https://github.com/Nemo157)
 * [:link:](sanitize-html/sanitize-html.d.ts) [sanitize-html](https://github.com/punkave/sanitize-html) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](sanitizer/sanitizer.d.ts) [Sanitizer](https://github.com/theSmaw/Caja-HTML-Sanitizer) by [Dave Taylor](http://davetayls.me)
+* [:link:](satnav/satnav.d.ts) [satnav](https://github.com/f5io/satnav-js) by [Christian Holm Diget](https://github.com/DotNetNerd)
 * [:link:](sax/sax.d.ts) [sax js](https://github.com/isaacs/sax-js) by [Asana](https://asana.com)
 * [:link:](screenfull/screenfull.d.ts) [screenfull.js](https://github.com/sindresorhus/screenfull.js) by [Ilia Choly](http://github.com/icholy)
 * [:link:](scrolltofixed/scrolltofixed.d.ts) [ScrollToFixed](https://github.com/bigspotteddog/ScrollToFixed) by [Ben Dixon](https://github.com/bmdixon)
 * [:link:](seedrandom/seedrandom.d.ts) [seedrandom](https://github.com/davidbau/seedrandom) by [Kern Handa](https://github.com/kernhanda)
+* [:link:](segment-analytics/segment-analytics.d.ts) [Segment's analytics.js](https://segment.com/docs/libraries/analytics.js) by [Andrew Fong](https://github.com/fongandrew)
+* [:link:](analytics-node/analytics-node.d.ts) [Segment's analytics.js for Node.js](https://segment.com/docs/libraries/node) by [Andrew Fong](https://github.com/fongandrew)
 * [:link:](select2/select2.d.ts) [Select2](http://ivaynberg.github.com/select2) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](selectize/selectize.d.ts) [Selectize](https://github.com/brianreavis/selectize.js) by [Adi Dahiya](https://github.com/adidahiya)
-* [:link:](selenium-webdriver/selenium-webdriver.d.ts) [Selenium WebDriverJS](https://code.google.com/p/selenium) by [Bill Armstrong](https://github.com/BillArmstrong)
+* [:link:](selenium-webdriver/selenium-webdriver.d.ts) [Selenium WebDriverJS](https://code.google.com/p/selenium) by [Bill Armstrong](https://github.com/BillArmstrong), [Yuki Kokubun](https://github.com/Kuniwak)
+* [:link:](semaphore/semaphore.d.ts) [semaphore](https://github.com/abrkn/semaphore.js) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](semver/semver.d.ts) [semver](https://github.com/isaacs/node-semver) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](sendgrid/sendgrid.d.ts) [sendgrid](https://github.com/sendgrid/sendgrid-nodejs) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](sentence-case/sentence-case.d.ts) [sentence-case](https://github.com/blakeembrey/sentence-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](sequelize/sequelize.d.ts) [Sequelize 2.0.0 dev13](http://sequelizejs.com) by [samuelneff](https://github.com/samuelneff), [Peter Harris](https://github.com/codeanimal)
+* [:link:](sequelize/sequelize.d.ts) [Sequelize](http://sequelizejs.com) by [samuelneff](https://github.com/samuelneff), [Peter Harris](https://github.com/codeanimal), [Ivan Drinchev](https://github.com/drinchev)
 * [:link:](sequelize-fixtures/sequelize-fixtures.d.ts) [Sequelize-Fixtures](https://github.com/domasx2/sequelize-fixtures) by [Christian Schwarz](https://github.com/cschwarz)
 * [:link:](on-headers/on-headers.d.ts) [serve-favicon](https://github.com/jshttp/on-headers) by [John Jeffery](https://github.com/jjeffery)
 * [:link:](serve-favicon/serve-favicon.d.ts) [serve-favicon](https://github.com/expressjs/serve-favicon) by [Uros Smolnik](https://github.com/urossmolnik)
@@ -981,12 +1117,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](signalr/signalr.d.ts) [SignalR](http://www.asp.net/signalr) by [Boris Yankov](https://github.com/borisyankov), [T. Michael Keesey](https://github.com/keesey)
 * [:link:](signature_pad/signature_pad.d.ts) [signature_pad](https://github.com/szimek/signature_pad) by [Abubaker Bashir](https://github.com/AbubakerB)
 * [:link:](simple-cw-node/simple-cw-node.d.ts) [simple-cw-node](https://github.com/astronaughts/simple-cw-node) by [vvakame](https://github.com/vvakame)
+* [:link:](simplebar/simplebar.d.ts) [simplebar.js](https://github.com/Grsmto/simplebar) by [Gregor Woiwode](https://github.com/gregonnet)
 * [:link:](jquery.simplemodal/jquery.simplemodal.d.ts) [SimpleModal](http://www.ericmmartin.com/projects/simplemodal) by [Friedrich von Never](https://github.com/ForNeVeR)
 * [:link:](sinon/sinon.d.ts) [Sinon](http://sinonjs.org) by [William Sears](https://github.com/mrbigdog2u)
 * [:link:](sinon-chai/sinon-chai.d.ts) [sinon-chai](https://github.com/domenic/sinon-chai) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid), [Jed Mao](https://github.com/jedmao)
 * [:link:](sinon-chrome/sinon-chrome.d.ts) [Sinon-Chrome](https://github.com/vitalets/sinon-chrome) by [Tim Perry](https://github.com/pimterry)
 * [:link:](sipml/sipml.d.ts) [SIPml5](http://sipml5.org) by [A. Groenenboom](https://github.com/chookies)
 * [:link:](sjcl/sjcl.d.ts) [sjcl](http://crypto.stanford.edu/sjcl) by [Eugene Chernyshov](https://github.com/Evgenus)
+* [:link:](ski/ski.d.ts) [ski](https://github.com/jden/ski) by [Aya Morisawa](https://github.com/AyaMorisawa)
 * [:link:](skyway/skyway.d.ts) [SkyWay](http://nttcom.github.io/skyway) by [Toshiya Nakakura](https://github.com/nakakura)
 * [:link:](slickgrid/SlickGrid.d.ts) [SlickGrid](https://github.com/mleibman/SlickGrid) by [Josh Baldwin](https://github.com/jbaldwin)
 * [:link:](slickgrid/slick.autotooltips.d.ts) [SlickGrid AutoToolTips Plugin](https://github.com/mleibman/SlickGrid) by [Ryo Iwamoto](https://github.com/ryiwamoto)
@@ -994,10 +1132,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](slickgrid/slick.rowselectionmodel.d.ts) [SlickGrid RowSelectionModel Plugin](https://github.com/mleibman/SlickGrid) by [Derek Cicerone](https://github.com/derekcicerone)
 * [:link:](smoothie/smoothie.d.ts) [Smoothie Charts](https://github.com/joewalnes/smoothie) by [Drew Noakes](https://drewnoakes.com), [Mike H. Hawley](https://github.com/mikehhawley)
 * [:link:](snake-case/snake-case.d.ts) [snake-case](https://github.com/blakeembrey/snake-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
-* [:link:](snapsvg/snapsvg.d.ts) [Snap-SVG](https://github.com/adobe-webplatform/Snap.svg) by [Lars Klein](https://github.com/lhk)
+* [:link:](snapsvg/snapsvg.d.ts) [Snap-SVG](https://github.com/adobe-webplatform/Snap.svg) by [Lars Klein](https://github.com/lhk), [Mattanja Kern](https://github.com/mattanja)
 * [:link:](socket.io/socket.io.d.ts) [socket.io](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages)
 * [:link:](socket.io-client/socket.io-client.d.ts) [socket.io-client](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages)
+* [:link:](socket.io.users/socket.io.users.d.ts) [socket.io.users](https://github.com/nodets/socket.io.users) by [Makis Maropoulos](https://github.com/kataras)
 * [:link:](sockjs/sockjs.d.ts) [SockJS 0.3.x](https://github.com/sockjs/sockjs-client) by [Emil Ivanov](https://github.com/vladev)
+* [:link:](sockjs-client/sockjs-client.d.ts) [sockjs-client](https://github.com/sockjs/sockjs-client) by [Emil Ivanov](https://github.com/vladev), [Alexander Rusakov](https://github.com/arusakov)
 * [:link:](sockjs-node/sockjs-node.d.ts) [sockjs-node 0.3.x](https://github.com/sockjs/sockjs-node) by [Phil McCloghry-Laing](https://github.com/pmccloghrylaing)
 * [:link:](soundjs/soundjs.d.ts) [SoundJS](http://www.createjs.com/#!/SoundJS) by [Pedro Ferreira](https://bitbucket.org/drk4)
 * [:link:](source-map/source-map.d.ts) [source-map](https://github.com/mozilla/source-map) by [Morten Houston Ludvigsen](https://github.com/MortenHoustonLudvigsen)
@@ -1010,9 +1150,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](sprintf/sprintf.d.ts) [sprintff](https://github.com/maritz/node-sprintff) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](sqlite3/sqlite3.d.ts) [sqlite3](https://github.com/mapbox/node-sqlite3) by [Nick Malaguti](https://github.com/nmalaguti)
 * [:link:](squirejs/squirejs.d.ts) [Squire](https://github.com/iammerrick/Squire.js) by [Bradley Ayers](https://github.com/bradleyayers)
+* [:link:](ssh2/ssh2.d.ts) [ssh2](https://github.com/mscdex/ssh2) by [Qubo](https://github.com/tkQubo)
 * [:link:](stack-mapper/stack-mapper.d.ts) [stack-mapper](https://github.com/thlorenz/stack-mapper) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](stacktrace-js/stacktrace-js.d.ts) [stacktrace.js](https://github.com/stacktracejs/stacktrace.js) by [Exceptionless](https://github.com/exceptionless)
 * [:link:](stampit/stampit.d.ts) [stampit](https://github.com/stampit-org/stampit) by [Vasyl Boroviak](https://github.com/koresar)
+* [:link:](stamplay-js-sdk/stamplay-js-sdk.d.ts) [stamplay-js-sdk](https://github.com/Stamplay/stamplay-js-sdk) by [Riderman de Sousa Barbosa](https://github.com/ridermansb)
+* [:link:](static-eval/static-eval.d.ts) [static-eval](https://github.com/substack/static-eval) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
 * [:link:](stats/stats.d.ts) [Stats.js r12](http://github.com/mrdoob/stats.js) by [Gregory Dalton](https://github.com/gregolai)
 * [:link:](statsd-client/statsd-client.d.ts) [statsd-client](https://github.com/msiebuhr/node-statsd-client) by [Peter Kooijmans](https://github.com/peterkooijmans)
 * [:link:](status-bar/status-bar.d.ts) [status-bar](https://github.com/atom/status-bar) by [vvakame](https://github.com/vvakame)
@@ -1021,7 +1164,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](stream-series/stream-series.d.ts) [stream-series](https://github.com/rschmukler/stream-series) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](stream-to-array/stream-to-array.d.ts) [stream-to-array](https://github.com/stream-utils/stream-to-array) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](streamjs/streamjs.d.ts) [streamjs](http://winterbe.github.io/streamjs) by [Bence Eros](https://github.com/erosb)
-* [:link:](stripe/stripe.d.ts) [stripe](https://stripe.com) by [Eric J. Smith](https://github.com/ejsmith)
+* [:link:](string_score/string_score.d.ts) [string_score](https://github.com/joshaven/string_score) by [Marcin Porębski](https://github.com/marcinporebski)
+* [:link:](string/string.d.ts) [string.js](http://stringjs.com) by [Bas Pennings](https://github.com/basp)
+* [:link:](stripe/stripe.d.ts) [stripe](https://stripe.com) by [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com), [Eric J. Smith](https://github.com/ejsmith)
 * [:link:](stripe-checkout/stripe-checkout.d.ts) [Stripe Checkout](https://stripe.com/checkout) by [Chris Wrench](https://github.com/cgwrench)
 * [:link:](stripe/stripe-node.d.ts) [stripe-node](https://github.com/stripe/stripe-node) by [William Johnston](https://github.com/wjohnsto)
 * [:link:](strophe/strophe.d.ts) [Strophe.js](http://strophe.im/strophejs) by [David Deutsch](https://github.com/DavidKDeutsch)
@@ -1030,10 +1175,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](superagent/superagent.d.ts) [SuperAgent](https://github.com/visionmedia/superagent) by [Alex Varju](https://github.com/varju)
 * [:link:](supertest/supertest.d.ts) [SuperTest](https://github.com/visionmedia/supertest) by [Alex Varju](https://github.com/varju)
 * [:link:](svg-pan-zoom/svg-pan-zoom.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [Chintan Shah](https://github.com/Promact)
+* [:link:](svg-sprite/svg-sprite.d.ts) [svg-sprite](https://github.com/jkphl/svg-sprite) by [Qubo](https://github.com/tkqubo)
 * [:link:](svgjs/svgjs.d.ts) [svg.js](http://www.svgjs.com) by [Sean Hess](https://seanhess.github.io)
 * [:link:](svg2png/svg2png.d.ts) [svg2png node package](https://github.com/domenic/svg2png) by [hans windhoff](https://github.com/hansrwindhoff)
 * [:link:](svgjs.draggable/svgjs.draggable.d.ts) [svgjs.draggable](http://www.svgjs.com) by [Luigi Trabacchin](https://github.com/LiFeleSs)
 * [:link:](swag/swag.d.ts) [swag](https://github.com/elving/swag) by [Shogo Iwano](https://github.com/shiwano)
+* [:link:](swaggerize-express/swaggerize-express.d.ts) [swaggerize-express 4.x](https://github.com/krakenjs/swaggerize-express) by [TANAKA Koichi](https://github.com/mugeso)
 * [:link:](swap-case/swap-case.d.ts) [swap-case](https://github.com/blakeembrey/swap-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](sweetalert/sweetalert.d.ts) [SweetAlert](https://github.com/t4t5/sweetalert) by [Markus Peloso](https://github.com/ToastHawaii)
 * [:link:](swfobject/swfobject.d.ts) [swfobject](https://code.google.com/p/swfobject) by [rou](https://github.com/rou)
@@ -1042,9 +1189,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](swipe/swipe.d.ts) [Swipe](https://github.com/thebird/Swipe) by [Andrey Kurdyumov](https://github.com/kant2002)
 * [:link:](swiper/swiper.d.ts) [Swiper](https://github.com/nolimits4web/Swiper) by [Sebastián Galiano](https://github.com/sgaliano)
 * [:link:](swipeview/swipeview.d.ts) [SwipeView](http://cubiq.org/swipeview) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](switchery/switchery.d.ts) [switchery](https://github.com/abpetkov/switchery) by [Bruno Grieder](https://github.com/bgrieder)
+* [:link:](switchery/switchery.d.ts) [switchery](https://github.com/abpetkov/switchery) by [Bruno Grieder](https://github.com/bgrieder), [Clayton Lautier](https://github.com/claylaut)
 * [:link:](swiz/swiz.d.ts) [swiz](https://github.com/racker/node-swiz) by [Jeff Goddard](https://github.com/jedigo)
 * [:link:](systemjs/systemjs.d.ts) [System.js](https://github.com/systemjs/systemjs) by [Ludovic HENIN](https://github.com/ludohenin), [Nathan Walker](https://github.com/NathanWalker)
+* [:link:](tabris/tabris.d.ts) [Tabris.js](http://tabrisjs.com) by [Tabris.js team](http://github.com/eclipsesource/tabris)
 * [:link:](tabtab/tabtab.d.ts) [tabtab](https://github.com/mklabs/node-tabtab) by [Vojtěch Habarta](https://github.com/vojtechhabarta)
 * [:link:](tape/tape.d.ts) [tape](https://github.com/substack/tape) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](tar/tar.d.ts) [tar](https://github.com/npm/node-tar) by [Maxime LUCE](https://github.com/SomaticIT)
@@ -1080,13 +1228,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](timelinejs/timelinejs.d.ts) [timelinejs](https://github.com/NUKnightLab/TimelineJS) by [Roland Zwaga](https://github.com/rolandzwaga)
 * [:link:](timezone-js/timezone-js.d.ts) [timezone-js](https://github.com/mde/timezone-js) by [bonnici](https://github.com/bonnici)
 * [:link:](timezonecomplete/timezonecomplete.d.ts) [timezonecomplete](https://github.com/SpiritIT/timezonecomplete) by [Rogier Schouten](https://github.com/rogierschouten)
-* [:link:](tv4/tv4.d.ts) [Tiny Validator tv4](https://github.com/geraintluff/tv4) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](tv4/tv4.d.ts) [Tiny Validator tv4](https://github.com/geraintluff/tv4) by [Bart van der Schoor](https://github.com/Bartvds), [Peter Snider](https://github.com/psnider)
 * [:link:](tinycolor/tinycolor.d.ts) [tinycolor](https://github.com/bgrins/TinyColor) by [Mordechai Zuber](https://github.com/M-Zuber)
 * [:link:](titanium/titanium.d.ts) [Titanium Mobile](http://www.appcelerator.com) by [Craig Younkins](https://github.com/cyounkins)
 * [:link:](title-case/title-case.d.ts) [title-case](https://github.com/blakeembrey/title-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](tmp/tmp.d.ts) [tmp](https://www.npmjs.com/package/tmp) by [Jared Klopper](https://github.com/optical)
 * [:link:](to-title-case-gouch/to-title-case-gouch.d.ts) [to-title-case](https://github.com/gouch/to-title-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](toastr/toastr.d.ts) [Toastr](https://github.com/CodeSeven/toastr) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](tooltipster/tooltipster.d.ts) [tooltipster](https://github.com/iamceege/tooltipster) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](sencha_touch/SenchaTouch.d.ts) [Touch](http://www.sencha.com/products/touch) by [Brian Kotek](https://github.com/brian428)
 * [:link:](traceback/traceback.d.ts) [Traceback](http://github.com/iriscouch/traceback) by [Michael Zabka](https://github.com/misak113)
 * [:link:](traverson/traverson.d.ts) [Traverson](https://github.com/basti1302/traverson) by [Marcin Porębski](https://github.com/marcinporebski)
@@ -1108,21 +1257,27 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](typescript-deferred/typescript-deferred.d.ts) [typescript-deferred](https://github.com/DirtyHairy/typescript-deferred) by [Christian Speckner](https://github.com/DirtyHairy)
 * [:link:](typescript-services/typescriptServices.d.ts) [TypeScript-Services](https://www.npmjs.org/package/typescript-services) by [Basarat Ali Syed](http://github.com/basarat)
 * [:link:](unity-webapi/unity-webapi.d.ts) [Ubuntu Unity Web API](https://launchpad.net/libunity-webapps) by [John Vrbanac](jhttps://github.com/jmvrbanac)
-* [:link:](ui-grid/ui-grid.d.ts) [ui-grid](http://www.ui-grid.info) by [Ben Tesser](https://github.com/btesser)
+* [:link:](ui-grid/ui-grid.d.ts) [ui-grid](http://www.ui-grid.info) by [Ben Tesser](https://github.com/btesser), [Joe Skeen](http://github.com/joeskeen)
+* [:link:](ui-router-extras/ui-router-extras.d.ts) [UI-Router Extras (ct.ui.router.extras module)](https://github.com/christopherthielen/ui-router-extras) by [Michael Putters](https://github.com/mputters), [Marcel van de Kamp](https://github.com/marcel-k)
 * [:link:](umbraco/umbraco-resources.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
-* [:link:](umbraco/umbraco-services.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
 * [:link:](umbraco/umbraco.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
+* [:link:](umbraco/umbraco-services.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
 * [:link:](underscore/underscore.d.ts) [Underscore](http://underscorejs.org) by [Boris Yankov](https://github.com/borisyankov), [Josh Baldwin](https://github.com/jbaldwin)
 * [:link:](underscore-ko/underscore-ko.d.ts) [Underscore-ko 1.2.2 with underscore](https://github.com/kamranayub/UnderscoreKO) by [Maurits Elbers](https://github.com/MagicMau)
 * [:link:](underscore.string/underscore.string.d.ts) [underscore.string](https://github.com/epeli/underscore.string) by [Ry Racherbaumer](http://github.com/rygine)
+* [:link:](undertaker/undertaker.d.ts) [undertaker](https://github.com/phated/undertaker) by [Qubo](https://github.com/tkqubo)
 * [:link:](jquery.uniform/jquery.uniform.d.ts) [Uniform.js](https://github.com/pixelmatrix/uniform) by [flyfishMT](https://github.com/flyfishMT)
 * [:link:](uniq/uniq.d.ts) [uniq](https://www.npmjs.com/package/uniq) by [Hans Windhoff](https://github.com/hansrwindhoff)
+* [:link:](unique-random/unique-random.d.ts) [unique-random](https://github.com/sindresorhus/unique-random) by [Yuki Kokubun](https://github.com/Kuniwak)
 * [:link:](universal-analytics/universal-analytics.d.ts) [universal-analytics](https://github.com/peaksandpies/universal-analytics) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](unorm/unorm.d.ts) [unorm](https://github.com/walling/unorm) by [Christopher Brown](https://github.com/chbrown)
 * [:link:](update-notifier/update-notifier.d.ts) [update-notifier](https://github.com/yeoman/update-notifier) by [vvakame](https://github.com/vvakame)
+* [:link:](upper-case/upper-case.d.ts) [upper-case](https://github.com/blakeembrey/upper-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
+* [:link:](upper-case-first/upper-case-first.d.ts) [upper-case-first](https://github.com/blakeembrey/upper-case-first) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](uri-templates/uri-templates.d.ts) [uri-templates](https://github.com/geraintluff/uri-templates) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](urijs/URIjs.d.ts) [URI.js](https://github.com/medialize/URI.js) by [RodneyJT](https://github.com/RodneyJT), [Brian Surowiec](https://github.com/xt0rted)
 * [:link:](js-url/js-url.d.ts) [url](https://github.com/websanova/js-url) by [MIZUNE Pine](https://github.com/pine613)
+* [:link:](url-template/url-template.d.ts) [url-template](https://github.com/bramstein/url-template) by [Marcin Porębski](https://github.com/marcinporebski)
 * [:link:](urlrouter/urlrouter.d.ts) [urlrouter](https://github.com/fengmk2/urlrouter) by [soywiz](https://github.com/soywiz)
 * [:link:](urlsafe-base64/urlsafe-base64.d.ts) [urlsafe-base64](https://github.com/RGBboy/urlsafe-base64) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](usage/usage.d.ts) [usage](https://github.com/arunoda/node-usage) by [Pascal Vomhoff](https://github.com/pvomhoff)
@@ -1137,7 +1292,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](videojs/videojs.d.ts) [Video.js](https://github.com/zencoder/video-js) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](vimeo/froogaloop.d.ts) [Vimeo](http://developer.vimeo.com/player/js-api) by [Daz Wilkin](https://github.com/DazWilkin)
 * [:link:](vinyl/vinyl.d.ts) [vinyl](https://github.com/wearefractal/vinyl) by [vvakame](https://github.com/vvakame), [jedmao](https://github.com/jedmao)
+* [:link:](vinyl-buffer/vinyl-buffer.d.ts) [vinyl-buffer](https://github.com/hughsk/vinyl-buffer) by [Qubo](https://github.com/tkQubo)
 * [:link:](vinyl-fs/vinyl-fs.d.ts) [vinyl-fs](https://github.com/wearefractal/vinyl-fs) by [vvakame](https://github.com/vvakame)
+* [:link:](vinyl-paths/vinyl-paths.d.ts) [vinyl-paths](https://github.com/sindresorhus/vinyl-paths) by [Qubo](https://github.com/tkQubo)
 * [:link:](vinyl-source-stream/vinyl-source-stream.d.ts) [vinyl-source-stream](https://github.com/hughsk/vinyl-source-stream) by [Asana](https://asana.com)
 * [:link:](virtual-dom/virtual-dom.d.ts) [virtual-dom](https://github.com/Matt-Esch/virtual-dom) by [Christopher Brown](https://github.com/chbrown)
 * [:link:](vortex-web-client/vortex-web-client.d.ts) [Vortex Web 1.2.0p1](http://www.prismtech.com/vortex/vortex-web) by [Stefan Profanter](https://github.com/Pro)
@@ -1148,10 +1305,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](webaudioapi/waa.d.ts) [Web Audio API](http://www.w3.org/TR/webaudio) by [Baruch Berger](https://github.com/bbss), [Kon](http://phyzkit.net), [kubosho](https://github.com/kubosho)
 * [:link:](webmidi/webmidi.d.ts) [Web MIDI API](http://www.w3.org/TR/webmidi) by [Toshiya Nakakura](https://github.com/nakakura)
 * [:link:](webspeechapi/webspeechapi.d.ts) [Web Speech API](https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html) by [SaschaNaz](https://github.com/saschanaz)
+* [:link:](webcl/webcl.d.ts) [WebCL](https://www.khronos.org/registry/webcl/specs/1.0.0) by [Ralph Brown](https://github.com/NCARalph)
 * [:link:](webcola/webcola.d.ts) [webcola](https://github.com/tgdwyer/WebCola) by [Qinfeng Chen](https://github.com/qinfchen)
 * [:link:](webcomponents.js/webcomponents.js.d.ts) [webcomponents.js](https://github.com/webcomponents/webcomponentsjs) by [Adi Dahiya](https://github.com/adidahiya)
 * [:link:](webcrypto/WebCrypto.d.ts) [WebCrypto](http://www.w3.org/TR/WebCryptoAPI) by [Lucas Dixon](https://github.com/iislucas)
+* [:link:](webgl-ext/webgl-ext.d.ts) [WebGL Extensions](http://webgl.org) by [Arthur Langereis](https://github.com/zenmumbler)
 * [:link:](webix/webix.d.ts) [Webix UI](http://webix.com) by [Maksim Kozhukh](http://github.com/mkozhukh)
+* [:link:](webpack/webpack.d.ts) [webpack](https://github.com/webpack/webpack) by [Qubo](https://github.com/tkqubo)
+* [:link:](webpack/webpack-env.d.ts) [webpack (module API)](https://github.com/webpack/webpack) by [use-strict](https://github.com/use-strict)
 * [:link:](webrtc/MediaStream.d.ts) [WebRTC](http://dev.w3.org/2011/webrtc) by [Ken Smith](https://github.com/smithkl42)
 * [:link:](websocket/websocket.d.ts) [websocket](https://github.com/Worlize/WebSocket-Node) by [Paul Loyd](https://github.com/loyd)
 * [:link:](websql/websql.d.ts) [websql](http://www.w3.org/TR/webdatabase) by [TeamworkGuy2](https://github.com/TeamworkGuy2)
@@ -1171,6 +1332,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](xdate/xdate.d.ts) [XDate](http://arshaw.com/xdate) by [yamada28go](https://github.com/yamada28go)
 * [:link:](jsfl/xJSFL.d.ts) [xJSFL](http://www.xjsfl.com) by [soywiz](https://github.com/soywiz)
 * [:link:](xlsx/xlsx.d.ts) [xlsx](https://github.com/SheetJS/js-xlsx) by [themauveavenger](https://github.com/themauveavenger)
+* [:link:](xml-parser/xml-parser.d.ts) [xml-parser](https://github.com/segmentio/xml-parser) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](xmlbuilder/xmlbuilder.d.ts) [xmlbuilder](https://github.com/oozcitak/xmlbuilder-js) by [Wallymathieu](http://github.com/wallymathieu)
 * [:link:](xpath/xpath.d.ts) [xpath](https://github.com/goto100/xpath) by [Andrew Bradley](https://github.com/cspotcode)
 * [:link:](xregexp/xregexp.d.ts) [XRegExp](http://xregexp.com) by [Bart van der Schoor](https://github.com/Bartvds)
@@ -1178,6 +1340,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](xss-filters/xss-filters.d.ts) [Yahoo XSS Filters](https://github.com/yahoo/xss-filters) by [Dave Taylor](http://davetayls.me)
 * [:link:](yamljs/yamljs.d.ts) [yamljs](https://github.com/jeremyfa/yaml.js) by [Tim Jonischkat](http://www.tim-jonischkat.de)
 * [:link:](yargs/yargs.d.ts) [yargs](https://github.com/chevex/yargs) by [Martin Poelstra](https://github.com/poelstra)
+* [:link:](ydn-db/ydn-db.d.ts) [YDN-DB version 1](http://dev.yathit.com/ydn-db/index.html) by [Kyaw Tun](https://github.com/yathit), [Gabriel Monteagudo](https://github.com/gabrielmaldi)
 * [:link:](yeoman-generator/yeoman-generator.d.ts) [yeoman-generator](https://github.com/yeoman/generator) by [Kentaro Okuno](http://github.com/armorik83)
 * [:link:](yosay/yosay.d.ts) [yosay](https://github.com/yeoman/yosay) by [Kentaro Okuno](http://github.com/armorik83)
 * [:link:](youtube/youtube.d.ts) [YouTube](https://developers.google.com/youtube) by [Daz Wilkin](https://github.com/DazWilkin), [Ian Obermiller](http://ianobermiller.com)
diff --git a/README.md b/README.md
index c17e2f724..5cc7045d7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Include a line like this:
 
 ## Contributions
 
-DefinitelyTyped only works because of contributions by users like you! 
+DefinitelyTyped only works because of contributions by users like you!
 
 Please see the [contribution guide](http://definitelytyped.org/guides/contributing.html) on how to contribute to DefinitelyTyped.
 
diff --git a/ace/ace.d.ts b/ace/ace.d.ts
index f0668da3c..bedcfee54 100644
--- a/ace/ace.d.ts
+++ b/ace/ace.d.ts
@@ -18,7 +18,9 @@ declare module AceAjax {
 
         bindKey:any;
 
-        exec:Function;
+        exec: Function;
+
+        readOnly?: boolean;
     }
 
     export interface CommandManager {
diff --git a/amazon-product-api/amazon-product-api-tests.ts b/amazon-product-api/amazon-product-api-tests.ts
new file mode 100644
index 000000000..b98e15710
--- /dev/null
+++ b/amazon-product-api/amazon-product-api-tests.ts
@@ -0,0 +1,84 @@
+/// <reference path="./amazon-product-api.d.ts" />
+/// <reference path="../node/node.d.ts"/>
+
+import amazon = require('amazon-product-api');
+
+var client = amazon.createClient({
+    awsId: process.env.AWS_ACCESS_KEY_ID,
+    awsSecret: process.env.AWS_SECRET,
+    awsTag: process.env.AWS_ASSOCIATE_TAG
+});
+
+
+// Item Search
+
+var searchQuery = {
+    director: 'Quentin Tarantino',
+    actor: 'Samuel L. Jackson',
+    searchIndex: 'DVD',
+    audienceRating: 'R',
+    responseGroup: 'ItemAttributes,Offers,Images'
+};
+
+client.itemSearch(searchQuery).then((results) => {
+    console.log(getResultCount(results) + " search results");
+}).catch(function(err){
+    console.log(err);
+});
+
+client.itemSearch(searchQuery, (err, results) => {
+    if(err) {
+        console.log(err);
+        return;
+    }
+    console.log(getResultCount(results) + " search results");
+});
+
+
+// Item Lookup
+
+var lookupQuery = {
+    itemId: 'B00008OE6I',
+    idType: 'ASIN',
+    responseGroup: 'OfferFull',
+    Condition: 'All'
+};
+
+client.itemLookup(lookupQuery).then((results) => {
+    console.log(getResultCount(results) + " lookup results");
+}).catch(function(err){
+    console.log(err);
+});
+
+client.itemLookup(lookupQuery, (err, results) => {
+    if(err) {
+        console.log(err);
+        return;
+    }
+    console.log(getResultCount(results) + " lookup results");
+});
+
+// Browse Node Lookup
+
+var nodeLookupQuery = {
+    browseNodeId: '2625373011'
+};
+
+client.browseNodeLookup(nodeLookupQuery).then((results) => {
+    console.log(getResultCount(results) + " node lookup results");
+}).catch(function(err){
+    console.log(err);
+});
+
+client.browseNodeLookup(nodeLookupQuery, (err, results) => {
+    if(err) {
+        console.log(err);
+        return;
+    }
+
+    console.log(getResultCount(results) + " node lookup results");
+});
+
+function getResultCount(results: Object[]) {
+    return results != undefined ? results.length : 0;
+}
\ No newline at end of file
diff --git a/amazon-product-api/amazon-product-api.d.ts b/amazon-product-api/amazon-product-api.d.ts
new file mode 100644
index 000000000..fc84dcc09
--- /dev/null
+++ b/amazon-product-api/amazon-product-api.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for amazon-product-api
+// Project: https://github.com/t3chnoboy/amazon-product-api
+// Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../es6-promise/es6-promise.d.ts"/>
+
+declare module "amazon-product-api" {
+
+    interface ICredentials {
+        awsId: string,
+        awsSecret: string,
+        awsTag: string
+    }
+
+    interface IAmazonProductQueryCallback {
+        (err: string, results: Object[]): void;
+    }
+
+    interface IAmazonProductClient {
+        itemSearch(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
+        itemLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
+        browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
+    }
+
+    export function createClient(credentials:ICredentials) : IAmazonProductClient;
+}
diff --git a/amcharts/AmCharts.d.ts b/amcharts/AmCharts.d.ts
index 97dd3a3ff..647fc6e25 100644
--- a/amcharts/AmCharts.d.ts
+++ b/amcharts/AmCharts.d.ts
@@ -178,15 +178,15 @@ declare module AmCharts {
         /** You can trigger the animation of the pie chart. */
         animateAgain();
         /** You can trigger the click on a slice from outside. index - the number of a slice or Slice object. */
-        clickSlice(index);
+        clickSlice(index: number);
         /** Hides slice. index - the number of a slice or Slice object. */
-        hideSlice(index);
+        hideSlice(index: number);
         /** You can simulate roll-out of a slice from outside. index - the number of a slice or Slice object. */
-        rollOutSlice(index);
+        rollOutSlice(index: number);
         /** You can simulate roll-over a slice from outside. index - the number of a slice or Slice object. */
-        rollOverSlice(index);
+        rollOverSlice(index: number);
         /** Shows slice. index - the number of a slice or Slice object. */
-        showSlice(index);
+        showSlice(index: number);
 
         /** Adds event listener of the type "clickSlice" or "pullInSlice" or "pullOutSlice" to the object.
             @param type Always "clickSlice" or "pullInSlice" or "pullOutSlice".
@@ -311,22 +311,32 @@ declare module AmCharts {
 
 If you do not set properties such as dashLength, lineAlpha, lineColor, etc - values of the axis are used.*/
     class Guide {
+        /** If you set it to true, the guide will be displayed above the graphs. */
+        above: boolean;
         /** Radar chart only. Specifies angle at which guide should start. Affects only fills, not lines. */
         angle: number;
         /** Baloon fill color. */
         balloonColor: string;
         /** The text which will be displayed if the user rolls-over the guide. */
         balloonText: string;
+        /** Specifies if label should be bold or not. */
+        boldLabel: boolean;
         /** Category of the guide (in case the guide is for category axis). */
         category: string;
         /** Dash length. */
         dashLength: number;
         /** Date of the guide (in case the guide is for category axis and parseDates is set to true). */
         date: Date;
+        /** Works if a guide is added to CategoryAxis and this axis is non-date-based. If you set it to true, the guide will start (or be placed, if it's not a fill) on the beginning of the category cell and will end at the end of toCategory cell. */
+        expand: boolean;
         /** Fill opacity. Value range is 0 - 1. */
         fillAlpha: number;
         /** Fill color. */
         fillColor: string;
+        /** Font size of guide label. */
+        fontSize: string;
+        /** Unique id of a Guide. You don't need to set it, unless you want to. */
+        id: string;
         /** Specifies whether label should be placed inside or outside plot area. */
         inside: boolean;
         /** The label which will be displayed near the guide. */
@@ -339,6 +349,8 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         lineColor: string;
         /** Line thickness. */
         lineThickness: number;
+        /** Position of guide label. Possible values are "left" or "right" for horizontal axis and "top" or "bottom" for vertical axis.  */
+        position: string;
         /** Tick length. */
         tickLength: number;
         /** Radar chart only. Specifies angle at which guide should end. Affects only fills, not lines. */
@@ -351,6 +363,8 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         toValue: number;
         /** Value of the guide (in case the guide is for value axis). */
         value: number;
+        /** Value axis of a guide. As you can add guides directly to the chart, you might need to specify which which value axis should be used. */
+        valueAxis: ValueAxis;
     }
     /** ImagesSettings is a class which holds common settings of all MapImage objects. */
     class ImagesSettings {
@@ -381,7 +395,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Font size of a label. 
             @default 11
         */
-        labelFontSize: number;
+        labelfontSize: string;
         /** Position of the label. Allowed values are: left, right, top, bottom and middle. right */
         labelPosition: string;
         /** Label roll-over color. #00CC00 */
@@ -546,7 +560,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Hides event bullets. */
         hideStockEvents();
         /** Removes event listener from the object. */
-        removeListener(obj, type, handler);
+        removeListener(obj: any, type: string, handler: any);
         /** Removes panel from the stock chart. Requires stockChart.validateNow() method to be called after this action. */
         removePanel(panel: StockPanel);
         /** Shows event bullets. */
@@ -556,7 +570,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Method which forces the stock chart to rebuild. Should be called after properties are changed. */
         validateNow();
         /** Zooms chart to specified dates. startDate, endDate - Date objects. */
-        zoom(startDate, endDate);
+        zoom(startDate: Date, endDate: Date);
         /** Zooms out the chart. */
         zoomOut();
 
@@ -716,7 +730,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         */
         equalWidths: boolean;
         /** Font size. Will use chart's font size if not set. */
-        fontSize: number;
+        fontSize: string;
         /** Horizontal space between legend item and left/right border. */
         horizontalGap: number;
         /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. [[title]] */
@@ -886,8 +900,17 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
     /** AmChart is a base class of all charts. It can not be instantiated explicitly. AmCoordinateChart, AmPieChart and AmMap extend AmChart class. */
     class AmChart {
     	/** used when constructing a chart with a theme */
-    	constructor(theme: any);
-    	/** Background color. You should set backgroundAlpha to >0 value in order background to be visible. We recommend setting background color directly on a chart's DIV instead of using this property. #FFFFFF */
+    	constructor(theme?: any);
+    	/** Specifies, if class names should be added to chart elements. */
+        addClassNames: boolean;
+        /** Array of Labels. Example of label object, with all possible properties:
+{"x": 20, "y": 20, "text": "this is label", "align": "left", "size": 12, "color": "#CC0000", "alpha": 1, "rotation": 0, "bold": true, "url": "http://www.amcharts.com"} */
+        allLabels: Label[];
+        /**  Set this to false if you don't want chart to resize itself whenever its parent container size changes. */
+        autoResize: boolean;
+        /** Opacity of background. Set it to >0 value if you want backgroundColor to work. However we recommend changing div's background-color style for changing background color. */
+        backgroundAlpha: number;
+        /** Background color. You should set backgroundAlpha to >0 value in order background to be visible. We recommend setting background color directly on a chart's DIV instead of using this property. #FFFFFF */
         backgroundColor: string;
         /** The chart creates AmBalloon class itself. If you want to customize balloon, get balloon instance using this property, and then change balloon's properties.  AmBalloon */
         balloon: AmBalloon;
@@ -895,32 +918,83 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         borderAlpha: number;
         /** Color of chart's border. You should set borderAlpha >0 in order border to be visible. We recommend setting border color directly on a chart's DIV instead of using this property. #000000 */
         borderColor: string;
+        /** This prefix is added to all class names which are added to all visual elements of a chart in case addClassNames is set to true. */
+        classNamePrefix: string;
         /** Text color. #000000 */
         color: string;
+        /** Non-commercial version only. Specifies position of link to amCharts site. Allowed values are: top-left, top-right, bottom-left and bottom-right.
+            @default 'top-left'
+        */
+        creditsPosition: string;
         /** Array of data objects, for example: [{country:"US", value:524},{country:"UK", value:624},{country:"Lithuania", value:824}]. You can have any number of fields and use any field names. In case of AmMap, data provider should be MapData object. */
         dataProvider: any[];
+        /** Decimal separator.
+            @Default . */
+        decimalSeparator: string;
+        /** Using this property you can add any additional information to SVG, like SVG filters or clip paths. The structure of this object should be identical to XML structure of a object you are adding, only in JSON format. */
+        defs: any;
+        /** Export config. Specifies how export to image/data export/print/annotate menu will look and behave. You can find a lot of examples in amcharts/plugins/export folder. */
+        export: ExportSettings;
         /** Font family. Verdana */
         fontFamily: string;
         /** Font size.
             @default 11
         */
-        fontSize: number;
-        /** Height of a chart. "100%" means the chart's height will be equal to it's container's (DIV) height and will resize if height of the container changes. Set a number instead of percents if your chart's size needs to be fixed.
-            @default 1
+        fontSize: string;
+        /** If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect. Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result. 
+            @Default false
         */
-        height: any;
+        handDrawn: boolean;
+        /** Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
+            @Default 2
+        */
+        handDrawScatter: number;
+        /** Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
+            @Default 1
+        */
+        handDrawThickness: number;
+        /** Time, in milliseconds after which balloon is hidden if the user rolls-out of the object. Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas. Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class. 
+            @Default 150
+        */
+        hideBalloonTime: number;
+        /** Legend of a chart. */
+        legend: AmLegend;
         /** Reference to the div of the legend. */
         legendDiv: HTMLElement;
-        /** Object with precision, decimalSeparator and thousandsSeparator set which will be used for number formatting. Precision set to -1 means that values won't be rounded.  {precision:-1, decimalSeparator:'.', thousandsSeparator:','} */
-        numberFormatter: Object;
+        /** You can add listeners of events using this property. Example: listeners = [{"event":"dataUpdated", "method":handleEvent}]; */
+        listerns: Object[];
         /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users, you should set panEventsEnabled to true. */
         panEventsEnabled: boolean;
-        /** Object with precision, decimalSeparator and thousandsSeparator set which will be used for formatting percent values. {precision:2, decimalSeparator:'.', thousandsSeparator:','} */
-        percentFormatter: Object;
+        /**  Specifies absolute or relative path to amCharts files, i.e. "amcharts/". (where all .js files are located)
+            If relative URLs are used, they will be relative to the current web page, displaying the chart.            
+            You can also set path globally, using global JavaScript variable AmCharts_path. If this variable is set, and "path" is not set in chart config, the chart will assume the path from the global variable. This allows setting amCharts path globally. I.e.:            
+            var AmCharts_path = "/libs/amcharts/";
+            "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.*/
+        path: string;     
+        /** Specifies path to the folder where images like resize grips, lens and similar are.
+            IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead. The "pathToImages" will be automatically set and does not need to be in the chart config, unless you keep your images separately from other amCharts files. */
+        pathToImages: string;
+        /** Precision of percent values. -1 means percent values won't be rounded at all and show as they are. 
+            @default 2
+        */
+        percentPrecision: number;
+        /** Precision of values. -1 means values won't be rounded at all and show as they are. 
+            @Default 1*/
+        precision: number;
         /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
         prefixesOfBigNumbers: any[];
         /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
         prefixesOfSmallNumbers: any[];
+        /** Theme of a chart. Config files of themes can be found in amcharts/themes/ folder. More info about using themes. */
+        theme: string;
+        /** Thousands separator. 
+            @default .
+        */
+        thousandsSeparator: string;
+        /** Array of Title objects. */
+        titles: Title[];
+        /** Type of a chart. Required when creating chart using JSON. Possible types are: serial, pie, xy, radar, funnel, gauge, map, stock. */
+        type: string;
         /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties. */
         usePrefixes: boolean;
         /** Read-only. Indicates current version of a script. */
@@ -938,7 +1012,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             bold - specifies if text is bold (true/false),
             url - url
         */
-        addLabel(x: number, y: number, text: string, align: string, size, color: string, rotation, alpha: number, bold: boolean, url: string);
+        addLabel(x: number, y: number, text: string, align: string, size: number, color: string, rotation: number, alpha: number, bold: boolean, url: string);
         /** Adds a legend to the chart.
             By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
             (NOTE: This method will not work on StockPanel.)
@@ -955,7 +1029,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         addLegend(legend: AmLegend, legendDiv: HTMLElement);
 
         /**   Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap. Plot area of Serial/XY chart is also updated unless autoMargins property is set to false. You can add any number of titles - each of them will be placed in a new line. To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method. text - text of a title size - font size color - title color alpha - title opacity bold - boolean value indicating if title should be bold. */
-        addTitle(text, size, color, alpha, bold);
+        addTitle(text: string, size: number, color: string, alpha: number, bold: boolean);
         /** Clears the chart area, intervals, etc. */
         clear();
         /** Removes all labels added to the chart. */
@@ -996,34 +1070,22 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
     /** AmCoordinateChart is a base class of AmRectangularChart. It can not be instantiated explicitly. */
 
     class AmCoordinateChart extends AmChart {
+        /** Read-only. Array, holding processed chart's data. */
+        chartData: Object[];
         /** Specifies the colors of the graphs if the lineColor of a graph is not set.
             It there are more graphs then colors in this array, the chart picks random color.
             @default ['#FF6600', '#FCD202', '#B0DE09', '#0D8ECF', '#2A0CD0', '#CD0D74', '#CC0000', '#00CC00', '#0000CC', '#DDDDDD', '#999999', '#333333', '#990000'] */
-        colors: any[];
+        colors: string[];
         /** The array of graphs belonging to this chart.
             To add/remove graph use addGraph/removeGraph methods instead of adding/removing graphs directly to array.
         */
-        graphs: any[];
-        /** The opacity of plot area's border.
-            Value range is 0 - 1.
+        graphs: AmGraph[];
+        /** Specifies if grid should be drawn above the graphs or below. Will not work properly with 3D charts.
+            @default false
         */
-        plotAreaBorderAlpha: number;
-        /** The color of the plot area's border.
-            Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0.
-            Set it to a value higher than 0 to make it visible.
-            @default #000000
-        */
-        plotAreaBorderColor: string;
-        /** Opacity of plot area.
-            Plural form is used to keep the same property names as our Flex charts'.
-            Flex charts can accept array of numbers to generate gradients.
-            Although you can set array here, only first value of this array will be used.
-        */
-        plotAreaFillAlphas: number;
-        /** You can set both one color if you need a solid color or array of colors to generate gradients, for example: ["#000000", "#0000CC"]
-            @default #FFFFFF
-        */
-        plotAreaFillColors: any;
+        gridAboveGraphs: boolean;
+        /** Instead of adding guides to the axes, you can push all of them to this array. In case guide has category or date defined, it will automatically will be assigned to the category axis. Otherwise to first value axis, unless you specify a different valueAxis for the guide. */
+        guides: Guide[];
         /** Specifies whether the animation should be sequenced or all objects should appear at once.
             @default true
         */
@@ -1053,6 +1115,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /**  Adds a graph to the chart.
          */
         addGraph(graph: AmGraph);
+        /** Adds a legend to the chart. By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter. (NOTE: This method will not work on StockPanel.) */ 
         /** Adds value axis to the chart.
             One value axis is created automatically, so if you don't want to change anything or add more value axes, you don't need to add it.
         */
@@ -1186,16 +1249,16 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         startOnAxis: boolean;
 
         /** Number returns coordinate of a category. Works only if parseDates is false. If parseDates is true, use dateToCoordinate method. category - String */
-        categoryToCoordinate(category);
+        categoryToCoordinate(category: string);
 
         /** date - Date object Returns Date of the coordinate, in case parseDates is set to true and equalSpacing is set to false.  coordinate - Number */
-        coordinateToDate(coordinate);
+        coordinateToDate(coordinate: number);
 
         /** Number Returns coordinate of the date, in case parseDates is set to true. if parseDates is false, use categoryToCoordinate method. date - Date object */
-        dateToCoordinate(date);
+        dateToCoordinate(date: Date);
         
         /** Number Returns index of the category which is most close to specified coordinate. x - coordinate */
-        xToIndex(x);
+        xToIndex(x: number);
     }
 
     /** ChartScrollbar class displays chart scrollbar. Supported by AmSerialChart and AmXYChart.
@@ -1269,7 +1332,9 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
 
     /** AmRectangularChart is a base class of AmSerialChart and AmXYChart. It can not be instantiated explicitly.*/
     class AmRectangularChart extends AmCoordinateChart {
-        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0). */
+        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0). 
+            @default 0
+        */
         angle: number;
         /** Space left from axis labels/title to the chart's outside border, if autoMargins set to true.
             @default 10
@@ -1279,11 +1344,12 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             @default true
         */
         autoMargins: boolean;
-        /** Chart cursor. */
+        /** Cursor of a chart. */
         chartCursor: ChartCursor;
         /** Chart scrollbar. */
         chartScrollbar: ChartScrollbar;
-        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0). */
+        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0). 
+            @default 0*/
         depth3D: number;
         /** Number of pixels between the container's bottom border and plot area. This space can be used for bottom axis' values. If autoMargin is true and bottom side has axis, this property is ignored.
             @default 20
@@ -1297,18 +1363,66 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             @default 20
         */
         marginRight: number;
-        /** Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call. */
+        /** Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call. 
+            @default false
+        */
         marginsUpdated: boolean;
         /** Number of pixels between the container's top border and plot area. This space can be used for top axis' values. If autoMargin is true and top side has axis, this property is ignored.
             @default 20
         */
         marginTop: number;
+        /** The opacity of plot area's border. Value range is 0 - 1.
+            @default 0
+         */
+        plotAreaBorderAlpha: number;
+        /** The color of the plot area's border. Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0. Set it to a value higher than 0 to make it visible. 
+            @default '#000000'*/
+        plotAreaBorderColor: string;
+        /** Opacity of plot area. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used. 
+            @default 0
+        */
+        plotAreaFillAlphas: number;
+        /** You can set both one color if you need a solid color or array of colors to generate gradients, for example: ["#000000", "#0000CC"] 
+            @default '#FFFFFF'
+        */
+        plotAreaFillColors: any;
+        /** If you are using gradients to fill the plot area, you can use this property to set gradient angle. The only allowed values are horizontal and vertical: 0, 90, 180, 270. 
+            @default 0
+        */
+        plotAreaGradientAngle: number;
         /** Array of trend lines added to a chart. You can add trend lines to a chart using this array or access already existing trend lines */
-        trendLines: any[];
-        /** It's a simple object containing information about zoom-out button. Other available properties of this object are fontSize and color. color specifies text color of a button. {backgroundColor:'#b2e1ff',backgroundAlpha:1} */
-        zoomOutButton: Object;
+        trendLines: TrendLine[];
+        /** Opacity of zoom-out button background. 
+            @default 0
+        */
+        zoomOutButtonAlpha: number;
+        /** Zoom-out button background color.
+            @default '#e5e5e5'
+        */
+        zoomOutButtonColor: string;
+        /** Name of zoom-out button image. In the images folder there is another lens image, called lensWhite.png. You might want to have white lens when background is dark. Or you can simply use your own image.
+            @default lens.png
+        */
+        zoomOutButtonImage: string;
+        /** Size of zoom-out button image
+            @default: 17
+        */
+        zoomOutButtonImageSize: number;
+        /** Padding around the text and image.
+            @default: 8
+        */
+        zoomOutButtonPadding: number;
+        /** Opacity of zoom-out button background when mouse is over it.
+            @default: 1
+        */
+        zoomOutButtonRollOverAlpha: number;
         /** Text in the zoom-out button. Show all */
         zoomOutText: string;
+        
+        /** Adds a ChartCursor object to a chart */
+        addChartCursor(cursor: ChartCursor);
+        /** Adds a ChartScrollbar to a chart */
+        addChartScrollbar(scrollbar: ChartScrollbar);
         /** Adds a TrendLine to a chart.
             You should call chart.validateNow() after this method is called in order the trend line to be visible. */
         addTrendLine(trendLine: TrendLine);
@@ -1318,7 +1432,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         removeChartScrollbar();
         /** Removes a trend line from a chart. 
             You should call chart.validateNow() in order the changes to be visible. */
-        removeTrendLine;
+        removeTrendLine(trendLine: TrendLine);
     }
 
     /* Trend lines are straight lines indicating trends, might also be used for some different purposes. Can be used by Serial and XY charts. To add/remove trend line, use chart.addTrendLine(trendLine)/chart.removeTrendLine(trendLine) methods or simply pass array of trend lines: chart.trendLines = [trendLine1, trendLine2].
@@ -1395,7 +1509,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Hides cursor. */
         hideCursor();
         /** You can force cursor to appear at specified cateogry or date. */
-        showCursorAt(category);
+        showCursorAt(category: string);
         /** Adds event listener of the type "changed" to the object.
             @param type Always "changed".
             @param handler Dispatched when cursor position is changed. "index" is a series index over which chart cursors currently is. "zooming" specifies if user is currently zooming (is selecting) the chart. mostCloseGraph property is set only when oneBalloonOnly is set to true.*/
@@ -1439,20 +1553,26 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
             chart.write("chartdiv");
     */
     class AmSerialChart extends AmRectangularChart {
-    	/** Read-only. Chart creates category axis itself. If you want to change some properties, you should get this axis from the chart and set properties to this object. */
+    	/** Date format of the graph balloon (if chart parses dates and you don't use chartCursor).
+            @default 'MMM DD, YYYY'
+        */
+        balloonDateFormat: string;
+        /** Read-only. Chart creates category axis itself. If you want to change some properties, you should get this axis from the chart and set properties to this object. */
         categoryAxis: CategoryAxis;
         /** Category field name tells the chart the name of the field in your dataProvider object which will be used for category axis values. */
         categoryField: string;
-        /** Read-only. Array of SerialDataItem objects generated from dataProvider. */
-        chartData: any[];
         /** The gap in pixels between two columns of the same category.
             @default 5
         */
         columnSpacing: number;
-        /** Relative width of columns. Value range is 0 - 1. 0.8 */
+        /** Space between 3D stacked columns.
+            @default 0
+        */
+        columnSpacing3D: number;
+        /** Relative width of columns. Value range is 0 - 1.
+            @default 0.8
+        */
         columnWidth: number;
-        /** Array holding chart's data. */
-        dataProvider: any[];
         /** Read-only. If category axis parses dates endDate indicates date to which the chart is currently displayed. */
         endDate: Date;
         /** Read-only. Category index to which the chart is currently displayed. */
@@ -1461,8 +1581,14 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         maxSelectedSeries: number;
         /** The longest time span allowed to select (in milliseconds) for example, 259200000 will limit selection to 3 days. */
         maxSelectedTime: number;
-        /** The shortest time span allowed to select (in milliseconds) for example, 1000 will limit selection to 1 second. */
+        /** The shortest time span allowed to select (in milliseconds) for example, 1000 will limit selection to 1 second. 
+            @default 0
+        */
         minSelectedTime: number;
+        /** Specifies if scrolling of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will zoom-in/out. */
+        mouseWheelScrollEnabled: boolean;
+        /** Specifies if zooming of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will scroll. */
+        mouseWheelZoomEnabled: boolean;
         /** If you set this to true, the chart will be rotated by 90 degrees (the columns will become bars). */
         rotate: boolean;
         /** Read-only. If category axis parses dates startDate indicates date from which the chart is currently displayed. */
@@ -1475,15 +1601,15 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         zoomOutOnDataUpdate: boolean;
 
         /** Number Returns index of the specified category value. value - series (category value) which index you want to find. */
-        getCategoryIndexByValue(value);
+        getCategoryIndexByValue(value: number);
         /** Zooms out, charts shows all available data. */
         zoomOut();
         /** Zooms the chart by the value of the category axis. start - category value, String \\ end - category value, String */
-        zoomToCategoryValues(start, end);
+        zoomToCategoryValues(start: Date, end: Date);
         /** Zooms the chart from one date to another. start - start date, Date object \\ end - end date, Date object */
-        zoomToDates(start, end);
+        zoomToDates(start: Date, end: Date);
         /** Zooms the chart by the index of the category. start - start index, Number \\ end - end index, Number */
-        zoomToIndexes(start, end);
+        zoomToIndexes(start: Date, end: Date);
     }
 
     class PeriodSelector {
@@ -1522,7 +1648,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
        .
 @param handler - Dispatched when dates in period selector input fields are changed or user clicks on one of the predefined period buttons. */
 
-        addListener(type, handler: (e: {
+        addListener(type: string, handler: (e: {
             /** Always: "changed" */
 
             type: string;
@@ -1695,6 +1821,31 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         urlTarget: string;
     }
 
+    /** Creates a label on the chart which can be placed anywhere, multiple can be assigned. */
+    class Label {
+        /** @Default 'left' */
+        align: string;
+        /** @Default 1 */
+        alpha: number;
+        /** Specifies if label is bold or not. */
+        bold: boolean;
+        /** Color of a label */
+        color: string; 
+        /** Unique id of a Label. You don't need to set it, unless you want to. */
+        id: string;
+        /** Rotation angle. */
+        rotation: number;
+        /** Text size */
+        size: number;
+        /** Text of a label */
+        text: string;
+        /** URL which will be access if user clicks on a label. */
+        url: string;
+        /** X position of a label. */
+        x: number|string;
+        /** y position of a label. */
+        y: number|string;
+    }
     /** Common settings of legends. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockLegend class will be used. */
     class LegendSettings {
         /** Alignment of legend entries. Possible values are: "left", "right" and "center". */
@@ -1807,7 +1958,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Balloon background color. Usually balloon background color is set by the chart. Only if "adjustBorderColor" is "true" this color will be used. #CC0000 */
         fillColor: string;
         /** Size of text in the balloon. Chart's fontSize is used by default. */
-        fontSize: number;
+        fontSize: string;
         /** Horizontal padding of the balloon.
             @default 8
         3*/
@@ -1865,7 +2016,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
         fillColor: string;
         /** Text size. */
-        fontSize: number;
+        fontSize: string;
         /** Opacity of grid lines. */
         gridAlpha: number;
         /** Color of grid lines. */
@@ -1945,7 +2096,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         */
         enabled: boolean;
         /** Font size. */
-        fontSize: number;
+        fontSize: string;
         /** Specifies which graph will be displayed in the scrollbar. */
         graph: AmGraph;
         /** Graph fill opacity. */
@@ -2004,6 +2155,8 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         alphaField: string;
         /** Value balloon color. Will use graph or data item color if not set. */
         balloonColor: string;
+        /**	If you set some function, the graph will call it and pass GraphDataItem and AmGraph object to it. This function should return a string which will be displayed in a balloon.  */
+        balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string; 
         /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] [[value]] */
         balloonText: string;
         /** Specifies if the line graph should be placed behind column graphs */
@@ -2069,7 +2222,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). */
         fillToGraph: AmGraph;
         /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: number;
+        fontSize: string;
         /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal". vertical */
         gradientOrientation: string;
         /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead. */
@@ -2193,7 +2346,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. #FFFFFF */
         fillColor: string;
         /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: number;
+        fontSize: string;
         /** Opacity of grid lines. 0.2 */
         gridAlpha: number;
         /** Color of grid lines. #000000 */
@@ -2247,7 +2400,7 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Color of axis title. Will use text color of chart if not set any. */
         titleColor: string;
         /** Font size of axis title. Will use font size of chart plus two pixels if not set any. */
-        titleFontSize: number;
+        titlefontSize: string;
 
         /** Adds guide to the axis. */
         addGuide(guide:Guide);
@@ -2269,24 +2422,43 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         durationUnits: Object;
         /** Radar chart only. Possible values are: "polygons" and "circles". Set "circles" for polar charts. polygons */
         gridType: string;
+        /** Unique id of value axis. It is not required to set it, unless you need to tell the graph which exact value axis it should use. */
+        id: string;
         /** Specifies whether guide values should be included when calculating min and max of the axis. */
         includeGuidesInMinMax: boolean;
         /** If true, the axis will include hidden graphs when calculating min and max values. */
         includeHidden: boolean;
         /** Specifies whether values on axis can only be integers or both integers and doubles. */
         integersOnly: boolean;
+        /** You can use this function to format Value axis labels. This function is called and these parameters are passed: labelFunction(value, valueText, valueAxis);
+Where value is numeric value, valueText is formatted string and valueAxis is a reference to valueAxis object. 
+
+If axis type is "date", labelFunction will pass different arguments:
+labelFunction(valueText, date, valueAxis)
+
+Your function should return string.*/
+        labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
+        labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
         /** Specifies if this value axis' scale should be logarithmic. */
         logarithmic: boolean;
         /** Read-only. Maximum value of the axis. */
         max: number;
         /** If you don't want max value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
         maximum: number;
+        /** If your value axis is date-based, you can specify maximum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
+        maximumData: Date;
         /** Read-only. Minimum value of the axis. */
         min: number;
         /** If you don't want min value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
         minimum: number;
+        /** If your value axis is date-based, you can specify minimum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
+        minimumDate: Date;
         /** If set value axis scale (min and max numbers) will be multiplied by it. I.e. if set to 1.2 the scope of values will increase by 20%. */
         minMaxMultiplier: number;
+        /** Works with radar charts only. If you set it to “middle”, labels and data points will be placed in the middle between axes. */
+        pointPosition: string;
+        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom". */
+        position: string;
         /** Precision (number of decimals) of values. */
         precision: number;
         /** Radar chart only. Specifies if categories (axes' titles) should be displayed near axes)
@@ -2301,10 +2473,22 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         stackType: string;
         /** Read-only. Value difference between two grid lines. */
         step: number;
+        /** If you set minimum and maximum for your axis, chart adjusts them so that grid would start and end on the beginning and end of plot area and grid would be at equal intervals. If you set strictMinMax to true, the chart will not adjust minimum and maximum of value axis. */
+        strictMinMax: boolean;
         /** In case you synchronize one value axis with another, you need to set the synchronization multiplier. Use synchronizeWithAxis method to set with which axis it should be synced. */
         synchronizationMultiplier: number;
+        /** One value axis can be synchronized with another value axis. You can use both reference to your axis or id of the axis here. You should set synchronizationMultiplyer in order for this to work. */
+        synchronizeWith: ValueAxis;
         /** If this value axis is stacked and has columns, setting valueAxis.totalText = "[[total]]" will make it to display total value above the most-top column. */
         totalText: string;
+        /** Color of total text. */
+        totalTextColor: string;
+        /** Distance from data point to total text. */
+        totalTextOffset: number;
+        /** This allows you to have logarithmic value axis and have zero values in the data. You must set it to >0 value in order to work. */
+        treatZeroAs: number;
+        /** Type of value axis. If your values in data provider are dates and you want this axis to show dates instead of numbers, set it to "date". */
+        type: string;
         /** Unit which will be added to the value label. */
         unit: string;
         /** Position of the unit. Possible values are "left" and "right". right */
@@ -2314,20 +2498,23 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** If true, values will always be formatted using scientific notation (5e+8, 5e-8...) Otherwise only values bigger then 1e+21 and smaller then 1e-7 will be displayed in scientific notation. */
         useScientificNotation: boolean;
 
+        /** Adds guide to the axis. */
+        addGuide(guide: Guide);
         /** Adds event listener to the object.  type - string like 'axisChanged' (should be listed in 'events' section of this class or classes which extend this class). handler - function which is called when event happens */
-        addListener(type, handler);
+        addListener(type: string, handler: any);
         /** Number, - value of coordinate. Returns value of the coordinate.  coordinate - y or x coordinate, in pixels. */
-        coordinateToValue(coordinate);
+        coordinateToValue(coordinate: number);
         /** Number - coordinate Returns coordinate of the value in pixels. value - Number */
-        getCoordinate(value);
-        
+        getCoordinate(value: number);
+        /** Removes guide from the axis.*/
+        removeGuide(guide: Guide);
         /** Removes event listener from the object. */
-        removeListener(obj, type, handler);
+        removeListener(obj: any, type: string, handler: any);
         
         /** One value axis can be synchronized with another value axis. You should set synchronizationMultiplyer in order for this to work. */
         synchronizeWithAxis(axis:ValueAxis);
         /** XY Chart only. Zooms-in the axis to the provided values. */
-        zoomToValues(startValue, endValue);
+        zoomToValues(startValue: number, endValue: number);
 
         /** Adds event listener of the type "axisZoomed" to the object.
             @param type Always "axisZoomed".
@@ -2347,4 +2534,25 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         /** Removes event listener from chart object. */
         removeListener(chart: AmChart, type: string, handler: any);
     }
-}
+    
+    class Title {
+        /** @default 1 */
+        alpha: number;
+        /** Specifies if the tile is bold or not. 
+            @default false*/
+        bold: boolean;
+        /** Text color of a title. */
+        color: string; 
+        /** Unique id of a Title. You don't need to set it, unless you want to. */
+        id: string;
+        /** Text size */
+        size: number;
+        /** Text of a label */
+        text: string;
+    }
+    class ExportSettings {
+        enabled: boolean;
+        libs: Object;
+        menu: Object;
+    }
+}
\ No newline at end of file
diff --git a/amplify-deferred/amplify-deferred-tests.ts b/amplify-deferred/amplify-deferred-tests.ts
new file mode 100644
index 000000000..957941cd2
--- /dev/null
+++ b/amplify-deferred/amplify-deferred-tests.ts
@@ -0,0 +1,265 @@
+/// <reference path="amplify-deferred.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+// Copied examples directly from AmplifyJs site
+
+// Subscribe and publish with no data
+
+amplify.subscribe("nodataexample", function () {
+    alert("nodataexample topic published!");
+});
+
+// Subscribe and publish with data
+
+amplify.publish("nodataexample");
+
+amplify.subscribe("dataexample", function (data) {
+    alert(data.foo); // bar
+});
+
+
+amplify.publish("dataexample", { foo: "bar" });
+
+amplify.subscribe("dataexample2", function (param1, param2) {
+    alert(param1 + param2); // barbaz
+});
+
+//...
+
+amplify.publish("dataexample2", "bar", "baz");
+
+// Subscribe and publish with context and data
+
+amplify.subscribe("datacontextexample", $("p:first"), function (data) {
+    this.text(data.exampleText); // first p element would have "foo bar baz" as text
+});
+
+amplify.publish("datacontextexample", { exampleText: "foo bar baz" });
+
+// Subscribe to a topic with high priority
+
+amplify.subscribe("priorityexample", function (data) {
+    alert(data.foo);
+});
+
+amplify.subscribe("priorityexample", function (data) {
+    if (data.foo === "oops") {
+        return false;
+    }
+}, 1);
+
+
+// Store data with amplify storage picking the default storage technology:
+
+amplify.publish("priorityexample", { foo: "bar" });
+amplify.publish("priorityexample", { foo: "oops" });
+
+amplify.store("storeExample1", { foo: "bar" });
+amplify.store("storeExample2", "baz");
+// retrieve the data later via the key
+var myStoredValue = amplify.store("storeExample1"),
+    myStoredValue2 = amplify.store("storeExample2"),
+    myStoredValues = amplify.store();
+myStoredValue.foo; // bar
+myStoredValue2; // baz
+myStoredValues.storeExample1.foo; // bar
+myStoredValues.storeExample2; // baz
+
+// Store data explicitly with session storage
+
+amplify.store.sessionStorage("explicitExample", { foo2: "baz" });
+// retrieve the data later via the key
+var myStoredValue2 = amplify.store.sessionStorage("explicitExample");
+myStoredValue2.foo2; // baz
+
+
+// REQUEST
+
+// Set up and use a request utilizing Ajax
+
+
+amplify.request.define("ajaxExample1", "ajax", {
+    url: "/myApiUrl",
+    dataType: "json",
+    type: "GET"
+});
+
+// later in code
+amplify.request("ajaxExample1", function (data) {
+    data.foo; // bar
+});
+
+// Set up and use a request utilizing Ajax and Caching
+
+amplify.request.define("ajaxExample2", "ajax", {
+    url: "/myApiUrl",
+    dataType: "json",
+    type: "GET",
+    cache: "persist"
+});
+
+// later in code
+amplify.request("ajaxExample2", function (data) {
+    data.foo; // bar
+});
+
+// a second call will result in pulling from the cache
+amplify.request("ajaxExample2", function (data) {
+    data.baz; // qux
+})
+
+// Set up and use a RESTful request utilizing Ajax
+
+amplify.request.define("ajaxRESTFulExample", "ajax", {
+    url: "/myRestFulApi/{type}/{id}",
+    type: "GET"
+})
+
+// later in code
+amplify.request("ajaxRESTFulExample",
+    {
+        type: "foo",
+        id: "bar"
+    },
+    function (data) {
+        // /myRESTFulApi/foo/bar was the URL used
+        data.foo; // bar
+    }
+    );
+
+// POST data with Ajax
+
+amplify.request.define("ajaxPostExample", "ajax", {
+    url: "/myRestFulApi",
+    type: "POST"
+})
+
+// later in code
+amplify.request("ajaxPostExample",
+    {
+        type: "foo",
+        id: "bar"
+    },
+    function (data) {
+        data.foo; // bar
+    }
+    );
+// Using data maps
+
+//  When searching Twitter, the key for the search phrase is q.If we want a more descriptive name, such as term, we can use a data map:
+
+amplify.request.define("twitter-search", "ajax", {
+    url: "http://search.twitter.com/search.json",
+    dataType: "jsonp",
+    dataMap: {
+        term: "q"
+    }
+});
+
+amplify.request("twitter-search", { term: "amplifyjs" });
+
+// Similarly, we can create a request that searches for mentions, by accepting a username:
+
+amplify.request.define("twitter-mentions", "ajax", {
+    url: "http://search.twitter.com/search.json",
+    dataType: "jsonp",
+    dataMap: function (data) {
+        return {
+            q: "@" + data.user
+        };
+    }
+});
+
+amplify.request("twitter-mentions", { user: "amplifyjs" });
+
+// Setting up and using decoders
+
+//Example:
+
+var appEnvelopeDecoder: amplifyDecoder = function (data, status, xhr, success, error) {
+    if (data.status === "success") {
+        success(data.data);
+    } else if (data.status === "fail" || data.status === "error") {
+        error(data.message, data.status);
+    } else {
+        error(data.message, "fatal");
+    }
+};
+
+//a new decoder can be added to the amplifyDecoders interface
+interface amplifyDecoders {
+    appEnvelope: amplifyDecoder;
+}
+
+amplify.request.decoders.appEnvelope = appEnvelopeDecoder;
+
+//but you can also just add it via an index
+amplify.request.decoders['appEnvelopeStr'] = appEnvelopeDecoder;
+
+
+amplify.request.define("decoderExample", "ajax", {
+    url: "/myAjaxUrl",
+    type: "POST",
+    decoder: "appEnvelope"
+});
+
+amplify.request({
+    resourceId: "decoderExample",
+    success: function (data) {
+        data.foo; // bar
+    },
+    error: function (message, level) {
+        alert("always handle errors with alerts.");
+    }
+});
+
+// POST with caching and single - use decoder
+
+// Example:
+
+amplify.request.define("decoderSingleExample", "ajax", {
+    url: "/myAjaxUrl",
+    type: "POST",
+    decoder: function (data, status, xhr, success, error) {
+        if (data.status === "success") {
+            success(data.data);
+        } else if (data.status === "fail" || data.status === "error") {
+            error(data.message, data.status);
+        } else {
+            error(data.message, "fatal");
+        }
+    }
+});
+
+amplify.request({
+    resourceId: "decoderSingleExample",
+    success: function (data) {
+        data.foo; // bar
+    },
+    error: function (message, level) {
+        alert("always handle errors with alerts.");
+    }
+});
+// Handling Status
+// Status in Success and Error Callbacks
+
+// amplify.request comes with built in support for status.The status parameter appears in the default success or error callbacks when using an ajax definition.
+
+amplify.request.define("statusExample1", "ajax", {
+    //...
+});
+
+amplify.request({
+    resourceId: "statusExample1",
+    success: function (data, status) {
+    },
+    error: function (data, status) {
+    }
+});
+
+amplify.request({
+    resourceId: "statusExample1"
+}).done(function (data, status) {
+}).fail(function (data, status) {
+}).always(function (data, status) { });
+
diff --git a/socket.io/legacy/socket.io-0.9-tests.ts.tscparams b/amplify-deferred/amplify-deferred-tests.ts.tscparams
similarity index 100%
rename from socket.io/legacy/socket.io-0.9-tests.ts.tscparams
rename to amplify-deferred/amplify-deferred-tests.ts.tscparams
diff --git a/amplify-deferred/amplify-deferred.d.ts b/amplify-deferred/amplify-deferred.d.ts
new file mode 100644
index 000000000..11e6d05e0
--- /dev/null
+++ b/amplify-deferred/amplify-deferred.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for AmplifyJs 1.1.0 using JQuery Deferred
+// Project: http://amplifyjs.com/
+// Definitions by: Jonas Eriksson <https://github.com/joeriks/>, Laurentiu Stamate <https://github.com/laurentiustamate94>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+interface amplifyRequestSettings {
+    resourceId: string;
+    data?: any;
+    success?: (...args: any[]) => void;
+    error?: (...args: any[]) => void;
+}
+
+interface amplifyDecoder {
+    (
+        data?: any,
+        status?: string,
+        xhr?: JQueryXHR,
+        success?: (...args: any[]) => void,
+        error?: (...args: any[]) => void
+        ): void
+}
+
+interface amplifyDecoders {
+    [decoderName: string]: amplifyDecoder;
+    jsSend: amplifyDecoder;
+}
+
+interface amplifyAjaxSettings extends JQueryAjaxSettings {
+    cache?: any;
+    dataMap?: {} | ((data: any) => {});
+    decoder?: any /* string or amplifyDecoder */;
+}
+
+interface amplifyRequest {
+
+    /***
+    * Request a resource.
+    * resourceId: Identifier string for the resource.
+    * data: A set of key/value pairs of data to be sent to the resource.
+    * callback: A function to invoke if the resource is retrieved successfully.
+    */
+    (resourceId: string, hash?: any, callback?: Function): JQueryPromise<any>;
+
+    /***
+    * Request a resource.
+    * settings: A set of key/value pairs of settings for the request.
+    *   resourceId: Identifier string for the resource.
+    *   data (optional): Data associated with the request.
+    *   success (optional): Function to invoke on success.
+    *   error (optional): Function to invoke on error.
+    */
+    (settings: amplifyRequestSettings): JQueryPromise<any>;
+
+    /***
+    * Define a resource.
+    * resourceId: Identifier string for the resource.
+    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
+    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
+    *   Any settings found in jQuery.ajax().
+    *   cache: See the cache section for more details.
+    *   decoder: See the decoder section for more details.
+    */
+    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
+
+    /***
+    * Define a custom request.
+    * resourceId: Identifier string for the resource.
+    * resource: Function to handle requests. Receives a hash with the following properties:
+    *   resourceId: Identifier string for the resource.
+    *   data: Data provided by the user.
+    *   success: Callback to invoke on success.
+    *   error: Callback to invoke on error.
+    */
+    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
+
+    decoders: amplifyDecoders;
+    cache: any;
+}
+
+interface amplifySubscribe {
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    */
+    (topic: string, callback: Function): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * context: What this will be when the callback is invoked.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, context: any, callback: Function, priority?: number): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, callback: Function, priority?: number): void;
+}
+interface amplifyStorageTypeStore {
+    /***
+    * Stores a value for a given key using the default storage type.
+    * 
+    * key: Identifier for the value being stored.
+    * value: The value to store. The value can be anything that can be serialized as JSON.
+    * [options]: A set of key/value pairs that relate to settings for storing the value.
+    */
+    (key: string, value: any, options?: any): void;
+
+    /***
+    * Gets a stored value based on the key.
+    */
+    (key: string): any;
+
+    /***
+    * Gets a hash of all stored values.
+    */
+    (): any;
+}
+
+interface amplifyStore extends amplifyStorageTypeStore {
+
+    /*** 
+    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    localStorage: amplifyStorageTypeStore;
+
+    /*** 
+    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    sessionStorage: amplifyStorageTypeStore;
+
+    /***
+    * Firefox 2+
+    */
+    globalStorage: amplifyStorageTypeStore;
+    
+    /***
+    * IE 5 - 7
+    */
+    userData: amplifyStorageTypeStore;
+
+    /***
+    * An in-memory store is provided as a fallback if none of the other storage types are available.
+    */
+    memory: amplifyStorageTypeStore;
+
+
+}
+
+interface amplifyStatic {
+
+    subscribe: amplifySubscribe;
+
+    /***
+    * Remove a subscription.
+    * topic: The topic being unsubscribed from.
+    * callback: The callback that was originally subscribed.
+    */
+    unsubscribe(topic: string, callback: Function): void;
+
+    /***
+    * Publish a message.
+    * topic: The name of the message to publish.
+    * Any additional parameters will be passed to the subscriptions.
+    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
+    */
+    publish(topic: string, ...args: any[]): boolean;
+
+    store: amplifyStore;
+
+    request: amplifyRequest;
+
+}
+
+declare var amplify: amplifyStatic;
+
diff --git a/amplifyjs/amplifyjs.d.ts b/amplifyjs/amplifyjs.d.ts
index 30e827294..961d815c6 100644
--- a/amplifyjs/amplifyjs.d.ts
+++ b/amplifyjs/amplifyjs.d.ts
@@ -29,6 +29,7 @@ interface amplifyDecoders {
 
 interface amplifyAjaxSettings extends JQueryAjaxSettings  {
     cache?: any;
+    dataMap?: {} | ((data: any) => {});
     decoder?: any /* string or amplifyDecoder */;
 }
 
diff --git a/analytics-node/analytics-node-tests.ts b/analytics-node/analytics-node-tests.ts
new file mode 100644
index 000000000..66a4b4995
--- /dev/null
+++ b/analytics-node/analytics-node-tests.ts
@@ -0,0 +1,82 @@
+/// <reference path="./analytics-node.d.ts" />
+
+var analytics: AnalyticsNode.Analytics;
+import Analytics = require("analytics-node");
+
+function testConfig(): void {
+  analytics = new Analytics('YOUR_WRITE_KEY', {
+    flushAt: 20,
+    flushAfter: 10000
+  });
+}
+
+function testIdentify(): void {
+  analytics.identify({
+    userId: '019mr8mf4r',
+    traits: {
+      name: 'Michael Bolton',
+      email: 'mbolton@initech.com',
+      plan: 'Enterprise',
+      friends: 42
+    }
+  });
+}
+
+function testTrack(): void {
+  analytics.track({
+    userId: '019mr8mf4r',
+    event: 'Purchased an Item',
+    properties: {
+      revenue: 39.95,
+      shippingMethod: '2-day'
+    }
+  });
+}
+
+function testPage(): void {
+  analytics.page({
+    userId: '019mr8mf4r',
+    category: 'Docs',
+    name: 'Node.js Library',
+    properties: {
+      url: 'https://segment.com/docs/libraries/node',
+      path: '/docs/libraries/node/',
+      title: 'Node.js Library - Segment',
+      referrer: 'https://github.com/segmentio/analytics-node'
+    }
+  });
+}
+
+function testAlias(): void {
+  // the anonymous user does actions ...
+  analytics.track({ userId: 'anonymous_user', event: 'Anonymous Event' })
+  // the anonymous user signs up and is aliased
+  analytics.alias({ previousId: 'anonymous_user', userId: 'identified@gmail.com' })
+  // the identified user is identified
+  analytics.identify({ userId: 'identified@gmail.com', traits: { plan: 'Free' } })
+  // the identified user does actions ...
+  analytics.track({ userId: 'identified@gmail.com', event: 'Identified Action' })
+}
+
+function testGroup(): void {
+  analytics.group({
+    userId: '019mr8mf4r',
+    groupId: '56',
+    traits: {
+      name: 'Initech',
+      description: 'Accounting Software'
+    }
+  });
+}
+
+function testIntegrations(): void {
+  analytics.track({
+    event: 'Upgraded Membershipt',
+    userId: '97234974',
+    integrations: {
+      'All': false,
+      'Vero': true,
+      'Google Analytics': false
+    }
+  });
+}
diff --git a/analytics-node/analytics-node.d.ts b/analytics-node/analytics-node.d.ts
new file mode 100644
index 000000000..981e754e5
--- /dev/null
+++ b/analytics-node/analytics-node.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for Segment's analytics.js for Node.js
+// Project: https://segment.com/docs/libraries/node/
+// Definitions by: Andrew Fong <https://github.com/fongandrew>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module AnalyticsNode {
+
+  interface Integrations {
+    [index: string]: boolean;
+  }
+
+  export class Analytics {
+    constructor(writeKey: string, opts?: {
+      flushAt?: number,
+      flushAfter?: number
+    });
+
+    /* The identify method lets you tie a user to their actions and record
+       traits about them. */
+    identify(message: {
+      userId: string | number;
+      traits?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* The track method lets you record the actions your users perform. */
+    track(message: {
+      userId: string | number;
+      event: string;
+      properties?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* The page method lets you record page views on your website, along with
+       optional extra information about the page being viewed. */
+    page(message: {
+      userId: string | number;
+      category?: string;
+      name?: string;
+      properties?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* alias is how you associate one identity with another. */
+    alias(message: {
+      previousId: string | number;
+      userId: string | number;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* Group calls can be used to associate individual users with shared
+       accounts or companies. */
+    group(message: {
+      userId: string | number;
+      groupId: string | number;
+      traits?: Object;
+      context?: Object;
+      timestamp?: Date;
+      anonymous_id?: string | number;
+      integrations?: Integrations;
+    }): Analytics;
+  }
+}
+
+declare module "analytics-node" {
+  export = AnalyticsNode.Analytics;
+}
diff --git a/angular-gettext/angular-gettext-tests.ts b/angular-gettext/angular-gettext-tests.ts
new file mode 100644
index 000000000..0b0532fc4
--- /dev/null
+++ b/angular-gettext/angular-gettext-tests.ts
@@ -0,0 +1,61 @@
+/// <reference path="angular-gettext.d.ts" />
+
+module angular_gettext_tests {
+  
+
+  // Configuring angular-gettext
+  // https://angular-gettext.rocketeer.be/dev-guide/configure/
+  //Setting the language
+  angular.module('myApp').run(function (gettextCatalog: angular.gettext.gettextCatalog) {
+    gettextCatalog.setCurrentLanguage('nl');
+  });
+
+  //Highlighting untranslated strings
+  angular.module('myApp').run(function (gettextCatalog: angular.gettext.gettextCatalog) {
+    gettextCatalog.debug = true;
+  });
+
+  
+  // Marking strings in JavaScript code as translatable. 
+  // https://angular-gettext.rocketeer.be/dev-guide/annotate-js/  
+  angular.module("myApp").controller("helloController", function (gettext: angular.gettext.gettextFunction) {
+    var myString = gettext("Hello");
+  });  
+
+  //Translating directly in JavaScript.
+  angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
+    var translated: string = gettextCatalog.getString("Hello");
+  });
+
+  angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
+    var myString2: string = gettextCatalog.getPlural(3, "Bird", "Birds");
+  });
+
+  angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
+    var translated: string = gettextCatalog.getString("Hello {{name}}", { name: "Ruben" });
+  });
+
+  // Setting strings manually
+  // https://angular-gettext.rocketeer.be/dev-guide/manual-setstrings/
+
+  angular.module("myApp").run(function (gettextCatalog: angular.gettext.gettextCatalog) {
+    // Load the strings automatically during initialization.
+    gettextCatalog.setStrings("nl", {
+      "Hello": "Hallo",
+      "One boat": ["Een boot", "{{$count}} boats"]
+    });
+  });
+
+
+  interface helloControllerScope extends ng.IScope {
+    switchLanguage: (lang: string) => void;
+  }
+  // Lazy-loading languages
+  // https://angular-gettext.rocketeer.be/dev-guide/lazy-loading/
+  angular.module("myApp").controller("helloController", function ($scope: helloControllerScope, gettextCatalog: angular.gettext.gettextCatalog) {
+    $scope.switchLanguage = function (lang: string) {
+      gettextCatalog.setCurrentLanguage(lang);
+      gettextCatalog.loadRemote("/languages/" + lang + ".json");
+    };
+  });
+}
\ No newline at end of file
diff --git a/angular-gettext/angular-gettext.d.ts b/angular-gettext/angular-gettext.d.ts
new file mode 100644
index 000000000..dc1de2bf6
--- /dev/null
+++ b/angular-gettext/angular-gettext.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for angular-gettext v2.1.0
+// Project: https://angular-gettext.rocketeer.be/
+// Definitions by: Ákos Lukács <https://github.com/AkosLukacs>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module angular.gettext {
+  interface gettextCatalog {
+
+    //////////////
+    /// Fields ///
+    //////////////
+
+    /** (default: false): Whether or not to prefix untranslated strings with [MISSING]: or a custom prefix. */
+    debug: boolean;
+    /** (default: [MISSING]:): Custom prefix for untranslated strings. */
+    debugPrefix: string;
+    /** (default: false): Whether or not to wrap all processed text with markers.Example output: [Welcome] */
+    showTranslatedMarkers: boolean;
+    /** (default: [): Custom prefix to mark strings that have been run through angular-gettext. */
+    translatedMarkerPrefix: string;
+    /** (default: ]): Custom suffix to mark strings that have been run through angular-gettext. */
+    translatedMarkerSuffix: string;
+    /** An object of loaded translation strings.Shouldn't be used directly. */
+    strings: {};
+    /** The default language, in which you're application is written. This defaults to English and it's generally a bad idea to use anything else: if your language has different pluralization rules you'll end up with incorrect translations. Deprecated 
+     * @deprecreated
+     */
+    baseLanguage: string;
+
+
+    ///////////////
+    /// Methods ///
+    ///////////////
+
+    /** Sets the current language and makes sure that all translations get updated correctly. */
+    setCurrentLanguage(lang: string): void;
+
+    /** Returns the current language. */
+    getCurrentLanguage(): string;
+
+    /** Processes an object of string definitions. More details https://angular-gettext.rocketeer.be/dev-guide/manual-setstrings/
+     * @param language A language code.
+     * @param strings A dictionary of strings. The format of this dictionary is:
+     *                   - Keys: Singular English strings (as defined in the source files)
+     *                   - Values: Either a single string for signular-only strings or an array of plural forms.
+     */
+    setStrings(language: string, strings: { [key: string]: string|string[] }): void;
+
+    /** Get the correct pluralized (but untranslated) string for the value of n. */
+    getStringForm(string: string, n: number): string;
+
+    /** Translate a string with the given context. Uses Angular.JS interpolation, so something like this will do what you expect: 
+     * var hello = gettextCatalog.getString("Hello {{name}}!", { name: "Ruben" });
+     * // var hello will be "Hallo Ruben!" in Dutch.
+     * The context parameter is optional: pass null (or don't pass anything) if you're not using it: this skips interpolation and is a lot faster.
+     */
+    getString(string: string, context?: any): string;
+
+    /** Translate a plural string with the given context. */
+    getPlural(n: number, string: string, stringPlural: string, context?: any): string;
+
+    /** Load a set of translation strings from a given URL.This should be a JSON catalog generated with grunt-angular-gettext. More details https://angular-gettext.rocketeer.be/dev-guide/lazy-loading/ */
+    loadRemote(url: string): ng.IHttpPromise<any>;
+  }
+
+  /** If you have text that should be translated in your JavaScript code, wrap it with a call to a function named gettext. This module provides an injectable function to do so */
+  interface gettextFunction {
+    (dummyString: string): string;
+  }
+}
+
diff --git a/angular-growl-v2/angular-growl-v2.d.ts b/angular-growl-v2/angular-growl-v2.d.ts
index 1c324723f..039490e3d 100644
--- a/angular-growl-v2/angular-growl-v2.d.ts
+++ b/angular-growl-v2/angular-growl-v2.d.ts
@@ -26,9 +26,12 @@ declare module angular.growl {
         disableCountDown?: boolean;
         disableIcons?: boolean;
         disableCloseButton?: boolean;
-        referenceId?: number;
         onclose?: Function;
         onopen?: Function;
+        position?: string;
+        referenceId?: number;
+        translateMessage?: boolean;
+        variables?: { [variable: string]: any; };
     }
 
     /**
@@ -45,7 +48,7 @@ declare module angular.growl {
         /**
          * Pre-defined server error interceptor.
          */
-        serverMessagesInterceptor: (string|Function)[];
+        serverMessagesInterceptor: (string|IHttpInterceptorFactory)[];
 
         /**
          * Set default TTL settings.
diff --git a/angular-localForage/angular-localForage.d.ts b/angular-localForage/angular-localForage.d.ts
index 6186d79d3..d9c9ad5ad 100644
--- a/angular-localForage/angular-localForage.d.ts
+++ b/angular-localForage/angular-localForage.d.ts
@@ -22,8 +22,8 @@ declare module angular.localForage {
     }
 
     interface ILocalForageService {
-        setDriver(driver:string):angular.IPromise<void>;
-        driver<T>():lf.ILocalForage<T>;
+        driver(): LocalForageDriver;
+        setDriver(name: string | string[]): angular.IPromise<void>;
 
         setItem(key:string, value:any):angular.IPromise<void>;
         setItem(keys:Array<string>, values:Array<any>):angular.IPromise<void>;
diff --git a/angular-odata-resources/angular-odata-resources-tests.ts b/angular-odata-resources/angular-odata-resources-tests.ts
index 5b8dbcc52..23286adc0 100644
--- a/angular-odata-resources/angular-odata-resources-tests.ts
+++ b/angular-odata-resources/angular-odata-resources-tests.ts
@@ -197,3 +197,12 @@ users = odataResourceClass.odata()
 var countResult = odataResourceClass.odata().count();
 var total = countResult.result;
 
+
+
+
+var usersSelect1 = odataResourceClass.odata()
+	.select('name', 'user');
+
+
+var usersSelect2 = odataResourceClass.odata()
+	.select(['name', 'user']);
\ No newline at end of file
diff --git a/angular-odata-resources/angular-odata-resources.d.ts b/angular-odata-resources/angular-odata-resources.d.ts
index 0a83df2c3..65e7d26e2 100644
--- a/angular-odata-resources/angular-odata-resources.d.ts
+++ b/angular-odata-resources/angular-odata-resources.d.ts
@@ -19,6 +19,7 @@ declare module OData {
             url?: string;
             method?: string;
         };
+        isodatav4?: boolean;
     }
 
 
@@ -267,6 +268,7 @@ declare module OData {
 
     interface ICountResult{
         result: number;
+        $promise: angular.IPromise<any>;
     }
 
     class Provider<T> {
@@ -278,14 +280,17 @@ declare module OData {
         private expandables;
         constructor(callback: ProviderCallback<T>);
         filter(operand1: any, operand2?: any, operand3?: any): Provider<T>;
-        orderBy(arg1: any, arg2?: any): Provider<T>;
+        orderBy(arg1: string, arg2?: string): Provider<T>;
         take(amount: number): Provider<T>;
         skip(amount: number): Provider<T>;
         private execute();
-        query(success?: any, error?: any): T[];
-        single(success?: any, error?: any): T;
-        get(data: any, success?: any, error?: any): T;
-        expand(params: any, otherParam1?: any, otherParam2?: any, otherParam3?: any, otherParam4?: any, otherParam5?: any, otherParam6?: any, otherParam7?: any): Provider<T>;
+        query(success?: ((p:T[])=>void), error?: (()=>void)): T[];
+        single(success?: ((p:T)=>void), error?: (()=>void)): T;
+        get(key: any, success?: ((p:T)=>void), error?: (()=>void)): T;
+        expand(...params: string[]): Provider<T>;
+        expand(params: string[]): Provider<T>;
+        select(...params: string[]): Provider<T>;
+        select(params: string[]): Provider<T>;
         count(success?: (result: ICountResult) => any, error?: () => any):ICountResult;
         withInlineCount(): Provider<T>;
     }
diff --git a/angular-protractor/angular-protractor.d.ts b/angular-protractor/angular-protractor.d.ts
index 2b86864cd..ff8324238 100644
--- a/angular-protractor/angular-protractor.d.ts
+++ b/angular-protractor/angular-protractor.d.ts
@@ -1228,7 +1228,21 @@ declare module protractor {
         row(index: number): LocatorWithColumn;
     }
 
-    interface IProtractorLocatorStrategy extends webdriver.ILocatorStrategy {
+    interface IProtractorLocatorStrategy {
+        /**
+         * webdriver's By is an enum of locator functions, so we must set it to
+         * a prototype before inheriting from it.
+         */
+        className: typeof webdriver.By.className;
+        css: typeof webdriver.By.css;
+        id: typeof webdriver.By.id;
+        linkText: typeof webdriver.By.linkText;
+        js: typeof webdriver.By.js;
+        name: typeof webdriver.By.name;
+        partialLinkText: typeof webdriver.By.partialLinkText;
+        tagName: typeof webdriver.By.tagName;
+        xpath: typeof webdriver.By.xpath;
+
         /**
          * Add a locator to this instance of ProtractorBy. This locator can then be
          * used with element(by.locatorName(args)).
diff --git a/angular-signalr-hub/angular-signalr-hub.d.ts b/angular-signalr-hub/angular-signalr-hub.d.ts
index 1edae69c7..302794106 100644
--- a/angular-signalr-hub/angular-signalr-hub.d.ts
+++ b/angular-signalr-hub/angular-signalr-hub.d.ts
@@ -18,7 +18,7 @@ declare module ngSignalr {
         connection: SignalR;
         proxy: HubProxy;
         
-        on(event: string, fn: ((...args: any[]) => void)): void;
+        on(event: string, fn: (...args: any[]) => void): void;
         invoke(method: string, ...args: any[]): JQueryDeferred<any>;
         disconnect(): void;
         connect(): JQueryPromise<any>;
@@ -70,4 +70,4 @@ declare module ngSignalr {
          */
         stateChanged?: (state: SignalRStateChange) => void;
     }
-}
\ No newline at end of file
+}
diff --git a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
index efb63d006..7851d2da3 100644
--- a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
+++ b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
@@ -135,7 +135,7 @@ testApp.config((
         popupDelay: 1000,
         appendToBody: true,
         trigger: 'mouseenter hover',
-        useContentExp: true
+        useContentExp: true,
     });
     $tooltipProvider.setTriggers({
         'customOpenTrigger': 'customCloseTrigger'
diff --git a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
index 1a36d21a2..8ebfdb6c2 100644
--- a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
+++ b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
@@ -5,6 +5,9 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
+// Support for AMD require
+declare module 'angular-bootstrap' {}
+
 declare module angular.ui.bootstrap {
 
     interface IAccordionConfig {
diff --git a/angular-ui-router/angular-ui-router-tests.ts b/angular-ui-router/angular-ui-router-tests.ts
index a05f13dd8..3211faee5 100644
--- a/angular-ui-router/angular-ui-router-tests.ts
+++ b/angular-ui-router/angular-ui-router-tests.ts
@@ -14,12 +14,28 @@ myApp.config((
 
   var matcher: ng.ui.IUrlMatcher = $urlMatcherFactory.compile("/foo/:bar?param1");
 
+  $urlMatcherFactory.caseInsensitive(false);
+  var isCaseInsensitive = $urlMatcherFactory.caseInsensitive();
+
+  $urlMatcherFactory.defaultSquashPolicy("nosquash");
+
+  $urlMatcherFactory.strictMode(true);
+  var isStrictMode = $urlMatcherFactory.strictMode();
+
   $urlMatcherFactory.type("myType2", {
     encode: function (item: any) { return item; },
     decode: function (item: any) { return item; },
     is: function (item: any) { return true; }
   });
 
+  $urlMatcherFactory.type("fullType", {
+    decode: (val) => parseInt(val, 10),
+    encode: (val) => val && val.toString(),
+    equals: (a, b) => this.is(a) && a === b,
+    is: (val) => angular.isNumber(val) && isFinite(val) && val % 1 === 0,
+    pattern: /\d+/
+  });
+
   var obj: Object = matcher.exec('/user/bob', { x:'1', q:'hello' });
   var concat: ng.ui.IUrlMatcher = matcher.concat('/test');
   var str: string = matcher.format({ id:'bob', q:'yes' });
@@ -54,6 +70,13 @@ myApp.config((
         $scope.items = ["A", "List", "Of", "Items"];
       }
     })
+    .state('state1.list', {
+      url: "/list",
+      templateUrl: "partials/state1.list.html",
+      controller: ['$scope', function ($scope: MyAppScope) {
+        $scope.items = ["A", "List", "Of", "Items"];
+      }]
+    })
     .state('state2', {
       url: "/state2",
       templateUrl: "partials/state2.html"
@@ -142,7 +165,9 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
 
     private stateServiceTest() {
         this.$state.go("myState");
+        this.$state.go(this.$state.current);
         this.$state.transitionTo("myState");
+        this.$state.transitionTo(this.$state.current);
         if (this.$state.includes("myState") === true) {
           //
         }
@@ -155,7 +180,21 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
         this.$state.get("myState");
         this.$state.get();
         this.$state.reload();
-        
+
+        // http://angular-ui.github.io/ui-router/site/#/api/ui.router.state.$state#properties
+        if (this.$state.transition) {
+          var transitionPromise: ng.IPromise<{}> = this.$state.transition;
+          transitionPromise.then(() => {
+            // transition success
+          }, () => {
+            // transition failure
+          }).catch(() => {
+            // transition failure
+          }).finally(() => {
+            // transition ended (success or failure)
+          });
+        }
+
         // Accesses the currently resolved values for the current state
         // http://stackoverflow.com/questions/28026620/is-there-a-way-to-access-resolved-state-dependencies-besides-injecting-them-into/28027023#28027023
         var resolvedValues = this.$state.$current.locals.globals;
@@ -177,3 +216,35 @@ module UiViewScrollProviderTests {
         $uiViewScrollProvider.useAnchorScroll();
     }]);
 }
+
+interface ITestUserService {
+    isLoggedIn: () => boolean;
+    handleLogin: () => ng.IPromise<{}>;
+}
+
+module UrlRouterProviderTests {
+    var app = angular.module("urlRouterProviderTests", ["ui.router"]);
+
+    app.config(($urlRouterProvider: ng.ui.IUrlRouterProvider) => {
+        // Prevent $urlRouter from automatically intercepting URL changes;
+        // this allows you to configure custom behavior in between
+        // location changes and route synchronization:
+        $urlRouterProvider.deferIntercept();
+    }).run(($rootScope: ng.IRootScopeService, $urlRouter: ng.ui.IUrlRouterService, UserService: ITestUserService) => {
+        $rootScope.$on('$locationChangeSuccess', e => {
+            // UserService is an example service for managing user state
+            if (UserService.isLoggedIn()) return;
+
+            // Prevent $urlRouter's default handler from firing
+            e.preventDefault();
+
+            UserService.handleLogin().then(() => {
+                // Once the user has logged in, sync the current URL to the router:
+                $urlRouter.sync();
+            });
+        });
+
+        // Configures $urlRouter's listener *after* your custom listener
+        $urlRouter.listen();
+    });
+}
diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts
index 10b92db7d..3ec31968c 100644
--- a/angular-ui-router/angular-ui-router.d.ts
+++ b/angular-ui-router/angular-ui-router.d.ts
@@ -26,24 +26,24 @@ declare module angular.ui {
         /**
          * Function, returns HTML content string
          */
-        templateProvider?: Function | Array<any>;
+        templateProvider?: Function | Array<string|Function>;
         /**
-         * A controller paired to the state. Function OR name as String
+         * A controller paired to the state. Function, annotated array or name as String
          */
-        controller?: Function | string;
+        controller?: Function|string|Array<string|Function>;
         controllerAs?: string;
         /**
          * Function (injectable), returns the actual controller function or string.
          */
-        controllerProvider?: Function;
-        
+        controllerProvider?: Function|Array<string|Function>;
+
         /**
          * Specifies the parent state of this state
          */
-        parent?: string | IState
-        
-        
-        resolve?: {};
+        parent?: string | IState;
+
+
+        resolve?: { [name:string]: any };
         /**
          * 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.
          */
@@ -55,18 +55,18 @@ declare module angular.ui {
         /**
          * Use the views property to set up multiple views. If you don't need multiple views within a single state this property is not needed. Tip: remember that often nested views are more useful and powerful than multiple sibling views.
          */
-        views?: {};
+        views?: { [name:string]: IState };
         abstract?: boolean;
         /**
          * Callback function for when a state is entered. Good way to trigger an action or dispatch an event, such as opening a dialog.
          * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
          */
-        onEnter?: Function|(string|Function)[];
+        onEnter?: Function|Array<string|Function>;
         /**
          * Callback functions for when a state is entered and exited. Good way to trigger an action or dispatch an event, such as opening a dialog.
          * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
          */
-        onExit?: Function|(string|Function)[];
+        onExit?: Function|Array<string|Function>;
         /**
          * Arbitrary data object, useful for custom configuration.
          */
@@ -91,12 +91,70 @@ declare module angular.ui {
     }
 
     interface IUrlMatcherFactory {
+        /**
+         * Creates a UrlMatcher for the specified pattern.
+         *
+         * @param pattern {string} The URL pattern.
+         *
+         * @returns {IUrlMatcher} The UrlMatcher.
+         */
         compile(pattern: string): IUrlMatcher;
+        /**
+         * Returns true if the specified object is a UrlMatcher, or false otherwise.
+         *
+         * @param o {any} The object to perform the type check against.
+         *
+         * @returns {boolean} Returns true if the object matches the IUrlMatcher interface, by implementing all the same methods.
+         */
         isMatcher(o: any): boolean;
-        type(name: string, definition: any, definitionFn?: any): any;
-        caseInsensitive(value: boolean): void;
+        /**
+         * Returns a type definition for the specified name
+         *
+         * @param name {string} The type definition name
+         *
+         * @returns {IType} The type definition
+         */
+        type(name: string): IType;
+        /**
+         * Registers a custom Type object that can be used to generate URLs with typed parameters.
+         *
+         * @param {IType} definition The type definition.
+         * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
+         *
+         * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
+         */
+        type(name: string, definition: IType, inlineAnnotedDefinitionFn?: any[]): IUrlMatcherFactory;
+        /**
+         * Registers a custom Type object that can be used to generate URLs with typed parameters.
+         *
+         * @param {IType} definition The type definition.
+         * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
+         *
+         * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
+         */
+        type(name: string, definition: IType, definitionFn?: (...args:any[]) => IType): IUrlMatcherFactory;
+        /**
+         * Defines whether URL matching should be case sensitive (the default behavior), or not.
+         *
+         * @param value {boolean} false to match URL in a case sensitive manner; otherwise true;
+         *
+         * @returns {boolean} the current value of caseInsensitive
+         */
+        caseInsensitive(value?: boolean): boolean;
+        /**
+         * Sets the default behavior when generating or matching URLs with default parameter values
+         *
+         * @param value {string} A string that defines the default parameter URL squashing behavior. nosquash: When generating an href with a default parameter value, do not squash the parameter value from the URL slash: When generating an href with a default parameter value, squash (remove) the parameter value, and, if the parameter is surrounded by slashes, squash (remove) one slash from the URL any other string, e.g. "~": When generating an href with a default parameter value, squash (remove) the parameter value from the URL and replace it with this string.
+         */
         defaultSquashPolicy(value: string): void;
-        strictMode(value: boolean): void;
+        /**
+         * Defines whether URLs should match trailing slashes, or not (the default behavior).
+         *
+         * @param value {boolean} false to match trailing slashes in URLs, otherwise true.
+         *
+         * @returns {boolean} the current value of strictMode
+         */
+        strictMode(value?: boolean): boolean;
     }
 
     interface IUrlRouterProvider extends angular.IServiceProvider {
@@ -114,6 +172,14 @@ declare module angular.ui {
         otherwise(path: string): IUrlRouterProvider;
         rule(handler: Function): IUrlRouterProvider;
         rule(handler: any[]): IUrlRouterProvider;
+        /**
+         * Disables (or enables) deferring location change interception.
+         *
+         * If you wish to customize the behavior of syncing the URL (for example, if you wish to defer a transition but maintain the current URL), call this method at configuration time. Then, at run time, call $urlRouter.listen() after you have configured your own $locationChangeSuccess event handler.
+         *
+         * @param {boolean} defer Indicates whether to defer location change interception. Passing no parameter is equivalent to true.
+         */
+        deferIntercept(defer?: boolean): void;
     }
 
     interface IStateOptions {
@@ -162,8 +228,11 @@ declare module angular.ui {
          * @param options Options object.
          */
         go(to: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
+        go(to: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
         transitionTo(state: string, params?: {}, updateLocation?: boolean): void;
+        transitionTo(state: IState, params?: {}, updateLocation?: boolean): void;
         transitionTo(state: string, params?: {}, options?: IStateOptions): void;
+        transitionTo(state: IState, params?: {}, options?: IStateOptions): void;
         includes(state: string, params?: {}): boolean;
         is(state:string, params?: {}): boolean;
         is(state: IState, params?: {}): boolean;
@@ -171,13 +240,18 @@ declare module angular.ui {
         href(state: string, params?: {}, options?: IHrefOptions): string;
         get(state: string): IState;
         get(): IState[];
+        /** A reference to the state's config object. However you passed it in. Useful for accessing custom data. */
         current: IState;
+        /** A param object, e.g. {sectionId: section.id)}, that you'd like to test against the current active state. */
         params: IStateParamsService;
         reload(): void;
-        
+
+        /** Currently pending transition. A promise that'll resolve or reject. */
+        transition: ng.IPromise<{}>;
+
         $current: IResolvedState;
     }
-    
+
     interface IResolvedState {
         locals: {
             /**
@@ -203,6 +277,7 @@ declare module angular.ui {
     	 *
     	 */
         sync(): void;
+        listen(): void;
     }
 
     interface IUiViewScrollProvider {
@@ -212,4 +287,47 @@ declare module angular.ui {
          */
         useAnchorScroll(): void;
     }
+
+    interface IType {
+        /**
+         * Converts a parameter value (from URL string or transition param) to a custom/native value.
+         *
+         * @param val {string} The URL parameter value to decode.
+         * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+         *
+         * @returns {any} Returns a custom representation of the URL parameter value.
+         */
+        decode(val: string, key: string): any;
+        /**
+         * Encodes a custom/native type value to a string that can be embedded in a URL. Note that the return value does not need to be URL-safe (i.e. passed through encodeURIComponent()), it only needs to be a representation of val that has been coerced to a string.
+         *
+         * @param val {any} The value to encode.
+         * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+         *
+         * @returns {string} Returns a string representation of val that can be encoded in a URL.
+         */
+        encode(val: any, key: string): string;
+        /**
+         * Determines whether two decoded values are equivalent.
+         *
+         * @param a {any} A value to compare against.
+         * @param b {any} A value to compare against.
+         *
+         * @returns {boolean} Returns true if the values are equivalent/equal, otherwise false.
+         */
+        equals? (a: any, b: any): boolean;
+        /**
+         * Detects whether a value is of a particular type. Accepts a native (decoded) value and determines whether it matches the current Type object.
+         *
+         * @param val {any} The value to check.
+         * @param key {any} Optional. If the type check is happening in the context of a specific UrlMatcher object, this is the name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+         *
+         * @returns {boolean} Returns true if the value matches the type, otherwise false.
+         */
+        is(val: any, key: string): boolean;
+        /**
+         * The regular expression pattern used to match values of this type when coming from a substring of a URL.
+         */
+        pattern?: RegExp;
+    }
 }
diff --git a/angular-ui-scroll/angular-ui-scroll-tests.ts b/angular-ui-scroll/angular-ui-scroll-tests.ts
new file mode 100644
index 000000000..1a85dd6b5
--- /dev/null
+++ b/angular-ui-scroll/angular-ui-scroll-tests.ts
@@ -0,0 +1,93 @@
+/// <reference path="angular-ui-scroll.d.ts" />
+var myApp = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
+
+module application {
+    interface IItem {
+        id: number;
+        content: string;
+    }
+
+    class DatasourceTest implements ng.ui.IScrollDatasource<IItem> {
+        get(index: number, count: number, success: (results: IItem[]) => void): void {
+            var ret = new Array<IItem>();
+            for (var i=0; i < count; i++) {
+                ret.push({id: i, content: 'item ' + i.toString()});
+            }
+            success(ret);
+        }
+    }
+
+    function factory(): any {
+        return DatasourceTest;
+    }
+
+    myApp.factory('DatasourceTest', factory);
+
+    // demo/examples/adapter
+    myApp.controller('mainController', ['$scope', 'DatasourceTest', function($scope: ng.IScope, datasource: DatasourceTest) {
+        var firstListAdapter: ng.ui.IScrollAdapter, secondListAdapter: ng.ui.IScrollAdapter;
+        $scope['datasource'] = datasource;
+
+        $scope['updateList1'] = (): void => {
+            firstListAdapter.applyUpdates( (item: IItem, scope: ng.IRepeatScope) => {
+                return item.content += ' *';
+            })
+        };
+
+        $scope['removeFromList1'] = (): void => {
+            firstListAdapter.applyUpdates( (item: IItem, scope: ng.IRepeatScope) => {
+                if (scope.$index % 2 === 0) {
+                    return []
+                }
+            })
+        };
+
+        var idList1: number = 1000;
+        $scope['addToList1'] = (): void => {
+            firstListAdapter.applyUpdates((item: IItem, scope: ng.IRepeatScope) => {
+                var newItem: IItem;
+                newItem = void 0;
+                if (scope.$index === 2) {
+                    newItem = {
+                        id: idList1,
+                        content: 'a new one #' + idList1
+                    };
+                    idList1++;
+                    return [item, newItem];
+                }
+            });
+        };
+
+        $scope['updateList2'] = (): void => {
+            secondListAdapter.applyUpdates((item: IItem, scope: ng.IRepeatScope) => {
+                return item.content += ' *';
+            });
+        };
+
+        $scope['removeFromList2'] = (): void => {
+            secondListAdapter.applyUpdates((item: IItem, scope: ng.IRepeatScope) => {
+                if (scope.$index % 2 !== 0) {
+                    return [];
+                }
+            });
+        };
+
+        var idList2: number = 2000;
+        $scope['addToList2'] = (): void => {
+            secondListAdapter.applyUpdates((item: IItem, scope: ng.IRepeatScope) => {
+                var newItem: IItem;
+                newItem = void 0;
+                if (scope.$index === 4) {
+                    newItem = {
+                        id: idList2,
+                        content: 'a new one #' + idList1
+                    };
+                    idList2++;
+                    return [item, newItem];
+                }
+            });
+        };
+
+    }]);
+}
+
diff --git a/angular-ui-scroll/angular-ui-scroll.d.ts b/angular-ui-scroll/angular-ui-scroll.d.ts
new file mode 100644
index 000000000..08ed233c0
--- /dev/null
+++ b/angular-ui-scroll/angular-ui-scroll.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for Angular JS 1.3.1+ (ui.scroll module)
+// Project: https://github.com/angular-ui/ui-scroll
+// Definitions by: Mark Nadig <https://github.com/marknadig>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module angular.ui {
+    interface IScrollDatasource<T> {
+        /**
+         * The datasource object implements methods and properties to be used by the directive to access the data
+         *
+         * @param index indicates the first data row requested
+         *
+         * @param count indicates number of data rows requested
+         *
+         * @param success function to call when the data are retrieved. The implementation of the service has to call
+         * this function when the data are retrieved and pass it an array of the items retrieved. If no items are
+         * retrieved, an empty array has to be passed.
+         *
+         * Important: Make sure to respect the index and count parameters of the request. The array passed to the
+         * success method should have exactly count elements unless it hit eof/bof
+         */
+        get(index: number, count: number, success: (results: Array<T>) => any): void;
+    }
+
+    interface IScrollAdapter {
+        /**
+         * a boolean value indicating whether there are any pending load requests.
+         */
+        isLoading: boolean;
+        /**
+         * a reference to the item currently in the topmost visible position.
+         */
+        topVisible: any;
+        /**
+         * a reference to the DOM element currently in the topmost visible position.
+         */
+        topVisibleElement: ng.IAugmentedJQueryStatic;
+        /**
+         * a reference to the scope created for the item currently in the topmost visible position.
+         */
+        topVisibleScope: ng.IRepeatScope;
+        /**
+         * calling this method reinitializes and reloads the scroller content.
+         */
+        reload(): void;
+        /**
+         * Replaces the item in the buffer at the given index with the new items.
+         *
+         * @param index provides position of the item to be affected in the dataset (not in the buffer). If the item with
+         * the given index currently is not in the buffer no updates will be applied. $index property of the item $scope
+         * can be used to access the index value for a given item
+         *
+         * @param newItems is an array of items to replace the affected item. If the array is empty ([]) the item will
+         * be deleted, otherwise the items in the array replace the item. If the newItem array contains the old item,
+         * the old item stays in place.
+         */
+        applyUpdates(index: number, newItems: any[]): void;
+        /**
+         * Replaces the item in the buffer at the given index with the new items.
+         *
+         * @param updater is a function to be applied to every item currently in the buffer. The function will receive
+         * 3 parameters: item, scope, and element. Here item is the item to be affected, scope is the item $scope, and
+         * element is the html element for the item. The return value of the function should be an array of items.
+         * Similarly to the newItem parameter (see above), if the array is empty([]), the item is deleted, otherwise
+         * the item is replaced by the items in the array. If the return value is not an array, the item remains
+         * unaffected, unless some updates were made to the item in the updater function. This can be thought of as
+         * in place update.
+         */
+        applyUpdates(updater: (item: any, scope: ng.IRepeatScope) => any): void;
+        /**
+         * Adds new items after the last item in the buffer
+         *
+         * @param newItems provides an array of items to be appended.
+         */
+        append(newItems: any[]): void;
+        /**
+         * Adds new items before the first item in the buffer
+         *
+         * @param newItems provides an array of items to be prepended.
+         */
+        prepend(newItems: any[]): void;
+    }
+}
diff --git a/angular-ui-tree/angular-ui-tree-tests.ts b/angular-ui-tree/angular-ui-tree-tests.ts
new file mode 100644
index 000000000..e66408814
--- /dev/null
+++ b/angular-ui-tree/angular-ui-tree-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="angular-ui-tree.d.ts" />
+
+var treeNode: AngularUITree.ITreeNode = {
+    id: 0,
+    nodes: [],
+    title: "test"
+};
+
+var treeNode2: AngularUITree.ITreeNode = {
+    id: "0",
+    nodes: [treeNode],
+    title: "test2"
+};
diff --git a/angular-ui-tree/angular-ui-tree.d.ts b/angular-ui-tree/angular-ui-tree.d.ts
new file mode 100644
index 000000000..1017ac11c
--- /dev/null
+++ b/angular-ui-tree/angular-ui-tree.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for angular-ui-tree v2.8.0
+// Project: https://github.com/angular-ui-tree/angular-ui-tree
+// Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module AngularUITree {
+    /**
+      * Node in list
+      */
+    interface ITreeNode {
+        id: number | string;
+        nodes: ITreeNode[];
+        title: string;
+    }
+}
diff --git a/angular2/angular2-2.0.0-alpha.36.d.ts b/angular2/angular2-2.0.0-alpha.36.d.ts
new file mode 100644
index 000000000..0c7b8609e
--- /dev/null
+++ b/angular2/angular2-2.0.0-alpha.36.d.ts
@@ -0,0 +1,5920 @@
+// Type definitions for Angular v2.0.0-alpha.36
+// 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.
+// ***********************************************************
+
+// angular2/angular2 depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<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 {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+
+
+
+/**
+ * The `angular2` is the single place to import all of the individual types.
+ */
+declare module ng {
+
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+     viewBindings: List<any>;
+  }
+  
+
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+
+    /**
+     * 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 {@link PipeMetadata} 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 use pipes in bindings, as follows:
+     * 
+     * ```html
+     * <div [class-set]="someExpression | somePipe">
+     * ```
+     */
+     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 {@link LifecycleEvent} 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+     bindings: 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;
+  }
+  
+
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+     name: string;
+  }
+  
+
+  /**
+   * 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`
+   */
+  enum LifecycleEvent {
+    
+
+    /**
+     * Notify a directive whenever a {@link ViewMetadata} that contains it is destroyed.
+     * 
+     * ## Example
+     * 
+     * ```
+     * @Directive({
+     *   ...,
+     *   lifecycle: [LifecycleEvent.onDestroy]
+     * })
+     * class ClassSet {
+     *   onDestroy() {
+     *     // invoked to notify directive of the containing view destruction.
+     *   }
+     * }
+     * ```
+     */
+     onDestroy,
+    
+
+    /**
+     * 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: [LifecycleEvent.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
+     *     }
+     *   }
+     * }
+     *  ```
+     */
+     onChange,
+    
+
+    /**
+     * 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: [LifecycleEvent.onCheck]
+     * })
+     * class ClassSet {
+     *   onCheck() {
+     *   }
+     * }
+     *  ```
+     */
+     onCheck,
+    
+
+    /**
+     * 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: [LifecycleEvent.onInit]
+     * })
+     * class ClassSet {
+     *   onInit() {
+     *   }
+     * }
+     *  ```
+     */
+     onInit,
+    
+
+    /**
+     * 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: [LifecycleEvent.onAllChangesDone]
+     * })
+     * class ClassSet {
+     * 
+     *   onAllChangesDone() {
+     *   }
+     * 
+     * }
+     *  ```
+     */
+     onAllChangesDone
+  }
+  
+
+  /**
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+
+    /**
+     * 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>>;
+    
+     pipes: List<Type | any | List<any>>;
+    
+
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#EMULATED `ViewEncapsulation.EMULATED`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#NONE `ViewEncapsulation.NONE`}.
+     */
+     encapsulation: ViewEncapsulation;
+  }
+  
+
+  /**
+   * How the template and styles of a view should be encapsulated.
+   */
+  enum ViewEncapsulation {
+    
+
+    /**
+     * Emulate scoping of styles by preprocessing the style rules
+     * and adding additional attributes to elements. This is the default.
+     */
+     EMULATED,
+    
+
+    /**
+     * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot.
+     */
+     NATIVE,
+    
+
+    /**
+     * Don't scope the template nor the styles.
+     */
+     NONE
+  }
+  
+
+  /**
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * See {@link QueryList} for usage and example.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+     descendants: boolean;
+    
+     isViewQuery: any;
+    
+     selector: any;
+    
+     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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+     attributeName: string;
+    
+     token: any;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute : AttributeFactory ;
+  
+
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+  
+    
+     (name: string): TypeDecorator;
+  
+  }
+  
+
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component : ComponentFactory ;
+  
+
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: List<Type | any | List<any>>,
+    pipes?: List<Type | any | List<any>>,
+    renderer?: string,
+    styles?: List<string>,
+    styleUrls?: List<string>,
+  }): ViewDecorator;
+  }
+  
+
+  /**
+   * {@link ComponentAnnotation} 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: {
+    selector?: string,
+    properties?: List<string>,
+    events?: List<string>,
+    host?: StringMap<string, string>,
+    lifecycle?: List<LifecycleEvent>,
+    bindings?: List<any>,
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: List<any>,
+    changeDetection?: string,
+  }): ComponentMetadata;
+  
+    
+     (obj: {
+    selector?: string,
+    properties?: List<string>,
+    events?: List<string>,
+    host?: StringMap<string, string>,
+    lifecycle?: List<LifecycleEvent>,
+    bindings?: List<any>,
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: List<any>,
+    changeDetection?: string,
+  }): ComponentDecorator;
+  
+  }
+  
+
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive : DirectiveFactory ;
+  
+
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+  }
+  
+
+  /**
+   * {@link DirectiveMetadata} 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: {
+    selector?: string, properties?: List<string>, events?: List<string>,
+        host?: StringMap<string, string>, lifecycle?: List<LifecycleEvent>, bindings?: List<any>,
+        exportAs?: string, compileChildren?: boolean;
+  }): DirectiveMetadata;
+  
+    
+     (obj: {
+    selector?: string, properties?: List<string>, events?: List<string>,
+        host?: StringMap<string, string>, lifecycle?: List<LifecycleEvent>, bindings?: List<any>,
+        exportAs?: string, compileChildren?: boolean;
+  }): DirectiveDecorator;
+  
+  }
+  
+
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View : ViewFactory ;
+  
+
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: List<Type | any | List<any>>,
+    pipes?: List<Type | any | List<any>>,
+    renderer?: string,
+    styles?: List<string>,
+    styleUrls?: List<string>,
+  }): ViewDecorator;
+  }
+  
+
+  /**
+   * {@link ViewAnnotation} 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: {
+    templateUrl?: string,
+    template?: string,
+    directives?: List<Type | any | List<any>>,
+    encapsulation?: ViewEncapsulation,
+    styles?: List<string>,
+    styleUrls?: List<string>,
+  }): ViewMetadata;
+  
+    
+     (obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: List<Type | any | List<any>>,
+    encapsulation?: ViewEncapsulation,
+    styles?: List<string>,
+    styleUrls?: List<string>,
+  }): ViewDecorator;
+  
+  }
+  
+
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query : QueryFactory ;
+  
+
+  /**
+   * {@link QueryMetadata} 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+  
+    
+     (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+  
+  }
+  
+
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery : QueryFactory ;
+  
+
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe : PipeFactory ;
+  
+
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+     new(obj: {
+    name: string,
+  }): any;
+  
+    
+     (obj: {name: string}): any;
+  
+  }
+  
+
+  /**
+   * Defines lifecycle method
+   * {@link annotations/LifeCycleEvent#onAllChangesDone `LifeCycleEvent.onAllChangesDone`}
+   * called when the bindings of all its children have been changed.
+   */
+  interface OnAllChangesDone {
+    
+     onAllChangesDone(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method {@link annotations/LifeCycleEvent#onChange `LifeCycleEvent.onChange`}
+   * called after all of component's bound properties are updated.
+   */
+  interface OnChange {
+    
+     onChange(changes: StringMap<string, any>): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method {@link annotations/LifeCycleEvent#onDestroy `LifeCycleEvent.onDestroy`}
+   * called when a directive is being destroyed.
+   */
+  interface OnDestroy {
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method {@link annotations/LifeCycleEvent#onInit `LifeCycleEvent.onInit`}
+   * called when a directive is being checked the first time.
+   */
+  interface OnInit {
+    
+     onInit(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method {@link annotations/LifeCycleEvent#onCheck `LifeCycleEvent.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 ;
+  
+
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+
+    /**
+     * Optional argument for specifying the superclass.
+     */
+     extends?: Type;
+    
+
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+     constructor: (Function | Array<any>);
+  }
+  
+
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+     annotations: Array<any>;
+    
+
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+     Class(obj: ClassDefinition): Type;
+  }
+  
+
+  /**
+   * CHECK_ONCE means that after calling detectChanges the mode of the change detector
+   * will become CHECKED.
+   */
+  const CHECK_ONCE : string ;
+  
+
+  /**
+   * CHECK_ALWAYS means that after calling detectChanges the mode of the change detector
+   * will remain CHECK_ALWAYS.
+   */
+  const CHECK_ALWAYS : string ;
+  
+
+  /**
+   * DETACHED means that the change detector sub tree is not a part of the main tree and
+   * should be skipped.
+   */
+  const DETACHED : string ;
+  
+
+  /**
+   * CHECKED means that the change detector should be skipped until its mode changes to
+   * CHECK_ONCE or CHECK_ALWAYS.
+   */
+  const CHECKED : string ;
+  
+
+  /**
+   * ON_PUSH means that the change detector's mode will be set to CHECK_ONCE during hydration.
+   */
+  const ON_PUSH : string ;
+  
+
+  /**
+   * DEFAULT means that the change detector's mode will be set to CHECK_ALWAYS during hydration.
+   */
+  const DEFAULT : string ;
+  
+
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * Angular expects that the data flows from top (root) component to child (leaf) components.
+   * This is known as directed acyclic graph. This allows Angular to only execute change detection
+   * once and prevents loops in change detection data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+  }
+  
+
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception, this is done to attach expression location information.
+   */
+  class ChangeDetectionError extends BaseException {
+    
+
+    /**
+     * Location of the expression.
+     */
+     location: string;
+  }
+  
+  interface ChangeDetector {
+    
+     parent: ChangeDetector;
+    
+     mode: string;
+    
+     ref: ChangeDetectorRef;
+    
+     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, pipes: any): void;
+    
+     dehydrate(): void;
+    
+     markPathToRootAsCheckOnce(): void;
+    
+     handleEvent(eventName: string, elIndex: number, locals: Locals): 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;
+  }
+  
+
+  /**
+   * Controls change detection.
+   * 
+   * {@link ChangeDetectorRef} allows requesting checks for detectors that rely on observables. It
+   * also allows detaching and attaching change detector subtrees.
+   */
+  interface 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;
+  }
+  
+
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+     static wrap(value: any): WrappedValue;
+    
+     wrapped: any;
+  }
+  
+
+  /**
+   * An interface which all pipes must implement.
+   * 
+   * #Example
+   * 
+   * ```
+   * class DoublePipe implements PipeTransform {
+   *  transform(value, args = []) {
+   *    return `${value}${value}`;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeTransform {
+    
+     transform(value: any, args: List<any>): any;
+  }
+  
+
+  /**
+   * An interface that stateful pipes should implement.
+   * 
+   * #Example
+   * 
+   * ```
+   * class StatefulPipe implements PipeTransform, PipeOnDestroy {
+   *  connection;
+   * 
+   *  onDestroy() {
+   *    this.connection.release();
+   *  }
+   * 
+   *  transform(value, args = []) {
+   *    this.connection = createConnection();
+   *    // ...
+   *    return someValue;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeOnDestroy {
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+     static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: IterableDifferFactory[]): Binding;
+    
+     factories: IterableDifferFactory[];
+    
+     find(iterable: Object): IterableDifferFactory;
+  }
+  
+  interface IterableDiffer {
+    
+     diff(object: Object): any;
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+     supports(objects: Object): boolean;
+    
+     create(cdRef: ChangeDetectorRef): IterableDiffer;
+  }
+  
+
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+     static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+     factories: KeyValueDifferFactory[];
+    
+     find(kv: Object): KeyValueDifferFactory;
+  }
+  
+  interface KeyValueDiffer {
+    
+     diff(object: Object): void;
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+     supports(objects: Object): boolean;
+    
+     create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+  }
+  
+
+  /**
+   * An opaque token representing the application root type in the {@link Injector}.
+   * 
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   * 
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   * 
+   * ```
+   */
+  const APP_COMPONENT : OpaqueToken ;
+  
+
+  /**
+   * 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 {@link ApplicationRef}.
+   */
+  function bootstrap(appComponentType: /*Type*/ any, componentInjectableBindings?: List<Type | Binding | List<any>>) : Promise<ApplicationRef> ;
+  
+
+  /**
+   * Runtime representation of a type.
+   * 
+   * In JavaScript a Type is a constructor function.
+   */
+  interface Type extends Function {
+    
+     new(args: any): any;
+  
+  }
+  
+
+  /**
+   * 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.
+   */
+  interface ApplicationRef {
+    
+
+    /**
+     * Returns the current {@link ComponentMetadata} type.
+     */
+     hostComponentType: Type;
+    
+
+    /**
+     * Returns the current {@link ComponentMetadata} instance.
+     */
+     hostComponent: any;
+    
+
+    /**
+     * Dispose (un-load) the application.
+     */
+     dispose(): void;
+    
+
+    /**
+     * Returns the root application {@link Injector}.
+     */
+     injector: Injector;
+  }
+  
+
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+
+    /**
+     * Returns the base URL of the currently running application.
+     */
+     value: any;
+  }
+  
+
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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 `Type` from a {@link ComponentMetadata} into a URL.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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 `Type` for {@link DirectiveMetadata}.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class DirectiveResolver {
+    
+
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+     resolve(type: Type): DirectiveMetadata;
+  }
+  
+
+  /**
+   * ## 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);
+   * ```
+   */
+  interface 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.
+   */
+  interface AppViewManager {
+    
+
+    /**
+     * Returns a {@link ViewContainerRef} at the {@link ElementRef} location.
+     */
+     getViewContainer(location: ElementRef): ViewContainerRef;
+    
+
+    /**
+     * Return the first child element of the host element view.
+     */
+     getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+
+    /**
+     * Returns an ElementRef for the element with the given variable name
+     * in the current view.
+     * 
+     * - `hostLocation`: {@link ElementRef} of any element in the View which defines the scope of
+     *   search.
+     * - `variableName`: Name of the variable to locate.
+     * - Returns {@link ElementRef} 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 {@link ElementRef}
+     * 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`: {@link ProtoViewRef} 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: {@link Injector} to use as parent injector for the view.
+     * 
+     * See {@link AppViewManager#destroyRootHostView}.
+     * 
+     * ## 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): HostViewRef;
+    
+
+    /**
+     * Remove the View created with {@link AppViewManager#createRootHostView}.
+     */
+     destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createEmbeddedViewInContainer(viewContainerLocation: ElementRef, atIndex: number, templateRef: TemplateRef): ViewRef;
+    
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createHostViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+
+    /**
+     * See {@link AppViewManager#createViewInContainer}.
+     */
+     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+    
+
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+    
+
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  }
+  
+
+  /**
+   * An iterable and observable live list of components in the DOM.
+   * 
+   * A QueryList contains a live list of child directives in the 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.
+   * 
+   * QueryList is updated as part of the change-detection cycle of a directive. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * 
+   * 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;
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+     reset(newList: List<T>): void;
+    
+     add(obj: T): void;
+    
+     fireCallbacks(): void;
+    
+     onChange(callback: () => void): void;
+    
+     removeCallback(callback: () => void): void;
+    
+     toString(): string;
+    
+     length: number;
+    
+     first: T;
+    
+     last: T;
+    
+     map<U>(fn: (item: T) => U): U[];
+  }
+  
+
+  /**
+   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
+   * application tree.
+   */
+  class DynamicComponentLoader {
+    
+
+    /**
+     * Loads a root component that is placed at the first element that matches the component's
+     * selector.
+     * 
+     * - `typeOrBinding` `Type` \ {@link Binding} - representing the component to load.
+     * - `overrideSelector` (optional) selector to load the component at (or use
+     *   `@Component.selector`) The selector can be anywhere (i.e. outside the current component.)
+     * - `injector` {@link Injector} - optional injector to use for the component.
+     * 
+     * The loaded component receives injection normally as a hosted view.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+     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.
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+     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.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+  }
+  
+
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  class LifeCycle {
+    
+
+    /**
+     * @private
+     */
+     registerWith(zone: NgZone, changeDetector?: ChangeDetector): void;
+    
+
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+     tick(): void;
+  }
+  
+
+  /**
+   * Reference to the element.
+   * 
+   * Represents an opaque reference 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.
+   */
+  class ElementRef implements RenderElementRef {
+    
+
+    /**
+     * Reference to the {@link ViewRef} where the `ElementRef` is inside of.
+     */
+     parentView: ViewRef;
+    
+
+    /**
+     * Index of the element inside the {@link ViewRef}.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+    
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: 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;
+  }
+  
+
+  /**
+   * Reference to a template within a component.
+   * 
+   * Represents an opaque reference to the underlying template that can
+   * be instantiated using the {@link ViewContainerRef}.
+   */
+  class TemplateRef {
+    
+
+    /**
+     * The location of the template
+     */
+     elementRef: ElementRef;
+    
+     protoViewRef: ProtoViewRef;
+    
+
+    /**
+     * Whether this template has a local variable with the given name
+     */
+     hasLocal(name: string): boolean;
+  }
+  
+
+  /**
+   * A reference to an Angular View.
+   * 
+   * A View is a fundamental building block of Application UI. A View is the smallest set of
+   * elements which are created and destroyed together. A View can change 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 {@link ViewContainerRef}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 {@link ProtoViewRef}s:
+   * 
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outter/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+
+    /**
+     * Return `RenderViewRef`
+     */
+     render: RenderViewRef;
+    
+
+    /**
+     * Return `RenderFragmentRef`
+     */
+     renderFragment: RenderFragmentRef;
+    
+
+    /**
+     * Set local variable in a view.
+     * 
+     * - `contextName` - Name of the local variable in a view.
+     * - `value` - Value for the local variable in a view.
+     */
+     setLocal(contextName: string, value: any): void;
+  }
+  
+  interface HostViewRef {
+  }
+  
+
+  /**
+   * A reference to an Angular ProtoView.
+   * 
+   * A ProtoView is a reference to a template for easy creation of views.
+   * (See {@link AppViewManager#createViewInContainer `AppViewManager#createViewInContainer`} and
+   * {@link AppViewManager#createRootHostView `AppViewManager#createRootHostView`}).
+   * 
+   * A `ProtoView` is a factory 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 {@link ProtoViewRef}s:
+   * 
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   */
+  interface ProtoViewRef {
+  }
+  
+
+  /**
+   * A location where {@link ViewRef}s can be attached.
+   * 
+   * A `ViewContainerRef` represents a location in a {@link ViewRef} where other child
+   * {@link ViewRef}s can be inserted. Adding and removing views is the only way of structurally
+   * changing the rendered DOM of the application.
+   */
+  interface ViewContainerRef {
+    
+     viewManager: AppViewManager;
+    
+     element: ElementRef;
+    
+
+    /**
+     * Remove all {@link ViewRef}s at current location.
+     */
+     clear(): void;
+    
+
+    /**
+     * Return a {@link ViewRef} at specific index.
+     */
+     get(index: number): ViewRef;
+    
+
+    /**
+     * Returns number of {@link ViewRef}s currently attached at this location.
+     */
+     length: number;
+    
+
+    /**
+     * Create and insert a {@link ViewRef} into the view-container.
+     * 
+     * - `protoViewRef` (optional) {@link ProtoViewRef} - The `ProtoView` to use for creating
+     *   `View` to be inserted at this location. If `ViewContainer` is created at a location
+     *   of inline template, then `protoViewRef` is the `ProtoView` of the template.
+     * - `atIndex` (optional) `number` - location of insertion point. (Or at the end if unspecified.)
+     * - `context` (optional) {@link ElementRef} - Context (for expression evaluation) from the
+     *   {@link ElementRef} location. (Or current context if unspecified.)
+     * - `bindings` (optional) Array of {@link ResolvedBinding} - Used for configuring
+     *   `ElementInjector`.
+     * 
+     * Returns newly created {@link ViewRef}.
+     */
+     createEmbeddedView(templateRef: TemplateRef, atIndex?: number): ViewRef;
+    
+     createHostView(protoViewRef?: ProtoViewRef, atIndex?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+
+    /**
+     * Insert a {@link ViewRef} at specefic index.
+     * 
+     * The index is location at which the {@link ViewRef} should be attached. If omitted it is
+     * inserted at the end.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
+    
+
+    /**
+     * Return the index of already inserted {@link ViewRef}.
+     */
+     indexOf(viewRef: ViewRef): number;
+    
+
+    /**
+     * Remove a {@link ViewRef} at specific index.
+     * 
+     * If the index is omitted last {@link ViewRef} is removed.
+     */
+     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;
+  }
+  
+
+  /**
+   * Angular's reference to a component instance.
+   * 
+   * `ComponentRef` represents a component instance lifecycle and meta information.
+   */
+  interface ComponentRef {
+    
+
+    /**
+     * Location of the component host element.
+     */
+     location: ElementRef;
+    
+
+    /**
+     * Instance of component.
+     */
+     instance: any;
+    
+
+    /**
+     * Returns the host {@link ViewRef}.
+     */
+     hostView: HostViewRef;
+    
+
+    /**
+     * Dispose of the component instance.
+     */
+     dispose(): void;
+  }
+  
+
+  /**
+   * 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.
+   */
+  class NgZone {
+    
+
+    /**
+     * Sets the zone hook that is called just before Angular event turn starts.
+     * It is called once per browser event.
+     */
+     overrideOnTurnStart(onTurnStartFn: Function): void;
+    
+
+    /**
+     * Sets the zone hook that is called immediately after Angular processes
+     * all pending microtasks.
+     */
+     overrideOnTurnDone(onTurnDoneFn: Function): void;
+    
+
+    /**
+     * Sets the zone hook that is called immediately after the last turn in
+     * an event completes. At this point Angular will no longer attempt to
+     * sync the UI. Any changes to the data model will not be reflected in the
+     * DOM. `onEventDoneFn` is executed outside Angular zone.
+     * 
+     * This hook is useful for validating application state (e.g. in a test).
+     */
+     overrideOnEventDone(onEventDoneFn: Function, opt_waitForAsync: boolean): void;
+    
+
+    /**
+     * Sets the zone hook that is called when an error is uncaught in the
+     * Angular zone. The first argument is the error. The second argument is
+     * the stack trace.
+     */
+     overrideOnErrorHandler(errorHandlingFn: Function): 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.runOutsideAngular(() => {
+     *   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;
+  }
+  
+
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ```
+   * class AComponent {
+   *   constructor(@Inject(MyService) aService:MyService) {}
+   * }
+   * ```
+   */
+  class InjectMetadata {
+    
+     token: any;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ```
+   * class AComponent {
+   *   constructor(@Optional() aService:MyService) {
+   *     this.aService = aService;
+   *   }
+   * }
+   * ```
+   */
+  class OptionalMetadata {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * A marker metadata 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 {}
+   * ```
+   */
+  class InjectableMetadata {
+  }
+  
+
+  /**
+   * Specifies that an injector should retrieve a dependency from itself.
+   * 
+   * ## Example
+   * 
+   * ```
+   * class Dependency {
+   * }
+   * 
+   * class NeedsDependency {
+   *   constructor(public @Self() dependency:Dependency) {}
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(Dependency);
+   * ```
+   */
+  class SelfMetadata {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * ## Example
+   * 
+   * ```
+   * class Dependency {
+   * }
+   * 
+   * class NeedsDependency {
+   *   constructor(public @Host() dependency:Dependency) {}
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Dependency).toClass(HostDependency)
+   * ]);
+   * var child = parent.resolveAndCreateChild([]);
+   * var grandChild = child.resolveAndCreateChild([NeedsDependency, Depedency]);
+   * var nd = grandChild.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(HostDependency);
+   * ```
+   */
+  class HostMetadata {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ## Example
+   * 
+   * 
+   * ```
+   * class Service {}
+   * 
+   * class ParentService implements Service {
+   * }
+   * 
+   * class ChildService implements Service {
+   *   constructor(public @SkipSelf() parentService:Service) {}
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Service).toClass(ParentService)
+   * ]);
+   * var child = parent.resolveAndCreateChild([
+   *   bind(Service).toClass(ChildSerice)
+   * ]);
+   * var s = child.get(Service);
+   * expect(s).toBeAnInstanceOf(ChildService);
+   * expect(s.parentService).toBeAnInstanceOf(ParentService);
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * `DependencyMetadata is used by the framework to extend DI.
+   * 
+   * Only metadata implementing `DependencyMetadata` are added to the list of dependency
+   * properties.
+   * 
+   * For example:
+   * 
+   * ```
+   * class Exclude extends DependencyMetadata {}
+   * class NotDependencyProperty {}
+   * 
+   * class AComponent {
+   *   constructor(@Exclude @NotDependencyProperty aService:AService) {}
+   * }
+   * ```
+   * 
+   * will create the following dependency:
+   * 
+   * ```
+   * new Dependency(Key.get(AService), [new Exclude()])
+   * ```
+   * 
+   * The framework can use `new Exclude()` to handle the `aService` dependency
+   * in a specific way.
+   */
+  class DependencyMetadata {
+    
+     token: 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 {
+   * }
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
+  
+
+  /**
+   * Lazily retrieve the reference value.
+   * 
+   * See: {@link forwardRef}
+   */
+  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.
+   */
+  class Injector {
+    
+
+    /**
+     * Turns a list of binding definitions into an internal resolved list of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested lists and converting individual
+     * bindings into a list of {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     * 
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more bindings.
+     * 
+     * The returned list is sparse, indexed by `id` for the {@link Key}. It is generally not useful to
+     * application code
+     * other than for passing it to {@link Injector} functions that require resolved binding lists,
+     * such as
+     * `fromResolvedBindings` and `createChildFromResolved`.
+     */
+     static resolve(bindings: List<Type | Binding | List<any>>): List<ResolvedBinding>;
+    
+
+    /**
+     * Resolves bindings and creates an injector based on those bindings. This function is slower than
+     * the corresponding `fromResolvedBindings` because it needs to resolve bindings first. See
+     * `resolve`
+     * for the {@link Injector}.
+     * 
+     * Prefer `fromResolvedBindings` in performance-critical code that creates lots of injectors.
+     * 
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more
+     * bindings.
+     * @param `depProvider`
+     */
+     static resolveAndCreate(bindings: List<Type | Binding | List<any>>, depProvider?: DependencyProvider): Injector;
+    
+
+    /**
+     * Creates an injector from previously resolved bindings. This bypasses resolution and flattening.
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * @param `bindings` A sparse list of {@link ResolvedBinding}s. See `resolve` for the
+     * {@link Injector}.
+     * @param `depProvider`
+     */
+     static fromResolvedBindings(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
+    
+
+    /**
+     * Returns debug information about the injector.
+     * 
+     * This information is included into exceptions thrown by the injector.
+     */
+     debugContext(): any;
+    
+
+    /**
+     * 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 {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     * 
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, 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 {@link ResolvedBinding}s into it.
+     * 
+     * @param `bindings`: A sparse list of {@link ResolvedBinding}s.
+     * See `resolve` for the {@link Injector}.
+     * @param `depProvider`
+     * @returns a new child {@link Injector}.
+     */
+     createChildFromResolved(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
+    
+
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * @param `binding`: either a type or a binding.
+     * @returns an object created using binding.
+     */
+     resolveAndInstantiate(binding: Type | Binding): any;
+    
+
+    /**
+     * Instantiates an object using a resolved bindin in the context of the injector.
+     * 
+     * @param `binding`: a resolved binding
+     * @returns an object created using binding.
+     */
+     instantiateResolved(binding: ResolvedBinding): any;
+    
+     displayName: string;
+    
+     toString(): string;
+  }
+  
+  class ProtoInjector {
+    
+     numberOfBindings: number;
+    
+     getBindingAtIndex(index: number): any;
+  }
+  
+  class BindingWithVisibility {
+    
+     binding: ResolvedBinding;
+    
+     visibility: Visibility;
+    
+     getKeyId(): number;
+  }
+  
+
+  /**
+   * Used to provide dependencies that cannot be easily expressed as bindings.
+   */
+  interface DependencyProvider {
+    
+     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
+  }
+  
+  enum Visibility {
+    
+     Public,
+    
+     Private,
+    
+     PublicAndPrivate
+  }
+  
+  const UNDEFINED : Object ;
+  
+
+  /**
+   * Describes how_ the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ## Example
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding(String, { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get(String)).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+
+    /**
+     * Token used when retrieving this binding. Usually the `Type`.
+     */
+     token: any;
+    
+
+    /**
+     * 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: any;
+    
+
+    /**
+     * Binds a key to the alias for an existing key.
+     * 
+     * An alias means that {@link Injector} 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: any;
+    
+
+    /**
+     * 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 {@link Binding} into {@link ResolvedBinding}.
+     * 
+     * {@link Injector} internally only uses {@link ResolvedBinding}, {@link Binding} contains
+     * convenience binding syntax.
+     */
+     resolve(): ResolvedBinding;
+  }
+  
+
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+     token: any;
+    
+
+    /**
+     * 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 separate 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: /*Type*/ 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;
+  }
+  
+
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * A {@link Binding} is resolved when it has a factory function. Binding to a class, alias, or
+   * value, are just convenience methods, as {@link Injector} only operates on calling factory
+   * functions.
+   */
+  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>;
+  }
+  
+
+  /**
+   * @private
+   */
+  class Dependency {
+    
+     static fromKey(key: Key): Dependency;
+    
+     key: Key;
+    
+     optional: boolean;
+    
+     lowerBoundVisibility: any;
+    
+     upperBoundVisibility: any;
+    
+     properties: List<any>;
+  }
+  
+
+  /**
+   * Provides an API for imperatively constructing {@link Binding}s.
+   * 
+   * This is only relevant for JavaScript. See {@link BindingBuilder}.
+   * 
+   * ## Example
+   * 
+   * ```javascript
+   * bind(MyInterface).toClass(MyClass)
+   * 
+   * ```
+   */
+  function bind(token: any) : BindingBuilder ;
+  
+
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`, usually the `Type` of the instance.
+   * 
+   * Keys are used internally by the {@link Injector} because their system-wide unique `id`s allow the
+   * injector to index in arrays rather than looking up items in maps.
+   */
+  class Key {
+    
+
+    /**
+     * Retrieves a `Key` for a token.
+     */
+     static get(token: Object): Key;
+    
+
+    /**
+     * @returns the number of keys registered in the system.
+     */
+     static numberOfKeys: number;
+    
+     token: Object;
+    
+     id: number;
+    
+     displayName: string;
+  }
+  
+
+  /**
+   * @private
+   */
+  class KeyRegistry {
+    
+     get(token: Object): Key;
+    
+     numberOfKeys: number;
+  }
+  
+
+  /**
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+     type: any;
+  }
+  
+
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   */
+  class NoBindingError extends AbstractBindingError {
+  }
+  
+
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     keys: List<Key>;
+    
+     injectors: List<Injector>;
+    
+     constructResolvingMessage: Function;
+    
+     addKey(injector: Injector, key: Key): void;
+    
+     context: any;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * 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.
+   */
+  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.
+   */
+  class InstantiationError extends AbstractBindingError {
+    
+     causeKey: Key;
+  }
+  
+
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   */
+  class InvalidBindingError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   */
+  class NoAnnotationError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Thrown when getting an object by index.
+   */
+  class OutOfBoundsError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+  class OpaqueToken {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+     new(token: any): InjectMetadata;
+  
+    
+     (token: any): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+     new(): OptionalMetadata;
+  
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+     new(): InjectableMetadata;
+  
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+     new(): SelfMetadata;
+  
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+     new(): HostMetadata;
+  
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+     new(): SkipSelfMetadata;
+  
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject : InjectFactory ;
+  
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional : OptionalFactory ;
+  
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable : InjectableFactory ;
+  
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self : SelfFactory ;
+  
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host : HostFactory ;
+  
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf : SkipSelfFactory ;
+  
+
+  /**
+   * 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 {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  const CORE_DIRECTIVES : List<Type> ;
+  
+
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass {
+    
+     initialClasses: any;
+    
+     rawClass: any;
+    
+     onCheck(): void;
+    
+     onDestroy(): 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>`
+   */
+  class NgFor {
+    
+     static bulkRemove(tuples: List<RecordViewTuple>, viewContainer: ViewContainerRef): List<RecordViewTuple>;
+    
+     static bulkInsert(tuples: List<RecordViewTuple>, viewContainer: ViewContainerRef, templateRef: TemplateRef): List<RecordViewTuple>;
+    
+     viewContainer: ViewContainerRef;
+    
+     templateRef: TemplateRef;
+    
+     iterableDiffers: IterableDiffers;
+    
+     cdr: ChangeDetectorRef;
+    
+     ngForOf: any;
+    
+     onCheck(): void;
+  }
+  
+  class RecordViewTuple {
+    
+     view: ViewRef;
+    
+     record: any;
+  }
+  
+
+  /**
+   * 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>`
+   */
+  class NgIf {
+    
+     ngIf: any;
+  }
+  
+
+  /**
+   * 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 ng-non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
+   * ```
+   */
+  class NgNonBindable {
+  }
+  
+
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle {
+    
+     rawStyle: any;
+    
+     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>
+   * ```
+   */
+  class NgSwitch {
+    
+     ngSwitch: any;
+  }
+  
+
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+     ngSwitchWhen: any;
+  }
+  
+
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+  }
+  
+
+  /**
+   * 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({onlySelf}?: {onlySelf?: boolean}): void;
+    
+     setParent(parent: ControlGroup | ControlArray): void;
+    
+     updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+     updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+     find(path: List<string | number>| string): AbstractControl;
+    
+     getError(errorCode: string, path?: List<string>): any;
+    
+     hasError(errorCode: string, path?: List<string>): 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
+   * {@link ControlGroup} and {@link ControlArray}.
+   */
+  class Control extends AbstractControl {
+    
+     updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                  {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): 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 {@link Control} 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
+   * {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other controls,
+   * but is of variable
+   * length.
+   */
+  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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   */
+  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 AbstractControlDirective {
+    
+     control: AbstractControl;
+    
+     value: any;
+    
+     valid: boolean;
+    
+     errors: StringMap<string, any>;
+    
+     pristine: boolean;
+    
+     dirty: boolean;
+    
+     touched: boolean;
+    
+     untouched: boolean;
+  }
+  
+
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+     updateModel(dir: NgControl, value: any): void;
+  }
+  
+
+  /**
+   * A directive that contains a group of [NgControl].
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+     name: string;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+  }
+  
+
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl {
+    
+     update: any;
+    
+     model: any;
+    
+     viewModel: 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl:Control;
+   *  login:string;
+   * 
+   *  constructor() {
+   *    this.loginControl = new Control('');
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl {
+    
+     form: Control;
+    
+     update: any;
+    
+     model: any;
+    
+     viewModel: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: StringMap<string, 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: [FORM_DIRECTIVES],
+   *      template: `
+   *               <input type='text' [(ng-model)]="searchQuery">
+   *      `})
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl {
+    
+     update: any;
+    
+     model: any;
+    
+     viewModel: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: StringMap<string, any>): void;
+    
+     control: Control;
+    
+     path: List<string>;
+    
+     validator: Function;
+    
+     viewToModelUpdate(newValue: any): void;
+  }
+  
+
+  /**
+   * An abstract class that all control directive extend.
+   * 
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+     name: string;
+    
+     valueAccessor: ControlValueAccessor;
+    
+     validator: Function;
+    
+     path: List<string>;
+    
+     viewToModelUpdate(newValue: any): void;
+  }
+  
+
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer {
+    
+     onInit(): void;
+    
+     onDestroy(): void;
+    
+     control: ControlGroup;
+    
+     path: List<string>;
+    
+     formDirective: Form;
+  }
+  
+
+  /**
+   * 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     directives: List<NgControl>;
+    
+     ngSubmit: any;
+    
+     onChange(_: any): void;
+    
+     formDirective: Form;
+    
+     control: ControlGroup;
+    
+     path: List<string>;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+     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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     ngSubmit: any;
+    
+     formDirective: Form;
+    
+     control: ControlGroup;
+    
+     path: List<string>;
+    
+     controls: StringMap<string, AbstractControl>;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+     updateModel(dir: NgControl, value: any): void;
+    
+     onSubmit(): boolean;
+  }
+  
+
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+     cd: NgControl;
+    
+     onChange: any;
+    
+     onTouched: any;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: (_: any) => void): void;
+    
+     registerOnTouched(fn: () => void): void;
+  }
+  
+
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+     cd: NgControl;
+    
+     onChange: any;
+    
+     onTouched: any;
+    
+     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: () => {}): void;
+  }
+  
+
+  /**
+   * Marks <option> as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+  }
+  
+
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+     cd: NgControl;
+    
+     value: string;
+    
+     onChange: any;
+    
+     onTouched: any;
+    
+     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.
+   */
+  const FORM_DIRECTIVES : List<Type> ;
+  
+
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+     static required(c:Control): StringMap<string, boolean>;
+    
+     static nullValidator(c: any): StringMap<string, boolean>;
+    
+     static compose(validators: List<Function>): Function;
+    
+     static group(c:ControlGroup): StringMap<string, boolean>;
+    
+     static array(c:ControlArray): StringMap<string, boolean>;
+  }
+  
+  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, FORM_DIRECTIVES, ControlGroup} from 'angular2/forms';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [
+   *     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: [
+   *     FORM_DIRECTIVES
+   *   ]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested
+   * {@link ControlGroup} that defines a `password` and a `passwordConfirmation` {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  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;
+  }
+  
+  const FORM_BINDINGS : List<Type> ;
+  
+  class RenderDirectiveMetadata {
+    
+     static DIRECTIVE_TYPE: any;
+    
+     static COMPONENT_TYPE: any;
+    
+     static create({id, selector, compileChildren, events, host, properties, readAttributes, type,
+                 callOnDestroy, callOnChange, callOnCheck, callOnInit, callOnAllChangesDone,
+                 changeDetection, exportAs}: {
+    id?: string,
+    selector?: string,
+    compileChildren?: boolean,
+    events?: List<string>,
+    host?: Map<string, string>,
+    properties?: List<string>,
+    readAttributes?: List<string>,
+    type?: number,
+    callOnDestroy?: boolean,
+    callOnChange?: boolean,
+    callOnCheck?: boolean,
+    callOnInit?: boolean,
+    callOnAllChangesDone?: boolean,
+    changeDetection?: string,
+    exportAs?: string
+  }): RenderDirectiveMetadata;
+    
+     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 DomRenderer extends Renderer {
+    
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+     destroyView(viewRef: RenderViewRef): void;
+    
+     getNativeElementSync(location: RenderElementRef): any;
+    
+     getRootNodes(fragment: RenderFragmentRef): List<Node>;
+    
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+     detachFragment(fragmentRef: RenderFragmentRef): 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;
+  }
+  
+
+  /**
+   * A dispatcher for all events happening in a view.
+   */
+  interface RenderEventDispatcher {
+    
+
+    /**
+     * 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
+     */
+     dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): void;
+  }
+  
+  class Renderer {
+    
+
+    /**
+     * Creates a root host view that includes the given element.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     * 
+     * @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 {RenderViewWithFragments} the created view including fragments
+     */
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+
+    /**
+     * Creates a regular view out of the given ProtoView.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     */
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+
+    /**
+     * Destroys the given view after it has been dehydrated and detached
+     */
+     destroyView(viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Attaches a fragment after another fragment.
+     */
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+
+    /**
+     * Attaches a fragment after an element.
+     */
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+
+    /**
+     * Detaches a fragment.
+     */
+     detachFragment(fragmentRef: RenderFragmentRef): 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: RenderEventDispatcher): void;
+  }
+  
+
+  /**
+   * Abstract reference to the element which can be marshaled across web-worker boundary.
+   * 
+   * This interface is used by the Renderer API.
+   */
+  interface RenderElementRef {
+    
+
+    /**
+     * Reference to the `RenderViewRef` where the `RenderElementRef` is inside of.
+     */
+     renderView: RenderViewRef;
+    
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: number;
+  }
+  
+  class RenderViewRef {
+  }
+  
+  class RenderProtoViewRef {
+  }
+  
+  class RenderFragmentRef {
+  }
+  
+  class RenderViewWithFragments {
+    
+     viewRef: RenderViewRef;
+    
+     fragmentRefs: RenderFragmentRef[];
+  }
+  
+  class ViewDefinition {
+    
+     componentId: string;
+    
+     templateAbsUrl: string;
+    
+     template: string;
+    
+     directives: List<RenderDirectiveMetadata>;
+    
+     styleAbsUrls: List<string>;
+    
+     styles: List<string>;
+    
+     encapsulation: ViewEncapsulation;
+  }
+  
+  const DOCUMENT : OpaqueToken ;
+  
+
+  /**
+   * A unique id (string) for an angular application.
+   */
+  const APP_ID : OpaqueToken ;
+  
+
+  /**
+   * Defines when a compiled template should be stored as a string
+   * rather than keeping its Nodes to preserve memory.
+   */
+  const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE : OpaqueToken ;
+  
+
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     final myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope : WtfScopeFn ;
+  
+
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave : <T>(scope: any, returnValue?: T) => T ;
+  
+
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange : (rangeType: string, action: string) => any ;
+  
+
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange : (range: any) => void ;
+  
+  interface WtfScopeFn {
+    
+     (arg0?: any, arg1?: any): any;
+  
+  }
+  
+  var ChangeDetectorRef: InjectableReference;
+  
+  var ApplicationRef: InjectableReference;
+  
+  var Compiler: InjectableReference;
+  
+  var AppViewManager: InjectableReference;
+  
+  var ViewRef: InjectableReference;
+  
+  var ProtoViewRef: InjectableReference;
+  
+  var ViewContainerRef: InjectableReference;
+  
+  var ComponentRef: InjectableReference;
+  
+}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
+
+
diff --git a/angular2/angular2-2.0.0-alpha.37.d.ts b/angular2/angular2-2.0.0-alpha.37.d.ts
new file mode 100644
index 000000000..733c9e8ef
--- /dev/null
+++ b/angular2/angular2-2.0.0-alpha.37.d.ts
@@ -0,0 +1,12214 @@
+// Type definitions for Angular v2.0.0-alpha.37
+// 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.
+// ***********************************************************
+
+// angular2/angular2 depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-promise/es6-promise.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
+// angular2/web_worker/worker depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-promise/es6-promise.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
+// angular2/web_worker/ui depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-promise/es6-promise.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
+
+
+interface Map<K,V> {}
+interface StringMap<K,V> extends Map<K,V> {}
+
+
+declare module ng {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngWorker {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngUi {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+
+
+
+
+/**
+ * The `angular2` is the single place to import all of the individual types.
+ */
+declare module ng {
+
+  /**
+   * 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 {@link ApplicationRef}.
+   */
+  function bootstrap(appComponentType: /*Type*/ any, componentInjectableBindings?: Array<Type | Binding | any[]>) : Promise<ApplicationRef> ;
+
+
+  /**
+   * 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 `bindings` and `viewBindings`.
+   *
+   * All template expressions and statements are then evaluated against the component instance.
+   *
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   *
+   * ## Example
+   *
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   *
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+
+
+    /**
+     * 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: ChangeDetectionStrategy;
+
+
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     *
+     * ```
+     */
+     viewBindings: any[];
+  }
+
+
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   *
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   *
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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 any ancestor elements
+   *
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   *
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   *
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   *
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+
+
+    /**
+     * 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 {@link PipeMetadata} 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 use pipes in bindings, as follows:
+     *
+     * ```html
+     * <div [class-set]="someExpression | somePipe">
+     * ```
+     */
+     properties: 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: 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.
+     */
+     host: StringMap<string, string>;
+
+
+    /**
+     * Specifies which lifecycle should be notified to the directive.
+     *
+     * See {@link LifecycleEvent} for details.
+     */
+     lifecycle: 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     *
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+     bindings: 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;
+  }
+
+
+  /**
+   * Declare reusable pipe function.
+   *
+   * ## Example
+   *
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+
+     name: string;
+  }
+
+
+  /**
+   * Lifecycle events are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentChecked`
+   * - `AfterContentChecked`
+   * - `OnDestroy` (at the very end before destruction)
+   */
+  enum LifecycleEvent {
+
+
+    /**
+     * Notify a directive when it has been checked the first time.
+     *
+     * 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: [LifecycleEvent.OnInit]
+     * })
+     * class ClassSet {
+     *   onInit() {
+     *   }
+     * }
+     *  ```
+     */
+     OnInit,
+
+
+    /**
+     * Notify a directive whenever a {@link ViewMetadata} that contains it is destroyed.
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   ...,
+     *   lifecycle: [LifecycleEvent.OnDestroy]
+     * })
+     * class ClassSet {
+     *   onDestroy() {
+     *     // invoked to notify directive of the containing view destruction.
+     *   }
+     * }
+     * ```
+     */
+     OnDestroy,
+
+
+    /**
+     * 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: [LifecycleEvent.OnChanges]
+     * })
+     * class ClassSet {
+     *   propA;
+     *   propB;
+     *   onChanges(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
+     *     }
+     *   }
+     * }
+     *  ```
+     */
+     OnChanges,
+
+
+    /**
+     * 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: [LifecycleEvent.DoCheck]
+     * })
+     * class ClassSet {
+     *   doCheck() {
+     *   }
+     * }
+     *  ```
+     */
+     DoCheck,
+
+
+    /**
+     * Notify a directive when the bindings of all its content children have been checked the first
+     * time (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterContentInit]
+     * })
+     * class ClassSet {
+     *
+     *   afterContentInit() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterContentInit,
+
+
+    /**
+     * Notify a directive when the bindings of all its content children have been checked (whether
+     * they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterContentChecked]
+     * })
+     * class ClassSet {
+     *
+     *   afterContentChecked() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterContentChecked,
+
+
+    /**
+     * Notify a directive when the bindings of all its view children have been checked the first time
+     * (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterViewInit]
+     * })
+     * class ClassSet {
+     *
+     *   afterViewInit() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterViewInit,
+
+
+    /**
+     * Notify a directive when the bindings of all its view children have been checked (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterViewChecked]
+     * })
+     * class ClassSet {
+     *
+     *   afterViewChecked() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterViewChecked
+  }
+
+
+  /**
+   * 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 {@link ComponentMetadata}.
+   *
+   * ## Example
+   *
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   *
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+
+
+    /**
+     * 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: string[];
+
+
+    /**
+     * Specifies an inline stylesheet for an angular component.
+     */
+     styles: 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: Array<Type | any | any[]>;
+
+     pipes: Array<Type | any | any[]>;
+
+
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+     encapsulation: ViewEncapsulation;
+  }
+
+
+  /**
+   * How the template and styles of a view should be encapsulated.
+   */
+  enum ViewEncapsulation {
+
+
+    /**
+     * Emulate scoping of styles by preprocessing the style rules
+     * and adding additional attributes to elements. This is the default.
+     */
+     Emulated,
+
+
+    /**
+     * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot.
+     */
+     Native,
+
+
+    /**
+     * Don't scope the template nor the styles.
+     */
+     None
+  }
+
+
+  /**
+   * Specifies that a {@link QueryList} should be injected.
+   *
+   * See {@link QueryList} for usage and example.
+   */
+  class QueryMetadata extends DependencyMetadata {
+
+     descendants: boolean;
+
+     isViewQuery: any;
+
+     selector: any;
+
+     isVarBindingQuery: boolean;
+
+     varBindings: 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+
+     attributeName: string;
+
+     token: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute : AttributeFactory ;
+
+
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+
+
+     (name: string): TypeDecorator;
+
+  }
+
+
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component : ComponentFactory ;
+
+
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   *
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
+    renderer?: string,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+  }
+
+
+  /**
+   * {@link ComponentAnnotation} 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: {
+    selector?: string,
+    properties?: string[],
+    events?: string[],
+    host?: StringMap<string, string>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
+  }): ComponentMetadata;
+
+
+     (obj: {
+    selector?: string,
+    properties?: string[],
+    events?: string[],
+    host?: StringMap<string, string>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
+  }): ComponentDecorator;
+
+  }
+
+
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive : DirectiveFactory ;
+
+
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   *
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+  }
+
+
+  /**
+   * {@link DirectiveMetadata} 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: {
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: any[], exportAs?: string,
+        compileChildren?: boolean;
+  }): DirectiveMetadata;
+
+
+     (obj: {
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: any[], exportAs?: string,
+        compileChildren?: boolean;
+  }): DirectiveDecorator;
+
+  }
+
+
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View : ViewFactory ;
+
+
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   *
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
+    renderer?: string,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+  }
+
+
+  /**
+   * {@link ViewAnnotation} 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: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    encapsulation?: ViewEncapsulation,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewMetadata;
+
+
+     (obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    encapsulation?: ViewEncapsulation,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+
+  }
+
+
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query : QueryFactory ;
+
+
+  /**
+   * {@link QueryMetadata} 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+
+
+     (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+
+  }
+
+
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery : QueryFactory ;
+
+
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe : PipeFactory ;
+
+
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   *
+   * ## Example as TypeScript Decorator
+   *
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   *
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   *
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+
+     new(obj: {
+    name: string,
+  }): any;
+
+
+     (obj: {name: string}): any;
+
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterContentInit `LifeCycleEvent.afterContentInit`}
+   * called when the bindings of all its content children have been checked the first time.
+   */
+  interface AfterContentInit {
+
+     afterContentInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterContentChecked `LifeCycleEvent.afterContentChecked`}
+   * called when the bindings of all its content children have been checked.
+   */
+  interface AfterContentChecked {
+
+     afterContentChecked(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterViewInit `LifeCycleEvent.afterViewInit`}
+   * called when the bindings of all its view children have been checked the first time.
+   */
+  interface AfterViewInit {
+
+     afterViewInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterViewChecked `LifeCycleEvent.afterViewChecked`}
+   * called when the bindings of all its view children have been checked.
+   */
+  interface AfterViewChecked {
+
+     afterViewChecked(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnChanges `LifeCycleEvent.OnChanges`}
+   * called after all of component's bound properties are updated.
+   */
+  interface OnChanges {
+
+     onChanges(changes: StringMap<string, any>): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnDestroy `LifeCycleEvent.OnDestroy`}
+   * called when a directive is being destroyed.
+   */
+  interface OnDestroy {
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnInit `LifeCycleEvent.OnInit`}
+   * called when a directive is being checked the first time.
+   */
+  interface OnInit {
+
+     onInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#DoCheck `LifeCycleEvent.DoCheck`}
+   * called when a directive is being checked.
+   */
+  interface DoCheck {
+
+     doCheck(): boolean;
+  }
+
+
+  /**
+   * 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 ;
+
+
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+
+
+    /**
+     * Optional argument for specifying the superclass.
+     */
+     extends?: Type;
+
+
+    /**
+     * Required constructor function for a class.
+     *
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     *
+     * See {@link Class} for example of usage.
+     */
+     constructor: (Function | any[]);
+  }
+
+
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+     annotations: any[];
+
+
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+     Class(obj: ClassDefinition): Type;
+  }
+
+  enum ChangeDetectionStrategy {
+
+
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+     CheckOnce,
+
+
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+     Checked,
+
+
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+     CheckAlways,
+
+
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+     Detached,
+
+
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+     OnPush,
+
+
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+     Default,
+
+
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+     OnPushObserve
+  }
+
+
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   *
+   * Angular expects that the data flows from top (root) component to child (leaf) components.
+   * This is known as directed acyclic graph. This allows Angular to only execute change detection
+   * once and prevents loops in change detection data flow.
+   *
+   * This exception is only thrown in dev mode.
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+  }
+
+
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   *
+   * This error wraps the original exception, this is done to attach expression location information.
+   */
+  class ChangeDetectionError extends BaseException {
+
+
+    /**
+     * Location of the expression.
+     */
+     location: string;
+  }
+
+  interface ChangeDetector {
+
+     parent: ChangeDetector;
+
+     mode: ChangeDetectionStrategy;
+
+     ref: ChangeDetectorRef;
+
+     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, pipes: any): void;
+
+     dehydrate(): void;
+
+     markPathToRootAsCheckOnce(): void;
+
+     handleEvent(eventName: string, elIndex: number, locals: Locals): 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;
+  }
+
+
+  /**
+   * Controls change detection.
+   *
+   * {@link ChangeDetectorRef} allows requesting checks for detectors that rely on observables. It
+   * also allows detaching and attaching change detector subtrees.
+   */
+  interface ChangeDetectorRef {
+
+
+    /**
+     * Request to check all OnPush ancestors.
+     */
+     markForCheck(): 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;
+  }
+
+
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   *
+   * Example:
+   *
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+
+     static wrap(value: any): WrappedValue;
+
+     wrapped: any;
+  }
+
+
+  /**
+   * An interface which all pipes must implement.
+   *
+   * #Example
+   *
+   * ```
+   * class DoublePipe implements PipeTransform {
+   *  transform(value, args = []) {
+   *    return `${value}${value}`;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeTransform {
+
+     transform(value: any, args: any[]): any;
+  }
+
+
+  /**
+   * An interface that stateful pipes should implement.
+   *
+   * #Example
+   *
+   * ```
+   * class StatefulPipe implements PipeTransform, PipeOnDestroy {
+   *  connection;
+   *
+   *  onDestroy() {
+   *    this.connection.release();
+   *  }
+   *
+   *  transform(value, args = []) {
+   *    this.connection = createConnection();
+   *    // ...
+   *    return someValue;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeOnDestroy {
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+
+     static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+
+
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     *
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     *
+     * # Example
+     *
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: IterableDifferFactory[]): Binding;
+
+     factories: IterableDifferFactory[];
+
+     find(iterable: Object): IterableDifferFactory;
+  }
+
+  interface IterableDiffer {
+
+     diff(object: Object): any;
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+
+     supports(objects: Object): boolean;
+
+     create(cdRef: ChangeDetectorRef): IterableDiffer;
+  }
+
+
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+
+     static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+
+
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     *
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     *
+     * # Example
+     *
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: KeyValueDifferFactory[]): Binding;
+
+     factories: KeyValueDifferFactory[];
+
+     find(kv: Object): KeyValueDifferFactory;
+  }
+
+  interface KeyValueDiffer {
+
+     diff(object: Object): void;
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+
+     supports(objects: Object): boolean;
+
+     create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+  }
+
+
+  /**
+   * An opaque token representing the application root type in the {@link Injector}.
+   *
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   *
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   *
+   * ```
+   */
+  const APP_COMPONENT : OpaqueToken ;
+
+
+  /**
+   * Runtime representation of a type.
+   *
+   * In JavaScript a Type is a constructor function.
+   */
+  interface Type extends Function {
+
+     new(...args: any[]): any;
+
+  }
+
+
+  /**
+   * 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.
+   */
+  interface ApplicationRef {
+
+
+    /**
+     * Returns the current {@link ComponentMetadata} type.
+     */
+     hostComponentType: Type;
+
+
+    /**
+     * Returns the current {@link ComponentMetadata} instance.
+     */
+     hostComponent: any;
+
+
+    /**
+     * Dispose (un-load) the application.
+     */
+     dispose(): void;
+
+
+    /**
+     * Returns the root application {@link Injector}.
+     */
+     injector: Injector;
+  }
+
+
+  /**
+   * Specifies app root url for the application.
+   *
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+
+
+    /**
+     * Returns the base URL of the currently running application.
+     */
+     value: any;
+  }
+
+
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  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 `Type` from a {@link ComponentMetadata} into a URL.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  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 `Type` for {@link DirectiveMetadata}.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  class DirectiveResolver {
+
+
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+     resolve(type: Type): DirectiveMetadata;
+  }
+
+
+  /**
+   * ## 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);
+   * ```
+   */
+  interface 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.
+   */
+  interface AppViewManager {
+
+
+    /**
+     * Returns a {@link ViewContainerRef} at the {@link ElementRef} location.
+     */
+     getViewContainer(location: ElementRef): ViewContainerRef;
+
+
+    /**
+     * Return the first child element of the host element view.
+     */
+     getHostElement(hostViewRef: HostViewRef): ElementRef;
+
+
+    /**
+     * Returns an ElementRef for the element with the given variable name
+     * in the current view.
+     *
+     * - `hostLocation`: {@link ElementRef} of any element in the View which defines the scope of
+     *   search.
+     * - `variableName`: Name of the variable to locate.
+     * - Returns {@link ElementRef} 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 {@link ElementRef}
+     * 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`: {@link ProtoViewRef} 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: {@link Injector} to use as parent injector for the view.
+     *
+     * See {@link AppViewManager#destroyRootHostView}.
+     *
+     * ## 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): HostViewRef;
+
+
+    /**
+     * Remove the View created with {@link AppViewManager#createRootHostView}.
+     */
+     destroyRootHostView(hostViewRef: HostViewRef): void;
+
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createEmbeddedViewInContainer(viewContainerLocation: ElementRef, atIndex: number, templateRef: TemplateRef): ViewRef;
+
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createHostViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+
+
+    /**
+     * See {@link AppViewManager#createViewInContainer}.
+     */
+     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+
+
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+
+
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  }
+
+
+  /**
+   * An iterable and observable live list of components in the DOM.
+   *
+   * A QueryList contains a live list of child directives in the 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.
+   *
+   * QueryList is updated as part of the change-detection cycle of a directive. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   *
+   *
+   * 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;
+   * }
+   * ```
+   */
+  class QueryList<T> {
+
+     reset(newList: T[]): void;
+
+     add(obj: T): void;
+
+     fireCallbacks(): void;
+
+     onChange(callback: () => void): void;
+
+     removeCallback(callback: () => void): void;
+
+     toString(): string;
+
+     length: number;
+
+     first: T;
+
+     last: T;
+
+     map<U>(fn: (item: T) => U): U[];
+  }
+
+
+  /**
+   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
+   * application tree.
+   */
+  class DynamicComponentLoader {
+
+
+    /**
+     * Loads a root component that is placed at the first element that matches the component's
+     * selector.
+     *
+     * - `typeOrBinding` `Type` \ {@link Binding} - representing the component to load.
+     * - `overrideSelector` (optional) selector to load the component at (or use
+     *   `@Component.selector`) The selector can be anywhere (i.e. outside the current component.)
+     * - `injector` {@link Injector} - optional injector to use for the component.
+     *
+     * The loaded component receives injection normally as a hosted view.
+     *
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+     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.
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+     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.
+     *
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+  }
+
+
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   *
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   *
+   * Each Angular application has a single `LifeCycle` instance.
+   *
+   * # Example
+   *
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   *
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   *
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  class LifeCycle {
+
+
+    /**
+     * @private
+     */
+     registerWith(zone: NgZone, changeDetector?: ChangeDetector): void;
+
+
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     *
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+     tick(): void;
+  }
+
+
+  /**
+   * Reference to the element.
+   *
+   * Represents an opaque reference 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.
+   */
+  class ElementRef implements RenderElementRef {
+
+
+    /**
+     * Reference to the {@link ViewRef} where the `ElementRef` is inside of.
+     */
+     parentView: ViewRef;
+
+
+    /**
+     * Index of the element inside the {@link ViewRef}.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: 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;
+  }
+
+
+  /**
+   * Reference to a template within a component.
+   *
+   * Represents an opaque reference to the underlying template that can
+   * be instantiated using the {@link ViewContainerRef}.
+   */
+  class TemplateRef {
+
+
+    /**
+     * The location of the template
+     */
+     elementRef: ElementRef;
+
+     protoViewRef: ProtoViewRef;
+
+
+    /**
+     * Whether this template has a local variable with the given name
+     */
+     hasLocal(name: string): boolean;
+  }
+
+
+  /**
+   * A reference to an Angular View.
+   *
+   * A View is a fundamental building block of Application UI. A View is the smallest set of
+   * elements which are created and destroyed together. A View can change 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 {@link ViewContainerRef}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 {@link ProtoViewRef}s:
+   *
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   *
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   *
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   *
+   * The outter/inner {@link ProtoViewRef}s are then assembled into views like so:
+   *
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+
+
+    /**
+     * Return `RenderViewRef`
+     */
+     render: RenderViewRef;
+
+
+    /**
+     * Return `RenderFragmentRef`
+     */
+     renderFragment: RenderFragmentRef;
+
+
+    /**
+     * Set local variable in a view.
+     *
+     * - `contextName` - Name of the local variable in a view.
+     * - `value` - Value for the local variable in a view.
+     */
+     setLocal(contextName: string, value: any): void;
+  }
+
+  interface HostViewRef {
+  }
+
+
+  /**
+   * A reference to an Angular ProtoView.
+   *
+   * A ProtoView is a reference to a template for easy creation of views.
+   * (See {@link AppViewManager#createViewInContainer `AppViewManager#createViewInContainer`} and
+   * {@link AppViewManager#createRootHostView `AppViewManager#createRootHostView`}).
+   *
+   * A `ProtoView` is a factory 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 {@link ProtoViewRef}s:
+   *
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   *
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   *
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   */
+  interface ProtoViewRef {
+  }
+
+
+  /**
+   * A location where {@link ViewRef}s can be attached.
+   *
+   * A `ViewContainerRef` represents a location in a {@link ViewRef} where other child
+   * {@link ViewRef}s can be inserted. Adding and removing views is the only way of structurally
+   * changing the rendered DOM of the application.
+   */
+  interface ViewContainerRef {
+
+     viewManager: AppViewManager;
+
+     element: ElementRef;
+
+
+    /**
+     * Remove all {@link ViewRef}s at current location.
+     */
+     clear(): void;
+
+
+    /**
+     * Return a {@link ViewRef} at specific index.
+     */
+     get(index: number): ViewRef;
+
+
+    /**
+     * Returns number of {@link ViewRef}s currently attached at this location.
+     */
+     length: number;
+
+
+    /**
+     * Create and insert a {@link ViewRef} into the view-container.
+     *
+     * - `protoViewRef` (optional) {@link ProtoViewRef} - The `ProtoView` to use for creating
+     *   `View` to be inserted at this location. If `ViewContainer` is created at a location
+     *   of inline template, then `protoViewRef` is the `ProtoView` of the template.
+     * - `atIndex` (optional) `number` - location of insertion point. (Or at the end if unspecified.)
+     * - `context` (optional) {@link ElementRef} - Context (for expression evaluation) from the
+     *   {@link ElementRef} location. (Or current context if unspecified.)
+     * - `bindings` (optional) Array of {@link ResolvedBinding} - Used for configuring
+     *   `ElementInjector`.
+     *
+     * Returns newly created {@link ViewRef}.
+     */
+     createEmbeddedView(templateRef: TemplateRef, atIndex?: number): ViewRef;
+
+     createHostView(protoViewRef?: ProtoViewRef, atIndex?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+
+
+    /**
+     * Insert a {@link ViewRef} at specefic index.
+     *
+     * The index is location at which the {@link ViewRef} should be attached. If omitted it is
+     * inserted at the end.
+     *
+     * Returns the inserted {@link ViewRef}.
+     */
+     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
+
+
+    /**
+     * Return the index of already inserted {@link ViewRef}.
+     */
+     indexOf(viewRef: ViewRef): number;
+
+
+    /**
+     * Remove a {@link ViewRef} at specific index.
+     *
+     * If the index is omitted last {@link ViewRef} is removed.
+     */
+     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;
+  }
+
+
+  /**
+   * Angular's reference to a component instance.
+   *
+   * `ComponentRef` represents a component instance lifecycle and meta information.
+   */
+  interface ComponentRef {
+
+
+    /**
+     * Location of the component host element.
+     */
+     location: ElementRef;
+
+
+    /**
+     * Instance of component.
+     */
+     instance: any;
+
+
+    /**
+     * Returns the host {@link ViewRef}.
+     */
+     hostView: HostViewRef;
+
+
+    /**
+     * Dispose of the component instance.
+     */
+     dispose(): void;
+  }
+
+
+  /**
+   * 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.
+   */
+  class NgZone {
+
+
+    /**
+     * Sets the zone hook that is called just before Angular event turn starts.
+     * It is called once per browser event.
+     */
+     overrideOnTurnStart(onTurnStartFn: Function): void;
+
+
+    /**
+     * Sets the zone hook that is called immediately after Angular processes
+     * all pending microtasks.
+     */
+     overrideOnTurnDone(onTurnDoneFn: Function): void;
+
+
+    /**
+     * Sets the zone hook that is called immediately after the last turn in
+     * an event completes. At this point Angular will no longer attempt to
+     * sync the UI. Any changes to the data model will not be reflected in the
+     * DOM. `onEventDoneFn` is executed outside Angular zone.
+     *
+     * This hook is useful for validating application state (e.g. in a test).
+     */
+     overrideOnEventDone(onEventDoneFn: Function, opt_waitForAsync: boolean): void;
+
+
+    /**
+     * Sets the zone hook that is called when an error is uncaught in the
+     * Angular zone. The first argument is the error. The second argument is
+     * the stack trace.
+     */
+     overrideOnErrorHandler(errorHandlingFn: Function): 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.runOutsideAngular(() => {
+     *   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;
+  }
+
+
+  /**
+   * A parameter metadata that specifies a dependency.
+   *
+   * ```
+   * class AComponent {
+   *   constructor(@Inject(MyService) aService:MyService) {}
+   * }
+   * ```
+   */
+  class InjectMetadata {
+
+     token: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   *
+   * ```
+   * class AComponent {
+   *   constructor(@Optional() aService:MyService) {
+   *     this.aService = aService;
+   *   }
+   * }
+   * ```
+   */
+  class OptionalMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * A marker metadata 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 {}
+   * ```
+   */
+  class InjectableMetadata {
+  }
+
+
+  /**
+   * Specifies that an injector should retrieve a dependency from itself.
+   *
+   * ## Example
+   *
+   * ```
+   * class Dependency {
+   * }
+   *
+   * class NeedsDependency {
+   *   constructor(public @Self() dependency:Dependency) {}
+   * }
+   *
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(Dependency);
+   * ```
+   */
+  class SelfMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   *
+   * ## Example
+   *
+   * ```
+   * class Dependency {
+   * }
+   *
+   * class NeedsDependency {
+   *   constructor(public @Host() dependency:Dependency) {}
+   * }
+   *
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Dependency).toClass(HostDependency)
+   * ]);
+   * var child = parent.resolveAndCreateChild([]);
+   * var grandChild = child.resolveAndCreateChild([NeedsDependency, Depedency]);
+   * var nd = grandChild.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(HostDependency);
+   * ```
+   */
+  class HostMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   *
+   * ## Example
+   *
+   *
+   * ```
+   * class Service {}
+   *
+   * class ParentService implements Service {
+   * }
+   *
+   * class ChildService implements Service {
+   *   constructor(public @SkipSelf() parentService:Service) {}
+   * }
+   *
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Service).toClass(ParentService)
+   * ]);
+   * var child = parent.resolveAndCreateChild([
+   *   bind(Service).toClass(ChildSerice)
+   * ]);
+   * var s = child.get(Service);
+   * expect(s).toBeAnInstanceOf(ChildService);
+   * expect(s.parentService).toBeAnInstanceOf(ParentService);
+   * ```
+   */
+  class SkipSelfMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * `DependencyMetadata is used by the framework to extend DI.
+   *
+   * Only metadata implementing `DependencyMetadata` are added to the list of dependency
+   * properties.
+   *
+   * For example:
+   *
+   * ```
+   * class Exclude extends DependencyMetadata {}
+   * class NotDependencyProperty {}
+   *
+   * class AComponent {
+   *   constructor(@Exclude @NotDependencyProperty aService:AService) {}
+   * }
+   * ```
+   *
+   * will create the following dependency:
+   *
+   * ```
+   * new Dependency(Key.get(AService), [new Exclude()])
+   * ```
+   *
+   * The framework can use `new Exclude()` to handle the `aService` dependency
+   * in a specific way.
+   */
+  class DependencyMetadata {
+
+     token: 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 {
+   * }
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
+
+
+  /**
+   * Lazily retrieve the reference value.
+   *
+   * See: {@link forwardRef}
+   */
+  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.
+   */
+  class Injector {
+
+
+    /**
+     * Turns a list of binding definitions into an internal resolved list of resolved bindings.
+     *
+     * A resolution is a process of flattening multiple nested lists and converting individual
+     * bindings into a list of {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more bindings.
+     *
+     * The returned list is sparse, indexed by `id` for the {@link Key}. It is generally not useful to
+     * application code
+     * other than for passing it to {@link Injector} functions that require resolved binding lists,
+     * such as
+     * `fromResolvedBindings` and `createChildFromResolved`.
+     */
+     static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+
+
+    /**
+     * Resolves bindings and creates an injector based on those bindings. This function is slower than
+     * the corresponding `fromResolvedBindings` because it needs to resolve bindings first. See
+     * `resolve`
+     * for the {@link Injector}.
+     *
+     * Prefer `fromResolvedBindings` in performance-critical code that creates lots of injectors.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more
+     * bindings.
+     * @param `depProvider`
+     */
+     static resolveAndCreate(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Creates an injector from previously resolved bindings. This bypasses resolution and flattening.
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     *
+     * @param `bindings` A sparse list of {@link ResolvedBinding}s. See `resolve` for the
+     * {@link Injector}.
+     * @param `depProvider`
+     */
+     static fromResolvedBindings(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Returns debug information about the injector.
+     *
+     * This information is included into exceptions thrown by the injector.
+     */
+     debugContext(): any;
+
+
+    /**
+     * 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 {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more bindings.
+     * @param `depProvider`
+     */
+     resolveAndCreateChild(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Creates a child injector and loads a new set of {@link ResolvedBinding}s into it.
+     *
+     * @param `bindings`: A sparse list of {@link ResolvedBinding}s.
+     * See `resolve` for the {@link Injector}.
+     * @param `depProvider`
+     * @returns a new child {@link Injector}.
+     */
+     createChildFromResolved(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     *
+     * @param `binding`: either a type or a binding.
+     * @returns an object created using binding.
+     */
+     resolveAndInstantiate(binding: Type | Binding): any;
+
+
+    /**
+     * Instantiates an object using a resolved bindin in the context of the injector.
+     *
+     * @param `binding`: a resolved binding
+     * @returns an object created using binding.
+     */
+     instantiateResolved(binding: ResolvedBinding): any;
+
+     displayName: string;
+
+     toString(): string;
+  }
+
+  class ProtoInjector {
+
+     numberOfBindings: number;
+
+     getBindingAtIndex(index: number): any;
+  }
+
+  class BindingWithVisibility {
+
+     binding: ResolvedBinding;
+
+     visibility: Visibility;
+
+     getKeyId(): number;
+  }
+
+
+  /**
+   * Used to provide dependencies that cannot be easily expressed as bindings.
+   */
+  interface DependencyProvider {
+
+     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
+  }
+
+  enum Visibility {
+
+     Public,
+
+     Private,
+
+     PublicAndPrivate
+  }
+
+  const UNDEFINED : Object ;
+
+
+  /**
+   * Describes how_ the {@link Injector} should instantiate a given token.
+   *
+   * See {@link bind}.
+   *
+   * ## Example
+   *
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding(String, { toValue: 'Hello' })
+   * ]);
+   *
+   * expect(injector.get(String)).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+
+
+    /**
+     * Token used when retrieving this binding. Usually the `Type`.
+     */
+     token: any;
+
+
+    /**
+     * 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: any;
+
+
+    /**
+     * Binds a key to the alias for an existing key.
+     *
+     * An alias means that {@link Injector} 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: any;
+
+
+    /**
+     * 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: any[];
+
+
+    /**
+     * Converts the {@link Binding} into {@link ResolvedBinding}.
+     *
+     * {@link Injector} internally only uses {@link ResolvedBinding}, {@link Binding} contains
+     * convenience binding syntax.
+     */
+     resolve(): ResolvedBinding;
+  }
+
+
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+
+     token: any;
+
+
+    /**
+     * 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 separate 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: /*Type*/ 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?: any[]): Binding;
+  }
+
+
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   *
+   * A {@link Binding} is resolved when it has a factory function. Binding to a class, alias, or
+   * value, are just convenience methods, as {@link Injector} only operates on calling factory
+   * functions.
+   */
+  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: Dependency[];
+  }
+
+
+  /**
+   * @private
+   */
+  class Dependency {
+
+     static fromKey(key: Key): Dependency;
+
+     key: Key;
+
+     optional: boolean;
+
+     lowerBoundVisibility: any;
+
+     upperBoundVisibility: any;
+
+     properties: any[];
+  }
+
+
+  /**
+   * Provides an API for imperatively constructing {@link Binding}s.
+   *
+   * This is only relevant for JavaScript. See {@link BindingBuilder}.
+   *
+   * ## Example
+   *
+   * ```javascript
+   * bind(MyInterface).toClass(MyClass)
+   *
+   * ```
+   */
+  function bind(token: any) : BindingBuilder ;
+
+
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   *
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`, usually the `Type` of the instance.
+   *
+   * Keys are used internally by the {@link Injector} because their system-wide unique `id`s allow the
+   * injector to index in arrays rather than looking up items in maps.
+   */
+  class Key {
+
+
+    /**
+     * Retrieves a `Key` for a token.
+     */
+     static get(token: Object): Key;
+
+
+    /**
+     * @returns the number of keys registered in the system.
+     */
+     static numberOfKeys: number;
+
+     token: Object;
+
+     id: number;
+
+     displayName: string;
+  }
+
+
+  /**
+   * @private
+   */
+  class KeyRegistry {
+
+     get(token: Object): Key;
+
+     numberOfKeys: number;
+  }
+
+
+  /**
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+
+     type: any;
+  }
+
+
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   */
+  class NoBindingError extends AbstractBindingError {
+  }
+
+
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+
+     name: string;
+
+     message: string;
+
+     keys: Key[];
+
+     injectors: Injector[];
+
+     constructResolvingMessage: Function;
+
+     addKey(injector: Injector, key: Key): void;
+
+     context: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * 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.
+   */
+  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.
+   */
+  class InstantiationError extends AbstractBindingError {
+
+     causeKey: Key;
+  }
+
+
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   */
+  class InvalidBindingError extends BaseException {
+
+     message: string;
+
+     toString(): string;
+  }
+
+
+  /**
+   * Thrown when the class has no annotation information.
+   *
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   */
+  class NoAnnotationError extends BaseException {
+
+     name: string;
+
+     message: string;
+
+     toString(): string;
+  }
+
+
+  /**
+   * Thrown when getting an object by index.
+   */
+  class OutOfBoundsError extends BaseException {
+
+     message: string;
+
+     toString(): string;
+  }
+
+  class OpaqueToken {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+
+     new(token: any): InjectMetadata;
+
+
+     (token: any): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+
+     new(): OptionalMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+
+     new(): InjectableMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+
+     new(): SelfMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+
+     new(): HostMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+
+     new(): SkipSelfMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject : InjectFactory ;
+
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional : OptionalFactory ;
+
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable : InjectableFactory ;
+
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self : SelfFactory ;
+
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host : HostFactory ;
+
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf : SkipSelfFactory ;
+
+
+  /**
+   * 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 {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   *
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   *
+   * ```
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   *
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  const CORE_DIRECTIVES : Type[] ;
+
+
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   *
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   *
+   * # Example:
+   *
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass {
+
+     initialClasses: any;
+
+     rawClass: any;
+
+     doCheck(): void;
+
+     onDestroy(): 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>`
+   */
+  class NgFor {
+
+     static bulkRemove(tuples: RecordViewTuple[], viewContainer: ViewContainerRef): RecordViewTuple[];
+
+     static bulkInsert(tuples: RecordViewTuple[], viewContainer: ViewContainerRef, templateRef: TemplateRef): RecordViewTuple[];
+
+     viewContainer: ViewContainerRef;
+
+     templateRef: TemplateRef;
+
+     iterableDiffers: IterableDiffers;
+
+     cdr: ChangeDetectorRef;
+
+     ngForOf: any;
+
+     doCheck(): void;
+  }
+
+  class RecordViewTuple {
+
+     view: ViewRef;
+
+     record: any;
+  }
+
+
+  /**
+   * 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>`
+   */
+  class NgIf {
+
+     ngIf: any;
+  }
+
+
+  /**
+   * 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 ng-non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
+   * ```
+   */
+  class NgNonBindable {
+  }
+
+
+  /**
+   * Adds or removes styles based on an {expression}.
+   *
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   *
+   * # Example:
+   *
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   *
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   *
+   * # Syntax
+   *
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle {
+
+     rawStyle: any;
+
+     doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+
+     ngSwitch: any;
+  }
+
+
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+
+     ngSwitchWhen: any;
+  }
+
+
+  /**
+   * Defines a default case statement.
+   *
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   *
+   * Example:
+   *
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+  }
+
+
+  /**
+   * 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({onlySelf}?: {onlySelf?: boolean}): void;
+
+     setParent(parent: ControlGroup | ControlArray): void;
+
+     updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+
+     updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+
+     find(path: Array<string | number>| string): AbstractControl;
+
+     getError(errorCode: string, path?: string[]): any;
+
+     hasError(errorCode: string, path?: string[]): 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
+   * {@link ControlGroup} and {@link ControlArray}.
+   */
+  class Control extends AbstractControl {
+
+     updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                  {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): 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 {@link Control} 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
+   * {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other controls,
+   * but is of variable
+   * length.
+   */
+  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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   */
+  class ControlArray extends AbstractControl {
+
+     controls: AbstractControl[];
+
+     at(index: number): AbstractControl;
+
+     push(control: AbstractControl): void;
+
+     insert(index: number, control: AbstractControl): void;
+
+     removeAt(index: number): void;
+
+     length: number;
+  }
+
+  class AbstractControlDirective {
+
+     control: AbstractControl;
+
+     value: any;
+
+     valid: boolean;
+
+     errors: StringMap<string, any>;
+
+     pristine: boolean;
+
+     dirty: boolean;
+
+     touched: boolean;
+
+     untouched: boolean;
+  }
+
+
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     updateModel(dir: NgControl, value: any): void;
+  }
+
+
+  /**
+   * A directive that contains a group of [NgControl].
+   *
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+
+     name: string;
+
+     formDirective: Form;
+
+     path: string[];
+  }
+
+
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   *
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   *
+   * # 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl {
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     onDestroy(): void;
+
+     viewToModelUpdate(newValue: any): void;
+
+     path: 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl:Control;
+   *  login:string;
+   *
+   *  constructor() {
+   *    this.loginControl = new Control('');
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl {
+
+     form: Control;
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     path: string[];
+
+     control: Control;
+
+     validator: Function;
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * Binds a domain model to the form.
+   *
+   * # Example
+   *  ```
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *               <input type='text' [(ng-model)]="searchQuery">
+   *      `})
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl {
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     control: Control;
+
+     path: string[];
+
+     validator: Function;
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * An abstract class that all control directive extend.
+   *
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+
+     name: string;
+
+     valueAccessor: ControlValueAccessor;
+
+     validator: Function;
+
+     path: string[];
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * Creates and binds a control group to a DOM element.
+   *
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   *
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   *
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer {
+
+     onInit(): void;
+
+     onDestroy(): void;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     formDirective: Form;
+  }
+
+
+  /**
+   * 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form {
+
+     form: ControlGroup;
+
+     directives: NgControl[];
+
+     ngSubmit: any;
+
+     onChanges(_: any): void;
+
+     formDirective: Form;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     addControl(dir: NgControl): void;
+
+     getControl(dir: NgControl): Control;
+
+     removeControl(dir: NgControl): void;
+
+     addControlGroup(dir: NgControlGroup): void;
+
+     removeControlGroup(dir: NgControlGroup): void;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   *
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+
+     form: ControlGroup;
+
+     ngSubmit: any;
+
+     formDirective: Form;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     controls: StringMap<string, AbstractControl>;
+
+     addControl(dir: NgControl): void;
+
+     getControl(dir: NgControl): Control;
+
+     removeControl(dir: NgControl): void;
+
+     addControlGroup(dir: NgControlGroup): void;
+
+     removeControlGroup(dir: NgControlGroup): void;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     updateModel(dir: NgControl, value: any): void;
+
+     onSubmit(): boolean;
+  }
+
+
+  /**
+   * A bridge between a control and a native element.
+   *
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   *
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     onChange: any;
+
+     onTouched: any;
+
+     renderer: Renderer;
+
+     elementRef: ElementRef;
+
+     writeValue(value: any): void;
+
+     ngClassUntouched: boolean;
+
+     ngClassTouched: boolean;
+
+     ngClassPristine: boolean;
+
+     ngClassDirty: boolean;
+
+     ngClassValid: boolean;
+
+     ngClassInvalid: boolean;
+
+     registerOnChange(fn: (_: any) => void): void;
+
+     registerOnTouched(fn: () => void): void;
+  }
+
+
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   *
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     onChange: any;
+
+     onTouched: any;
+
+     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: () => {}): void;
+  }
+
+
+  /**
+   * Marks <option> as dynamic, so Angular can be notified when options change.
+   *
+   * #Example:
+   *
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+  }
+
+
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     value: string;
+
+     onChange: any;
+
+     onTouched: any;
+
+     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.
+   */
+  const FORM_DIRECTIVES : Type[] ;
+
+
+  /**
+   * Provides a set of validators used by form controls.
+   *
+   * # Example
+   *
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+
+     static required(c:Control): StringMap<string, boolean>;
+
+     static nullValidator(c: any): StringMap<string, boolean>;
+
+     static compose(validators: Function[]): Function;
+
+     static group(c:ControlGroup): StringMap<string, boolean>;
+
+     static array(c:ControlArray): StringMap<string, boolean>;
+  }
+
+  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, FORM_DIRECTIVES, ControlGroup} from 'angular2/forms';
+   *
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [
+   *     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: [
+   *     FORM_DIRECTIVES
+   *   ]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested
+   * {@link ControlGroup} that defines a `password` and a `passwordConfirmation` {@link Control}:
+   *
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   *
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   *
+   *  ```
+   */
+  class FormBuilder {
+
+     group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+
+     control(value: Object, validator?: Function): Control;
+
+     array(controlsConfig: any[], validator?: Function): ControlArray;
+  }
+
+  const FORM_BINDINGS : Type[] ;
+
+  class RenderDirectiveMetadata {
+
+     static DIRECTIVE_TYPE: any;
+
+     static COMPONENT_TYPE: any;
+
+     static create({id, selector, compileChildren, events, host, properties, readAttributes, type,
+                 callOnDestroy, callOnChanges, callDoCheck, callOnInit, callAfterContentInit,
+                 callAfterContentChecked, callAfterViewInit, callAfterViewChecked, changeDetection,
+                 exportAs}: {
+    id?: string,
+    selector?: string,
+    compileChildren?: boolean,
+    events?: string[],
+    host?: Map<string, string>,
+    properties?: string[],
+    readAttributes?: string[],
+    type?: number,
+    callOnDestroy?: boolean,
+    callOnChanges?: boolean,
+    callDoCheck?: boolean,
+    callOnInit?: boolean,
+    callAfterContentInit?: boolean,
+    callAfterContentChecked?: boolean,
+    callAfterViewInit?: boolean,
+    callAfterViewChecked?: boolean,
+    changeDetection?: ChangeDetectionStrategy,
+    exportAs?: string
+  }): RenderDirectiveMetadata;
+
+     id: any;
+
+     selector: string;
+
+     compileChildren: boolean;
+
+     events: string[];
+
+     properties: string[];
+
+     readAttributes: string[];
+
+     type: number;
+
+     callOnDestroy: boolean;
+
+     callOnChanges: boolean;
+
+     callDoCheck: boolean;
+
+     callOnInit: boolean;
+
+     callAfterContentInit: boolean;
+
+     callAfterContentChecked: boolean;
+
+     callAfterViewInit: boolean;
+
+     callAfterViewChecked: boolean;
+
+     changeDetection: ChangeDetectionStrategy;
+
+     exportAs: string;
+
+     hostListeners: Map<string, string>;
+
+     hostProperties: Map<string, string>;
+
+     hostAttributes: Map<string, string>;
+  }
+
+  class DomRenderer extends Renderer {
+
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+
+     destroyView(viewRef: RenderViewRef): void;
+
+     getNativeElementSync(location: RenderElementRef): any;
+
+     getRootNodes(fragment: RenderFragmentRef): Node[];
+
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+
+     detachFragment(fragmentRef: RenderFragmentRef): 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: any[]): void;
+
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: any): void;
+  }
+
+
+  /**
+   * A dispatcher for all events happening in a view.
+   */
+  interface RenderEventDispatcher {
+
+
+    /**
+     * 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
+     * @return {boolean} False if `preventDefault` should be called on the DOM event.
+     */
+     dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+  }
+
+  class Renderer {
+
+
+    /**
+     * Creates a root host view that includes the given element.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     *
+     * @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 {RenderViewWithFragments} the created view including fragments
+     */
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+
+
+    /**
+     * Creates a regular view out of the given ProtoView.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     */
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+
+
+    /**
+     * Destroys the given view after it has been dehydrated and detached
+     */
+     destroyView(viewRef: RenderViewRef): void;
+
+
+    /**
+     * Attaches a fragment after another fragment.
+     */
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+
+
+    /**
+     * Attaches a fragment after an element.
+     */
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+
+
+    /**
+     * Detaches a fragment.
+     */
+     detachFragment(fragmentRef: RenderFragmentRef): 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: 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: RenderEventDispatcher): void;
+  }
+
+
+  /**
+   * Abstract reference to the element which can be marshaled across web-worker boundary.
+   *
+   * This interface is used by the Renderer API.
+   */
+  interface RenderElementRef {
+
+
+    /**
+     * Reference to the `RenderViewRef` where the `RenderElementRef` is inside of.
+     */
+     renderView: RenderViewRef;
+
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: number;
+  }
+
+  class RenderViewRef {
+  }
+
+  class RenderProtoViewRef {
+  }
+
+  class RenderFragmentRef {
+  }
+
+  class RenderViewWithFragments {
+
+     viewRef: RenderViewRef;
+
+     fragmentRefs: RenderFragmentRef[];
+  }
+
+  class ViewDefinition {
+
+     componentId: string;
+
+     templateAbsUrl: string;
+
+     template: string;
+
+     directives: RenderDirectiveMetadata[];
+
+     styleAbsUrls: string[];
+
+     styles: string[];
+
+     encapsulation: ViewEncapsulation;
+  }
+
+  const DOCUMENT : OpaqueToken ;
+
+
+  /**
+   * A unique id (string) for an angular application.
+   */
+  const APP_ID : OpaqueToken ;
+
+
+  /**
+   * Defines when a compiled template should be stored as a string
+   * rather than keeping its Nodes to preserve memory.
+   */
+  const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE : OpaqueToken ;
+
+
+  /**
+   * Create trace scope.
+   *
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   *
+   * Used to mark scope entry. The return value is used to leave the scope.
+   *
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   *
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   *
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope : WtfScopeFn ;
+
+
+  /**
+   * Used to mark end of Scope.
+   *
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   *
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave : <T>(scope: any, returnValue?: T) => T ;
+
+
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   *
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange : (rangeType: string, action: string) => any ;
+
+
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange : (range: any) => void ;
+
+  interface WtfScopeFn {
+
+     (arg0?: any, arg1?: any): any;
+
+  }
+
+  var ChangeDetectorRef: InjectableReference;
+
+  var ApplicationRef: InjectableReference;
+
+  var Compiler: InjectableReference;
+
+  var AppViewManager: InjectableReference;
+
+  var ViewRef: InjectableReference;
+
+  var ProtoViewRef: InjectableReference;
+
+  var ViewContainerRef: InjectableReference;
+
+  var ComponentRef: InjectableReference;
+
+}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
+
+
+
+declare module ngWorker {
+
+  /**
+   * 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 `bindings` and `viewBindings`.
+   *
+   * All template expressions and statements are then evaluated against the component instance.
+   *
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   *
+   * ## Example
+   *
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   *
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+
+
+    /**
+     * 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: ChangeDetectionStrategy;
+
+
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     *
+     * ```
+     */
+     viewBindings: any[];
+  }
+
+
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   *
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   *
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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 any ancestor elements
+   *
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   *
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   *
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   *
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+
+
+    /**
+     * 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 {@link PipeMetadata} 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 use pipes in bindings, as follows:
+     *
+     * ```html
+     * <div [class-set]="someExpression | somePipe">
+     * ```
+     */
+     properties: 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: 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.
+     */
+     host: StringMap<string, string>;
+
+
+    /**
+     * Specifies which lifecycle should be notified to the directive.
+     *
+     * See {@link LifecycleEvent} for details.
+     */
+     lifecycle: 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     *
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+     bindings: 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;
+  }
+
+
+  /**
+   * Declare reusable pipe function.
+   *
+   * ## Example
+   *
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+
+     name: string;
+  }
+
+
+  /**
+   * Lifecycle events are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentChecked`
+   * - `AfterContentChecked`
+   * - `OnDestroy` (at the very end before destruction)
+   */
+  enum LifecycleEvent {
+
+
+    /**
+     * Notify a directive when it has been checked the first time.
+     *
+     * 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: [LifecycleEvent.OnInit]
+     * })
+     * class ClassSet {
+     *   onInit() {
+     *   }
+     * }
+     *  ```
+     */
+     OnInit,
+
+
+    /**
+     * Notify a directive whenever a {@link ViewMetadata} that contains it is destroyed.
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   ...,
+     *   lifecycle: [LifecycleEvent.OnDestroy]
+     * })
+     * class ClassSet {
+     *   onDestroy() {
+     *     // invoked to notify directive of the containing view destruction.
+     *   }
+     * }
+     * ```
+     */
+     OnDestroy,
+
+
+    /**
+     * 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: [LifecycleEvent.OnChanges]
+     * })
+     * class ClassSet {
+     *   propA;
+     *   propB;
+     *   onChanges(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
+     *     }
+     *   }
+     * }
+     *  ```
+     */
+     OnChanges,
+
+
+    /**
+     * 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: [LifecycleEvent.DoCheck]
+     * })
+     * class ClassSet {
+     *   doCheck() {
+     *   }
+     * }
+     *  ```
+     */
+     DoCheck,
+
+
+    /**
+     * Notify a directive when the bindings of all its content children have been checked the first
+     * time (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterContentInit]
+     * })
+     * class ClassSet {
+     *
+     *   afterContentInit() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterContentInit,
+
+
+    /**
+     * Notify a directive when the bindings of all its content children have been checked (whether
+     * they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterContentChecked]
+     * })
+     * class ClassSet {
+     *
+     *   afterContentChecked() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterContentChecked,
+
+
+    /**
+     * Notify a directive when the bindings of all its view children have been checked the first time
+     * (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterViewInit]
+     * })
+     * class ClassSet {
+     *
+     *   afterViewInit() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterViewInit,
+
+
+    /**
+     * Notify a directive when the bindings of all its view children have been checked (whether they
+     * have changed or not).
+     *
+     * ## Example
+     *
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   lifecycle: [LifecycleEvent.AfterViewChecked]
+     * })
+     * class ClassSet {
+     *
+     *   afterViewChecked() {
+     *   }
+     *
+     * }
+     *  ```
+     */
+     AfterViewChecked
+  }
+
+
+  /**
+   * 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 {@link ComponentMetadata}.
+   *
+   * ## Example
+   *
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   *
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+
+
+    /**
+     * 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: string[];
+
+
+    /**
+     * Specifies an inline stylesheet for an angular component.
+     */
+     styles: 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: Array<Type | any | any[]>;
+
+     pipes: Array<Type | any | any[]>;
+
+
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+     encapsulation: ViewEncapsulation;
+  }
+
+
+  /**
+   * How the template and styles of a view should be encapsulated.
+   */
+  enum ViewEncapsulation {
+
+
+    /**
+     * Emulate scoping of styles by preprocessing the style rules
+     * and adding additional attributes to elements. This is the default.
+     */
+     Emulated,
+
+
+    /**
+     * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot.
+     */
+     Native,
+
+
+    /**
+     * Don't scope the template nor the styles.
+     */
+     None
+  }
+
+
+  /**
+   * Specifies that a {@link QueryList} should be injected.
+   *
+   * See {@link QueryList} for usage and example.
+   */
+  class QueryMetadata extends DependencyMetadata {
+
+     descendants: boolean;
+
+     isViewQuery: any;
+
+     selector: any;
+
+     isVarBindingQuery: boolean;
+
+     varBindings: 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+
+     attributeName: string;
+
+     token: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute : AttributeFactory ;
+
+
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+
+
+     (name: string): TypeDecorator;
+
+  }
+
+
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component : ComponentFactory ;
+
+
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   *
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
+    renderer?: string,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+  }
+
+
+  /**
+   * {@link ComponentAnnotation} 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: {
+    selector?: string,
+    properties?: string[],
+    events?: string[],
+    host?: StringMap<string, string>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
+  }): ComponentMetadata;
+
+
+     (obj: {
+    selector?: string,
+    properties?: string[],
+    events?: string[],
+    host?: StringMap<string, string>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
+    exportAs?: string,
+    compileChildren?: boolean,
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
+  }): ComponentDecorator;
+
+  }
+
+
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive : DirectiveFactory ;
+
+
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   *
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+  }
+
+
+  /**
+   * {@link DirectiveMetadata} 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: {
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: any[], exportAs?: string,
+        compileChildren?: boolean;
+  }): DirectiveMetadata;
+
+
+     (obj: {
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: any[], exportAs?: string,
+        compileChildren?: boolean;
+  }): DirectiveDecorator;
+
+  }
+
+
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View : ViewFactory ;
+
+
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   *
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+
+
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+     View(obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
+    renderer?: string,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+  }
+
+
+  /**
+   * {@link ViewAnnotation} 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: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    encapsulation?: ViewEncapsulation,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewMetadata;
+
+
+     (obj: {
+    templateUrl?: string,
+    template?: string,
+    directives?: Array<Type | any | any[]>,
+    encapsulation?: ViewEncapsulation,
+    styles?: string[],
+    styleUrls?: string[],
+  }): ViewDecorator;
+
+  }
+
+
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query : QueryFactory ;
+
+
+  /**
+   * {@link QueryMetadata} 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+
+
+     (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+
+  }
+
+
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery : QueryFactory ;
+
+
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe : PipeFactory ;
+
+
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   *
+   * ## Example as TypeScript Decorator
+   *
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   *
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   *
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+
+     new(obj: {
+    name: string,
+  }): any;
+
+
+     (obj: {name: string}): any;
+
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterContentInit `LifeCycleEvent.afterContentInit`}
+   * called when the bindings of all its content children have been checked the first time.
+   */
+  interface AfterContentInit {
+
+     afterContentInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterContentChecked `LifeCycleEvent.afterContentChecked`}
+   * called when the bindings of all its content children have been checked.
+   */
+  interface AfterContentChecked {
+
+     afterContentChecked(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterViewInit `LifeCycleEvent.afterViewInit`}
+   * called when the bindings of all its view children have been checked the first time.
+   */
+  interface AfterViewInit {
+
+     afterViewInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method
+   * {@link metadata/LifeCycleEvent#AfterViewChecked `LifeCycleEvent.afterViewChecked`}
+   * called when the bindings of all its view children have been checked.
+   */
+  interface AfterViewChecked {
+
+     afterViewChecked(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnChanges `LifeCycleEvent.OnChanges`}
+   * called after all of component's bound properties are updated.
+   */
+  interface OnChanges {
+
+     onChanges(changes: StringMap<string, any>): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnDestroy `LifeCycleEvent.OnDestroy`}
+   * called when a directive is being destroyed.
+   */
+  interface OnDestroy {
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnInit `LifeCycleEvent.OnInit`}
+   * called when a directive is being checked the first time.
+   */
+  interface OnInit {
+
+     onInit(): void;
+  }
+
+
+  /**
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#DoCheck `LifeCycleEvent.DoCheck`}
+   * called when a directive is being checked.
+   */
+  interface DoCheck {
+
+     doCheck(): boolean;
+  }
+
+
+  /**
+   * 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 ;
+
+
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+
+
+    /**
+     * Optional argument for specifying the superclass.
+     */
+     extends?: Type;
+
+
+    /**
+     * Required constructor function for a class.
+     *
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     *
+     * See {@link Class} for example of usage.
+     */
+     constructor: (Function | any[]);
+  }
+
+
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+     annotations: any[];
+
+
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+     Class(obj: ClassDefinition): Type;
+  }
+
+  enum ChangeDetectionStrategy {
+
+
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+     CheckOnce,
+
+
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+     Checked,
+
+
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+     CheckAlways,
+
+
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+     Detached,
+
+
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+     OnPush,
+
+
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+     Default,
+
+
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+     OnPushObserve
+  }
+
+
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   *
+   * Angular expects that the data flows from top (root) component to child (leaf) components.
+   * This is known as directed acyclic graph. This allows Angular to only execute change detection
+   * once and prevents loops in change detection data flow.
+   *
+   * This exception is only thrown in dev mode.
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+  }
+
+
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   *
+   * This error wraps the original exception, this is done to attach expression location information.
+   */
+  class ChangeDetectionError extends BaseException {
+
+
+    /**
+     * Location of the expression.
+     */
+     location: string;
+  }
+
+  interface ChangeDetector {
+
+     parent: ChangeDetector;
+
+     mode: ChangeDetectionStrategy;
+
+     ref: ChangeDetectorRef;
+
+     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, pipes: any): void;
+
+     dehydrate(): void;
+
+     markPathToRootAsCheckOnce(): void;
+
+     handleEvent(eventName: string, elIndex: number, locals: Locals): 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;
+  }
+
+
+  /**
+   * Controls change detection.
+   *
+   * {@link ChangeDetectorRef} allows requesting checks for detectors that rely on observables. It
+   * also allows detaching and attaching change detector subtrees.
+   */
+  interface ChangeDetectorRef {
+
+
+    /**
+     * Request to check all OnPush ancestors.
+     */
+     markForCheck(): 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;
+  }
+
+
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   *
+   * Example:
+   *
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+
+     static wrap(value: any): WrappedValue;
+
+     wrapped: any;
+  }
+
+
+  /**
+   * An interface which all pipes must implement.
+   *
+   * #Example
+   *
+   * ```
+   * class DoublePipe implements PipeTransform {
+   *  transform(value, args = []) {
+   *    return `${value}${value}`;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeTransform {
+
+     transform(value: any, args: any[]): any;
+  }
+
+
+  /**
+   * An interface that stateful pipes should implement.
+   *
+   * #Example
+   *
+   * ```
+   * class StatefulPipe implements PipeTransform, PipeOnDestroy {
+   *  connection;
+   *
+   *  onDestroy() {
+   *    this.connection.release();
+   *  }
+   *
+   *  transform(value, args = []) {
+   *    this.connection = createConnection();
+   *    // ...
+   *    return someValue;
+   *  }
+   * }
+   * ```
+   */
+  interface PipeOnDestroy {
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+
+     static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+
+
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     *
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     *
+     * # Example
+     *
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: IterableDifferFactory[]): Binding;
+
+     factories: IterableDifferFactory[];
+
+     find(iterable: Object): IterableDifferFactory;
+  }
+
+  interface IterableDiffer {
+
+     diff(object: Object): any;
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+
+     supports(objects: Object): boolean;
+
+     create(cdRef: ChangeDetectorRef): IterableDiffer;
+  }
+
+
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+
+     static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+
+
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     *
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     *
+     * # Example
+     *
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+     static extend(factories: KeyValueDifferFactory[]): Binding;
+
+     factories: KeyValueDifferFactory[];
+
+     find(kv: Object): KeyValueDifferFactory;
+  }
+
+  interface KeyValueDiffer {
+
+     diff(object: Object): void;
+
+     onDestroy(): void;
+  }
+
+
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+
+     supports(objects: Object): boolean;
+
+     create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+  }
+
+
+  /**
+   * An opaque token representing the application root type in the {@link Injector}.
+   *
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   *
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   *
+   * ```
+   */
+  const APP_COMPONENT : OpaqueToken ;
+
+
+  /**
+   * Runtime representation of a type.
+   *
+   * In JavaScript a Type is a constructor function.
+   */
+  interface Type extends Function {
+
+     new(...args: any[]): any;
+
+  }
+
+
+  /**
+   * 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.
+   */
+  interface ApplicationRef {
+
+
+    /**
+     * Returns the current {@link ComponentMetadata} type.
+     */
+     hostComponentType: Type;
+
+
+    /**
+     * Returns the current {@link ComponentMetadata} instance.
+     */
+     hostComponent: any;
+
+
+    /**
+     * Dispose (un-load) the application.
+     */
+     dispose(): void;
+
+
+    /**
+     * Returns the root application {@link Injector}.
+     */
+     injector: Injector;
+  }
+
+
+  /**
+   * Specifies app root url for the application.
+   *
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+
+
+    /**
+     * Returns the base URL of the currently running application.
+     */
+     value: any;
+  }
+
+
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  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 `Type` from a {@link ComponentMetadata} into a URL.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  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 `Type` for {@link DirectiveMetadata}.
+   *
+   * This interface can be overridden by the application developer to create custom behavior.
+   *
+   * See {@link Compiler}
+   */
+  class DirectiveResolver {
+
+
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+     resolve(type: Type): DirectiveMetadata;
+  }
+
+
+  /**
+   * ## 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);
+   * ```
+   */
+  interface 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.
+   */
+  interface AppViewManager {
+
+
+    /**
+     * Returns a {@link ViewContainerRef} at the {@link ElementRef} location.
+     */
+     getViewContainer(location: ElementRef): ViewContainerRef;
+
+
+    /**
+     * Return the first child element of the host element view.
+     */
+     getHostElement(hostViewRef: HostViewRef): ElementRef;
+
+
+    /**
+     * Returns an ElementRef for the element with the given variable name
+     * in the current view.
+     *
+     * - `hostLocation`: {@link ElementRef} of any element in the View which defines the scope of
+     *   search.
+     * - `variableName`: Name of the variable to locate.
+     * - Returns {@link ElementRef} 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 {@link ElementRef}
+     * 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`: {@link ProtoViewRef} 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: {@link Injector} to use as parent injector for the view.
+     *
+     * See {@link AppViewManager#destroyRootHostView}.
+     *
+     * ## 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): HostViewRef;
+
+
+    /**
+     * Remove the View created with {@link AppViewManager#createRootHostView}.
+     */
+     destroyRootHostView(hostViewRef: HostViewRef): void;
+
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createEmbeddedViewInContainer(viewContainerLocation: ElementRef, atIndex: number, templateRef: TemplateRef): ViewRef;
+
+
+    /**
+     * See {@link AppViewManager#destroyViewInContainer}.
+     */
+     createHostViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+
+
+    /**
+     * See {@link AppViewManager#createViewInContainer}.
+     */
+     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+
+
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+
+
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  }
+
+
+  /**
+   * An iterable and observable live list of components in the DOM.
+   *
+   * A QueryList contains a live list of child directives in the 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.
+   *
+   * QueryList is updated as part of the change-detection cycle of a directive. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   *
+   *
+   * 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;
+   * }
+   * ```
+   */
+  class QueryList<T> {
+
+     reset(newList: T[]): void;
+
+     add(obj: T): void;
+
+     fireCallbacks(): void;
+
+     onChange(callback: () => void): void;
+
+     removeCallback(callback: () => void): void;
+
+     toString(): string;
+
+     length: number;
+
+     first: T;
+
+     last: T;
+
+     map<U>(fn: (item: T) => U): U[];
+  }
+
+
+  /**
+   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
+   * application tree.
+   */
+  class DynamicComponentLoader {
+
+
+    /**
+     * Loads a root component that is placed at the first element that matches the component's
+     * selector.
+     *
+     * - `typeOrBinding` `Type` \ {@link Binding} - representing the component to load.
+     * - `overrideSelector` (optional) selector to load the component at (or use
+     *   `@Component.selector`) The selector can be anywhere (i.e. outside the current component.)
+     * - `injector` {@link Injector} - optional injector to use for the component.
+     *
+     * The loaded component receives injection normally as a hosted view.
+     *
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+     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.
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+     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.
+     *
+     *
+     * ## Example
+     *
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     *
+     *
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     *
+     * ng.bootstrap(MyApp);
+     * ```
+     *
+     * Resulting DOM:
+     *
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+  }
+
+
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   *
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   *
+   * Each Angular application has a single `LifeCycle` instance.
+   *
+   * # Example
+   *
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   *
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   *
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  class LifeCycle {
+
+
+    /**
+     * @private
+     */
+     registerWith(zone: NgZone, changeDetector?: ChangeDetector): void;
+
+
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     *
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+     tick(): void;
+  }
+
+
+  /**
+   * Reference to the element.
+   *
+   * Represents an opaque reference 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.
+   */
+  class ElementRef implements RenderElementRef {
+
+
+    /**
+     * Reference to the {@link ViewRef} where the `ElementRef` is inside of.
+     */
+     parentView: ViewRef;
+
+
+    /**
+     * Index of the element inside the {@link ViewRef}.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: 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;
+  }
+
+
+  /**
+   * Reference to a template within a component.
+   *
+   * Represents an opaque reference to the underlying template that can
+   * be instantiated using the {@link ViewContainerRef}.
+   */
+  class TemplateRef {
+
+
+    /**
+     * The location of the template
+     */
+     elementRef: ElementRef;
+
+     protoViewRef: ProtoViewRef;
+
+
+    /**
+     * Whether this template has a local variable with the given name
+     */
+     hasLocal(name: string): boolean;
+  }
+
+
+  /**
+   * A reference to an Angular View.
+   *
+   * A View is a fundamental building block of Application UI. A View is the smallest set of
+   * elements which are created and destroyed together. A View can change 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 {@link ViewContainerRef}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 {@link ProtoViewRef}s:
+   *
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   *
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   *
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   *
+   * The outter/inner {@link ProtoViewRef}s are then assembled into views like so:
+   *
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+
+
+    /**
+     * Return `RenderViewRef`
+     */
+     render: RenderViewRef;
+
+
+    /**
+     * Return `RenderFragmentRef`
+     */
+     renderFragment: RenderFragmentRef;
+
+
+    /**
+     * Set local variable in a view.
+     *
+     * - `contextName` - Name of the local variable in a view.
+     * - `value` - Value for the local variable in a view.
+     */
+     setLocal(contextName: string, value: any): void;
+  }
+
+  interface HostViewRef {
+  }
+
+
+  /**
+   * A reference to an Angular ProtoView.
+   *
+   * A ProtoView is a reference to a template for easy creation of views.
+   * (See {@link AppViewManager#createViewInContainer `AppViewManager#createViewInContainer`} and
+   * {@link AppViewManager#createRootHostView `AppViewManager#createRootHostView`}).
+   *
+   * A `ProtoView` is a factory 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 {@link ProtoViewRef}s:
+   *
+   * Outter {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   *
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   *
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   */
+  interface ProtoViewRef {
+  }
+
+
+  /**
+   * A location where {@link ViewRef}s can be attached.
+   *
+   * A `ViewContainerRef` represents a location in a {@link ViewRef} where other child
+   * {@link ViewRef}s can be inserted. Adding and removing views is the only way of structurally
+   * changing the rendered DOM of the application.
+   */
+  interface ViewContainerRef {
+
+     viewManager: AppViewManager;
+
+     element: ElementRef;
+
+
+    /**
+     * Remove all {@link ViewRef}s at current location.
+     */
+     clear(): void;
+
+
+    /**
+     * Return a {@link ViewRef} at specific index.
+     */
+     get(index: number): ViewRef;
+
+
+    /**
+     * Returns number of {@link ViewRef}s currently attached at this location.
+     */
+     length: number;
+
+
+    /**
+     * Create and insert a {@link ViewRef} into the view-container.
+     *
+     * - `protoViewRef` (optional) {@link ProtoViewRef} - The `ProtoView` to use for creating
+     *   `View` to be inserted at this location. If `ViewContainer` is created at a location
+     *   of inline template, then `protoViewRef` is the `ProtoView` of the template.
+     * - `atIndex` (optional) `number` - location of insertion point. (Or at the end if unspecified.)
+     * - `context` (optional) {@link ElementRef} - Context (for expression evaluation) from the
+     *   {@link ElementRef} location. (Or current context if unspecified.)
+     * - `bindings` (optional) Array of {@link ResolvedBinding} - Used for configuring
+     *   `ElementInjector`.
+     *
+     * Returns newly created {@link ViewRef}.
+     */
+     createEmbeddedView(templateRef: TemplateRef, atIndex?: number): ViewRef;
+
+     createHostView(protoViewRef?: ProtoViewRef, atIndex?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+
+
+    /**
+     * Insert a {@link ViewRef} at specefic index.
+     *
+     * The index is location at which the {@link ViewRef} should be attached. If omitted it is
+     * inserted at the end.
+     *
+     * Returns the inserted {@link ViewRef}.
+     */
+     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
+
+
+    /**
+     * Return the index of already inserted {@link ViewRef}.
+     */
+     indexOf(viewRef: ViewRef): number;
+
+
+    /**
+     * Remove a {@link ViewRef} at specific index.
+     *
+     * If the index is omitted last {@link ViewRef} is removed.
+     */
+     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;
+  }
+
+
+  /**
+   * Angular's reference to a component instance.
+   *
+   * `ComponentRef` represents a component instance lifecycle and meta information.
+   */
+  interface ComponentRef {
+
+
+    /**
+     * Location of the component host element.
+     */
+     location: ElementRef;
+
+
+    /**
+     * Instance of component.
+     */
+     instance: any;
+
+
+    /**
+     * Returns the host {@link ViewRef}.
+     */
+     hostView: HostViewRef;
+
+
+    /**
+     * Dispose of the component instance.
+     */
+     dispose(): void;
+  }
+
+
+  /**
+   * 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.
+   */
+  class NgZone {
+
+
+    /**
+     * Sets the zone hook that is called just before Angular event turn starts.
+     * It is called once per browser event.
+     */
+     overrideOnTurnStart(onTurnStartFn: Function): void;
+
+
+    /**
+     * Sets the zone hook that is called immediately after Angular processes
+     * all pending microtasks.
+     */
+     overrideOnTurnDone(onTurnDoneFn: Function): void;
+
+
+    /**
+     * Sets the zone hook that is called immediately after the last turn in
+     * an event completes. At this point Angular will no longer attempt to
+     * sync the UI. Any changes to the data model will not be reflected in the
+     * DOM. `onEventDoneFn` is executed outside Angular zone.
+     *
+     * This hook is useful for validating application state (e.g. in a test).
+     */
+     overrideOnEventDone(onEventDoneFn: Function, opt_waitForAsync: boolean): void;
+
+
+    /**
+     * Sets the zone hook that is called when an error is uncaught in the
+     * Angular zone. The first argument is the error. The second argument is
+     * the stack trace.
+     */
+     overrideOnErrorHandler(errorHandlingFn: Function): 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.runOutsideAngular(() => {
+     *   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;
+  }
+
+
+  /**
+   * A parameter metadata that specifies a dependency.
+   *
+   * ```
+   * class AComponent {
+   *   constructor(@Inject(MyService) aService:MyService) {}
+   * }
+   * ```
+   */
+  class InjectMetadata {
+
+     token: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   *
+   * ```
+   * class AComponent {
+   *   constructor(@Optional() aService:MyService) {
+   *     this.aService = aService;
+   *   }
+   * }
+   * ```
+   */
+  class OptionalMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * A marker metadata 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 {}
+   * ```
+   */
+  class InjectableMetadata {
+  }
+
+
+  /**
+   * Specifies that an injector should retrieve a dependency from itself.
+   *
+   * ## Example
+   *
+   * ```
+   * class Dependency {
+   * }
+   *
+   * class NeedsDependency {
+   *   constructor(public @Self() dependency:Dependency) {}
+   * }
+   *
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(Dependency);
+   * ```
+   */
+  class SelfMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   *
+   * ## Example
+   *
+   * ```
+   * class Dependency {
+   * }
+   *
+   * class NeedsDependency {
+   *   constructor(public @Host() dependency:Dependency) {}
+   * }
+   *
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Dependency).toClass(HostDependency)
+   * ]);
+   * var child = parent.resolveAndCreateChild([]);
+   * var grandChild = child.resolveAndCreateChild([NeedsDependency, Depedency]);
+   * var nd = grandChild.get(NeedsDependency);
+   * expect(nd.dependency).toBeAnInstanceOf(HostDependency);
+   * ```
+   */
+  class HostMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   *
+   * ## Example
+   *
+   *
+   * ```
+   * class Service {}
+   *
+   * class ParentService implements Service {
+   * }
+   *
+   * class ChildService implements Service {
+   *   constructor(public @SkipSelf() parentService:Service) {}
+   * }
+   *
+   * var parent = Injector.resolveAndCreate([
+   *   bind(Service).toClass(ParentService)
+   * ]);
+   * var child = parent.resolveAndCreateChild([
+   *   bind(Service).toClass(ChildSerice)
+   * ]);
+   * var s = child.get(Service);
+   * expect(s).toBeAnInstanceOf(ChildService);
+   * expect(s.parentService).toBeAnInstanceOf(ParentService);
+   * ```
+   */
+  class SkipSelfMetadata {
+
+     toString(): string;
+  }
+
+
+  /**
+   * `DependencyMetadata is used by the framework to extend DI.
+   *
+   * Only metadata implementing `DependencyMetadata` are added to the list of dependency
+   * properties.
+   *
+   * For example:
+   *
+   * ```
+   * class Exclude extends DependencyMetadata {}
+   * class NotDependencyProperty {}
+   *
+   * class AComponent {
+   *   constructor(@Exclude @NotDependencyProperty aService:AService) {}
+   * }
+   * ```
+   *
+   * will create the following dependency:
+   *
+   * ```
+   * new Dependency(Key.get(AService), [new Exclude()])
+   * ```
+   *
+   * The framework can use `new Exclude()` to handle the `aService` dependency
+   * in a specific way.
+   */
+  class DependencyMetadata {
+
+     token: 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 {
+   * }
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
+
+
+  /**
+   * Lazily retrieve the reference value.
+   *
+   * See: {@link forwardRef}
+   */
+  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.
+   */
+  class Injector {
+
+
+    /**
+     * Turns a list of binding definitions into an internal resolved list of resolved bindings.
+     *
+     * A resolution is a process of flattening multiple nested lists and converting individual
+     * bindings into a list of {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more bindings.
+     *
+     * The returned list is sparse, indexed by `id` for the {@link Key}. It is generally not useful to
+     * application code
+     * other than for passing it to {@link Injector} functions that require resolved binding lists,
+     * such as
+     * `fromResolvedBindings` and `createChildFromResolved`.
+     */
+     static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+
+
+    /**
+     * Resolves bindings and creates an injector based on those bindings. This function is slower than
+     * the corresponding `fromResolvedBindings` because it needs to resolve bindings first. See
+     * `resolve`
+     * for the {@link Injector}.
+     *
+     * Prefer `fromResolvedBindings` in performance-critical code that creates lots of injectors.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more
+     * bindings.
+     * @param `depProvider`
+     */
+     static resolveAndCreate(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Creates an injector from previously resolved bindings. This bypasses resolution and flattening.
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     *
+     * @param `bindings` A sparse list of {@link ResolvedBinding}s. See `resolve` for the
+     * {@link Injector}.
+     * @param `depProvider`
+     */
+     static fromResolvedBindings(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Returns debug information about the injector.
+     *
+     * This information is included into exceptions thrown by the injector.
+     */
+     debugContext(): any;
+
+
+    /**
+     * 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 {@link ResolvedBinding}s. The resolution can be cached by `resolve`
+     * for the {@link Injector} for performance-sensitive code.
+     *
+     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, or a
+     * recursive list of more bindings.
+     * @param `depProvider`
+     */
+     resolveAndCreateChild(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Creates a child injector and loads a new set of {@link ResolvedBinding}s into it.
+     *
+     * @param `bindings`: A sparse list of {@link ResolvedBinding}s.
+     * See `resolve` for the {@link Injector}.
+     * @param `depProvider`
+     * @returns a new child {@link Injector}.
+     */
+     createChildFromResolved(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
+
+
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     *
+     * @param `binding`: either a type or a binding.
+     * @returns an object created using binding.
+     */
+     resolveAndInstantiate(binding: Type | Binding): any;
+
+
+    /**
+     * Instantiates an object using a resolved bindin in the context of the injector.
+     *
+     * @param `binding`: a resolved binding
+     * @returns an object created using binding.
+     */
+     instantiateResolved(binding: ResolvedBinding): any;
+
+     displayName: string;
+
+     toString(): string;
+  }
+
+  class ProtoInjector {
+
+     numberOfBindings: number;
+
+     getBindingAtIndex(index: number): any;
+  }
+
+  class BindingWithVisibility {
+
+     binding: ResolvedBinding;
+
+     visibility: Visibility;
+
+     getKeyId(): number;
+  }
+
+
+  /**
+   * Used to provide dependencies that cannot be easily expressed as bindings.
+   */
+  interface DependencyProvider {
+
+     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
+  }
+
+  enum Visibility {
+
+     Public,
+
+     Private,
+
+     PublicAndPrivate
+  }
+
+  const UNDEFINED : Object ;
+
+
+  /**
+   * Describes how_ the {@link Injector} should instantiate a given token.
+   *
+   * See {@link bind}.
+   *
+   * ## Example
+   *
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding(String, { toValue: 'Hello' })
+   * ]);
+   *
+   * expect(injector.get(String)).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+
+
+    /**
+     * Token used when retrieving this binding. Usually the `Type`.
+     */
+     token: any;
+
+
+    /**
+     * 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: any;
+
+
+    /**
+     * Binds a key to the alias for an existing key.
+     *
+     * An alias means that {@link Injector} 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: any;
+
+
+    /**
+     * 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: any[];
+
+
+    /**
+     * Converts the {@link Binding} into {@link ResolvedBinding}.
+     *
+     * {@link Injector} internally only uses {@link ResolvedBinding}, {@link Binding} contains
+     * convenience binding syntax.
+     */
+     resolve(): ResolvedBinding;
+  }
+
+
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+
+     token: any;
+
+
+    /**
+     * 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 separate 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: /*Type*/ 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?: any[]): Binding;
+  }
+
+
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   *
+   * A {@link Binding} is resolved when it has a factory function. Binding to a class, alias, or
+   * value, are just convenience methods, as {@link Injector} only operates on calling factory
+   * functions.
+   */
+  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: Dependency[];
+  }
+
+
+  /**
+   * @private
+   */
+  class Dependency {
+
+     static fromKey(key: Key): Dependency;
+
+     key: Key;
+
+     optional: boolean;
+
+     lowerBoundVisibility: any;
+
+     upperBoundVisibility: any;
+
+     properties: any[];
+  }
+
+
+  /**
+   * Provides an API for imperatively constructing {@link Binding}s.
+   *
+   * This is only relevant for JavaScript. See {@link BindingBuilder}.
+   *
+   * ## Example
+   *
+   * ```javascript
+   * bind(MyInterface).toClass(MyClass)
+   *
+   * ```
+   */
+  function bind(token: any) : BindingBuilder ;
+
+
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   *
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`, usually the `Type` of the instance.
+   *
+   * Keys are used internally by the {@link Injector} because their system-wide unique `id`s allow the
+   * injector to index in arrays rather than looking up items in maps.
+   */
+  class Key {
+
+
+    /**
+     * Retrieves a `Key` for a token.
+     */
+     static get(token: Object): Key;
+
+
+    /**
+     * @returns the number of keys registered in the system.
+     */
+     static numberOfKeys: number;
+
+     token: Object;
+
+     id: number;
+
+     displayName: string;
+  }
+
+
+  /**
+   * @private
+   */
+  class KeyRegistry {
+
+     get(token: Object): Key;
+
+     numberOfKeys: number;
+  }
+
+
+  /**
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+
+     type: any;
+  }
+
+
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   */
+  class NoBindingError extends AbstractBindingError {
+  }
+
+
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+
+     name: string;
+
+     message: string;
+
+     keys: Key[];
+
+     injectors: Injector[];
+
+     constructResolvingMessage: Function;
+
+     addKey(injector: Injector, key: Key): void;
+
+     context: any;
+
+     toString(): string;
+  }
+
+
+  /**
+   * 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.
+   */
+  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.
+   */
+  class InstantiationError extends AbstractBindingError {
+
+     causeKey: Key;
+  }
+
+
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   */
+  class InvalidBindingError extends BaseException {
+
+     message: string;
+
+     toString(): string;
+  }
+
+
+  /**
+   * Thrown when the class has no annotation information.
+   *
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   */
+  class NoAnnotationError extends BaseException {
+
+     name: string;
+
+     message: string;
+
+     toString(): string;
+  }
+
+
+  /**
+   * Thrown when getting an object by index.
+   */
+  class OutOfBoundsError extends BaseException {
+
+     message: string;
+
+     toString(): string;
+  }
+
+  class OpaqueToken {
+
+     toString(): string;
+  }
+
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+
+     new(token: any): InjectMetadata;
+
+
+     (token: any): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+
+     new(): OptionalMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+
+     new(): InjectableMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+
+     new(): SelfMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+
+     new(): HostMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+
+     new(): SkipSelfMetadata;
+
+
+     (): any;
+
+  }
+
+
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject : InjectFactory ;
+
+
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional : OptionalFactory ;
+
+
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable : InjectableFactory ;
+
+
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self : SelfFactory ;
+
+
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host : HostFactory ;
+
+
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf : SkipSelfFactory ;
+
+
+  /**
+   * 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 {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   *
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   *
+   * ```
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   *
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  const CORE_DIRECTIVES : Type[] ;
+
+
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   *
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   *
+   * # Example:
+   *
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass {
+
+     initialClasses: any;
+
+     rawClass: any;
+
+     doCheck(): void;
+
+     onDestroy(): 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>`
+   */
+  class NgFor {
+
+     static bulkRemove(tuples: RecordViewTuple[], viewContainer: ViewContainerRef): RecordViewTuple[];
+
+     static bulkInsert(tuples: RecordViewTuple[], viewContainer: ViewContainerRef, templateRef: TemplateRef): RecordViewTuple[];
+
+     viewContainer: ViewContainerRef;
+
+     templateRef: TemplateRef;
+
+     iterableDiffers: IterableDiffers;
+
+     cdr: ChangeDetectorRef;
+
+     ngForOf: any;
+
+     doCheck(): void;
+  }
+
+  class RecordViewTuple {
+
+     view: ViewRef;
+
+     record: any;
+  }
+
+
+  /**
+   * 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>`
+   */
+  class NgIf {
+
+     ngIf: any;
+  }
+
+
+  /**
+   * 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 ng-non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
+   * ```
+   */
+  class NgNonBindable {
+  }
+
+
+  /**
+   * Adds or removes styles based on an {expression}.
+   *
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   *
+   * # Example:
+   *
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   *
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   *
+   * # Syntax
+   *
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle {
+
+     rawStyle: any;
+
+     doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+
+     ngSwitch: any;
+  }
+
+
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+
+     ngSwitchWhen: any;
+  }
+
+
+  /**
+   * Defines a default case statement.
+   *
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   *
+   * Example:
+   *
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+  }
+
+
+  /**
+   * 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({onlySelf}?: {onlySelf?: boolean}): void;
+
+     setParent(parent: ControlGroup | ControlArray): void;
+
+     updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+
+     updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+
+     find(path: Array<string | number>| string): AbstractControl;
+
+     getError(errorCode: string, path?: string[]): any;
+
+     hasError(errorCode: string, path?: string[]): 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
+   * {@link ControlGroup} and {@link ControlArray}.
+   */
+  class Control extends AbstractControl {
+
+     updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                  {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): 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 {@link Control} 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
+   * {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other controls,
+   * but is of variable
+   * length.
+   */
+  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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   */
+  class ControlArray extends AbstractControl {
+
+     controls: AbstractControl[];
+
+     at(index: number): AbstractControl;
+
+     push(control: AbstractControl): void;
+
+     insert(index: number, control: AbstractControl): void;
+
+     removeAt(index: number): void;
+
+     length: number;
+  }
+
+  class AbstractControlDirective {
+
+     control: AbstractControl;
+
+     value: any;
+
+     valid: boolean;
+
+     errors: StringMap<string, any>;
+
+     pristine: boolean;
+
+     dirty: boolean;
+
+     touched: boolean;
+
+     untouched: boolean;
+  }
+
+
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     updateModel(dir: NgControl, value: any): void;
+  }
+
+
+  /**
+   * A directive that contains a group of [NgControl].
+   *
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+
+     name: string;
+
+     formDirective: Form;
+
+     path: string[];
+  }
+
+
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   *
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   *
+   * # 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl {
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     onDestroy(): void;
+
+     viewToModelUpdate(newValue: any): void;
+
+     path: 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl:Control;
+   *  login:string;
+   *
+   *  constructor() {
+   *    this.loginControl = new Control('');
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl {
+
+     form: Control;
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     path: string[];
+
+     control: Control;
+
+     validator: Function;
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * Binds a domain model to the form.
+   *
+   * # Example
+   *  ```
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *               <input type='text' [(ng-model)]="searchQuery">
+   *      `})
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl {
+
+     update: any;
+
+     model: any;
+
+     viewModel: any;
+
+     ngValidators: QueryList<NgValidator>;
+
+     onChanges(c: StringMap<string, any>): void;
+
+     control: Control;
+
+     path: string[];
+
+     validator: Function;
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * An abstract class that all control directive extend.
+   *
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+
+     name: string;
+
+     valueAccessor: ControlValueAccessor;
+
+     validator: Function;
+
+     path: string[];
+
+     viewToModelUpdate(newValue: any): void;
+  }
+
+
+  /**
+   * Creates and binds a control group to a DOM element.
+   *
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   *
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   *
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer {
+
+     onInit(): void;
+
+     onDestroy(): void;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     formDirective: Form;
+  }
+
+
+  /**
+   * 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: [FORM_DIRECTIVES],
+   *      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: [FORM_DIRECTIVES],
+   *      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'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form {
+
+     form: ControlGroup;
+
+     directives: NgControl[];
+
+     ngSubmit: any;
+
+     onChanges(_: any): void;
+
+     formDirective: Form;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     addControl(dir: NgControl): void;
+
+     getControl(dir: NgControl): Control;
+
+     removeControl(dir: NgControl): void;
+
+     addControlGroup(dir: NgControlGroup): void;
+
+     removeControlGroup(dir: NgControlGroup): void;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   *
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+
+     form: ControlGroup;
+
+     ngSubmit: any;
+
+     formDirective: Form;
+
+     control: ControlGroup;
+
+     path: string[];
+
+     controls: StringMap<string, AbstractControl>;
+
+     addControl(dir: NgControl): void;
+
+     getControl(dir: NgControl): Control;
+
+     removeControl(dir: NgControl): void;
+
+     addControlGroup(dir: NgControlGroup): void;
+
+     removeControlGroup(dir: NgControlGroup): void;
+
+     getControlGroup(dir: NgControlGroup): ControlGroup;
+
+     updateModel(dir: NgControl, value: any): void;
+
+     onSubmit(): boolean;
+  }
+
+
+  /**
+   * A bridge between a control and a native element.
+   *
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   *
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     onChange: any;
+
+     onTouched: any;
+
+     renderer: Renderer;
+
+     elementRef: ElementRef;
+
+     writeValue(value: any): void;
+
+     ngClassUntouched: boolean;
+
+     ngClassTouched: boolean;
+
+     ngClassPristine: boolean;
+
+     ngClassDirty: boolean;
+
+     ngClassValid: boolean;
+
+     ngClassInvalid: boolean;
+
+     registerOnChange(fn: (_: any) => void): void;
+
+     registerOnTouched(fn: () => void): void;
+  }
+
+
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   *
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     onChange: any;
+
+     onTouched: any;
+
+     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: () => {}): void;
+  }
+
+
+  /**
+   * Marks <option> as dynamic, so Angular can be notified when options change.
+   *
+   * #Example:
+   *
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+  }
+
+
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+
+     cd: NgControl;
+
+     value: string;
+
+     onChange: any;
+
+     onTouched: any;
+
+     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.
+   */
+  const FORM_DIRECTIVES : Type[] ;
+
+
+  /**
+   * Provides a set of validators used by form controls.
+   *
+   * # Example
+   *
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+
+     static required(c:Control): StringMap<string, boolean>;
+
+     static nullValidator(c: any): StringMap<string, boolean>;
+
+     static compose(validators: Function[]): Function;
+
+     static group(c:ControlGroup): StringMap<string, boolean>;
+
+     static array(c:ControlArray): StringMap<string, boolean>;
+  }
+
+  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, FORM_DIRECTIVES, ControlGroup} from 'angular2/forms';
+   *
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [
+   *     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: [
+   *     FORM_DIRECTIVES
+   *   ]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested
+   * {@link ControlGroup} that defines a `password` and a `passwordConfirmation` {@link Control}:
+   *
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   *
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   *
+   *  ```
+   */
+  class FormBuilder {
+
+     group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+
+     control(value: Object, validator?: Function): Control;
+
+     array(controlsConfig: any[], validator?: Function): ControlArray;
+  }
+
+  const FORM_BINDINGS : Type[] ;
+
+  class RenderDirectiveMetadata {
+
+     static DIRECTIVE_TYPE: any;
+
+     static COMPONENT_TYPE: any;
+
+     static create({id, selector, compileChildren, events, host, properties, readAttributes, type,
+                 callOnDestroy, callOnChanges, callDoCheck, callOnInit, callAfterContentInit,
+                 callAfterContentChecked, callAfterViewInit, callAfterViewChecked, changeDetection,
+                 exportAs}: {
+    id?: string,
+    selector?: string,
+    compileChildren?: boolean,
+    events?: string[],
+    host?: Map<string, string>,
+    properties?: string[],
+    readAttributes?: string[],
+    type?: number,
+    callOnDestroy?: boolean,
+    callOnChanges?: boolean,
+    callDoCheck?: boolean,
+    callOnInit?: boolean,
+    callAfterContentInit?: boolean,
+    callAfterContentChecked?: boolean,
+    callAfterViewInit?: boolean,
+    callAfterViewChecked?: boolean,
+    changeDetection?: ChangeDetectionStrategy,
+    exportAs?: string
+  }): RenderDirectiveMetadata;
+
+     id: any;
+
+     selector: string;
+
+     compileChildren: boolean;
+
+     events: string[];
+
+     properties: string[];
+
+     readAttributes: string[];
+
+     type: number;
+
+     callOnDestroy: boolean;
+
+     callOnChanges: boolean;
+
+     callDoCheck: boolean;
+
+     callOnInit: boolean;
+
+     callAfterContentInit: boolean;
+
+     callAfterContentChecked: boolean;
+
+     callAfterViewInit: boolean;
+
+     callAfterViewChecked: boolean;
+
+     changeDetection: ChangeDetectionStrategy;
+
+     exportAs: string;
+
+     hostListeners: Map<string, string>;
+
+     hostProperties: Map<string, string>;
+
+     hostAttributes: Map<string, string>;
+  }
+
+  class DomRenderer extends Renderer {
+
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+
+     destroyView(viewRef: RenderViewRef): void;
+
+     getNativeElementSync(location: RenderElementRef): any;
+
+     getRootNodes(fragment: RenderFragmentRef): Node[];
+
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+
+     detachFragment(fragmentRef: RenderFragmentRef): 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: any[]): void;
+
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: any): void;
+  }
+
+
+  /**
+   * A dispatcher for all events happening in a view.
+   */
+  interface RenderEventDispatcher {
+
+
+    /**
+     * 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
+     * @return {boolean} False if `preventDefault` should be called on the DOM event.
+     */
+     dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+  }
+
+  class Renderer {
+
+
+    /**
+     * Creates a root host view that includes the given element.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     *
+     * @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 {RenderViewWithFragments} the created view including fragments
+     */
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+
+
+    /**
+     * Creates a regular view out of the given ProtoView.
+     * Note that the fragmentCount needs to be passed in so that we can create a result
+     * synchronously even when dealing with webworkers!
+     */
+     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+
+
+    /**
+     * Destroys the given view after it has been dehydrated and detached
+     */
+     destroyView(viewRef: RenderViewRef): void;
+
+
+    /**
+     * Attaches a fragment after another fragment.
+     */
+     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+
+
+    /**
+     * Attaches a fragment after an element.
+     */
+     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+
+
+    /**
+     * Detaches a fragment.
+     */
+     detachFragment(fragmentRef: RenderFragmentRef): 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: 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: RenderEventDispatcher): void;
+  }
+
+
+  /**
+   * Abstract reference to the element which can be marshaled across web-worker boundary.
+   *
+   * This interface is used by the Renderer API.
+   */
+  interface RenderElementRef {
+
+
+    /**
+     * Reference to the `RenderViewRef` where the `RenderElementRef` is inside of.
+     */
+     renderView: RenderViewRef;
+
+
+    /**
+     * Index of the element inside the `RenderViewRef`.
+     *
+     * This is used internally by the Angular framework to locate elements.
+     */
+     renderBoundElementIndex: number;
+  }
+
+  class RenderViewRef {
+  }
+
+  class RenderProtoViewRef {
+  }
+
+  class RenderFragmentRef {
+  }
+
+  class RenderViewWithFragments {
+
+     viewRef: RenderViewRef;
+
+     fragmentRefs: RenderFragmentRef[];
+  }
+
+  class ViewDefinition {
+
+     componentId: string;
+
+     templateAbsUrl: string;
+
+     template: string;
+
+     directives: RenderDirectiveMetadata[];
+
+     styleAbsUrls: string[];
+
+     styles: string[];
+
+     encapsulation: ViewEncapsulation;
+  }
+
+  const DOCUMENT : OpaqueToken ;
+
+
+  /**
+   * A unique id (string) for an angular application.
+   */
+  const APP_ID : OpaqueToken ;
+
+
+  /**
+   * Defines when a compiled template should be stored as a string
+   * rather than keeping its Nodes to preserve memory.
+   */
+  const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE : OpaqueToken ;
+
+
+  /**
+   * Create trace scope.
+   *
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   *
+   * Used to mark scope entry. The return value is used to leave the scope.
+   *
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   *
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   *
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope : WtfScopeFn ;
+
+
+  /**
+   * Used to mark end of Scope.
+   *
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   *
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave : <T>(scope: any, returnValue?: T) => T ;
+
+
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   *
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange : (rangeType: string, action: string) => any ;
+
+
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange : (range: any) => void ;
+
+  interface WtfScopeFn {
+
+     (arg0?: any, arg1?: any): any;
+
+  }
+
+
+  /**
+   * Bootstrapping a Webworker Application
+   *
+   * You instantiate the application side by calling bootstrapWebworker from your webworker index
+   * script.
+   * You can call bootstrapWebworker() exactly as you would call bootstrap() in a regular Angular
+   * application
+   * See the bootstrap() docs for more details.
+   */
+  function bootstrapWebWorker(appComponentType: Type, componentInjectableBindings?: Array<Type | Binding | any[]>) : Promise<ApplicationRef> ;
+
+
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+
+
+    /**
+     * Returns an {@link EventEmitter} that emits every time a messsage
+     * is received on the given channel.
+     */
+     from(channel: string): EventEmitter;
+
+
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+     to(channel: string): EventEmitter;
+  }
+
+  interface MessageBusSource {
+
+
+    /**
+     * Returns an {@link EventEmitter} that emits every time a messsage
+     * is received on the given channel.
+     */
+     from(channel: string): EventEmitter;
+  }
+
+  interface MessageBusSink {
+
+
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+     to(channel: string): EventEmitter;
+  }
+
+  class ClientMessageBrokerFactory {
+
+     createMessageBroker(channel: string): ClientMessageBroker;
+  }
+
+  class ClientMessageBroker {
+
+     channel: any;
+
+     runOnService(args: UiArguments, returnType: Type): Promise<any>;
+  }
+
+  class FnArg {
+
+     value: any;
+
+     type: Type;
+  }
+
+  class UiArguments {
+
+     method: string;
+
+     args: FnArg[];
+  }
+
+  class ServiceMessageBrokerFactory {
+
+     createMessageBroker(channel: string): ServiceMessageBroker;
+  }
+
+
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker desererializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  class ServiceMessageBroker {
+
+     channel: any;
+
+     registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+  }
+
+  class ReceivedMessage {
+
+     method: string;
+
+     args: any[];
+
+     id: string;
+
+     type: string;
+  }
+
+  const PRIMITIVE : Type ;
+
+  class Serializer {
+
+     serialize(obj: any, type: Type): Object;
+
+     deserialize(map: any, type: Type, data?: any): any;
+
+     mapToObject(map: Map<string, any>, type?: Type): Object;
+
+     objectToMap(obj: StringMap<string, any>, type?: Type, data?: any): Map<string, any>;
+
+     allocateRenderViews(fragmentCount: number): void;
+  }
+
+  var ChangeDetectorRef: InjectableReference;
+
+  var ApplicationRef: InjectableReference;
+
+  var Compiler: InjectableReference;
+
+  var AppViewManager: InjectableReference;
+
+  var ViewRef: InjectableReference;
+
+  var ProtoViewRef: InjectableReference;
+
+  var ViewContainerRef: InjectableReference;
+
+  var ComponentRef: InjectableReference;
+
+}
+
+declare module "angular2/web_worker/worker" {
+  export = ngWorker;
+}
+
+
+
+declare module ngUi {
+  class WebWorkerApplication {
+
+     createClientMessageBroker(channel: string): ClientMessageBroker;
+
+     createServiceMessageBroker(channel: string): ServiceMessageBroker;
+  }
+
+
+  /**
+   * Bootstrapping a WebWorker
+   *
+   * You instantiate a WebWorker application by calling bootstrap with the URI of your worker's index
+   * script
+   * Note: The WebWorker script must call bootstrapWebworker once it is set up to complete the
+   * bootstrapping process
+   */
+  function bootstrap(uri: string) : WebWorkerInstance ;
+
+  function spawnWebWorker(uri: string) : WebWorkerInstance ;
+
+
+  /**
+   * Wrapper class that exposes the {@link WebWorkerApplication}
+   * Isolate instance and underyling {@link MessageBus} for lower level message passing.
+   */
+  class WebWorkerInstance {
+
+     app: WebWorkerApplication;
+
+     worker: Worker;
+
+     bus: MessageBus;
+  }
+
+
+  /**
+   * 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 Observable {
+
+     observer(generator: any): Object;
+  }
+
+
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+
+
+    /**
+     * Returns an {@link EventEmitter} that emits every time a messsage
+     * is received on the given channel.
+     */
+     from(channel: string): EventEmitter;
+
+
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+     to(channel: string): EventEmitter;
+  }
+
+  interface MessageBusSource {
+
+
+    /**
+     * Returns an {@link EventEmitter} that emits every time a messsage
+     * is received on the given channel.
+     */
+     from(channel: string): EventEmitter;
+  }
+
+  interface MessageBusSink {
+
+
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+     to(channel: string): EventEmitter;
+  }
+
+
+  /**
+   * Runtime representation of a type.
+   *
+   * In JavaScript a Type is a constructor function.
+   */
+  interface Type extends Function {
+
+     new(...args: any[]): any;
+
+  }
+
+  class ClientMessageBrokerFactory {
+
+     createMessageBroker(channel: string): ClientMessageBroker;
+  }
+
+  class ClientMessageBroker {
+
+     channel: any;
+
+     runOnService(args: UiArguments, returnType: Type): Promise<any>;
+  }
+
+  class FnArg {
+
+     value: any;
+
+     type: Type;
+  }
+
+  class UiArguments {
+
+     method: string;
+
+     args: FnArg[];
+  }
+
+  class ServiceMessageBrokerFactory {
+
+     createMessageBroker(channel: string): ServiceMessageBroker;
+  }
+
+
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker desererializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  class ServiceMessageBroker {
+
+     channel: any;
+
+     registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+  }
+
+  class ReceivedMessage {
+
+     method: string;
+
+     args: any[];
+
+     id: string;
+
+     type: string;
+  }
+
+  const PRIMITIVE : Type ;
+
+  class Serializer {
+
+     serialize(obj: any, type: Type): Object;
+
+     deserialize(map: any, type: Type, data?: any): any;
+
+     mapToObject(map: Map<string, any>, type?: Type): Object;
+
+     objectToMap(obj: StringMap<string, any>, type?: Type, data?: any): Map<string, any>;
+
+     allocateRenderViews(fragmentCount: number): void;
+  }
+
+}
+
+declare module "angular2/web_worker/ui" {
+  export = ngUi;
+}
+
+
diff --git a/angular2/angular2-2.0.0-alpha.38.d.ts b/angular2/angular2-2.0.0-alpha.38.d.ts
new file mode 100644
index 000000000..518698deb
--- /dev/null
+++ b/angular2/angular2-2.0.0-alpha.38.d.ts
@@ -0,0 +1,17106 @@
+// Type definitions for Angular v2.0.0-local_sha.f77234e
+// 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.
+// ***********************************************************
+
+// angular2/angular2 depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/worker depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/ui depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+
+
+interface Map<K,V> {}
+interface StringMap<K,V> extends Map<K,V> {}
+
+
+declare module ng {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngWorker {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngUi {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+
+
+
+declare module ng {  
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: StringMap<string, any>,
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
+    /**
+     * 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: ChangeDetectionStrategy;
+    
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+    viewBindings: any[];
+    
+  }
+
+    
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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]',
+   *   inputs: [
+   *     '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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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]',
+   *   inputs: [
+   *     'text: tooltip'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
+   * 
+   * ## 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]',
+   *   inputs: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      });
+    
+    /**
+     * 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 data-bound input properties for a directive
+     * 
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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.
+     * 
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+     * 
+     * The following example creates a component with two data-bound properties.
+     * 
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
+     * })
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    inputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
+     * 
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
+     * 
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+     * })
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
+     * 
+     *   constructor() {
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
+     * })
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
+     * }
+     * bootstrap(App);
+     * ```
+     */
+    outputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Host Listeners
+     * 
+     * Specifies which DOM events 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 evaluation 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 $event local variable.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+     * 
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'button[counting]',
+     *   host: {
+     *     '(click)': 'onClick($event.target)'
+     *   }
+     * })
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Host Property Bindings
+     * 
+     * Specifies which DOM properties a directive updates.
+     * 
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[ng-model]',
+     *   host: {
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
+     *   }
+     * })
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element.
+     * 
+     * ### Example
+     * 
+     * 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.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     */
+    host: StringMap<string, string>;
+    
+    /**
+     * 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+    bindings: 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;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: StringMap<string, any>;
+    
+  }
+
+    
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
+  }
+
+    
+  /**
+   * Declares a data-bound input property.
+   * 
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
+    /**
+     * Specifies a template URL for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    templateUrl: string;
+    
+    /**
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     */
+    template: string;
+    
+    /**
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: 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: [NgFor]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+    directives: Array<Type | any[]>;
+    
+    pipes: Array<Type | any[]>;
+    
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+    encapsulation: ViewEncapsulation;
+    
+  }
+
+    
+  /**
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
+   */
+  enum ViewEncapsulation {
+    
+    /**
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
+     */
+    Emulated,
+    
+    /**
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
+     */
+    Native,
+    
+    /**
+     * Don't provide any template or style encapsulation.
+     */
+    None
+  }
+  
+
+    
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link DirectiveMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      }): DirectiveMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      }): DirectiveDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>,
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>,
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ViewMetadata} 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: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+    
+  }
+
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
+
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
+    
+  }
+
+    
+  /**
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
+   */
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
+   */
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component: ComponentFactory;
+  
+
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
+  /**
+   * 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 = ng.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;
+  
+
+    
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+    /**
+     * Optional argument for specifying the superclass.
+     */
+    extends?: Type;
+    
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+    constructor: (Function | any[]);
+    
+  }
+
+    
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+    annotations: any[];
+    
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+    Class(obj: ClassDefinition): Type;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
+    /**
+     * Private
+     */
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
+    
+    /**
+     * Turns an array of binding definitions into an array of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
+     */
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Describes how the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
+    
+  }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
+  
+
+    
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
+   * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
+   * }
+   * ```
+   */
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+   * 
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
+   * 
+   * ```
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
+   * }
+   * ```
+   */
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
+   */
+  class DatePipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  let DEFAULT_PIPES: Binding;
+  
+
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
+  /**
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
+   *  }
+   * }
+   * 
+   * ```
+   */
+  class JsonPipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
+   */
+  class SlicePipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  /**
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class LowerCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  class NumberPipe {
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An {@link angular2/di/OpaqueToken} representing the application root type in the {@link
+   * Injector}.
+   * 
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   * 
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   * 
+   * ```
+   */
+  let APP_COMPONENT: OpaqueToken;
+  
+
+    
+  /**
+   * A DI Token representing a unique string id assigned to the application by Angular and used
+   * primarily for prefixing application attributes and CSS styles when
+   * {@link ViewEncapsulation#Emulated} is being used.
+   * 
+   * If you need to avoid randomly generated value to be used as an application id, you can provide
+   * a custom value via a DI binding <!-- TODO: provider --> configuring the root {@link Injector}
+   * using this token.
+   */
+  let APP_ID: OpaqueToken;
+  
+
+    
+  /**
+   * Initialize the Angular 'platform' on the page.
+   * 
+   * See {@link PlatformRef} for details on the Angular platform.
+   * 
+   * # Without specified bindings
+   * 
+   * If no bindings are specified, `platform`'s behavior depends on whether an existing
+   * platform exists:
+   * 
+   * If no platform exists, a new one will be created with the default {@link platformBindings}.
+   * 
+   * If a platform already exists, it will be returned (regardless of what bindings it
+   * was created with). This is a convenience feature, allowing for multiple applications
+   * to be loaded into the same platform without awareness of each other.
+   * 
+   * # With specified bindings
+   * 
+   * It is also possible to specify bindings to be made in the new platform. These bindings
+   * will be shared between all applications on the page. For example, an abstraction for
+   * the browser cookie jar should be bound at the platform level, because there is only one
+   * cookie jar regardless of how many applications on the age will be accessing it.
+   * 
+   * If bindings are specified directly, `platform` will create the Angular platform with
+   * them if a platform did not exist already. If it did exist, however, an error will be
+   * thrown.
+   * 
+   * # DOM Applications
+   * 
+   * This version of `platform` initializes Angular to run in the UI thread, with direct
+   * DOM access. Web-worker applications should call `platform` from
+   * `src/web_workers/worker/application_common` instead.
+   */
+  function platform(bindings?: Array<Type | Binding | any[]>): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
+   */
+  interface ApplicationRef {
+    
+    /**
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
+     */
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
+    
+    /**
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
+     */
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+    
+    /**
+     * Retrieve the application {@link Injector}.
+     */
+    injector: Injector;
+    
+    /**
+     * Retrieve the application {@link NgZone}.
+     */
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  function bootstrap(appComponentType: /*Type*/ any, appBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+  
+
+    
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+    constructor(value: string);
+    
+    /**
+     * Returns the base URL of the currently running application.
+     */
+    value: any;
+    
+  }
+
+    
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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;
+    
+  }
+
+    
+  /**
+   * A service that can be used to get and set the title of a current HTML document.
+   * 
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
+   */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
+  class DirectiveResolver {
+    
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+    resolve(type: Type): DirectiveMetadata;
+    
+  }
+
+    
+  /**
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
+   * 
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
+   */
+  interface Compiler {
+    
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
+  }
+
+    
+  /**
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
+   */
+  interface AppViewManager {
+    
+    /**
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
+     */
+    getViewContainer(location: ElementRef): ViewContainerRef;
+    
+    /**
+     * Returns the {@link ElementRef} that makes up the specified Host View.
+     */
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+    /**
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
+     * 
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
+     */
+    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+    /**
+     * Returns the component instance for the provided Host Element.
+     */
+    getComponent(hostLocation: ElementRef): any;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
+     * 
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
+     * 
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
+     * 
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
+     * 
+     * ## 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): HostViewRef;
+    
+    /**
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
+     */
+    destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
+     */
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
+     */
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
+     */
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
+    
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
+    
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
+   * 
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
+   * 
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
+   * 
+   * Changes can be observed by subscribing to the changes `Observable`.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+   * ```javascript
+   * @Component({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
+   *   }
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+    changes: Observable;
+    
+    length: number;
+    
+    first: T;
+    
+    last: T;
+    
+    /**
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
+     * 
+     * In a browser the platform-specific global view is the main DOM Document.
+     * 
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+  }
+
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  interface LifeCycle {
+    
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+    tick(): void;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  /**
+   * A dispatcher that relays all events that occur in a Render View.
+   * 
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
+   */
+  interface RenderEventDispatcher {
+    
+    /**
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
+     */
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+    
+  }
+
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
+    /**
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
+     * 
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
+     */
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[]): void;
+    
+    /**
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
+     */
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
+    
+    /**
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+    /**
+     * Creates a Render View based on the provided `protoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+    /**
+     * Destroys a Render View specified via `viewRef`.
+     * 
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
+     * 
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
+     */
+    destroyView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
+     */
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Attaches the Nodes of the Render Fragment after an Element.
+     */
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Detaches the Nodes of a Render Fragment from their parent.
+     * 
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
+     */
+    detachFragment(fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Notifies a custom Renderer to initialize a Render View.
+     * 
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
+     */
+    hydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Notifies a custom Renderer that a Render View is no longer active.
+     * 
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
+     * 
+     * If `attributeValue` is `null`, the attribute is removed.
+     */
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+    /**
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
+     */
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+    /**
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
+     */
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+    /**
+     * Calls a method on the Element specified via `location`.
+     */
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
+  }
+
+    
+  /**
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
+   * 
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
+   * 
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
+   * 
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
+   * 
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
+   * 
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
+   * 
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
+   * 
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
+   * 
+   * 
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
+   */
+  interface RenderProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
+   * 
+   * Any {@link RenderView} has one Render Fragment.
+   * 
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
+   */
+  class RenderFragmentRef {
+    
+  }
+
+    
+  /**
+   * Container class produced by a {@link Renderer} when creating a Render View.
+   * 
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
+   */
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  /**
+   * A DI Token representing the main rendering context. In a browser this is the DOM Document.
+   * 
+   * Note: Document might not be available in the Application Context when Application and Rendering
+   * Contexts are not the same (e.g. when running the application into a Web Worker).
+   */
+  let DOCUMENT: OpaqueToken;
+  
+
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass implements DoCheck,  OnDestroy {
+    
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    initialClasses: any;
+    
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): 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, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
+   * 
+   * 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>`
+   */
+  class NgFor implements DoCheck {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
+    
+    ngForOf: any;
+    
+    doCheck(): 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 ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+   * 
+   * ```
+   * <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>`
+   */
+  class NgIf {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
+  }
+
+    
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle implements DoCheck {
+    
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+    
+    ngSwitch: any;
+    
+  }
+
+    
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
+  }
+
+    
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
+  }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
+  
+
+    
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+    constructor(validator: Function);
+    
+    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({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    setParent(parent: ControlGroup | ControlArray): void;
+    
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
+    
+  }
+
+    
+  /**
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class Control extends AbstractControl {
+    
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    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 {@link Control} 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 {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlGroup extends AbstractControl {
+    
+    constructor(controls: StringMap<string, AbstractControl>, optionals?: StringMap<string, boolean>, validator?: Function);
+    
+    controls: StringMap<string, AbstractControl>;
+    
+    addControl(name: string, control: 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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlArray extends AbstractControl {
+    
+    constructor(controls: AbstractControl[], validator?: Function);
+    
+    controls: AbstractControl[];
+    
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
+    
+  }
+
+    
+  class AbstractControlDirective {
+    
+    control: AbstractControl;
+    
+    value: any;
+    
+    valid: boolean;
+    
+    errors: StringMap<string, any>;
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+  }
+
+    
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+  }
+
+    
+  /**
+   * A directive that contains multiple {@link NgControl}.
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+    name: string;
+    
+    formDirective: Form;
+    
+    path: string[];
+    
+  }
+
+    
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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): void {
+   *    // 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: [FORM_DIRECTIVES],
+   *      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(): void {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
+    
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    onDestroy(): void;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+    path: string[];
+    
+    formDirective: any;
+    
+    control: Control;
+    
+    validator: Function;
+    
+  }
+
+    
+  /**
+   * Binds an existing {@link Control} to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
+   * }
+   *  ```
+   * 
+   * # ng-model
+   * 
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl: Control = new Control('');
+   *  login:string;
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    form: Control;
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    path: string[];
+    
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Binds a domain model to a form control.
+   * 
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    control: Control;
+    
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * A base class that all control directive extend.
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+    name: string;
+    
+    valueAccessor: ControlValueAccessor;
+    
+    validator: Function;
+    
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
+    
+    constructor(_parent: ControlContainer);
+    
+    onInit(): void;
+    
+    onDestroy(): void;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
+    
+  }
+
+    
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.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(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+    form: ControlGroup;
+    
+    ngSubmit: any;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    controls: StringMap<string, AbstractControl>;
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => void): void;
+    
+    registerOnTouched(fn: () => void): void;
+    
+  }
+
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => {}): void;
+    
+    registerOnTouched(fn: () => {}): void;
+    
+  }
+
+    
+  /**
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
+    
+    value: string;
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
+   */
+  let FORM_DIRECTIVES: Type[];
+  
+
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+    static required(control:Control): StringMap<string, boolean>;
+    
+    static nullValidator(c: any): StringMap<string, boolean>;
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): StringMap<string, boolean>;
+    
+    static array(array:ControlArray): StringMap<string, boolean>;
+    
+  }
+
+    
+  class DefaultValidators {
+    
+  }
+
+    
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [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: [FORM_DIRECTIVES]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  class FormBuilder {
+    
+    group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+    
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
+    
+  }
+
+    
+  /**
+   * Shorthand set of bindings used for building Angular forms.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
+   */
+  let FORM_BINDINGS: Type[];
+  
+
+    
+  function inspectNativeElement(element: any): DebugElement;
+  
+
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
+    /**
+     * Get child DebugElements from within the Light DOM.
+     * 
+     * @return {DebugElement[]}
+     */
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
+  }
+
+    
+  /**
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
+   */
+  function inspectElement(elementRef: ElementRef): DebugElement;
+  
+
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
+
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope: WtfScopeFn;
+  
+
+    
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
+  
+
+    
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
+  
+
+    
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange: (range: any) => void;
+  
+
+    
+  interface WtfScopeFn {
+    
+    (arg0?: any, arg1?: any): any;
+    
+  }
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
+  var ApplicationRef: InjectableReference;
+  
+
+    
+  var Compiler: InjectableReference;
+  
+
+    
+  var AppViewManager: InjectableReference;
+  
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
+  var ViewRef: InjectableReference;
+  
+
+    
+  var ProtoViewRef: InjectableReference;
+  
+
+    
+  var ViewContainerRef: InjectableReference;
+  
+
+    
+  var ComponentRef: InjectableReference;
+  
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var Renderer: InjectableReference;
+  
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
+
+
+
+declare module ngWorker {  
+  /**
+   * A dispatcher that relays all events that occur in a Render View.
+   * 
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
+   */
+  interface RenderEventDispatcher {
+    
+    /**
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
+     */
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+    
+  }
+
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
+    /**
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
+     * 
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
+     */
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[]): void;
+    
+    /**
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
+     */
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
+    
+    /**
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+    /**
+     * Creates a Render View based on the provided `protoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+    /**
+     * Destroys a Render View specified via `viewRef`.
+     * 
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
+     * 
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
+     */
+    destroyView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
+     */
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Attaches the Nodes of the Render Fragment after an Element.
+     */
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Detaches the Nodes of a Render Fragment from their parent.
+     * 
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
+     */
+    detachFragment(fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Notifies a custom Renderer to initialize a Render View.
+     * 
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
+     */
+    hydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Notifies a custom Renderer that a Render View is no longer active.
+     * 
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
+     * 
+     * If `attributeValue` is `null`, the attribute is removed.
+     */
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+    /**
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
+     */
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+    /**
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
+     */
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+    /**
+     * Calls a method on the Element specified via `location`.
+     */
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
+  }
+
+    
+  /**
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
+   * 
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
+   * 
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
+   * 
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
+   * 
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
+   * 
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
+   * 
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
+   * 
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
+   * 
+   * 
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
+   */
+  interface RenderProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
+   * 
+   * Any {@link RenderView} has one Render Fragment.
+   * 
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
+   */
+  class RenderFragmentRef {
+    
+  }
+
+    
+  /**
+   * Container class produced by a {@link Renderer} when creating a Render View.
+   * 
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
+   */
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: StringMap<string, any>,
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
+    /**
+     * 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: ChangeDetectionStrategy;
+    
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+    viewBindings: any[];
+    
+  }
+
+    
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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]',
+   *   inputs: [
+   *     '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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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]',
+   *   inputs: [
+   *     'text: tooltip'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
+   * 
+   * ## 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]',
+   *   inputs: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      });
+    
+    /**
+     * 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 data-bound input properties for a directive
+     * 
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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.
+     * 
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+     * 
+     * The following example creates a component with two data-bound properties.
+     * 
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
+     * })
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    inputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
+     * 
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
+     * 
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+     * })
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
+     * 
+     *   constructor() {
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
+     * })
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
+     * }
+     * bootstrap(App);
+     * ```
+     */
+    outputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Host Listeners
+     * 
+     * Specifies which DOM events 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 evaluation 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 $event local variable.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+     * 
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'button[counting]',
+     *   host: {
+     *     '(click)': 'onClick($event.target)'
+     *   }
+     * })
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Host Property Bindings
+     * 
+     * Specifies which DOM properties a directive updates.
+     * 
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[ng-model]',
+     *   host: {
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
+     *   }
+     * })
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element.
+     * 
+     * ### Example
+     * 
+     * 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.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     */
+    host: StringMap<string, string>;
+    
+    /**
+     * 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+    bindings: 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;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: StringMap<string, any>;
+    
+  }
+
+    
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
+  }
+
+    
+  /**
+   * Declares a data-bound input property.
+   * 
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
+    /**
+     * Specifies a template URL for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    templateUrl: string;
+    
+    /**
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     */
+    template: string;
+    
+    /**
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: 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: [NgFor]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+    directives: Array<Type | any[]>;
+    
+    pipes: Array<Type | any[]>;
+    
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+    encapsulation: ViewEncapsulation;
+    
+  }
+
+    
+  /**
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
+   */
+  enum ViewEncapsulation {
+    
+    /**
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
+     */
+    Emulated,
+    
+    /**
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
+     */
+    Native,
+    
+    /**
+     * Don't provide any template or style encapsulation.
+     */
+    None
+  }
+  
+
+    
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link DirectiveMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      }): DirectiveMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>
+      }): DirectiveDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>,
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: StringMap<string, string>,
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: StringMap<string, any>,
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ViewMetadata} 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: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+    
+  }
+
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
+
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
+    
+  }
+
+    
+  /**
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
+   */
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
+   */
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component: ComponentFactory;
+  
+
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
+  /**
+   * 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 = ng.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;
+  
+
+    
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+    /**
+     * Optional argument for specifying the superclass.
+     */
+    extends?: Type;
+    
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+    constructor: (Function | any[]);
+    
+  }
+
+    
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+    annotations: any[];
+    
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+    Class(obj: ClassDefinition): Type;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
+    /**
+     * Private
+     */
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
+    
+    /**
+     * Turns an array of binding definitions into an array of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
+     */
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Describes how the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
+    
+  }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
+  
+
+    
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
+   * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
+   * }
+   * ```
+   */
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+   * 
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
+   * 
+   * ```
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
+   * }
+   * ```
+   */
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
+   */
+  class DatePipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  let DEFAULT_PIPES: Binding;
+  
+
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
+  /**
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
+   *  }
+   * }
+   * 
+   * ```
+   */
+  class JsonPipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
+   */
+  class SlicePipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  /**
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class LowerCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  class NumberPipe {
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
+   */
+  interface ApplicationRef {
+    
+    /**
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
+     */
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
+    
+    /**
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
+     */
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+    
+    /**
+     * Retrieve the application {@link Injector}.
+     */
+    injector: Injector;
+    
+    /**
+     * Retrieve the application {@link NgZone}.
+     */
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+    constructor(value: string);
+    
+    /**
+     * Returns the base URL of the currently running application.
+     */
+    value: any;
+    
+  }
+
+    
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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;
+    
+  }
+
+    
+  /**
+   * A service that can be used to get and set the title of a current HTML document.
+   * 
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
+   */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  class DirectiveResolver {
+    
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+    resolve(type: Type): DirectiveMetadata;
+    
+  }
+
+    
+  /**
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
+   * 
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
+   */
+  interface Compiler {
+    
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
+  }
+
+    
+  /**
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
+   */
+  interface AppViewManager {
+    
+    /**
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
+     */
+    getViewContainer(location: ElementRef): ViewContainerRef;
+    
+    /**
+     * Returns the {@link ElementRef} that makes up the specified Host View.
+     */
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+    /**
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
+     * 
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
+     */
+    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+    /**
+     * Returns the component instance for the provided Host Element.
+     */
+    getComponent(hostLocation: ElementRef): any;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
+     * 
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
+     * 
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
+     * 
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
+     * 
+     * ## 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): HostViewRef;
+    
+    /**
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
+     */
+    destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
+     */
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
+     */
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
+     */
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
+    
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
+    
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
+   * 
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
+   * 
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
+   * 
+   * Changes can be observed by subscribing to the changes `Observable`.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+   * ```javascript
+   * @Component({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
+   *   }
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+    changes: Observable;
+    
+    length: number;
+    
+    first: T;
+    
+    last: T;
+    
+    /**
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
+     * 
+     * In a browser the platform-specific global view is the main DOM Document.
+     * 
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+  }
+
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  interface LifeCycle {
+    
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+    tick(): void;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass implements DoCheck,  OnDestroy {
+    
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    initialClasses: any;
+    
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): 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, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
+   * 
+   * 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>`
+   */
+  class NgFor implements DoCheck {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
+    
+    ngForOf: any;
+    
+    doCheck(): 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 ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+   * 
+   * ```
+   * <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>`
+   */
+  class NgIf {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
+  }
+
+    
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle implements DoCheck {
+    
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+    
+    ngSwitch: any;
+    
+  }
+
+    
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
+  }
+
+    
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
+  }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
+  
+
+    
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+    constructor(validator: Function);
+    
+    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({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    setParent(parent: ControlGroup | ControlArray): void;
+    
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
+    
+  }
+
+    
+  /**
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class Control extends AbstractControl {
+    
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    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 {@link Control} 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 {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlGroup extends AbstractControl {
+    
+    constructor(controls: StringMap<string, AbstractControl>, optionals?: StringMap<string, boolean>, validator?: Function);
+    
+    controls: StringMap<string, AbstractControl>;
+    
+    addControl(name: string, control: 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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlArray extends AbstractControl {
+    
+    constructor(controls: AbstractControl[], validator?: Function);
+    
+    controls: AbstractControl[];
+    
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
+    
+  }
+
+    
+  class AbstractControlDirective {
+    
+    control: AbstractControl;
+    
+    value: any;
+    
+    valid: boolean;
+    
+    errors: StringMap<string, any>;
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+  }
+
+    
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+  }
+
+    
+  /**
+   * A directive that contains multiple {@link NgControl}.
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+    name: string;
+    
+    formDirective: Form;
+    
+    path: string[];
+    
+  }
+
+    
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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): void {
+   *    // 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: [FORM_DIRECTIVES],
+   *      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(): void {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
+    
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    onDestroy(): void;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+    path: string[];
+    
+    formDirective: any;
+    
+    control: Control;
+    
+    validator: Function;
+    
+  }
+
+    
+  /**
+   * Binds an existing {@link Control} to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
+   * }
+   *  ```
+   * 
+   * # ng-model
+   * 
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl: Control = new Control('');
+   *  login:string;
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    form: Control;
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    path: string[];
+    
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Binds a domain model to a form control.
+   * 
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: StringMap<string, SimpleChange>): void;
+    
+    control: Control;
+    
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * A base class that all control directive extend.
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+    name: string;
+    
+    valueAccessor: ControlValueAccessor;
+    
+    validator: Function;
+    
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
+    
+    constructor(_parent: ControlContainer);
+    
+    onInit(): void;
+    
+    onDestroy(): void;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
+    
+  }
+
+    
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.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(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+    form: ControlGroup;
+    
+    ngSubmit: any;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    controls: StringMap<string, AbstractControl>;
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => void): void;
+    
+    registerOnTouched(fn: () => void): void;
+    
+  }
+
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => {}): void;
+    
+    registerOnTouched(fn: () => {}): void;
+    
+  }
+
+    
+  /**
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
+    
+    value: string;
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
+   */
+  let FORM_DIRECTIVES: Type[];
+  
+
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+    static required(control:Control): StringMap<string, boolean>;
+    
+    static nullValidator(c: any): StringMap<string, boolean>;
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): StringMap<string, boolean>;
+    
+    static array(array:ControlArray): StringMap<string, boolean>;
+    
+  }
+
+    
+  class DefaultValidators {
+    
+  }
+
+    
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [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: [FORM_DIRECTIVES]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  class FormBuilder {
+    
+    group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+    
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
+    
+  }
+
+    
+  /**
+   * Shorthand set of bindings used for building Angular forms.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
+   */
+  let FORM_BINDINGS: Type[];
+  
+
+    
+  function inspectNativeElement(element: any): DebugElement;
+  
+
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
+    /**
+     * Get child DebugElements from within the Light DOM.
+     * 
+     * @return {DebugElement[]}
+     */
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
+  }
+
+    
+  /**
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
+   */
+  function inspectElement(elementRef: ElementRef): DebugElement;
+  
+
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
+
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope: WtfScopeFn;
+  
+
+    
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
+  
+
+    
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
+  
+
+    
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange: (range: any) => void;
+  
+
+    
+  interface WtfScopeFn {
+    
+    (arg0?: any, arg1?: any): any;
+    
+  }
+
+    
+  /**
+   * Bootstrapping a Webworker Application
+   * 
+   * You instantiate the application side by calling bootstrapWebworker from your webworker index
+   * script.
+   * You can call bootstrapWebworker() exactly as you would call bootstrap() in a regular Angular
+   * application
+   * See the bootstrap() docs for more details.
+   */
+  function bootstrapWebWorker(appComponentType: Type, componentInjectableBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+  
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: StringMap<string, any>);
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var Renderer: InjectableReference;
+  
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
+  var ApplicationRef: InjectableReference;
+  
+
+    
+  var Compiler: InjectableReference;
+  
+
+    
+  var AppViewManager: InjectableReference;
+  
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
+  var ViewRef: InjectableReference;
+  
+
+    
+  var ProtoViewRef: InjectableReference;
+  
+
+    
+  var ViewContainerRef: InjectableReference;
+  
+
+    
+  var ComponentRef: InjectableReference;
+  
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/web_worker/worker" {
+  export = ngWorker;
+}
+
+
+
+declare module ngUi {  
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  class WebWorkerApplication {
+    
+    constructor(_clientMessageBrokerFactory: ClientMessageBrokerFactory, _serviceMessageBrokerFactory: ServiceMessageBrokerFactory);
+    
+    createClientMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+    createServiceMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Bootstrapping a WebWorker
+   * 
+   * You instantiate a WebWorker application by calling bootstrap with the URI of your worker's index
+   * script
+   * Note: The WebWorker script must call bootstrapWebworker once it is set up to complete the
+   * bootstrapping process
+   */
+  function bootstrap(uri: string): WebWorkerInstance;
+  
+
+    
+  function spawnWebWorker(uri: string): WebWorkerInstance;
+  
+
+    
+  /**
+   * Wrapper class that exposes the {@link WebWorkerApplication}
+   * Isolate instance and underlying {@link MessageBus} for lower level message passing.
+   */
+  class WebWorkerInstance {
+    
+    constructor(app: WebWorkerApplication, worker: Worker, bus: MessageBus);
+    
+    app: WebWorkerApplication;
+    
+    worker: Worker;
+    
+    bus: MessageBus;
+    
+  }
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: StringMap<string, any>);
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/web_worker/ui" {
+  export = ngUi;
+}
+
+
diff --git a/angular2/angular2-2.0.0-alpha.39.d.ts b/angular2/angular2-2.0.0-alpha.39.d.ts
new file mode 100644
index 000000000..616157aaf
--- /dev/null
+++ b/angular2/angular2-2.0.0-alpha.39.d.ts
@@ -0,0 +1,17105 @@
+// Type definitions for Angular v2.0.0-39
+// 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.
+// ***********************************************************
+
+// angular2/angular2 depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/worker depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/ui depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+
+
+interface Map<K,V> {}
+
+
+declare module ng {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngWorker {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngUi {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+
+
+
+declare module ng {  
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: {[key: string]: any},
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
+    /**
+     * 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: ChangeDetectionStrategy;
+    
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+    viewBindings: any[];
+    
+  }
+
+    
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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]',
+   *   inputs: [
+   *     '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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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]',
+   *   inputs: [
+   *     'text: tooltip'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
+   * 
+   * ## 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]',
+   *   inputs: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      });
+    
+    /**
+     * 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 data-bound input properties for a directive
+     * 
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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.
+     * 
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+     * 
+     * The following example creates a component with two data-bound properties.
+     * 
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
+     * })
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    inputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
+     * 
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
+     * 
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+     * })
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
+     * 
+     *   constructor() {
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
+     * })
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
+     * }
+     * bootstrap(App);
+     * ```
+     */
+    outputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Host Listeners
+     * 
+     * Specifies which DOM events 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 evaluation 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 $event local variable.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+     * 
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'button[counting]',
+     *   host: {
+     *     '(click)': 'onClick($event.target)'
+     *   }
+     * })
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Host Property Bindings
+     * 
+     * Specifies which DOM properties a directive updates.
+     * 
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[ng-model]',
+     *   host: {
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
+     *   }
+     * })
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element.
+     * 
+     * ### Example
+     * 
+     * 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.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     */
+    host: {[key: string]: string};
+    
+    /**
+     * 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+    bindings: 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;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: {[key: string]: any};
+    
+  }
+
+    
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
+  }
+
+    
+  /**
+   * Declares a data-bound input property.
+   * 
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
+    /**
+     * Specifies a template URL for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    templateUrl: string;
+    
+    /**
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     */
+    template: string;
+    
+    /**
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: 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: [NgFor]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+    directives: Array<Type | any[]>;
+    
+    pipes: Array<Type | any[]>;
+    
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+    encapsulation: ViewEncapsulation;
+    
+  }
+
+    
+  /**
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
+   */
+  enum ViewEncapsulation {
+    
+    /**
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
+     */
+    Emulated,
+    
+    /**
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
+     */
+    Native,
+    
+    /**
+     * Don't provide any template or style encapsulation.
+     */
+    None
+  }
+  
+
+    
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link DirectiveMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ViewMetadata} 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: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+    
+  }
+
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
+
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
+    
+  }
+
+    
+  /**
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
+   */
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
+   */
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component: ComponentFactory;
+  
+
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
+  /**
+   * 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 = ng.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;
+  
+
+    
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+    /**
+     * Optional argument for specifying the superclass.
+     */
+    extends?: Type;
+    
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+    constructor: Function | any[];
+    
+  }
+
+    
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+    annotations: any[];
+    
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+    Class(obj: ClassDefinition): Type;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
+    /**
+     * Private
+     */
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
+    
+    /**
+     * Turns an array of binding definitions into an array of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
+     */
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Describes how the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
+    
+  }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
+  
+
+    
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
+   * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
+   * }
+   * ```
+   */
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+   * 
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
+   * 
+   * ```
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
+   * }
+   * ```
+   */
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
+   */
+  class DatePipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  let DEFAULT_PIPES: Binding;
+  
+
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
+  /**
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
+   *  }
+   * }
+   * 
+   * ```
+   */
+  class JsonPipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
+   */
+  class SlicePipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  /**
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class LowerCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  class NumberPipe {
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An {@link angular2/di/OpaqueToken} representing the application root type in the {@link
+   * Injector}.
+   * 
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   * 
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   * 
+   * ```
+   */
+  let APP_COMPONENT: OpaqueToken;
+  
+
+    
+  /**
+   * A DI Token representing a unique string id assigned to the application by Angular and used
+   * primarily for prefixing application attributes and CSS styles when
+   * {@link ViewEncapsulation#Emulated} is being used.
+   * 
+   * If you need to avoid randomly generated value to be used as an application id, you can provide
+   * a custom value via a DI binding <!-- TODO: provider --> configuring the root {@link Injector}
+   * using this token.
+   */
+  let APP_ID: OpaqueToken;
+  
+
+    
+  /**
+   * Initialize the Angular 'platform' on the page.
+   * 
+   * See {@link PlatformRef} for details on the Angular platform.
+   * 
+   * # Without specified bindings
+   * 
+   * If no bindings are specified, `platform`'s behavior depends on whether an existing
+   * platform exists:
+   * 
+   * If no platform exists, a new one will be created with the default {@link platformBindings}.
+   * 
+   * If a platform already exists, it will be returned (regardless of what bindings it
+   * was created with). This is a convenience feature, allowing for multiple applications
+   * to be loaded into the same platform without awareness of each other.
+   * 
+   * # With specified bindings
+   * 
+   * It is also possible to specify bindings to be made in the new platform. These bindings
+   * will be shared between all applications on the page. For example, an abstraction for
+   * the browser cookie jar should be bound at the platform level, because there is only one
+   * cookie jar regardless of how many applications on the age will be accessing it.
+   * 
+   * If bindings are specified directly, `platform` will create the Angular platform with
+   * them if a platform did not exist already. If it did exist, however, an error will be
+   * thrown.
+   * 
+   * # DOM Applications
+   * 
+   * This version of `platform` initializes Angular to run in the UI thread, with direct
+   * DOM access. Web-worker applications should call `platform` from
+   * `src/web_workers/worker/application_common` instead.
+   */
+  function platform(bindings?: Array<Type | Binding | any[]>): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
+   */
+  interface ApplicationRef {
+    
+    /**
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
+     */
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
+    
+    /**
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
+     */
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+    
+    /**
+     * Retrieve the application {@link Injector}.
+     */
+    injector: Injector;
+    
+    /**
+     * Retrieve the application {@link NgZone}.
+     */
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  function bootstrap(appComponentType: /*Type*/ any, appBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+  
+
+    
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+    constructor(value: string);
+    
+    /**
+     * Returns the base URL of the currently running application.
+     */
+    value: any;
+    
+  }
+
+    
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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;
+    
+  }
+
+    
+  /**
+   * A service that can be used to get and set the title of a current HTML document.
+   * 
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
+   */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
+  class DirectiveResolver {
+    
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+    resolve(type: Type): DirectiveMetadata;
+    
+  }
+
+    
+  /**
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
+   * 
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
+   */
+  interface Compiler {
+    
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
+  }
+
+    
+  /**
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
+   */
+  interface AppViewManager {
+    
+    /**
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
+     */
+    getViewContainer(location: ElementRef): ViewContainerRef;
+    
+    /**
+     * Returns the {@link ElementRef} that makes up the specified Host View.
+     */
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+    /**
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
+     * 
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
+     */
+    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+    /**
+     * Returns the component instance for the provided Host Element.
+     */
+    getComponent(hostLocation: ElementRef): any;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
+     * 
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
+     * 
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
+     * 
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
+     * 
+     * ## 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): HostViewRef;
+    
+    /**
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
+     */
+    destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
+     */
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
+     */
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
+     */
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
+    
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
+    
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
+   * 
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
+   * 
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
+   * 
+   * Changes can be observed by subscribing to the changes `Observable`.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+   * ```javascript
+   * @Component({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
+   *   }
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+    changes: Observable;
+    
+    length: number;
+    
+    first: T;
+    
+    last: T;
+    
+    /**
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
+     * 
+     * In a browser the platform-specific global view is the main DOM Document.
+     * 
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+  }
+
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  interface LifeCycle {
+    
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+    tick(): void;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  /**
+   * A dispatcher that relays all events that occur in a Render View.
+   * 
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
+   */
+  interface RenderEventDispatcher {
+    
+    /**
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
+     */
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+    
+  }
+
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
+    /**
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
+     * 
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
+     */
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[], nativeShadow: boolean): void;
+    
+    /**
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
+     */
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
+    
+    /**
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+    /**
+     * Creates a Render View based on the provided `protoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+    /**
+     * Destroys a Render View specified via `viewRef`.
+     * 
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
+     * 
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
+     */
+    destroyView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
+     */
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Attaches the Nodes of the Render Fragment after an Element.
+     */
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Detaches the Nodes of a Render Fragment from their parent.
+     * 
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
+     */
+    detachFragment(fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Notifies a custom Renderer to initialize a Render View.
+     * 
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
+     */
+    hydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Notifies a custom Renderer that a Render View is no longer active.
+     * 
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
+     * 
+     * If `attributeValue` is `null`, the attribute is removed.
+     */
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+    /**
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
+     */
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+    /**
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
+     */
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+    /**
+     * Calls a method on the Element specified via `location`.
+     */
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
+  }
+
+    
+  /**
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
+   * 
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
+   * 
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
+   * 
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
+   * 
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
+   * 
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
+   * 
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
+   * 
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
+   * 
+   * 
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
+   */
+  interface RenderProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
+   * 
+   * Any {@link RenderView} has one Render Fragment.
+   * 
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
+   */
+  class RenderFragmentRef {
+    
+  }
+
+    
+  /**
+   * Container class produced by a {@link Renderer} when creating a Render View.
+   * 
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
+   */
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  /**
+   * A DI Token representing the main rendering context. In a browser this is the DOM Document.
+   * 
+   * Note: Document might not be available in the Application Context when Application and Rendering
+   * Contexts are not the same (e.g. when running the application into a Web Worker).
+   */
+  let DOCUMENT: OpaqueToken;
+  
+
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass implements DoCheck,  OnDestroy {
+    
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    initialClasses: any;
+    
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): 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, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
+   * 
+   * 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>`
+   */
+  class NgFor implements DoCheck {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
+    
+    ngForOf: any;
+    
+    doCheck(): 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 ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+   * 
+   * ```
+   * <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>`
+   */
+  class NgIf {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
+  }
+
+    
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle implements DoCheck {
+    
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+    
+    ngSwitch: any;
+    
+  }
+
+    
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
+  }
+
+    
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
+  }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
+  
+
+    
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+    constructor(validator: Function);
+    
+    validator: Function;
+    
+    value: any;
+    
+    status: string;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+    valueChanges: Observable;
+    
+    markAsTouched(): void;
+    
+    markAsDirty({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    setParent(parent: ControlGroup | ControlArray): void;
+    
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
+    
+  }
+
+    
+  /**
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class Control extends AbstractControl {
+    
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    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 {@link Control} 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 {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlGroup extends AbstractControl {
+    
+    constructor(controls: {[key: string]: AbstractControl}, optionals?: {[key: string]: boolean}, validator?: Function);
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(name: string, control: 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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlArray extends AbstractControl {
+    
+    constructor(controls: AbstractControl[], validator?: Function);
+    
+    controls: AbstractControl[];
+    
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
+    
+  }
+
+    
+  class AbstractControlDirective {
+    
+    control: AbstractControl;
+    
+    value: any;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+  }
+
+    
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+  }
+
+    
+  /**
+   * A directive that contains multiple {@link NgControl}.
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+    name: string;
+    
+    formDirective: Form;
+    
+    path: string[];
+    
+  }
+
+    
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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): void {
+   *    // 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: [FORM_DIRECTIVES],
+   *      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(): void {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
+    
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    onDestroy(): void;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+    path: string[];
+    
+    formDirective: any;
+    
+    control: Control;
+    
+    validator: Function;
+    
+  }
+
+    
+  /**
+   * Binds an existing {@link Control} to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
+   * }
+   *  ```
+   * 
+   * # ng-model
+   * 
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl: Control = new Control('');
+   *  login:string;
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    form: Control;
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    path: string[];
+    
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Binds a domain model to a form control.
+   * 
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    control: Control;
+    
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * A base class that all control directive extend.
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+    name: string;
+    
+    valueAccessor: ControlValueAccessor;
+    
+    validator: Function;
+    
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
+    
+    constructor(_parent: ControlContainer);
+    
+    onInit(): void;
+    
+    onDestroy(): void;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
+    
+  }
+
+    
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.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(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+    form: ControlGroup;
+    
+    ngSubmit: any;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => void): void;
+    
+    registerOnTouched(fn: () => void): void;
+    
+  }
+
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => {}): void;
+    
+    registerOnTouched(fn: () => {}): void;
+    
+  }
+
+    
+  /**
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
+    
+    value: string;
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
+   */
+  let FORM_DIRECTIVES: Type[];
+  
+
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+    static required(control:Control): {[key: string]: boolean};
+    
+    static nullValidator(c: any): {[key: string]: boolean};
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): {[key: string]: any[]};
+    
+    static array(array:ControlArray): {[key: string]: any[]};
+    
+  }
+
+    
+  class DefaultValidators {
+    
+  }
+
+    
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [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: [FORM_DIRECTIVES]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  class FormBuilder {
+    
+    group(controlsConfig: {[key: string]: any}, extra?: {[key: string]: any}): ControlGroup;
+    
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
+    
+  }
+
+    
+  /**
+   * Shorthand set of bindings used for building Angular forms.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
+   */
+  let FORM_BINDINGS: Type[];
+  
+
+    
+  function inspectNativeElement(element: any): DebugElement;
+  
+
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
+    /**
+     * Get child DebugElements from within the Light DOM.
+     * 
+     * @return {DebugElement[]}
+     */
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
+  }
+
+    
+  /**
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
+   */
+  function inspectElement(elementRef: ElementRef): DebugElement;
+  
+
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
+
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope: WtfScopeFn;
+  
+
+    
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
+  
+
+    
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
+  
+
+    
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange: (range: any) => void;
+  
+
+    
+  interface WtfScopeFn {
+    
+    (arg0?: any, arg1?: any): any;
+    
+  }
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
+  var ApplicationRef: InjectableReference;
+  
+
+    
+  var Compiler: InjectableReference;
+  
+
+    
+  var AppViewManager: InjectableReference;
+  
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
+  var ViewRef: InjectableReference;
+  
+
+    
+  var ProtoViewRef: InjectableReference;
+  
+
+    
+  var ViewContainerRef: InjectableReference;
+  
+
+    
+  var ComponentRef: InjectableReference;
+  
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var Renderer: InjectableReference;
+  
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
+
+
+
+declare module ngWorker {  
+  /**
+   * A dispatcher that relays all events that occur in a Render View.
+   * 
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
+   */
+  interface RenderEventDispatcher {
+    
+    /**
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
+     */
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+    
+  }
+
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
+    /**
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
+     * 
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
+     */
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[], nativeShadow: boolean): void;
+    
+    /**
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
+     */
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
+    
+    /**
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+    /**
+     * Creates a Render View based on the provided `protoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+    /**
+     * Destroys a Render View specified via `viewRef`.
+     * 
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
+     * 
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
+     */
+    destroyView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
+     */
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Attaches the Nodes of the Render Fragment after an Element.
+     */
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Detaches the Nodes of a Render Fragment from their parent.
+     * 
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
+     */
+    detachFragment(fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Notifies a custom Renderer to initialize a Render View.
+     * 
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
+     */
+    hydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Notifies a custom Renderer that a Render View is no longer active.
+     * 
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
+     * 
+     * If `attributeValue` is `null`, the attribute is removed.
+     */
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+    /**
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
+     */
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+    /**
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
+     */
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+    /**
+     * Calls a method on the Element specified via `location`.
+     */
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
+  }
+
+    
+  /**
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
+   * 
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
+   * 
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
+   * 
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
+   * 
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
+   * 
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
+   * 
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
+   * 
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
+   * 
+   * 
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
+   */
+  interface RenderProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
+   * 
+   * Any {@link RenderView} has one Render Fragment.
+   * 
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
+   */
+  class RenderFragmentRef {
+    
+  }
+
+    
+  /**
+   * Container class produced by a {@link Renderer} when creating a Render View.
+   * 
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
+   */
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: {[key: string]: any},
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
+    /**
+     * 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: ChangeDetectionStrategy;
+    
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+    viewBindings: any[];
+    
+  }
+
+    
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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]',
+   *   inputs: [
+   *     '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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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]',
+   *   inputs: [
+   *     'text: tooltip'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
+   * 
+   * ## 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]',
+   *   inputs: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      });
+    
+    /**
+     * 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 data-bound input properties for a directive
+     * 
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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.
+     * 
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+     * 
+     * The following example creates a component with two data-bound properties.
+     * 
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
+     * })
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    inputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
+     * 
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
+     * 
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+     * })
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
+     * 
+     *   constructor() {
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
+     * })
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
+     * }
+     * bootstrap(App);
+     * ```
+     */
+    outputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Host Listeners
+     * 
+     * Specifies which DOM events 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 evaluation 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 $event local variable.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+     * 
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'button[counting]',
+     *   host: {
+     *     '(click)': 'onClick($event.target)'
+     *   }
+     * })
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Host Property Bindings
+     * 
+     * Specifies which DOM properties a directive updates.
+     * 
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[ng-model]',
+     *   host: {
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
+     *   }
+     * })
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element.
+     * 
+     * ### Example
+     * 
+     * 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.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     */
+    host: {[key: string]: string};
+    
+    /**
+     * 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+    bindings: 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;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: {[key: string]: any};
+    
+  }
+
+    
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
+  }
+
+    
+  /**
+   * Declares a data-bound input property.
+   * 
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
+    /**
+     * Specifies a template URL for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    templateUrl: string;
+    
+    /**
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     */
+    template: string;
+    
+    /**
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: 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: [NgFor]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+    directives: Array<Type | any[]>;
+    
+    pipes: Array<Type | any[]>;
+    
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+    encapsulation: ViewEncapsulation;
+    
+  }
+
+    
+  /**
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
+   */
+  enum ViewEncapsulation {
+    
+    /**
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
+     */
+    Emulated,
+    
+    /**
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
+     */
+    Native,
+    
+    /**
+     * Don't provide any template or style encapsulation.
+     */
+    None
+  }
+  
+
+    
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link DirectiveMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ViewMetadata} 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: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+    
+  }
+
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
+
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
+    
+  }
+
+    
+  /**
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
+   */
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
+   */
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component: ComponentFactory;
+  
+
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
+  /**
+   * 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 = ng.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;
+  
+
+    
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+    /**
+     * Optional argument for specifying the superclass.
+     */
+    extends?: Type;
+    
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+    constructor: Function | any[];
+    
+  }
+
+    
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+    annotations: any[];
+    
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+    Class(obj: ClassDefinition): Type;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
+    /**
+     * Private
+     */
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
+    
+    /**
+     * Turns an array of binding definitions into an array of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
+     */
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Describes how the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
+    
+  }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
+  
+
+    
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
+   * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
+   * }
+   * ```
+   */
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+   * 
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
+   * 
+   * ```
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
+   * }
+   * ```
+   */
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
+   */
+  class DatePipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  let DEFAULT_PIPES: Binding;
+  
+
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
+  /**
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
+   *  }
+   * }
+   * 
+   * ```
+   */
+  class JsonPipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
+   */
+  class SlicePipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  /**
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class LowerCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  class NumberPipe {
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
+   */
+  interface ApplicationRef {
+    
+    /**
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
+     */
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
+    
+    /**
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
+     */
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+    
+    /**
+     * Retrieve the application {@link Injector}.
+     */
+    injector: Injector;
+    
+    /**
+     * Retrieve the application {@link NgZone}.
+     */
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+    constructor(value: string);
+    
+    /**
+     * Returns the base URL of the currently running application.
+     */
+    value: any;
+    
+  }
+
+    
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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;
+    
+  }
+
+    
+  /**
+   * A service that can be used to get and set the title of a current HTML document.
+   * 
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
+   */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  class DirectiveResolver {
+    
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+    resolve(type: Type): DirectiveMetadata;
+    
+  }
+
+    
+  /**
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
+   * 
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
+   */
+  interface Compiler {
+    
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
+  }
+
+    
+  /**
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
+   */
+  interface AppViewManager {
+    
+    /**
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
+     */
+    getViewContainer(location: ElementRef): ViewContainerRef;
+    
+    /**
+     * Returns the {@link ElementRef} that makes up the specified Host View.
+     */
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+    /**
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
+     * 
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
+     */
+    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+    /**
+     * Returns the component instance for the provided Host Element.
+     */
+    getComponent(hostLocation: ElementRef): any;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
+     * 
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
+     * 
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
+     * 
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
+     * 
+     * ## 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): HostViewRef;
+    
+    /**
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
+     */
+    destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
+     */
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
+     */
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
+     */
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
+    
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
+    
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
+   * 
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
+   * 
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
+   * 
+   * Changes can be observed by subscribing to the changes `Observable`.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+   * ```javascript
+   * @Component({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
+   *   }
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+    changes: Observable;
+    
+    length: number;
+    
+    first: T;
+    
+    last: T;
+    
+    /**
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
+     * 
+     * In a browser the platform-specific global view is the main DOM Document.
+     * 
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+  }
+
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  interface LifeCycle {
+    
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+    tick(): void;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass implements DoCheck,  OnDestroy {
+    
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    initialClasses: any;
+    
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): 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, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
+   * 
+   * 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>`
+   */
+  class NgFor implements DoCheck {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
+    
+    ngForOf: any;
+    
+    doCheck(): 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 ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+   * 
+   * ```
+   * <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>`
+   */
+  class NgIf {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
+  }
+
+    
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle implements DoCheck {
+    
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+    
+    ngSwitch: any;
+    
+  }
+
+    
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
+  }
+
+    
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
+  }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
+  
+
+    
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+    constructor(validator: Function);
+    
+    validator: Function;
+    
+    value: any;
+    
+    status: string;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+    valueChanges: Observable;
+    
+    markAsTouched(): void;
+    
+    markAsDirty({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    setParent(parent: ControlGroup | ControlArray): void;
+    
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
+    
+  }
+
+    
+  /**
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class Control extends AbstractControl {
+    
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    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 {@link Control} 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 {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlGroup extends AbstractControl {
+    
+    constructor(controls: {[key: string]: AbstractControl}, optionals?: {[key: string]: boolean}, validator?: Function);
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(name: string, control: 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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlArray extends AbstractControl {
+    
+    constructor(controls: AbstractControl[], validator?: Function);
+    
+    controls: AbstractControl[];
+    
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
+    
+  }
+
+    
+  class AbstractControlDirective {
+    
+    control: AbstractControl;
+    
+    value: any;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+  }
+
+    
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+  }
+
+    
+  /**
+   * A directive that contains multiple {@link NgControl}.
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+    name: string;
+    
+    formDirective: Form;
+    
+    path: string[];
+    
+  }
+
+    
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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): void {
+   *    // 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: [FORM_DIRECTIVES],
+   *      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(): void {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
+   *  }
+   * }
+   *  ```
+   */
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
+    
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    onDestroy(): void;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+    path: string[];
+    
+    formDirective: any;
+    
+    control: Control;
+    
+    validator: Function;
+    
+  }
+
+    
+  /**
+   * Binds an existing {@link Control} to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
+   * }
+   *  ```
+   * 
+   * # ng-model
+   * 
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl: Control = new Control('');
+   *  login:string;
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    form: Control;
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    path: string[];
+    
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Binds a domain model to a form control.
+   * 
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    control: Control;
+    
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * A base class that all control directive extend.
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+    name: string;
+    
+    valueAccessor: ControlValueAccessor;
+    
+    validator: Function;
+    
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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'}}
+   *  }
+   * }
+   * 
+   *  ```
+   */
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
+    
+    constructor(_parent: ControlContainer);
+    
+    onInit(): void;
+    
+    onDestroy(): void;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
+    
+  }
+
+    
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.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(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+    form: ControlGroup;
+    
+    ngSubmit: any;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => void): void;
+    
+    registerOnTouched(fn: () => void): void;
+    
+  }
+
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => {}): void;
+    
+    registerOnTouched(fn: () => {}): void;
+    
+  }
+
+    
+  /**
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
+    
+    value: string;
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
+   */
+  let FORM_DIRECTIVES: Type[];
+  
+
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+    static required(control:Control): {[key: string]: boolean};
+    
+    static nullValidator(c: any): {[key: string]: boolean};
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): {[key: string]: any[]};
+    
+    static array(array:ControlArray): {[key: string]: any[]};
+    
+  }
+
+    
+  class DefaultValidators {
+    
+  }
+
+    
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [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: [FORM_DIRECTIVES]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  class FormBuilder {
+    
+    group(controlsConfig: {[key: string]: any}, extra?: {[key: string]: any}): ControlGroup;
+    
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
+    
+  }
+
+    
+  /**
+   * Shorthand set of bindings used for building Angular forms.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
+   */
+  let FORM_BINDINGS: Type[];
+  
+
+    
+  function inspectNativeElement(element: any): DebugElement;
+  
+
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
+    /**
+     * Get child DebugElements from within the Light DOM.
+     * 
+     * @return {DebugElement[]}
+     */
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
+  }
+
+    
+  /**
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
+   */
+  function inspectElement(elementRef: ElementRef): DebugElement;
+  
+
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
+
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope: WtfScopeFn;
+  
+
+    
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
+  
+
+    
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
+  
+
+    
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange: (range: any) => void;
+  
+
+    
+  interface WtfScopeFn {
+    
+    (arg0?: any, arg1?: any): any;
+    
+  }
+
+    
+  /**
+   * Bootstrapping a Webworker Application
+   * 
+   * You instantiate the application side by calling bootstrapWebworker from your webworker index
+   * script.
+   * You can call bootstrapWebworker() exactly as you would call bootstrap() in a regular Angular
+   * application
+   * See the bootstrap() docs for more details.
+   */
+  function bootstrapWebWorker(appComponentType: Type, componentInjectableBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+  
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: {[key: string]: any});
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var Renderer: InjectableReference;
+  
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
+  var ApplicationRef: InjectableReference;
+  
+
+    
+  var Compiler: InjectableReference;
+  
+
+    
+  var AppViewManager: InjectableReference;
+  
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
+  var ViewRef: InjectableReference;
+  
+
+    
+  var ProtoViewRef: InjectableReference;
+  
+
+    
+  var ViewContainerRef: InjectableReference;
+  
+
+    
+  var ComponentRef: InjectableReference;
+  
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/web_worker/worker" {
+  export = ngWorker;
+}
+
+
+
+declare module ngUi {  
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  class WebWorkerApplication {
+    
+    constructor(_clientMessageBrokerFactory: ClientMessageBrokerFactory, _serviceMessageBrokerFactory: ServiceMessageBrokerFactory);
+    
+    createClientMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+    createServiceMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Bootstrapping a WebWorker
+   * 
+   * You instantiate a WebWorker application by calling bootstrap with the URI of your worker's index
+   * script
+   * Note: The WebWorker script must call bootstrapWebworker once it is set up to complete the
+   * bootstrapping process
+   */
+  function bootstrap(uri: string): WebWorkerInstance;
+  
+
+    
+  function spawnWebWorker(uri: string): WebWorkerInstance;
+  
+
+    
+  /**
+   * Wrapper class that exposes the {@link WebWorkerApplication}
+   * Isolate instance and underlying {@link MessageBus} for lower level message passing.
+   */
+  class WebWorkerInstance {
+    
+    constructor(app: WebWorkerApplication, worker: Worker, bus: MessageBus);
+    
+    app: WebWorkerApplication;
+    
+    worker: Worker;
+    
+    bus: MessageBus;
+    
+  }
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: {[key: string]: any});
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/web_worker/ui" {
+  export = ngUi;
+}
+
+
diff --git a/angular2/angular2-tests.ts b/angular2/angular2-tests.ts
index 1cd77cdf4..a39cdcf79 100644
--- a/angular2/angular2-tests.ts
+++ b/angular2/angular2-tests.ts
@@ -16,7 +16,7 @@ class Cmp {
 Cmp.annotations = [
   Component({
     selector: 'cmp',
-    injectables: [Service, bind(Service2).toValue(null)]
+    bindings: [Service, bind(Service2).toValue(null)]
   }),
   View({
     template: '{{greeting}} world!',
@@ -24,13 +24,13 @@ Cmp.annotations = [
   }),
   Directive({
     selector: '[tooltip]',
-    properties: [
+    inputs: [
       'text: tooltip'
     ],
-    hostListeners: {
-      'onmouseenter': 'onMouseEnter()',
-      'onmouseleave': 'onMouseLeave()'
-    }
+    outputs: [
+      '(mouseenter):onMouseEnter()',
+      '(mouseleave):onMouseLeave()'
+    ]
   })
 ];
 
diff --git a/angular2/angular2-tests.ts.tscparams b/angular2/angular2-tests.ts.tscparams
index cfedaf198..3f0863ac6 100644
--- a/angular2/angular2-tests.ts.tscparams
+++ b/angular2/angular2-tests.ts.tscparams
@@ -1 +1 @@
---experimentalDecorators --target ES5
\ No newline at end of file
+--experimentalDecorators --noImplicitAny --target ES5
diff --git a/angular2/angular2.d.ts b/angular2/angular2.d.ts
index 4c9c2aea2..616157aaf 100644
--- a/angular2/angular2.d.ts
+++ b/angular2/angular2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular v2.0.0-alpha.35
+// Type definitions for Angular v2.0.0-39
 // Project: http://angular.io/
 // Definitions by: angular team <https://github.com/angular/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -13,13 +13,21 @@
 // If you don't have them installed you can install them using TSD
 // https://github.com/DefinitelyTyped/tsd
 
-///<reference path="../es6-promise/es6-promise.d.ts"/>
-///<reference path="../rx/rx.d.ts"/>
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/worker depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
+// angular2/web_worker/ui depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="../es6-shim/es6-shim.d.ts"/>
 
 
-interface List<T> extends Array<T> {}
 interface Map<K,V> {}
-interface StringMap<K,V> extends Map<K,V> {}
+
 
 declare module ng {
   // See https://github.com/Microsoft/TypeScript/issues/1168
@@ -31,14 +39,380 @@ declare module ng {
   interface InjectableReference {}
 }
 
+declare module ngWorker {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
+declare module ngUi {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+
 
 
 
-/**
- * The `angular2` is the single place to import all of the individual types.
- */
-declare module ng {
+declare module ng {  
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
 
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
   /**
    * Declare reusable UI building blocks for an application.
    * 
@@ -56,6 +430,11 @@ declare module ng {
    * 
    * For details on the `@View` annotation, see {@link ViewMetadata}.
    * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
    * ## Example
    * 
    * ```
@@ -76,23 +455,35 @@ declare module ng {
    */
   class ComponentMetadata extends DirectiveMetadata {
     
-
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: {[key: string]: any},
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
     /**
      * 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.
+     * 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.
+     * or only when the component tells it to do so.
      */
-     changeDetection: string;
+    changeDetection: ChangeDetectionStrategy;
     
-
     /**
-     * Defines the set of injectable objects that are visible to its view dom children.
+     * Defines the set of injectable objects that are visible to its view DOM children.
      * 
      * ## Simple Example
      * 
@@ -131,10 +522,11 @@ declare module ng {
      * 
      * ```
      */
-     viewBindings: List<any>;
+    viewBindings: any[];
+    
   }
-  
 
+    
   /**
    * Directives allow you to attach behavior to elements in the DOM.
    * 
@@ -229,7 +621,7 @@ declare module ng {
    * 
    * @Directive({
    *   selector: '[dependency]',
-   *   properties: [
+   *   inputs: [
    *     'id: dependency'
    *   ]
    * })
@@ -375,7 +767,7 @@ declare module ng {
    * ```
    * @Directive({
    *   selector: '[tooltip]',
-   *   properties: [
+   *   inputs: [
    *     'text: tooltip'
    *   ],
    *   host: {
@@ -451,6 +843,10 @@ declare module ng {
    * the directive
    * controller is correctly instantiated on the `<template>` element rather than the `<li>` element.
    * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
    * 
    * ## Example
    * 
@@ -461,7 +857,7 @@ declare module ng {
    * ```
    * @Directive({
    *   selector: '[unless]',
-   *   properties: ['unless']
+   *   inputs: ['unless']
    * })
    * export class Unless {
    *   viewContainer: ViewContainerRef;
@@ -511,7 +907,20 @@ declare module ng {
    */
   class DirectiveMetadata extends InjectableMetadata {
     
-
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      });
+    
     /**
      * The CSS selector that triggers the instantiation of a directive.
      * 
@@ -543,211 +952,212 @@ declare module ng {
      * 
      * 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.
+     * Enumerates the set of data-bound input properties for a directive
      * 
-     * The `properties` property defines a set of `directiveProperty` to `bindingProperty`
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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 {@link PipeMetadata} 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.
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
      * 
-     * ## Syntax
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
      * 
-     * There is no need to specify both `directiveProperty` and `bindingProperty` when they both have
-     * the same value.
+     * The following example creates a component with two data-bound properties.
      * 
-     * ```
-     * @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'
-     *   ]
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
      * })
-     * class Tooltip {
-     *   set text(value: string) {
-     *     // This will get called every time with the new value when the 'tooltip' property changes
-     *   }
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
      * }
-     * ```
      * 
-     * 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:
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
      * 
-     * ```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 use pipes in bindings, as follows:
-     * 
-     * ```html
-     * <div [class-set]="someExpression | somePipe">
+     * bootstrap(App);
      * ```
      */
-     properties: List<string>;
+    inputs: string[];
     
-
     /**
-     * Enumerates the set of emitted events.
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
      * 
-     * ## Syntax
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
      * 
-     * ```
-     * @Component({
-     *   events: ['statusChange']
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
      * })
-     * class TaskComponent {
-     *   statusChange: EventEmitter;
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
      * 
      *   constructor() {
-     *     this.statusChange = new EventEmitter();
-     *   }
-     * 
-     *   onComplete() {
-     *     this.statusChange.next('completed');
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
      *   }
      * }
-     * ```
      * 
-     * Use `propertyName: eventName` when the event emitter property name is different from the name
-     * of the emitted event:
-     * 
-     * ```
-     * @Component({
-     *   events: ['status: statusChange']
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
      * })
-     * class TaskComponent {
-     *   status: EventEmitter;
-     * 
-     *   constructor() {
-     *     this.status = new EventEmitter();
-     *   }
-     * 
-     *   onComplete() {
-     *     this.status.next('completed');
-     *   }
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
      * }
+     * bootstrap(App);
      * ```
      */
-     events: List<string>;
+    outputs: string[];
     
-
     /**
-     * Specifiy the events, actions, properties and attributes related to the host element.
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
      * 
-     * ## Events
+     * ## Host Listeners
      * 
-     * Specifies which DOM hostListeners a directive listens to via a set of `(event)` to `method`
+     * Specifies which DOM events 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
+     * If the evaluation 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)
+     * When writing a directive event binding, you can also refer to the $event local variable.
      * 
-     * ## Syntax
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
      * 
-     * ```
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
      * @Directive({
+     *   selector: 'button[counting]',
      *   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)'
+     *     '(click)': 'onClick($event.target)'
      *   }
      * })
-     * 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
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
      *   }
      * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
      * ```
      * 
-     * ## Properties
+     * ## Host Property Bindings
      * 
-     * Specifies which DOM properties a directives updates.
+     * Specifies which DOM properties a directive updates.
      * 
-     * ## Syntax
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
      * 
-     * ```
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
      * @Directive({
-     *   selector: 'input',
+     *   selector: '[ng-model]',
      *   host: {
-     *     '[prop]': 'expression'
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
      *   }
      * })
-     * class InputDirective {
-     *   value:string;
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
      * }
-     * ```
      * 
-     * In this example the prop property of the host element is updated with the expression value
-     * every time it changes.
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
      * 
      * ## 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.
+     * Specifies static attributes that should be propagated to a host element.
      * 
-     * ## Syntax
+     * ### Example
      * 
-     * ```
+     * 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.
+     * 
+     * ```typescript
      * @Directive({
      *   selector: '[my-button]',
      *   host: {
@@ -757,55 +1167,11 @@ declare module ng {
      * 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>;
+    host: {[key: string]: string};
     
-
     /**
-     * Specifies which lifecycle should be notified to the directive.
-     * 
-     * See {@link LifecycleEvent} 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
+     * Defines the set of injectable objects that are visible to a Directive and its light DOM
      * children.
      * 
      * ## Simple Example
@@ -834,9 +1200,8 @@ declare module ng {
      * }
      * ```
      */
-     bindings: List<any>;
+    bindings: any[];
     
-
     /**
      * Defines the name that can be used in the template to assign this directive to a variable.
      * 
@@ -862,10 +1227,67 @@ declare module ng {
      * 
      * ```
      */
-     exportAs: string;
+    exportAs: string;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: {[key: string]: any};
+    
   }
-  
 
+    
   /**
    * Declare reusable pipe function.
    * 
@@ -882,152 +1304,211 @@ declare module ng {
    */
   class PipeMetadata extends InjectableMetadata {
     
-     name: string;
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
   }
-  
 
+    
   /**
-   * 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`
-   */
-  enum LifecycleEvent {
-    
-
-    /**
-     * Notify a directive whenever a {@link ViewMetadata} that contains it is destroyed.
-     * 
-     * ## Example
-     * 
-     * ```
-     * @Directive({
-     *   ...,
-     *   lifecycle: [LifecycleEvent.onDestroy]
-     * })
-     * class ClassSet {
-     *   onDestroy() {
-     *     // invoked to notify directive of the containing view destruction.
-     *   }
-     * }
-     * ```
-     */
-     onDestroy,
-    
-
-    /**
-     * 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: [LifecycleEvent.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
-     *     }
-     *   }
-     * }
-     *  ```
-     */
-     onChange,
-    
-
-    /**
-     * 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: [LifecycleEvent.onCheck]
-     * })
-     * class ClassSet {
-     *   onCheck() {
-     *   }
-     * }
-     *  ```
-     */
-     onCheck,
-    
-
-    /**
-     * 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: [LifecycleEvent.onInit]
-     * })
-     * class ClassSet {
-     *   onInit() {
-     *   }
-     * }
-     *  ```
-     */
-     onInit,
-    
-
-    /**
-     * 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: [LifecycleEvent.onAllChangesDone]
-     * })
-     * class ClassSet {
-     * 
-     *   onAllChangesDone() {
-     *   }
-     * 
-     * }
-     *  ```
-     */
-     onAllChangesDone
-  }
-  
-
-  /**
-   * Declares the available HTML templates for an application.
+   * Declares a data-bound input property.
    * 
-   * Each angular component requires a single `@Component` and at least one `@View` annotation. The
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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.
    * 
@@ -1057,35 +1538,44 @@ declare module ng {
    */
   class ViewMetadata {
     
-
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
     /**
-     * Specifies a template URL for an angular component.
+     * 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: Only one of `templateUrl` or `template` can be defined per View.
      * 
-     * NOTE: either `templateUrl` or `template` should be used, but not both.
+     * <!-- TODO: what's the url relative to? -->
      */
-     template: string;
+    templateUrl: string;
     
-
     /**
-     * Specifies stylesheet URLs for an angular component.
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
      */
-     styleUrls: List<string>;
+    template: string;
     
-
     /**
-     * Specifies an inline stylesheet for an angular component.
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
      */
-     styles: List<string>;
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: string[];
     
-
     /**
      * Specifies a list of directives that can be used within a template.
      * 
@@ -1098,7 +1588,7 @@ declare module ng {
      *     selector: 'my-component'
      *   })
      * @View({
-     *   directives: [For]
+     *   directives: [NgFor]
      *   template: '
      *   <ul>
      *     <li *ng-for="#item of items">{{item}}</li>
@@ -1108,172 +1598,64 @@ declare module ng {
      * }
      * ```
      */
-     directives: List<Type | any | List<any>>;
+    directives: Array<Type | any[]>;
     
-     pipes: List<Type | any | List<any>>;
+    pipes: Array<Type | any[]>;
     
-
     /**
      * Specify how the template and the styles should be encapsulated.
-     * The default is {@link ViewEncapsulation#EMULATED `ViewEncapsulation.EMULATED`} if the view
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
      * has styles,
-     * otherwise {@link ViewEncapsulation#NONE `ViewEncapsulation.NONE`}.
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
      */
-     encapsulation: ViewEncapsulation;
+    encapsulation: ViewEncapsulation;
+    
   }
-  
 
+    
   /**
-   * How the template and styles of a view should be encapsulated.
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
    */
   enum ViewEncapsulation {
     
-
     /**
-     * Emulate scoping of styles by preprocessing the style rules
-     * and adding additional attributes to elements. This is the default.
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
      */
-     EMULATED,
+    Emulated,
     
-
     /**
-     * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot.
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
      */
-     NATIVE,
+    Native,
     
-
     /**
-     * Don't scope the template nor the styles.
+     * Don't provide any template or style encapsulation.
      */
-     NONE
+    None
   }
   
 
+    
   /**
-   * Specifies that a {@link QueryList} should be injected.
+   * Interface for the {@link DirectiveMetadata} decorator function.
    * 
-   * See {@link QueryList} for usage and example.
+   * See {@link DirectiveFactory}.
    */
-  class QueryMetadata extends DependencyMetadata {
+  interface DirectiveDecorator extends TypeDecorator {
     
-     descendants: boolean;
-    
-     isViewQuery: void;
-    
-     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
-   *   }
-   * }
-   * ```
-   */
-  class AttributeMetadata extends DependencyMetadata {
     
-     attributeName: string;
-    
-     token: void;
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * {@link AttributeMetadata} factory function.
-   */
-  var Attribute : AttributeFactory ;
-  
-
-  /**
-   * {@link AttributeMetadata} 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): AttributeMetadata;
-  
-    
-     (name: string): TypeDecorator;
-  
-  }
-  
-
-  /**
-   * {@link ComponentMetadata} factory function.
-   */
-  var Component : ComponentFactory ;
-  
-
   /**
    * Interface for the {@link ComponentMetadata} decorator function.
    * 
@@ -1281,112 +1663,45 @@ declare module ng {
    */
   interface ComponentDecorator extends TypeDecorator {
     
-
     /**
      * Chain {@link ViewMetadata} annotation.
      */
-     View(obj: {
-    templateUrl?: string,
-    template?: string,
-    directives?: List<Type | any | List<any>>,
-    pipes?: List<Type | any | List<any>>,
-    renderer?: string,
-    styles?: List<string>,
-    styleUrls?: List<string>,
-  }): ViewDecorator;
-  }
-  
-
-  /**
-   * {@link ComponentAnnotation} 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 {
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
     
-     new(obj: {
-    selector?: string,
-    properties?: List<string>,
-    events?: List<string>,
-    host?: StringMap<string, string>,
-    lifecycle?: List<LifecycleEvent>,
-    bindings?: List<any>,
-    exportAs?: string,
-    compileChildren?: boolean,
-    viewBindings?: List<any>,
-    changeDetection?: string,
-  }): ComponentMetadata;
-  
+  }
+
     
-     (obj: {
-    selector?: string,
-    properties?: List<string>,
-    events?: List<string>,
-    host?: StringMap<string, string>,
-    lifecycle?: List<LifecycleEvent>,
-    bindings?: List<any>,
-    exportAs?: string,
-    compileChildren?: boolean,
-    viewBindings?: List<any>,
-    changeDetection?: string,
-  }): ComponentDecorator;
-  
-  }
-  
-
   /**
-   * {@link DirectiveMetadata} factory function.
-   */
-  var Directive : DirectiveFactory ;
-  
-
-  /**
-   * Interface for the {@link DirectiveMetadata} decorator function.
+   * Interface for the {@link ViewMetadata} decorator function.
    * 
-   * See {@link DirectiveFactory}.
+   * See {@link ViewFactory}.
    */
-  interface DirectiveDecorator extends TypeDecorator {
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
   }
-  
 
+    
   /**
    * {@link DirectiveMetadata} factory for creating annotations, decorators or DSL.
    * 
@@ -1429,53 +1744,37 @@ declare module ng {
    */
   interface DirectiveFactory {
     
-     new(obj: {
-    selector?: string, properties?: List<string>, events?: List<string>,
-        host?: StringMap<string, string>, lifecycle?: List<LifecycleEvent>, bindings?: List<any>,
-        exportAs?: string, compileChildren?: boolean;
-  }): DirectiveMetadata;
-  
+    new(obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveMetadata;
     
-     (obj: {
-    selector?: string, properties?: List<string>, events?: List<string>,
-        host?: StringMap<string, string>, lifecycle?: List<LifecycleEvent>, bindings?: List<any>,
-        exportAs?: string, compileChildren?: boolean;
-  }): DirectiveDecorator;
-  
-  }
-  
-
-  /**
-   * {@link ViewMetadata} factory function.
-   */
-  var View : ViewFactory ;
-  
-
-  /**
-   * Interface for the {@link ViewMetadata} decorator function.
-   * 
-   * See {@link ViewFactory}.
-   */
-  interface ViewDecorator extends TypeDecorator {
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveDecorator;
     
-
-    /**
-     * Chain {@link ViewMetadata} annotation.
-     */
-     View(obj: {
-    templateUrl?: string,
-    template?: string,
-    directives?: List<Type | any | List<any>>,
-    pipes?: List<Type | any | List<any>>,
-    renderer?: string,
-    styles?: List<string>,
-    styleUrls?: List<string>,
-  }): ViewDecorator;
   }
-  
 
+    
   /**
-   * {@link ViewAnnotation} factory for creating annotations, decorators or DSL.
+   * {@link ComponentMetadata} factory for creating annotations, decorators or DSL.
    * 
    * ## Example as TypeScript Decorator
    * 
@@ -1512,53 +1811,58 @@ declare module ng {
    * };
    * 
    * MyComponent.annotations = [
-   *   new ng.Component({...})
+   *   new ng.Component({...}),
    *   new ng.View({...})
    * ]
    * ```
    */
-  interface ViewFactory {
+  interface ComponentFactory {
     
-     new(obj: {
-    templateUrl?: string,
-    template?: string,
-    directives?: List<Type | any | List<any>>,
-    encapsulation?: ViewEncapsulation,
-    styles?: List<string>,
-    styleUrls?: List<string>,
-  }): ViewMetadata;
-  
+    new(obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
     
-     (obj: {
-    templateUrl?: string,
-    template?: string,
-    directives?: List<Type | any | List<any>>,
-    encapsulation?: ViewEncapsulation,
-    styles?: List<string>,
-    styleUrls?: List<string>,
-  }): ViewDecorator;
-  
   }
-  
 
+    
   /**
-   * {@link QueryMetadata} factory function.
-   */
-  var Query : QueryFactory ;
-  
-
-  /**
-   * {@link QueryMetadata} factory for creating annotations, decorators or DSL.
+   * {@link ViewMetadata} factory for creating annotations, decorators or DSL.
    * 
    * ## Example as TypeScript Decorator
    * 
    * ```
-   * import {Query, QueryList, Component, View} from "angular2/angular2";
+   * import {Component, View} from "angular2/angular2";
    * 
    * @Component({...})
    * @View({...})
    * class MyComponent {
-   *   constructor(@Query(SomeType) queryList: QueryList) {
+   *   constructor() {
    *     ...
    *   }
    * }
@@ -1571,7 +1875,75 @@ declare module ng {
    *   .Component({...})
    *   .View({...})
    *   .Class({
-   *     constructor: [new ng.Query(SomeType), function(queryList) {
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function() {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...}),
+   *   new ng.View({...})
+   * ]
+   * ```
+   */
+  interface ViewFactory {
+    
+    new(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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) {
    *       ...
    *     }]
    *   })
@@ -1580,12 +1952,67 @@ declare module ng {
    * ## 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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.Component({...}),
    *   new ng.View({...})
    * ]
    * MyComponent.parameters = [
@@ -1595,26 +2022,49 @@ declare module ng {
    */
   interface QueryFactory {
     
-     new(selector: Type | string, {descendants}?: {descendants?: boolean}): QueryMetadata;
-  
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
     
-     (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
-  
   }
-  
 
-  /**
-   * {@link ViewQueryMetadata} factory function.
-   */
-  var ViewQuery : QueryFactory ;
-  
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
 
-  /**
-   * {@link PipeMetadata} factory function.
-   */
-  var Pipe : PipeFactory ;
-  
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
 
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
   /**
    * {@link PipeMetadata} factory for creating decorators.
    * 
@@ -1635,67 +2085,174 @@ declare module ng {
    */
   interface PipeFactory {
     
-     new(obj: {
-    name: string,
-  }): any;
-  
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
     
-     (obj: {name: string}): any;
-  
   }
-  
 
+    
   /**
-   * Defines lifecycle method
-   * {@link annotations/LifeCycleEvent#onAllChangesDone `LifeCycleEvent.onAllChangesDone`}
-   * called when the bindings of all its children have been changed.
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
    */
-  interface OnAllChangesDone {
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
     
-     onAllChangesDone(): void;
   }
-  
 
+    
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onChange `LifeCycleEvent.onChange`}
-   * called after all of component's bound properties are updated.
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
    */
-  interface OnChange {
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
     
-     onChange(changes: StringMap<string, any>): void;
   }
-  
 
+    
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onDestroy `LifeCycleEvent.onDestroy`}
-   * called when a directive is being destroyed.
+   * {@link HostBindingMetadata} factory function.
    */
-  interface OnDestroy {
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
     
-     onDestroy(): void;
   }
-  
 
+    
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onInit `LifeCycleEvent.onInit`}
-   * called when a directive is being checked the first time.
+   * {@link HostListenerMetadata} factory function.
    */
-  interface OnInit {
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
     
-     onInit(): void;
   }
-  
 
+    
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onCheck `LifeCycleEvent.onCheck`}
-   * called when a directive is being checked.
+   * {@link ComponentMetadata} factory function.
    */
-  interface OnCheck {
-    
-     onCheck(): void;
-  }
+  var Component: ComponentFactory;
   
 
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
   /**
    * Provides a way for expressing ES6 classes with parameter annotations in ES5.
    * 
@@ -1742,10 +2299,10 @@ declare module ng {
    * ## Example with parameter annotations
    * 
    * ```
-   * var MyService = neg.Class({
+   * var MyService = ng.Class({
    *   constructor: [String, [new Query(), QueryList], function(name, queryList) {
    *     ...
-   *   }];
+   *   }]
    * });
    * ```
    * 
@@ -1777,21 +2334,20 @@ declare module ng {
    * });
    * ```
    */
-  function Class(clsDef: ClassDefinition) : Type ;
+  function Class(clsDef: ClassDefinition): Type;
   
 
+    
   /**
    * Declares the interface to be used with {@link Class}.
    */
   interface ClassDefinition {
     
-
     /**
      * Optional argument for specifying the superclass.
      */
-     extends?: Type;
+    extends?: Type;
     
-
     /**
      * Required constructor function for a class.
      * 
@@ -1801,10 +2357,11 @@ declare module ng {
      * 
      * See {@link Class} for example of usage.
      */
-     constructor: (Function | Array<any>);
+    constructor: Function | any[];
+    
   }
-  
 
+    
   /**
    * An interface implemented by all Angular type decorators, which allows them to be used as ES7
    * decorators as well as
@@ -1829,307 +2386,1851 @@ declare module ng {
    */
   interface TypeDecorator {
     
-
     /**
      * Invoke as ES7 decorator.
      */
-     <T extends Type>(type: T): T;
-  
+    <T extends Type>(type: T): T;
     
-
     /**
      * Storage for the accumulated annotations so far used by the DSL syntax.
      * 
      * Used by {@link Class} to annotate the generated class.
      */
-     annotations: Array<any>;
+    annotations: any[];
     
-
     /**
      * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
      */
-     Class(obj: ClassDefinition): Type;
-  }
-  
-
-  /**
-   * CHECK_ONCE means that after calling detectChanges the mode of the change detector
-   * will become CHECKED.
-   */
-  const CHECK_ONCE : string ;
-  
-
-  /**
-   * CHECK_ALWAYS means that after calling detectChanges the mode of the change detector
-   * will remain CHECK_ALWAYS.
-   */
-  const CHECK_ALWAYS : string ;
-  
-
-  /**
-   * DETACHED means that the change detector sub tree is not a part of the main tree and
-   * should be skipped.
-   */
-  const DETACHED : string ;
-  
-
-  /**
-   * CHECKED means that the change detector should be skipped until its mode changes to
-   * CHECK_ONCE or CHECK_ALWAYS.
-   */
-  const CHECKED : string ;
-  
-
-  /**
-   * ON_PUSH means that the change detector's mode will be set to CHECK_ONCE during hydration.
-   */
-  const ON_PUSH : string ;
-  
-
-  /**
-   * DEFAULT means that the change detector's mode will be set to CHECK_ALWAYS during hydration.
-   */
-  const DEFAULT : string ;
-  
-
-  /**
-   * An error thrown if application changes model breaking the top-down data flow.
-   * 
-   * Angular expects that the data flows from top (root) component to child (leaf) components.
-   * This is known as directed acyclic graph. This allows Angular to only execute change detection
-   * once and prevents loops in change detection data flow.
-   * 
-   * This exception is only thrown in dev mode.
-   */
-  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
-  }
-  
-
-  /**
-   * Thrown when an expression evaluation raises an exception.
-   * 
-   * This error wraps the original exception, this is done to attach expression location information.
-   */
-  class ChangeDetectionError extends BaseException {
+    Class(obj: ClassDefinition): Type;
     
+  }
 
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
     /**
-     * Location of the expression.
+     * Private
      */
-     location: string;
-  }
-  
-  interface ChangeDetector {
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
     
-     parent: ChangeDetector;
-    
-     mode: string;
-    
-     ref: ChangeDetectorRef;
-    
-     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, pipes: any): void;
-    
-     dehydrate(): void;
-    
-     markPathToRootAsCheckOnce(): void;
-    
-     handleEvent(eventName: string, elIndex: number, locals: Locals): 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;
-  }
-  
-
-  /**
-   * Controls change detection.
-   * 
-   * {@link ChangeDetectorRef} allows requesting checks for detectors that rely on observables. It
-   * also allows detaching and attaching change detector subtrees.
-   */
-  interface ChangeDetectorRef {
-    
-
     /**
-     * Request to check all ON_PUSH ancestors.
-     */
-     requestCheck(): void;
-    
-
-    /**
-     * Detaches the change detector from the change detector tree.
+     * Turns an array of binding definitions into an array of resolved bindings.
      * 
-     * The detached change detector will not be checked until it is reattached.
-     */
-     detach(): void;
-    
-
-    /**
-     * Reattach the change detector to the change detector tree.
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
      * 
-     * This also requests a check of this change detector. This reattached change detector will be
-     * checked during the
-     * next change detection run.
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
      */
-     reattach(): void;
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
   }
-  
 
+    
   /**
-   * Indicates that the result of a {@link PipeMetadata} transformation has changed even though the
-   * reference
-   * has not changed.
+   * Describes how the {@link Injector} should instantiate a given token.
    * 
-   * The wrapped value will be unwrapped by change detection, and the unwrapped value will be stored.
+   * See {@link bind}.
    * 
-   * Example:
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
    * 
-   * ```
-   * if (this._latestValue === this._latestReturnedValue) {
-   *    return this._latestReturnedValue;
-   *  } else {
-   *    this._latestReturnedValue = this._latestValue;
-   *    return WrappedValue.wrap(this._latestValue); // this will force update
-   *  }
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
    * ```
    */
-  class WrappedValue {
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
     
-     wrapped: any;
   }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
   
 
+    
   /**
-   * An interface which all pipes must implement.
+   * A unique object used for retrieving items from the {@link Injector}.
    * 
-   * #Example
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
    * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
    * ```
-   * class DoublePipe implements PipeTransform {
-   *  transform(value, args = []) {
-   *    return `${value}${value}`;
-   *  }
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
    * }
    * ```
    */
-  interface PipeTransform {
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
     
-     transform(value: any, args: List<any>): any;
   }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
   
 
+    
   /**
-   * An interface that stateful pipes should implement.
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
    * 
-   * #Example
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
    * 
    * ```
-   * class StatefulPipe implements PipeTransform, PipeOnDestroy {
-   *  connection;
-   * 
-   *  onDestroy() {
-   *    this.connection.release();
-   *  }
-   * 
-   *  transform(value, args = []) {
-   *    this.connection = createConnection();
-   *    // ...
-   *    return someValue;
-   *  }
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
    * }
    * ```
    */
-  interface PipeOnDestroy {
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
     
-     onDestroy(): void;
   }
-  
 
+    
   /**
-   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
    */
-  class IterableDiffers {
+  class DatePipe implements PipeTransform {
     
-     factories: IterableDifferFactory[];
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
     
-     find(iterable: Object): IterableDifferFactory;
   }
-  
-  interface IterableDiffer {
+
     
-     diff(object: Object): any;
-    
-     onDestroy(): void;
-  }
+  let DEFAULT_PIPES: Binding;
   
 
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
   /**
-   * Provides a factory for {@link IterableDiffer}.
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
+   *  }
+   * }
+   * 
+   * ```
    */
-  interface IterableDifferFactory {
+  class JsonPipe implements PipeTransform {
     
-     supports(objects: Object): boolean;
+    transform(value: any, args?: any[]): string;
     
-     create(cdRef: ChangeDetectorRef): IterableDiffer;
   }
-  
 
+    
   /**
-   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
    */
-  class KeyValueDiffers {
+  class SlicePipe implements PipeTransform {
     
-     factories: KeyValueDifferFactory[];
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
     
-     find(kv: Object): KeyValueDifferFactory;
   }
-  
-  interface KeyValueDiffer {
-    
-     diff(object: Object): void;
-    
-     onDestroy(): void;
-  }
-  
 
+    
   /**
-   * Provides a factory for {@link KeyValueDiffer}.
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
    */
-  interface KeyValueDifferFactory {
+  class LowerCasePipe implements PipeTransform {
     
-     supports(objects: Object): boolean;
+    transform(value: string, args?: any[]): string;
     
-     create(cdRef: ChangeDetectorRef): KeyValueDiffer;
   }
-  
 
+    
+  class NumberPipe {
+    
+  }
+
+    
   /**
-   * An opaque token representing the application root type in the {@link Injector}.
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An {@link angular2/di/OpaqueToken} representing the application root type in the {@link
+   * Injector}.
    * 
    * ```
    * @Component(...)
@@ -2144,185 +4245,220 @@ declare module ng {
    * 
    * ```
    */
-  const APP_COMPONENT : OpaqueToken ;
+  let APP_COMPONENT: OpaqueToken;
   
 
+    
   /**
-   * Represents a Angular's representation of an Application.
+   * A DI Token representing a unique string id assigned to the application by Angular and used
+   * primarily for prefixing application attributes and CSS styles when
+   * {@link ViewEncapsulation#Emulated} is being used.
    * 
-   * `ApplicationRef` represents a running application instance. Use it to retrieve the host
-   * component, injector,
-   * or dispose of an application.
+   * If you need to avoid randomly generated value to be used as an application id, you can provide
+   * a custom value via a DI binding <!-- TODO: provider --> configuring the root {@link Injector}
+   * using this token.
+   */
+  let APP_ID: OpaqueToken;
+  
+
+    
+  /**
+   * Initialize the Angular 'platform' on the page.
+   * 
+   * See {@link PlatformRef} for details on the Angular platform.
+   * 
+   * # Without specified bindings
+   * 
+   * If no bindings are specified, `platform`'s behavior depends on whether an existing
+   * platform exists:
+   * 
+   * If no platform exists, a new one will be created with the default {@link platformBindings}.
+   * 
+   * If a platform already exists, it will be returned (regardless of what bindings it
+   * was created with). This is a convenience feature, allowing for multiple applications
+   * to be loaded into the same platform without awareness of each other.
+   * 
+   * # With specified bindings
+   * 
+   * It is also possible to specify bindings to be made in the new platform. These bindings
+   * will be shared between all applications on the page. For example, an abstraction for
+   * the browser cookie jar should be bound at the platform level, because there is only one
+   * cookie jar regardless of how many applications on the age will be accessing it.
+   * 
+   * If bindings are specified directly, `platform` will create the Angular platform with
+   * them if a platform did not exist already. If it did exist, however, an error will be
+   * thrown.
+   * 
+   * # DOM Applications
+   * 
+   * This version of `platform` initializes Angular to run in the UI thread, with direct
+   * DOM access. Web-worker applications should call `platform` from
+   * `src/web_workers/worker/application_common` instead.
+   */
+  function platform(bindings?: Array<Type | Binding | any[]>): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
    */
   interface ApplicationRef {
     
-
     /**
-     * Returns the current {@link ComponentMetadata} type.
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
      */
-     hostComponentType: Type;
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
     
-
     /**
-     * Returns the current {@link ComponentMetadata} instance.
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
      */
-     hostComponent: any;
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
     
-
     /**
-     * Dispose (un-load) the application.
+     * Retrieve the application {@link Injector}.
      */
-     dispose(): void;
+    injector: Injector;
     
-
     /**
-     * Returns the root application {@link Injector}.
+     * Retrieve the application {@link NgZone}.
      */
-     injector: Injector;
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
   }
-  
 
-  /**
-   * 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 {@link ApplicationRef}.
-   */
-  function bootstrap(appComponentType: /*Type*/ any, componentInjectableBindings?: List<Type | Binding | List<any>>) : Promise<ApplicationRef> ;
-  
-
-  /**
-   * Runtime representation of a type.
-   * 
-   * In JavaScript a Type is a constructor function.
-   */
-  interface Type extends Function {
     
-     new(args: any): any;
-  
-  }
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
   
 
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  function bootstrap(appComponentType: /*Type*/ any, appBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+  
+
+    
   /**
    * Specifies app root url for the application.
    * 
@@ -2334,14 +4470,16 @@ declare module ng {
    */
   class AppRootUrl {
     
-
+    constructor(value: string);
+    
     /**
      * Returns the base URL of the currently running application.
      */
-     value: void;
+    value: any;
+    
   }
-  
 
+    
   /**
    * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
    * 
@@ -2351,7 +4489,6 @@ declare module ng {
    */
   class UrlResolver {
     
-
     /**
      * Resolves the `url` given the `baseUrl`:
      * - when the `url` is null, the `baseUrl` is returned,
@@ -2364,128 +4501,538 @@ declare module ng {
      * @param {string} url
      * @returns {string} the resolved URL
      */
-     resolve(baseUrl: string, url: string): string;
-  }
-  
-
-  /**
-   * Resolve a `Type` from a {@link ComponentMetadata} into a URL.
-   * 
-   * This interface can be overridden by the application developer to create custom behavior.
-   * 
-   * See {@link Compiler}
-   */
-  class ComponentUrlMapper {
+    resolve(baseUrl: string, url: string): string;
     
-
-    /**
-     * 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 `Type` for {@link DirectiveMetadata}.
+   * A service that can be used to get and set the title of a current HTML document.
    * 
-   * This interface can be overridden by the application developer to create custom behavior.
-   * 
-   * See {@link Compiler}
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
    */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
   class DirectiveResolver {
     
-
     /**
      * Return {@link DirectiveMetadata} for a given `Type`.
      */
-     resolve(type: Type): DirectiveMetadata;
+    resolve(type: Type): DirectiveMetadata;
+    
   }
-  
 
+    
   /**
-   * ## URL Resolution
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
    * 
-   * ```
-   * 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);
-   * ```
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
    */
   interface Compiler {
     
-     compileInHost(componentTypeOrBinding: Type | Binding): Promise<ProtoViewRef>;
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
   }
-  
 
+    
   /**
-   * 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.
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
    */
   interface AppViewManager {
     
-
     /**
-     * Returns a {@link ViewContainerRef} at the {@link ElementRef} location.
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
      */
-     getViewContainer(location: ElementRef): ViewContainerRef;
+    getViewContainer(location: ElementRef): ViewContainerRef;
     
-
     /**
-     * Return the first child element of the host element view.
+     * Returns the {@link ElementRef} that makes up the specified Host View.
      */
-     getHostElement(hostViewRef: HostViewRef): ElementRef;
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
     
-
     /**
-     * Returns an ElementRef for the element with the given variable name
-     * in the current view.
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
      * 
-     * - `hostLocation`: {@link ElementRef} of any element in the View which defines the scope of
-     *   search.
-     * - `variableName`: Name of the variable to locate.
-     * - Returns {@link ElementRef} of the found element or null. (Throws if not found.)
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
      */
-     getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    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 {@link ElementRef}
-     * location.
+     * Returns the component instance for the provided Host Element.
      */
-     getComponent(hostLocation: ElementRef): any;
+    getComponent(hostLocation: ElementRef): any;
     
-
     /**
-     * Load component view into existing element.
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
      * 
-     * 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.
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
      * 
-     * - `hostProtoViewRef`: {@link ProtoViewRef} 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: {@link Injector} to use as parent injector for the view.
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
      * 
-     * See {@link AppViewManager#destroyRootHostView}.
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
      * 
      * ## Example
      * 
@@ -2526,158 +5073,130 @@ declare module ng {
      * ng.bootstrap(MyApp);
      * ```
      */
-     createRootHostView(hostProtoViewRef: ProtoViewRef, overrideSelector: string, injector: Injector): HostViewRef;
+    createRootHostView(hostProtoViewRef: ProtoViewRef, overrideSelector: string, injector: Injector): HostViewRef;
     
-
     /**
-     * Remove the View created with {@link AppViewManager#createRootHostView}.
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
      */
-     destroyRootHostView(hostViewRef: HostViewRef): void;
+    destroyRootHostView(hostViewRef: HostViewRef): void;
     
-
     /**
-     * See {@link AppViewManager#destroyViewInContainer}.
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
      */
-     createEmbeddedViewInContainer(viewContainerLocation: ElementRef, atIndex: number, templateRef: TemplateRef): ViewRef;
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
     
-
     /**
-     * See {@link AppViewManager#destroyViewInContainer}.
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
      */
-     createHostViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
     
-
     /**
-     * See {@link AppViewManager#createViewInContainer}.
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
      */
-     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
     
-
     /**
      * See {@link AppViewManager#detachViewInContainer}.
      */
-     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
     
-
     /**
      * See {@link AppViewManager#attachViewInContainer}.
      */
-     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
   }
-  
 
+    
   /**
-   * An iterable and observable live list of components in the DOM.
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
    * 
-   * A QueryList contains a live list of child directives in the DOM of a directive.
-   * The directives are kept in depth-first pre-order traversal of the DOM.
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
    * 
-   * 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.
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
    * 
-   * QueryList is updated as part of the change-detection cycle of a directive. Since change detection
-   * happens after construction of a directive, QueryList will always be empty when observed in the
-   * constructor.
+   * Changes can be observed by subscribing to the changes `Observable`.
    * 
+   * NOTE: In the future this class will implement an `Observable` interface.
    * 
-   * 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.
-   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
    * ```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({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
    *   }
    * }
-   * 
-   * @Component({
-   *   selector: 'pane',
-   *   properties: ['title']
-   * })
-   * @View(...)
-   * class Pane {
-   *   title:string;
-   * }
    * ```
    */
   class QueryList<T> {
     
-     reset(newList: List<T>): void;
+    changes: Observable;
     
-     add(obj: T): void;
+    length: number;
     
-     fireCallbacks(): void;
+    first: T;
     
-     onChange(callback: () => void): void;
+    last: T;
     
-     removeCallback(callback: () => void): void;
-    
-     toString(): string;
-    
-     length: number;
-    
-     first: T;
-    
-     last: T;
-    
-     map<U>(fn: (item: T) => U): U[];
-  }
-  
-
-  /**
-   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
-   * application tree.
-   */
-  class DynamicComponentLoader {
-    
-
     /**
-     * Loads a root component that is placed at the first element that matches the component's
-     * selector.
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
      * 
-     * - `typeOrBinding` `Type` \ {@link Binding} - representing the component to load.
-     * - `overrideSelector` (optional) selector to load the component at (or use
-     *   `@Component.selector`) The selector can be anywhere (i.e. outside the current component.)
-     * - `injector` {@link Injector} - optional injector to use for the component.
+     * In a browser the platform-specific global view is the main DOM Document.
      * 
-     * The loaded component receives injection normally as a hosted view.
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
      * 
      * 
      * ## Example
@@ -2723,14 +5242,21 @@ declare module ng {
      * </my-app>
      * ```
      */
-     loadAsRoot(typeOrBinding: Type | Binding, overrideSelector: string, injector: Injector): Promise<ComponentRef>;
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
     
-
     /**
-     * Loads a component into the component view of the provided ElementRef next to the element
-     * with the given name.
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
      * 
-     * The loaded component receives injection normally as a hosted view.
      * 
      * ## Example
      * 
@@ -2773,13 +5299,16 @@ declare module ng {
      * </my-app>
      * ```
      */
-     loadIntoLocation(typeOrBinding: Type | Binding, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
     
-
     /**
-     * Loads a component next to the provided ElementRef.
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
      * 
-     * The loaded component receives injection normally as a hosted view.
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
      * 
      * 
      * ## Example
@@ -2803,7 +5332,7 @@ declare module ng {
      * })
      * class MyApp {
      *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
-     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
      *   }
      * }
      * 
@@ -2817,10 +5346,344 @@ declare module ng {
      * <child-component>Child</child-component>
      * ```
      */
-     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
   }
-  
 
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
   /**
    * Provides access to explicitly trigger change detection in an application.
    * 
@@ -2847,15 +5710,8 @@ declare module ng {
    * });
    * ```
    */
-  class LifeCycle {
+  interface LifeCycle {
     
-
-    /**
-     * @private
-     */
-     registerWith(zone: NgZone, changeDetector?: ChangeDetector): void;
-    
-
     /**
      * Invoke this method to explicitly process change detection and its side-effects.
      * 
@@ -2870,1451 +5726,491 @@ declare module ng {
      * detection must
      *  complete.
      */
-     tick(): void;
+    tick(): void;
+    
   }
-  
 
+    
   /**
-   * Reference to the element.
+   * An injectable service for executing work inside or outside of the Angular zone.
    * 
-   * Represents an opaque reference 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.
-   */
-  class ElementRef implements RenderElementRef {
-    
-
-    /**
-     * Reference to the {@link ViewRef} where the `ElementRef` is inside of.
-     */
-     parentView: ViewRef;
-    
-
-    /**
-     * Index of the element inside the {@link ViewRef}.
-     * 
-     * This is used internally by the Angular framework to locate elements.
-     */
-     boundElementIndex: number;
-    
-
-    /**
-     * Index of the element inside the `RenderViewRef`.
-     * 
-     * This is used internally by the Angular framework to locate elements.
-     */
-     renderBoundElementIndex: 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;
-  }
-  
-
-  /**
-   * Reference to a template within a component.
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
    * 
-   * Represents an opaque reference to the underlying template that can
-   * be instantiated using the {@link ViewContainerRef}.
-   */
-  class TemplateRef {
-    
-
-    /**
-     * The location of the template
-     */
-     elementRef: ElementRef;
-    
-     protoViewRef: ProtoViewRef;
-    
-
-    /**
-     * Whether this template has a local variable with the given name
-     */
-     hasLocal(name: string): boolean;
-  }
-  
-
-  /**
-   * A reference to an Angular View.
-   * 
-   * A View is a fundamental building block of Application UI. A View is the smallest set of
-   * elements which are created and destroyed together. A View can change 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 {@link ViewContainerRef}s
-   * which allow the views to be nested.
-   * 
-   * ## Example
-   * 
-   * Given this template
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
    * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
    * ```
-   * Count: {{items.length}}
-   * <ul>
-   *   <li *ng-for="var item of items">{{item}}</li>
-   * </ul>
-   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
    * 
-   * The above example we have two {@link ProtoViewRef}s:
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
    * 
-   * Outter {@link ProtoViewRef}:
-   * ```
-   * Count: {{items.length}}
-   * <ul>
-   *   <template ng-for var-item [ng-for-of]="items"></template>
-   * </ul>
-   * ```
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
    * 
-   * Inner {@link ProtoViewRef}:
-   * ```
-   *   <li>{{item}}</li>
-   * ```
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
    * 
-   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   *   constructor(private _ngZone: NgZone) {}
    * 
-   * The outter/inner {@link ProtoViewRef}s are then assembled into views like so:
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
    * 
-   * ```
-   * <!-- ViewRef: outer-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: outer-0 -->
-   * ```
-   */
-  interface ViewRef extends HostViewRef {
-    
-
-    /**
-     * Return `RenderViewRef`
-     */
-     render: RenderViewRef;
-    
-
-    /**
-     * Return `RenderFragmentRef`
-     */
-     renderFragment: RenderFragmentRef;
-    
-
-    /**
-     * Set local variable in a view.
-     * 
-     * - `contextName` - Name of the local variable in a view.
-     * - `value` - Value for the local variable in a view.
-     */
-     setLocal(contextName: string, value: any): void;
-  }
-  
-  interface HostViewRef {
-  }
-  
-
-  /**
-   * A reference to an Angular ProtoView.
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
    * 
-   * A ProtoView is a reference to a template for easy creation of views.
-   * (See {@link AppViewManager#createViewInContainer} and {@link AppViewManager#createRootHostView}).
    * 
-   * A `ProtoView` is a foctary for creating `View`s.
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
    * 
-   * ## Example
-   * 
-   * Given this template
-   * 
-   * ```
-   * Count: {{items.length}}
-   * <ul>
-   *   <li *ng-for="var item of items">{{item}}</li>
-   * </ul>
-   * ```
-   * 
-   * The above example we have two {@link ProtoViewRef}s:
-   * 
-   * Outter {@link ProtoViewRef}:
-   * ```
-   * Count: {{items.length}}
-   * <ul>
-   *   <template ng-for var-item [ng-for-of]="items"></template>
-   * </ul>
-   * ```
-   * 
-   * Inner {@link ProtoViewRef}:
-   * ```
-   *   <li>{{item}}</li>
-   * ```
-   * 
-   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
-   */
-  interface ProtoViewRef {
-  }
-  
-
-  /**
-   * A location where {@link ViewRef}s can be attached.
-   * 
-   * A `ViewContainerRef` represents a location in a {@link ViewRef} where other child
-   * {@link ViewRef}s can be inserted. Adding and removing views is the only way of structurally
-   * changing the rendered DOM of the application.
-   */
-  interface ViewContainerRef {
-    
-     viewManager: AppViewManager;
-    
-     element: ElementRef;
-    
-
-    /**
-     * Remove all {@link ViewRef}s at current location.
-     */
-     clear(): void;
-    
-
-    /**
-     * Return a {@link ViewRef} at specific index.
-     */
-     get(index: number): ViewRef;
-    
-
-    /**
-     * Returns number of {@link ViewRef}s currently attached at this location.
-     */
-     length: number;
-    
-
-    /**
-     * Create and insert a {@link ViewRef} into the view-container.
-     * 
-     * - `protoViewRef` (optional) {@link ProtoViewRef} - The `ProtoView` to use for creating
-     *   `View` to be inserted at this location. If `ViewContainer` is created at a location
-     *   of inline template, then `protoViewRef` is the `ProtoView` of the template.
-     * - `atIndex` (optional) `number` - location of insertion point. (Or at the end if unspecified.)
-     * - `context` (optional) {@link ElementRef} - Context (for expression evaluation) from the
-     *   {@link ElementRef} location. (Or current context if unspecified.)
-     * - `bindings` (optional) Array of {@link ResolvedBinding} - Used for configuring
-     *   `ElementInjector`.
-     * 
-     * Returns newly created {@link ViewRef}.
-     */
-     createEmbeddedView(templateRef: TemplateRef, atIndex?: number): ViewRef;
-    
-     createHostView(protoViewRef?: ProtoViewRef, atIndex?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
-    
-
-    /**
-     * Insert a {@link ViewRef} at specefic index.
-     * 
-     * The index is location at which the {@link ViewRef} should be attached. If omitted it is
-     * inserted at the end.
-     * 
-     * Returns the inserted {@link ViewRef}.
-     */
-     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
-    
-
-    /**
-     * Return the index of already inserted {@link ViewRef}.
-     */
-     indexOf(viewRef: ViewRef): number;
-    
-
-    /**
-     * Remove a {@link ViewRef} at specific index.
-     * 
-     * If the index is omitted last {@link ViewRef} is removed.
-     */
-     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;
-  }
-  
-
-  /**
-   * Angular's reference to a component instance.
-   * 
-   * `ComponentRef` represents a component instance lifecycle and meta information.
-   */
-  interface ComponentRef {
-    
-
-    /**
-     * Location of the component host element.
-     */
-     location: ElementRef;
-    
-
-    /**
-     * Instance of component.
-     */
-     instance: any;
-    
-
-    /**
-     * Returns the host {@link ViewRef}.
-     */
-     hostView: HostViewRef;
-    
-
-    /**
-     * Dispose of the component instance.
-     */
-     dispose(): void;
-  }
-  
-
-  /**
-   * 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.
-   */
-  class NgZone {
-    
-
-    /**
-     * Sets the zone hook that is called just before Angular event turn starts.
-     * It is called once per browser event.
-     */
-     overrideOnTurnStart(onTurnStartFn: Function): void;
-    
-
-    /**
-     * Sets the zone hook that is called immediately after Angular processes
-     * all pending microtasks.
-     */
-     overrideOnTurnDone(onTurnDoneFn: Function): void;
-    
-
-    /**
-     * Sets the zone hook that is called immediately after the last turn in
-     * an event completes. At this point Angular will no longer attempt to
-     * sync the UI. Any changes to the data model will not be reflected in the
-     * DOM. `onEventDoneFn` is executed outside Angular zone.
-     * 
-     * This hook is useful for validating application state (e.g. in a test).
-     */
-     overrideOnEventDone(onEventDoneFn: Function, opt_waitForAsync: boolean): void;
-    
-
-    /**
-     * Sets the zone hook that is called when an error is uncaught in the
-     * Angular zone. The first argument is the error. The second argument is
-     * the stack trace.
-     */
-     overrideOnErrorHandler(errorHandlingFn: Function): 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.runOutsideAngular(() => {
-     *   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;
-  }
-  
-
-  /**
-   * A parameter metadata that specifies a dependency.
-   * 
-   * ```
-   * class AComponent {
-   *   constructor(@Inject(MyService) aService:MyService) {}
-   * }
-   * ```
-   */
-  class InjectMetadata {
-    
-     token: void;
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
-   * the dependency is not found.
-   * 
-   * ```
-   * class AComponent {
-   *   constructor(@Optional() aService:MyService) {
-   *     this.aService = aService;
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
    *   }
    * }
    * ```
    */
-  class OptionalMetadata {
+  interface NgZone {
     
-     toString(): string;
-  }
-  
-
-  /**
-   * A marker metadata 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 {}
-   * ```
-   */
-  class InjectableMetadata {
-  }
-  
-
-  /**
-   * Specifies that an injector should retrieve a dependency from itself.
-   * 
-   * ## Example
-   * 
-   * ```
-   * class Dependency {
-   * }
-   * 
-   * class NeedsDependency {
-   *   constructor(public @Self() dependency:Dependency) {}
-   * }
-   * 
-   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
-   * var nd = inj.get(NeedsDependency);
-   * expect(nd.dependency).toBeAnInstanceOf(Dependency);
-   * ```
-   */
-  class SelfMetadata {
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * Specifies that an injector should retrieve a dependency from any injector until reaching the
-   * closest host.
-   * 
-   * ## Example
-   * 
-   * ```
-   * class Dependency {
-   * }
-   * 
-   * class NeedsDependency {
-   *   constructor(public @Host() dependency:Dependency) {}
-   * }
-   * 
-   * var parent = Injector.resolveAndCreate([
-   *   bind(Dependency).toClass(HostDependency)
-   * ]);
-   * var child = parent.resolveAndCreateChild([]);
-   * var grandChild = child.resolveAndCreateChild([NeedsDependency, Depedency]);
-   * var nd = grandChild.get(NeedsDependency);
-   * expect(nd.dependency).toBeAnInstanceOf(HostDependency);
-   * ```
-   */
-  class HostMetadata {
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * Specifies that the dependency resolution should start from the parent injector.
-   * 
-   * ## Example
-   * 
-   * 
-   * ```
-   * class Service {}
-   * 
-   * class ParentService implements Service {
-   * }
-   * 
-   * class ChildService implements Service {
-   *   constructor(public @SkipSelf() parentService:Service) {}
-   * }
-   * 
-   * var parent = Injector.resolveAndCreate([
-   *   bind(Service).toClass(ParentService)
-   * ]);
-   * var child = parent.resolveAndCreateChild([
-   *   bind(Service).toClass(ChildSerice)
-   * ]);
-   * var s = child.get(Service);
-   * expect(s).toBeAnInstanceOf(ChildService);
-   * expect(s.parentService).toBeAnInstanceOf(ParentService);
-   * ```
-   */
-  class SkipSelfMetadata {
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * `DependencyMetadata is used by the framework to extend DI.
-   * 
-   * Only metadata implementing `DependencyMetadata` are added to the list of dependency
-   * properties.
-   * 
-   * For example:
-   * 
-   * ```
-   * class Exclude extends DependencyMetadata {}
-   * class NotDependencyProperty {}
-   * 
-   * class AComponent {
-   *   constructor(@Exclude @NotDependencyProperty aService:AService) {}
-   * }
-   * ```
-   * 
-   * will create the following dependency:
-   * 
-   * ```
-   * new Dependency(Key.get(AService), [new Exclude()])
-   * ```
-   * 
-   * The framework can use `new Exclude()` to handle the `aService` dependency
-   * in a specific way.
-   */
-  class DependencyMetadata {
-    
-     token: void;
-  }
-  
-
-  /**
-   * 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 {
-   * }
-   * ```
-   */
-  function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
-  
-
-  /**
-   * Lazily retrieve the reference value.
-   * 
-   * See: {@link forwardRef}
-   */
-  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.
-   */
-  class Injector {
-    
-
     /**
-     * Returns debug information about the injector.
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
      * 
-     * This information is included into exceptions thrown by the injector.
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
      */
-     debugContext(): any;
+    run(fn: () => any): any;
     
-
     /**
-     * Retrieves an instance from the injector.
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
      * 
-     * @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.
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
      * 
-     * @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.
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
      * 
-     * @param `index`: index of an instance.
-     * @returns an instance represented by the index. Throws if not found.
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
      */
-     getAt(index: number): any;
+    runOutsideAngular(fn: () => any): 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 {@link ResolvedBinding}s. The resolution can be cached by `resolve`
-     * for the {@link Injector} for performance-sensitive code.
-     * 
-     * @param `bindings` can be a list of `Type`, {@link Binding}, {@link ResolvedBinding}, 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 {@link ResolvedBinding}s into it.
-     * 
-     * @param `bindings`: A sparse list of {@link ResolvedBinding}s.
-     * See `resolve` for the {@link Injector}.
-     * @param `depProvider`
-     * @returns a new child {@link Injector}.
-     */
-     createChildFromResolved(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
-    
-
-    /**
-     * Resolves a binding and instantiates an object in the context of the injector.
-     * 
-     * @param `binding`: either a type or a binding.
-     * @returns an object created using binding.
-     */
-     resolveAndInstantiate(binding: Type | Binding): any;
-    
-
-    /**
-     * Instantiates an object using a resolved bindin in the context of the injector.
-     * 
-     * @param `binding`: a resolved binding
-     * @returns an object created using binding.
-     */
-     instantiateResolved(binding: ResolvedBinding): any;
-    
-     displayName: string;
-    
-     toString(): string;
   }
-  
-  class ProtoInjector {
-    
-     numberOfBindings: number;
-    
-     getBindingAtIndex(index: number): any;
-  }
-  
-  class BindingWithVisibility {
-    
-     binding: ResolvedBinding;
-    
-     visibility: Visibility;
-    
-     getKeyId(): number;
-  }
-  
 
+    
   /**
-   * Used to provide dependencies that cannot be easily expressed as bindings.
-   */
-  interface DependencyProvider {
-    
-     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
-  }
-  
-  enum Visibility {
-    
-     Public,
-    
-     Private,
-    
-     PublicAndPrivate
-  }
-  
-  const UNDEFINED : Object ;
-  
-
-  /**
-   * Describes how_ the {@link Injector} should instantiate a given token.
+   * A dispatcher that relays all events that occur in a Render View.
    * 
-   * See {@link bind}.
-   * 
-   * ## Example
-   * 
-   * ```javascript
-   * var injector = Injector.resolveAndCreate([
-   *   new Binding(String, { toValue: 'Hello' })
-   * ]);
-   * 
-   * expect(injector.get(String)).toEqual('Hello');
-   * ```
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
    */
-  class Binding {
+  interface RenderEventDispatcher {
     
-
     /**
-     * Token used when retrieving this binding. Usually the `Type`.
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
      */
-     token: void;
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
     
+  }
 
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
     /**
-     * Binds an interface to an implementation / subclass.
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
      * 
-     * ## 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);
-     * ```
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
      */
-     toClass: Type;
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[], nativeShadow: boolean): void;
     
-
     /**
-     * Binds a key to a value.
-     * 
-     * ## Example
-     * 
-     * ```javascript
-     * var injector = Injector.resolveAndCreate([
-     *   new Binding(String, { toValue: 'Hello' })
-     * ]);
-     * 
-     * expect(injector.get(String)).toEqual('Hello');
-     * ```
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
      */
-     toValue: void;
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
     
-
     /**
-     * Binds a key to the alias for an existing key.
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
      * 
-     * An alias means that {@link Injector} 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.
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
      * 
-     * ## Example
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
      * 
-     * 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);
-     * ```
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
      */
-     toAlias: void;
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
     
-
     /**
-     * Binds a key to a function which computes the value.
+     * Creates a Render View based on the provided `protoViewRef`.
      * 
-     * ## Example
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
      * 
-     * ```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');
-     * ```
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
      */
-     toFactory: Function;
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
     
-
     /**
-     * Used in conjunction with `toFactory` and specifies a set of dependencies
-     * (as `token`s) which should be injected into the factory function.
+     * Destroys a Render View specified via `viewRef`.
      * 
-     * ## Example
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
      * 
-     * ```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');
-     * ```
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
      */
-     dependencies: List<any>;
+    destroyView(viewRef: RenderViewRef): void;
     
-
     /**
-     * Converts the {@link Binding} into {@link ResolvedBinding}.
-     * 
-     * {@link Injector} internally only uses {@link ResolvedBinding}, {@link Binding} contains
-     * convenience binding syntax.
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
      */
-     resolve(): ResolvedBinding;
-  }
-  
-
-  /**
-   * Helper class for the {@link bind} function.
-   */
-  class BindingBuilder {
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
     
-     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);
-     * ```
+     * Attaches the Nodes of the Render Fragment after an Element.
      */
-     toClass(type: Type): Binding;
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
     
-
     /**
-     * Binds a key to a value.
+     * Detaches the Nodes of a Render Fragment from their parent.
      * 
-     * ## Example
-     * 
-     * ```javascript
-     * var injector = Injector.resolveAndCreate([
-     *   bind(String).toValue('Hello')
-     * ]);
-     * 
-     * expect(injector.get(String)).toEqual('Hello');
-     * ```
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
      */
-     toValue(value: any): Binding;
+    detachFragment(fragmentRef: RenderFragmentRef): void;
     
-
     /**
-     * Binds a key to the alias for an existing key.
+     * Notifies a custom Renderer to initialize a Render View.
      * 
-     * 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 separate 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);
-     * ```
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
      */
-     toAlias(aliasToken: /*Type*/ any): Binding;
+    hydrateView(viewRef: RenderViewRef): void;
     
-
     /**
-     * Binds a key to a function which computes the value.
+     * Notifies a custom Renderer that a Render View is no longer active.
      * 
-     * ## Example
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
      * 
-     * ```javascript
-     * var injector = Injector.resolveAndCreate([
-     *   bind(Number).toFactory(() => { return 1+2; }),
-     *   bind(String).toFactory((v) => { return "Value: " + v; }, [Number])
-     * ]);
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
      * 
-     * expect(injector.get(Number)).toEqual(3);
-     * expect(injector.get(String)).toEqual('Value: 3');
-     * ```
+     * If `attributeValue` is `null`, the attribute is removed.
      */
-     toFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
-  }
-  
-
-  /**
-   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
-   * 
-   * A {@link Binding} is resolved when it has a factory function. Binding to a class, alias, or
-   * value, are just convenience methods, as {@link Injector} only operates on calling factory
-   * functions.
-   */
-  class ResolvedBinding {
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
     
-
     /**
-     * A key, usually a `Type`.
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
      */
-     key: Key;
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
     
-
     /**
-     * Factory function which can return an instance of an object represented by a key.
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
      */
-     factory: Function;
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
     
-
     /**
-     * Arguments (dependencies) to the `factory` function.
+     * Calls a method on the Element specified via `location`.
      */
-     dependencies: List<Dependency>;
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
   }
-  
 
+    
   /**
-   * @private
-   */
-  class Dependency {
-    
-     key: Key;
-    
-     optional: boolean;
-    
-     lowerBoundVisibility: any;
-    
-     upperBoundVisibility: any;
-    
-     properties: List<any>;
-  }
-  
-
-  /**
-   * Provides an API for imperatively constructing {@link Binding}s.
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
    * 
-   * This is only relevant for JavaScript. See {@link BindingBuilder}.
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
    * 
-   * ## Example
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
    * 
-   * ```javascript
-   * bind(MyInterface).toClass(MyClass)
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
    * 
-   * ```
-   */
-  function bind(token: any) : BindingBuilder ;
-  
-
-  /**
-   * A unique object used for retrieving items from the {@link Injector}.
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
    * 
-   * Keys have:
-   * - a system-wide unique `id`.
-   * - a `token`, usually the `Type` of the instance.
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
    * 
-   * Keys are used internally by the {@link Injector} because their system-wide unique `id`s allow the
-   * injector to index in arrays rather than looking up items in maps.
-   */
-  interface Key {
-    
-     token: Object;
-    
-     id: number;
-    
-     displayName: string;
-  }
-  
-
-  /**
-   * @private
-   */
-  class KeyRegistry {
-    
-     get(token: Object): Key;
-    
-     numberOfKeys: number;
-  }
-  
-
-  /**
-   * Type literals is a Dart-only feature. This is here only so we can x-compile
-   * to multiple languages.
-   */
-  class TypeLiteral {
-    
-     type: any;
-  }
-  
-
-  /**
-   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
-   * {@link Injector} does not have a {@link Binding} for {@link Key}.
-   */
-  class NoBindingError extends AbstractBindingError {
-  }
-  
-
-  /**
-   * Base class for all errors arising from misconfigured bindings.
-   */
-  class AbstractBindingError extends BaseException {
-    
-     name: string;
-    
-     message: string;
-    
-     keys: List<Key>;
-    
-     injectors: List<Injector>;
-    
-     constructResolvingMessage: Function;
-    
-     addKey(injector: Injector, key: Key): void;
-    
-     context: void;
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * Thrown when dependencies form a cycle.
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
    * 
-   * ## Example:
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
    * 
-   * ```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.
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
    */
-  class CyclicDependencyError extends AbstractBindingError {
+  interface RenderProtoViewRef {
+    
   }
-  
 
+    
   /**
-   * Thrown when a constructing type returns with an Error.
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
    * 
-   * The `InstantiationError` class contains the original error plus the dependency graph which caused
-   * this object to be instantiated.
-   */
-  class InstantiationError extends AbstractBindingError {
-    
-     causeKey: Key;
-  }
-  
-
-  /**
-   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
-   * creation.
-   */
-  class InvalidBindingError extends BaseException {
-    
-     message: string;
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * Thrown when the class has no annotation information.
+   * Any {@link RenderView} has one Render Fragment.
    * 
-   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
-   * need to be injected into the constructor.
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
    */
-  class NoAnnotationError extends BaseException {
+  class RenderFragmentRef {
     
-     name: string;
-    
-     message: string;
-    
-     toString(): string;
   }
-  
 
+    
   /**
-   * Thrown when getting an object by index.
-   */
-  class OutOfBoundsError extends BaseException {
-    
-     message: string;
-    
-     toString(): string;
-  }
-  
-  class OpaqueToken {
-    
-     toString(): string;
-  }
-  
-
-  /**
-   * Factory for creating {@link InjectMetadata}.
-   */
-  interface InjectFactory {
-    
-     new(token: any): InjectMetadata;
-  
-    
-     (token: any): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link OptionalMetadata}.
-   */
-  interface OptionalFactory {
-    
-     new(): OptionalMetadata;
-  
-    
-     (): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link InjectableMetadata}.
-   */
-  interface InjectableFactory {
-    
-     new(): InjectableMetadata;
-  
-    
-     (): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link SelfMetadata}.
-   */
-  interface SelfFactory {
-    
-     new(): SelfMetadata;
-  
-    
-     (): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link HostMetadata}.
-   */
-  interface HostFactory {
-    
-     new(): HostMetadata;
-  
-    
-     (): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link SkipSelfMetadata}.
-   */
-  interface SkipSelfFactory {
-    
-     new(): SkipSelfMetadata;
-  
-    
-     (): any;
-  
-  }
-  
-
-  /**
-   * Factory for creating {@link InjectMetadata}.
-   */
-  var Inject : InjectFactory ;
-  
-
-  /**
-   * Factory for creating {@link OptionalMetadata}.
-   */
-  var Optional : OptionalFactory ;
-  
-
-  /**
-   * Factory for creating {@link InjectableMetadata}.
-   */
-  var Injectable : InjectableFactory ;
-  
-
-  /**
-   * Factory for creating {@link SelfMetadata}.
-   */
-  var Self : SelfFactory ;
-  
-
-  /**
-   * Factory for creating {@link HostMetadata}.
-   */
-  var Host : HostFactory ;
-  
-
-  /**
-   * Factory for creating {@link SkipSelfMetadata}.
-   */
-  var SkipSelf : SkipSelfFactory ;
-  
-
-  /**
-   * A collection of the Angular core directives that are likely to be used in each and every Angular
-   * application.
+   * Container class produced by a {@link Renderer} when creating a Render View.
    * 
-   * 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 {
-   *   ...
-   * }
-   * ```
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
    */
-  const CORE_DIRECTIVES : List<Type> ;
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  /**
+   * A DI Token representing the main rendering context. In a browser this is the DOM Document.
+   * 
+   * Note: Document might not be available in the Application Context when Application and Rendering
+   * Contexts are not the same (e.g. when running the application into a Web Worker).
+   */
+  let DOCUMENT: OpaqueToken;
   
 
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
   /**
    * Adds and removes CSS classes based on an {expression} value.
    * 
@@ -4335,25 +6231,29 @@ declare module ng {
    * </div>
    * ```
    */
-  class NgClass {
+  class NgClass implements DoCheck,  OnDestroy {
     
-     initialClasses: void;
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
     
-     rawClass: void;
+    initialClasses: any;
     
-     onCheck(): void;
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): void;
     
-     onDestroy(): 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.
+   * iteration in the template context, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
    * 
    * When the contents of the iterator changes, `NgFor` makes the corresponding changes to the DOM:
    * 
@@ -4377,36 +6277,24 @@ declare module ng {
    * - `<li template="ng-for #item of items; #i = index">...</li>`
    * - `<template ng-for #item [ng-for-of]="items" #i="index"><li>...</li></template>`
    */
-  class NgFor {
+  class NgFor implements DoCheck {
     
-     viewContainer: ViewContainerRef;
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
     
-     templateRef: TemplateRef;
+    ngForOf: any;
     
-     iterableDiffers: IterableDiffers;
+    doCheck(): void;
     
-     cdr: ChangeDetectorRef;
-    
-     ngForOf: void;
-    
-     onCheck(): void;
   }
-  
-  class RecordViewTuple {
-    
-     view: ViewRef;
-    
-     record: any;
-  }
-  
 
+    
   /**
    * 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:
+   * ### Example ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
    * 
    * ```
    * <div *ng-if="errorCount > 0" class="error">
@@ -4424,27 +6312,13 @@ declare module ng {
    */
   class NgIf {
     
-     ngIf: void;
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
   }
-  
-
-  /**
-   * 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 ng-non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
-   * ```
-   */
-  class NgNonBindable {
-  }
-  
 
+    
   /**
    * Adds or removes styles based on an {expression}.
    * 
@@ -4455,32 +6329,28 @@ declare module ng {
    * # Example:
    * 
    * ```
-   * <div ng-style="{'text-align': alignEpr}"></div>
+   * <div [ng-style]="{'text-align': alignExp}"></div>
    * ```
    * 
-   * In the above example the `text-align` style will be updated based on the `alignEpr` value
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
    * changes.
    * 
    * # Syntax
    * 
-   * - `<div ng-style="{'text-align': alignEpr}"></div>`
-   * - `<div ng-style="styleExp"></div>`
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
    */
-  class NgStyle {
+  class NgStyle implements DoCheck {
     
-     rawStyle: void;
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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.
@@ -4508,10 +6378,11 @@ declare module ng {
    */
   class NgSwitch {
     
-     ngSwitch: void;
+    ngSwitch: any;
+    
   }
-  
 
+    
   /**
    * Defines a case statement as an expression.
    * 
@@ -4529,10 +6400,13 @@ declare module ng {
    */
   class NgSwitchWhen {
     
-     ngSwitchWhen: void;
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
   }
-  
 
+    
   /**
    * Defines a default case statement.
    * 
@@ -4545,147 +6419,257 @@ declare module ng {
    * ```
    */
   class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
   }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
   
 
+    
   /**
    * Omitting from external API doc as this is really an abstract internal concept.
    */
   class AbstractControl {
     
-     validator: Function;
+    constructor(validator: Function);
     
-     value: any;
+    validator: Function;
     
-     status: string;
+    value: any;
     
-     valid: boolean;
+    status: string;
     
-     errors: StringMap<string, any>;
+    valid: boolean;
     
-     pristine: boolean;
+    errors: {[key: string]: any};
     
-     dirty: boolean;
+    pristine: boolean;
     
-     touched: boolean;
+    dirty: boolean;
     
-     untouched: boolean;
+    touched: boolean;
     
-     valueChanges: Observable;
+    untouched: boolean;
     
-     markAsTouched(): void;
+    valueChanges: Observable;
     
-     markAsDirty({onlySelf}?: {onlySelf?: boolean}): void;
+    markAsTouched(): void;
     
-     setParent(parent: ControlGroup | ControlArray): void;
+    markAsDirty({onlySelf}?: {onlySelf?: boolean}): void;
     
-     updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    setParent(parent: ControlGroup | ControlArray): void;
     
-     updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
     
-     find(path: List<string | number>| string): AbstractControl;
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
     
-     getError(errorCode: string, path?: List<string>): any;
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
     
-     hasError(errorCode: string, path?: List<string>): boolean;
   }
-  
 
+    
   /**
-   * Defines a part of a form that cannot be divided into other controls.
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
    * 
    * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
-   * with
-   * {@link ControlGroup} and {@link ControlArray}.
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
    */
   class Control extends AbstractControl {
     
-     updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
-                  {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    registerOnChange(fn: Function): 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 {@link Control} 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.
+   * A `ControlGroup` aggregates the values and errors of each {@link Control} 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
-   * {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other controls,
-   * but is of variable
-   * length.
+   * along with {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
    */
   class ControlGroup extends AbstractControl {
     
-     controls: StringMap<string, AbstractControl>;
+    constructor(controls: {[key: string]: AbstractControl}, optionals?: {[key: string]: boolean}, validator?: Function);
     
-     addControl(name: string, c: AbstractControl): void;
+    controls: {[key: string]: AbstractControl};
     
-     removeControl(name: string): void;
+    addControl(name: string, control: AbstractControl): void;
     
-     include(controlName: string): void;
+    removeControl(name: string): void;
     
-     exclude(controlName: string): void;
+    include(controlName: string): void;
+    
+    exclude(controlName: string): void;
+    
+    contains(controlName: string): boolean;
     
-     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 {@link Control} 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.
+   * 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
    * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
    */
   class ControlArray extends AbstractControl {
     
-     controls: List<AbstractControl>;
+    constructor(controls: AbstractControl[], validator?: Function);
     
-     at(index: number): AbstractControl;
+    controls: AbstractControl[];
     
-     push(control: AbstractControl): void;
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
     
-     insert(index: number, control: AbstractControl): void;
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
     
-     removeAt(index: number): void;
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
     
-     length: number;
   }
-  
+
+    
   class AbstractControlDirective {
     
-     control: AbstractControl;
+    control: AbstractControl;
     
-     value: any;
+    value: any;
     
-     valid: boolean;
+    valid: boolean;
     
-     errors: StringMap<string, any>;
+    errors: {[key: string]: any};
     
-     pristine: boolean;
+    pristine: boolean;
     
-     dirty: boolean;
+    dirty: boolean;
     
-     touched: boolean;
+    touched: boolean;
+    
+    untouched: boolean;
     
-     untouched: boolean;
   }
-  
 
+    
   /**
    * An interface that {@link NgFormModel} and {@link NgForm} implement.
    * 
@@ -4693,37 +6677,39 @@ declare module ng {
    */
   interface Form {
     
-     addControl(dir: NgControl): void;
+    addControl(dir: NgControl): void;
     
-     removeControl(dir: NgControl): void;
+    removeControl(dir: NgControl): void;
     
-     getControl(dir: NgControl): Control;
+    getControl(dir: NgControl): Control;
     
-     addControlGroup(dir: NgControlGroup): void;
+    addControlGroup(dir: NgControlGroup): void;
     
-     removeControlGroup(dir: NgControlGroup): void;
+    removeControlGroup(dir: NgControlGroup): void;
     
-     getControlGroup(dir: NgControlGroup): ControlGroup;
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
     
-     updateModel(dir: NgControl, value: any): void;
   }
-  
 
+    
   /**
-   * A directive that contains a group of [NgControl].
+   * A directive that contains multiple {@link NgControl}.
    * 
    * Only used by the forms module.
    */
   class ControlContainer extends AbstractControlDirective {
     
-     name: string;
+    name: string;
     
-     formDirective: Form;
+    formDirective: Form;
+    
+    path: string[];
     
-     path: List<string>;
   }
-  
 
+    
   /**
    * Creates and binds a control with a specified name to a DOM element.
    * 
@@ -4733,24 +6719,23 @@ declare module ng {
    * 
    * 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.
+   * changes.
    * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
    *      directives: [FORM_DIRECTIVES],
    *      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>
+   *        <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>
+   *          Password <input type='password' ng-control='password'>
+   *          <button type='submit'>Log in!</button>
+   *        </form>
    *      `})
    * class LoginComp {
-   *  onLogIn(value) {
+   *  onLogIn(value): void {
    *    // value === {login: 'some login', password: 'some password'}
    *  }
    * }
@@ -4763,175 +6748,194 @@ declare module ng {
    * @View({
    *      directives: [FORM_DIRECTIVES],
    *      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>
+   *        <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() {
+   *  onLogIn(): void {
    *    // this.credentials.login === "some login"
    *    // this.credentials.password === "some password"
    *  }
    * }
    *  ```
    */
-  class NgControlName extends NgControl {
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
     
-     update: void;
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
     
-     model: any;
+    update: any;
     
-     viewModel: any;
+    model: any;
     
-     ngValidators: QueryList<NgValidator>;
+    viewModel: any;
     
-     onChange(c: StringMap<string, any>): void;
+    validators: Function[];
     
-     onDestroy(): void;
+    onChanges(changes: {[key: string]: SimpleChange}): void;
     
-     viewToModelUpdate(newValue: any): void;
+    onDestroy(): void;
     
-     path: List<string>;
+    viewToModelUpdate(newValue: any): void;
     
-     formDirective: any;
+    path: string[];
     
-     control: Control;
+    formDirective: any;
+    
+    control: Control;
+    
+    validator: Function;
     
-     validator: Function;
   }
-  
 
+    
   /**
-   * Binds an existing control to a DOM element.
+   * Binds an existing {@link Control} to a DOM element.
    * 
-   * # Example
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
    * 
    * 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.
+   * 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"})
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
    * @View({
-   *      directives: [FORM_DIRECTIVES],
-   *      template: "<input type='text' [ng-form-control]='loginControl'>"
-   *      })
-   * class LoginComp {
-   *  loginControl:Control;
-   * 
-   *  constructor() {
-   *    this.loginControl = new Control('');
-   *  }
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
    * }
-   * 
    *  ```
    * 
-   * We can also use ng-model to bind a domain model to the form.
+   * # ng-model
    * 
-   *  ```
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
    * @Component({selector: "login-comp"})
    * @View({
    *      directives: [FORM_DIRECTIVES],
    *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
    *      })
    * class LoginComp {
-   *  loginControl:Control;
+   *  loginControl: Control = new Control('');
    *  login:string;
-   * 
-   *  constructor() {
-   *    this.loginControl = new Control('');
-   *  }
    * }
    *  ```
    */
-  class NgFormControl extends NgControl {
+  class NgFormControl extends NgControl implements OnChanges {
     
-     form: Control;
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
     
-     update: void;
+    form: Control;
     
-     model: any;
+    update: any;
     
-     viewModel: any;
+    model: any;
     
-     ngValidators: QueryList<NgValidator>;
+    viewModel: any;
     
-     onChange(c: StringMap<string, any>): void;
+    validators: Function[];
     
-     path: List<string>;
+    onChanges(changes: {[key: string]: SimpleChange}): void;
     
-     control: Control;
+    path: string[];
     
-     validator: Function;
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
     
-     viewToModelUpdate(newValue: any): void;
   }
-  
 
+    
   /**
-   * Binds a domain model to the form.
+   * Binds a domain model to a form control.
    * 
-   * # Example
-   *  ```
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
    * @Component({selector: "search-comp"})
    * @View({
    *      directives: [FORM_DIRECTIVES],
-   *      template: `
-   *               <input type='text' [(ng-model)]="searchQuery">
-   *      `})
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
    * class SearchComp {
    *  searchQuery: string;
    * }
    *  ```
    */
-  class NgModel extends NgControl {
+  class NgModel extends NgControl implements OnChanges {
     
-     update: void;
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
     
-     model: any;
+    update: any;
     
-     viewModel: any;
+    model: any;
     
-     ngValidators: QueryList<NgValidator>;
+    viewModel: any;
     
-     onChange(c: StringMap<string, any>): void;
+    validators: Function[];
     
-     control: Control;
+    onChanges(changes: {[key: string]: SimpleChange}): void;
     
-     path: List<string>;
+    control: Control;
     
-     validator: Function;
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
     
-     viewToModelUpdate(newValue: any): void;
   }
-  
 
+    
   /**
-   * An abstract class that all control directive extend.
-   * 
+   * A base class that all control directive extend.
    * It binds a {@link Control} object to a DOM element.
    */
   class NgControl extends AbstractControlDirective {
     
-     name: string;
+    name: string;
     
-     valueAccessor: ControlValueAccessor;
+    valueAccessor: ControlValueAccessor;
     
-     validator: Function;
+    validator: Function;
     
-     path: List<string>;
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
     
-     viewToModelUpdate(newValue: any): void;
   }
-  
 
+    
   /**
    * Creates and binds a control group to a DOM element.
    * 
@@ -4962,48 +6966,91 @@ declare module ng {
    *      `})
    * class SignupComp {
    *  onSignUp(value) {
-   *    // value === {personal: {name: 'some name'},
+   *    // value === {
+   *    //  personal: {name: 'some name'},
    *    //  credentials: {login: 'some login', password: 'some password'}}
    *  }
    * }
    * 
    *  ```
    */
-  class NgControlGroup extends ControlContainer {
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
     
-     onInit(): void;
+    constructor(_parent: ControlContainer);
     
-     onDestroy(): void;
+    onInit(): void;
     
-     control: ControlGroup;
+    onDestroy(): void;
     
-     path: List<string>;
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
     
-     formDirective: Form;
   }
-  
 
+    
   /**
    * Binds an existing control group to a DOM element.
    * 
-   * # Example
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
    * 
    * 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.
+   * password controls to the login and password elements.
    * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
    *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
    * @Component({selector: "login-comp"})
    * @View({
    *      directives: [FORM_DIRECTIVES],
-   *      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>"
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.password'>
+   *          <button (click)="onLogin()">Login</button>
+   *        </form>`
    *      })
    * class LoginComp {
-   *  loginForm:ControlGroup;
+   *  credentials: {login: string, password: string};
+   *  loginForm: ControlGroup;
    * 
    *  constructor() {
    *    this.loginForm = new ControlGroup({
@@ -5012,11 +7059,7838 @@ declare module ng {
    *    });
    *  }
    * 
-   *  onLogin() {
-   *    // this.loginForm.value
+   *  onLogin(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+    form: ControlGroup;
+    
+    ngSubmit: any;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see {@link DefaultValueAccessor} 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
+   * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => void): void;
+    
+    registerOnTouched(fn: () => void): void;
+    
+  }
+
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    registerOnChange(fn: (_: any) => {}): void;
+    
+    registerOnTouched(fn: () => {}): void;
+    
+  }
+
+    
+  /**
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
+   * 
+   * #Example:
+   * 
+   * ```
+   * <select ng-control="city">
+   *   <option *ng-for="#c of cities" [value]="c"></option>
+   * </select>
+   * ```
+   */
+  class NgSelectOption {
+    
+  }
+
+    
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
+    
+    value: string;
+    
+    onChange: any;
+    
+    onTouched: any;
+    
+    writeValue(value: any): void;
+    
+    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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
+   */
+  let FORM_DIRECTIVES: Type[];
+  
+
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   */
+  class Validators {
+    
+    static required(control:Control): {[key: string]: boolean};
+    
+    static nullValidator(c: any): {[key: string]: boolean};
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): {[key: string]: any[]};
+    
+    static array(array:ControlArray): {[key: string]: any[]};
+    
+  }
+
+    
+  class DefaultValidators {
+    
+  }
+
+    
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewBindings: [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: [FORM_DIRECTIVES]
+   * })
+   * 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 {@link ControlGroup} that consists of a `login` {@link Control}, and a
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   */
+  class FormBuilder {
+    
+    group(controlsConfig: {[key: string]: any}, extra?: {[key: string]: any}): ControlGroup;
+    
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
+    
+  }
+
+    
+  /**
+   * Shorthand set of bindings used for building Angular forms.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
+   */
+  let FORM_BINDINGS: Type[];
+  
+
+    
+  function inspectNativeElement(element: any): DebugElement;
+  
+
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
+    /**
+     * Get child DebugElements from within the Light DOM.
+     * 
+     * @return {DebugElement[]}
+     */
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
+  }
+
+    
+  /**
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
+   */
+  function inspectElement(elementRef: ElementRef): DebugElement;
+  
+
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
+  /**
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
+   */
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
+
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
+  /**
+   * Create trace scope.
+   * 
+   * Scopes must be strictly nested and are analogous to stack frames, but
+   * do not have to follow the stack frames. Instead it is recommended that they follow logical
+   * nesting. You may want to use
+   * [Event
+   * Signatures](http://google.github.io/tracing-framework/instrumenting-code.html#custom-events)
+   * as they are defined in WTF.
+   * 
+   * Used to mark scope entry. The return value is used to leave the scope.
+   * 
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   * 
+   *     someMethod() {
+   *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
+   *        // DO SOME WORK HERE
+   *        return wtfLeave(s, 123); // Return value 123
+   *     }
+   * 
+   * Note, adding try-finally block around the work to ensure that `wtfLeave` gets called can
+   * negatively impact the performance of your application. For this reason we recommend that
+   * you don't add them to ensure that `wtfLeave` gets called. In production `wtfLeave` is a noop and
+   * so try-finally block has no value. When debugging perf issues, skipping `wtfLeave`, do to
+   * exception, will produce incorrect trace, but presence of exception signifies logic error which
+   * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
+   * an exception is expected during normal execution while profiling.
+   */
+  var wtfCreateScope: WtfScopeFn;
+  
+
+    
+  /**
+   * Used to mark end of Scope.
+   * 
+   * - `scope` to end.
+   * - `returnValue` (optional) to be passed to the WTF.
+   * 
+   * Returns the `returnValue for easy chaining.
+   */
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
+  
+
+    
+  /**
+   * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
+   * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
+   * enabled.
+   * 
+   *     someMethod() {
+   *        var s = wtfStartTimeRange('HTTP:GET', 'some.url');
+   *        var future = new Future.delay(5).then((_) {
+   *          wtfEndTimeRange(s);
+   *        });
+   *     }
+   */
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
+  
+
+    
+  /**
+   * Ends a async time range operation.
+   * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
+   * enabled.
+   */
+  var wtfEndTimeRange: (range: any) => void;
+  
+
+    
+  interface WtfScopeFn {
+    
+    (arg0?: any, arg1?: any): any;
+    
+  }
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
+  var ApplicationRef: InjectableReference;
+  
+
+    
+  var Compiler: InjectableReference;
+  
+
+    
+  var AppViewManager: InjectableReference;
+  
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
+  var ViewRef: InjectableReference;
+  
+
+    
+  var ProtoViewRef: InjectableReference;
+  
+
+    
+  var ViewContainerRef: InjectableReference;
+  
+
+    
+  var ComponentRef: InjectableReference;
+  
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var Renderer: InjectableReference;
+  
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
+
+
+
+declare module ngWorker {  
+  /**
+   * A dispatcher that relays all events that occur in a Render View.
+   * 
+   * Use {@link Renderer#setEventDispatcher} to register a dispatcher for a particular Render View.
+   */
+  interface RenderEventDispatcher {
+    
+    /**
+     * Called when Event called `eventName` was triggered on an Element with an Event Binding for this
+     * Event.
+     * 
+     * `elementIndex` specifies the depth-first index of the Element in the Render View.
+     * 
+     * `locals` is a map for local variable to value mapping that should be used when evaluating the
+     * Event Binding expression.
+     * 
+     * Returns `false` if `preventDefault` should be called to stop the default behavior of the Event
+     * in the Rendering Context.
+     */
+    dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+    
+  }
+
+    
+  /**
+   * Injectable service that provides a low-level interface for modifying the UI.
+   * 
+   * Use this service to bypass Angular's templating and make custom UI changes that can't be
+   * expressed declaratively. For example if you need to set a property or an attribute whose name is
+   * not statically known, use {@link #setElementProperty} or {@link #setElementAttribute}
+   * respectively.
+   * 
+   * If you are implementing a custom renderer, you must implement this interface.
+   * 
+   * The default Renderer implementation is {@link DomRenderer}. Also see {@link WebWorkerRenderer}.
+   */
+  interface Renderer {
+    
+    /**
+     * Registers a component template represented as arrays of {@link RenderTemplateCmd}s and styles
+     * with the Renderer.
+     * 
+     * Once a template is registered it can be referenced via {@link RenderBeginComponentCmd} when
+     * {@link #createProtoView creating Render ProtoView}.
+     */
+    registerComponentTemplate(templateId: number, commands: RenderTemplateCmd[], styles: string[], nativeShadow: boolean): void;
+    
+    /**
+     * Creates a {@link RenderProtoViewRef} from an array of {@link RenderTemplateCmd}`s.
+     */
+    createProtoView(cmds: RenderTemplateCmd[]): RenderProtoViewRef;
+    
+    /**
+     * Creates a Root Host View based on the provided `hostProtoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * `hostElementSelector` is a (CSS) selector for querying the main document to find the Host
+     * Element. The newly created Root Host View should be attached to this element.
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
+    
+    /**
+     * Creates a Render View based on the provided `protoViewRef`.
+     * 
+     * `fragmentCount` is the number of nested {@link RenderFragmentRef}s in this View. This parameter
+     * is non-optional so that the renderer can create a result synchronously even when application
+     * runs in a different context (e.g. in a Web Worker).
+     * 
+     * Returns an instance of {@link RenderViewWithFragments}, representing the Render View.
+     */
+    createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
+    
+    /**
+     * Destroys a Render View specified via `viewRef`.
+     * 
+     * This operation should be performed only on a View that has already been dehydrated and
+     * all of its Render Fragments have been detached.
+     * 
+     * Destroying a View indicates to the Renderer that this View is not going to be referenced in any
+     * future operations. If the Renderer created any renderer-specific objects for this View, these
+     * objects should now be destroyed to prevent memory leaks.
+     */
+    destroyView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Attaches the Nodes of a Render Fragment after the last Node of `previousFragmentRef`.
+     */
+    attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Attaches the Nodes of the Render Fragment after an Element.
+     */
+    attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Detaches the Nodes of a Render Fragment from their parent.
+     * 
+     * This operations should be called only on a View that has been already
+     * {@link #dehydrateView dehydrated}.
+     */
+    detachFragment(fragmentRef: RenderFragmentRef): void;
+    
+    /**
+     * Notifies a custom Renderer to initialize a Render View.
+     * 
+     * This method is called by Angular after a Render View has been created, or when a previously
+     * dehydrated Render View is about to be reused.
+     */
+    hydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Notifies a custom Renderer that a Render View is no longer active.
+     * 
+     * This method is called by Angular before a Render View will be destroyed, or when a hydrated
+     * Render View is about to be put into a pool for future reuse.
+     */
+    dehydrateView(viewRef: RenderViewRef): void;
+    
+    /**
+     * Returns the underlying native element at the specified `location`, or `null` if direct access
+     * to native elements is not supported (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this api as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding, or other {@link Renderer} methods instead.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    getNativeElementSync(location: RenderElementRef): any;
+    
+    /**
+     * Sets a property on the Element specified via `location`.
+     */
+    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+    /**
+     * Sets an attribute on the Element specified via `location`.
+     * 
+     * If `attributeValue` is `null`, the attribute is removed.
+     */
+    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+    /**
+     * Sets a (CSS) class on the Element specified via `location`.
+     * 
+     * `isAdd` specifies if the class should be added or removed.
+     */
+    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+    /**
+     * Sets a (CSS) inline style on the Element specified via `location`.
+     * 
+     * If `styleValue` is `null`, the style is removed.
+     */
+    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+    /**
+     * Calls a method on the Element specified via `location`.
+     */
+    invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
+    
+    /**
+     * Sets the value of an interpolated TextNode at the specified index to the `text` value.
+     * 
+     * `textNodeIndex` is the depth-first index of the Node among interpolated Nodes in the Render
+     * View.
+     */
+    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+    /**
+     * Sets a dispatcher to relay all events triggered in the given Render View.
+     * 
+     * Each Render View can have only one Event Dispatcher, if this method is called multiple times,
+     * the last provided dispatcher will be used.
+     */
+    setEventDispatcher(viewRef: RenderViewRef, dispatcher: RenderEventDispatcher): void;
+    
+  }
+
+    
+  /**
+   * Represents an Element that is part of a {@link RenderViewRef Render View}.
+   * 
+   * `RenderElementRef` is a counterpart to {@link ElementRef} available in the Application Context.
+   * 
+   * When using `Renderer` from the Application Context, `ElementRef` can be used instead of
+   * `RenderElementRef`.
+   */
+  interface RenderElementRef {
+    
+    /**
+     * Reference to the Render View that contains this Element.
+     */
+    renderView: RenderViewRef;
+    
+    /**
+     * Index of the Element (in the depth-first order) inside the Render View.
+     * 
+     * This index is used internally by Angular to locate elements.
+     */
+    boundElementIndex: number;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View in the Rendering Context.
+   * 
+   * `RenderViewRef` specifies to the {@link Renderer} what View to update or destroy.
+   * 
+   * Unlike a {@link ViewRef} available in the Application Context, Render View contains all the
+   * static Component Views that have been recursively merged into a single Render View.
+   * 
+   * Each `RenderViewRef` contains one or more {@link RenderFragmentRef Render Fragments}, these
+   * Fragments are created, hydrated, dehydrated and destroyed as a single unit together with the
+   * View.
+   */
+  class RenderViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView in the Rendering Context.
+   * 
+   * When you implement a custom {@link Renderer}, `RenderProtoViewRef` specifies what Render View
+   * your renderer should create.
+   * 
+   * `RenderProtoViewRef` is a counterpart to {@link ProtoViewRef} available in the Application
+   * Context. But unlike `ProtoViewRef`, `RenderProtoViewRef` contains all static nested Proto Views
+   * that are recursively merged into a single Render Proto View.
+   * 
+   * 
+   * <!-- TODO: this is created by Renderer#createProtoView in the new compiler -->
+   */
+  interface RenderProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a list of sibling Nodes that can be moved by the {@link Renderer} independently of
+   * other Render Fragments.
+   * 
+   * Any {@link RenderView} has one Render Fragment.
+   * 
+   * Additionally any View with an Embedded View that contains a {@link NgContent View Projection}
+   * results in additional Render Fragment.
+   */
+  class RenderFragmentRef {
+    
+  }
+
+    
+  /**
+   * Container class produced by a {@link Renderer} when creating a Render View.
+   * 
+   * An instance of `RenderViewWithFragments` contains a {@link RenderViewRef} and an array of
+   * {@link RenderFragmentRef}s belonging to this Render View.
+   */
+  class RenderViewWithFragments {
+    
+    constructor(viewRef: RenderViewRef, fragmentRefs: RenderFragmentRef[]);
+    
+    /**
+     * Reference to the {@link RenderViewRef}.
+     */
+    viewRef: RenderViewRef;
+    
+    /**
+     * Array of {@link RenderFragmentRef}s ordered in the depth-first order.
+     */
+    fragmentRefs: RenderFragmentRef[];
+    
+  }
+
+    
+  interface RenderTemplateCmd {
+    
+    visit(visitor: RenderCommandVisitor, context: any): any;
+    
+  }
+
+    
+  interface RenderCommandVisitor {
+    
+    visitText(cmd: RenderTextCmd, context: any): any;
+    
+    visitNgContent(cmd: RenderNgContentCmd, context: any): any;
+    
+    visitBeginElement(cmd: RenderBeginElementCmd, context: any): any;
+    
+    visitEndElement(context: any): any;
+    
+    visitBeginComponent(cmd: RenderBeginComponentCmd, context: any): any;
+    
+    visitEndComponent(context: any): any;
+    
+    visitEmbeddedTemplate(cmd: RenderEmbeddedTemplateCmd, context: any): any;
+    
+  }
+
+    
+  interface RenderTextCmd extends RenderBeginCmd {
+    
+    value: string;
+    
+  }
+
+    
+  interface RenderNgContentCmd {
+    
+    ngContentIndex: number;
+    
+  }
+
+    
+  interface RenderBeginElementCmd extends RenderBeginCmd {
+    
+    name: string;
+    
+    attrNameAndValues: string[];
+    
+    eventTargetAndNames: string[];
+    
+  }
+
+    
+  interface RenderBeginComponentCmd extends RenderBeginElementCmd {
+    
+    nativeShadow: boolean;
+    
+    templateId: number;
+    
+  }
+
+    
+  interface RenderEmbeddedTemplateCmd extends RenderBeginElementCmd {
+    
+    isMerged: boolean;
+    
+    children: RenderTemplateCmd[];
+    
+  }
+
+    
+  interface RenderBeginCmd extends RenderTemplateCmd {
+    
+    ngContentIndex: number;
+    
+    isBound: boolean;
+    
+  }
+
+    
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * Implement this interface to get notified when your directive's content has been fully
+   * initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/plamXUpsLQbIXpViZhUO?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentInit {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentInit() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentInit: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <child-cmp where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentInit {
+    
+    afterContentInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your directive's content.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/tGdrytNEKQnecIPkD7NU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({template: `<ng-content></ng-content>`})
+   * class ParentComponent implements AfterContentChecked {
+   *   @ContentChild(ChildComponent) contentChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // contentChild is not initialized yet
+   *     console.log(this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   afterContentChecked() {
+   *     // contentChild is updated after the content has been checked
+   *     console.log('AfterContentChecked: ' + this.getMessage(this.contentChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <parent-cmp>
+   *       <button (click)="hasContent = !hasContent">Toggle content child</button>
+   *       <child-cmp *ng-if="hasContent" where="content"></child-cmp>
+   *     </parent-cmp>`,
+   *   directives: [NgIf, ParentComponent, ChildComponent]
+   * })
+   * export class App {
+   *   hasContent = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterContentChecked {
+    
+    afterContentChecked(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your component's view has been fully initialized.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LhTKVMEM0fkJgyp4CI1W?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `<child-cmp where="view"></child-cmp>`,
+   *   directives: [ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewInit {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewInit() {
+   *     // viewChild is updated after the view has been initialized
+   *     console.log('afterViewInit: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewInit {
+    
+    afterViewInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified after every check of your component's view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/0qDGHcPQkc25CXhTNzKU?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'child-cmp'})
+   * @View({template: `{{where}} child`})
+   * class ChildComponent {
+   *   @Property() where: string;
+   * }
+   * 
+   * @Component({selector: 'parent-cmp'})
+   * @View({
+   *   template: `
+   *     <button (click)="showView = !showView">Toggle view child</button>
+   *     <child-cmp *ng-if="showView" where="view"></child-cmp>`,
+   *   directives: [NgIf, ChildComponent]
+   * })
+   * class ParentComponent implements AfterViewChecked {
+   *   @ViewChild(ChildComponent) viewChild: ChildComponent;
+   *   showView = true;
+   * 
+   *   constructor() {
+   *     // viewChild is not initialized yet
+   *     console.log(this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   afterViewChecked() {
+   *     // viewChild is updated after the view has been checked
+   *     console.log('AfterViewChecked: ' + this.getMessage(this.viewChild));
+   *   }
+   * 
+   *   private getMessage(cmp: ChildComponent): string {
+   *     return cmp ? cmp.where + ' child' : 'no child';
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<parent-cmp></parent-cmp>`,
+   *   directives: [ParentComponent]
+   * })
+   * export class App {
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface AfterViewChecked {
+    
+    afterViewChecked(): void;
+    
+  }
+
+    
+  /**
+   * Lifecycle hooks are guaranteed to be called in the following order:
+   * - `OnChanges` (if any bindings have changed),
+   * - `OnInit` (after the first check only),
+   * - `DoCheck`,
+   * - `AfterContentInit`,
+   * - `AfterContentChecked`,
+   * - `AfterViewInit`,
+   * - `AfterViewChecked`,
+   * - `OnDestroy` (at the very end before destruction)
+   * Implement this interface to get notified when any data-bound property of your directive changes.
+   * 
+   * `onChanges` is called right after the data-bound properties have been checked and before view
+   * and content children are checked if at least one of them has changed.
+   * 
+   * The `changes` parameter contains an entry for each of the changed data-bound property. The key is
+   * the property name and the value is an instance of {@link SimpleChange}.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/AHrB6opLqHDBPkt4KpdT?p=preview)):
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>myProp = {{myProp}}</p>`})
+   * class MyComponent implements OnChanges {
+   *   @Property() myProp: any;
+   * 
+   *   onChanges(changes: {[propName: string]: SimpleChange}) {
+   *     console.log('onChanges - myProp = ' + changes['myProp'].currentValue);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="value = value + 1">Change MyComponent</button>
+   *     <my-cmp [my-prop]="value"></my-cmp>`,
+   *   directives: [MyComponent]
+   * })
+   * export class App {
+   *   value = 0;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * ```
+   */
+  interface OnChanges {
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to get notified when your directive is destroyed.
+   * 
+   * `onDestroy` callback is typically used for any custom cleanup that needs to occur when the
+   * instance is destroyed
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typesript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   * * ```
+   */
+  interface OnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to execute custom initialization logic after your directive's
+   * data-bound properties have been initialized.
+   * 
+   * `onInit` is called right after the directive's data-bound properties have been checked for the
+   * first time, and before any of its children have been checked. It is invoked only once when the
+   * directive is instantiated.
+   * 
+   * ### Example ([live example](http://plnkr.co/edit/1MBypRryXd64v4pV03Yn?p=preview))
+   * 
+   * ```typescript
+   * @Component({selector: 'my-cmp'})
+   * @View({template: `<p>my-component</p>`})
+   * class MyComponent implements OnInit, OnDestroy {
+   *   onInit() {
+   *     console.log('onInit');
+   *   }
+   * 
+   *   onDestroy() {
+   *     console.log('onDestroy');
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="hasChild = !hasChild">
+   *       {{hasChild ? 'Destroy' : 'Create'}} MyComponent
+   *     </button>
+   *     <my-cmp *ng-if="hasChild"></my-cmp>`,
+   *   directives: [MyComponent, NgIf]
+   * })
+   * export class App {
+   *   hasChild = true;
+   * }
+   * 
+   * bootstrap(App).catch(err => console.error(err));
+   *  ```
+   */
+  interface OnInit {
+    
+    onInit(): void;
+    
+  }
+
+    
+  /**
+   * Implement this interface to override the default change detection algorithm for your directive.
+   * 
+   * `doCheck` gets called to check the changes in the directives instead of the default algorithm.
+   * 
+   * The default change detection algorithm looks for differences by comparing bound-property values
+   * by reference across change detection runs. When `DoCheck` is implemented, the default algorithm
+   * is disabled and `doCheck` is responsible for checking for changes.
+   * 
+   * Implementing this interface allows improving performance by using insights about the component,
+   * its implementation and data types of its properties.
+   * 
+   * Note that a directive should not implement both `DoCheck` and {@link OnChanges} at the same time.
+   * `onChanges` would not be called when a directive implements `DoCheck`. Reaction to the changes
+   * have to be handled from within the `doCheck` callback.
+   * 
+   * Use {@link KeyValueDiffers} and {@link IterableDiffers} to add your custom check mechanisms.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/QpnIlF0CR2i5bcYbHEUJ?p=preview))
+   * 
+   * In the following example `doCheck` uses an {@link IterableDiffers} to detect the updates to the
+   * array `list`:
+   * 
+   * ```typescript
+   * @Component({selector: 'custom-check'})
+   * @View({
+   *   template: `
+   *     <p>Changes:</p>
+   *     <ul>
+   *       <li *ng-for="#line of logs">{{line}}</li>
+   *     </ul>`,
+   *   directives: [NgFor]
+   * })
+   * class CustomCheckComponent implements DoCheck {
+   *   @Property() list: any[];
+   *   differ: any;
+   *   logs = [];
+   * 
+   *   constructor(differs: IterableDiffers) {
+   *     this.differ = differs.find([]).create(null);
+   *   }
+   * 
+   *   doCheck() {
+   *     var changes = this.differ.diff(this.list);
+   * 
+   *     if (changes) {
+   *       changes.forEachAddedItem(r => this.logs.push('added ' + r.item));
+   *       changes.forEachRemovedItem(r => this.logs.push('removed ' + r.item))
+   *     }
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <button (click)="list.push(list.length)">Push</button>
+   *     <button (click)="list.pop()">Pop</button>
+   *     <custom-check [list]="list"></custom-check>`,
+   *   directives: [CustomCheckComponent]
+   * })
+   * export class App {
+   *   list = [];
+   * }
+   * ```
+   */
+  interface DoCheck {
+    
+    doCheck(): void;
+    
+  }
+
+    
+  /**
+   * Declares an injectable parameter to be a live list of directives or variable
+   * bindings from the content children of a directive.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * 
+   * Assume that `<tabs>` component would like to get a list its children `<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>
+   * ```
+   * 
+   * The preferred solution is to query for `Pane` directives using this decorator.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'pane',
+   *   inputs: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * 
+   * @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;
+   *  }
+   * }
+   * ```
+   * 
+   * A query can look for variable bindings by passing in a string with desired binding symbol.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/sT2j25cH1dURAyBRCKx1?p=preview))
+   * ```html
+   * <seeker>
+   *   <div #findme>...</div>
+   * </seeker>
+   * 
+   * @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class seeker {
+   *   constructor(@Query('findme') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * In this case the object that is injected depend on the type of the variable
+   * binding. It can be an ElementRef, a directive or a component.
+   * 
+   * Passing in a comma separated list of variable bindings will query for all of them.
+   * 
+   * ```html
+   * <seeker>
+   *   <div #find-me>...</div>
+   *   <div #find-me-too>...</div>
+   * </seeker>
+   * 
+   *  @Component({
+   *   selector: 'foo'
+   * })
+   * @View(...)
+   * class Seeker {
+   *   constructor(@Query('findMe, findMeToo') elList: QueryList<ElementRef>) {...}
+   * }
+   * ```
+   * 
+   * Configure whether query looks for direct children or all descendants
+   * of the querying element, by using the `descendants` parameter.
+   * It is set to `false` by default.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wtGeB977bv7qvA5FTYl9?p=preview))
+   * ```html
+   * <container #first>
+   *   <item>a</item>
+   *   <item>b</item>
+   *   <container #second>
+   *     <item>c</item>
+   *   </container>
+   * </container>
+   * ```
+   * 
+   * When querying for items, the first container will see only `a` and `b` by default,
+   * but with `Query(TextDirective, {descendants: true})` it will see `c` too.
+   * 
+   * The queried directives are kept in a depth-first pre-order with respect to their
+   * positions in the DOM.
+   * 
+   * Query does not look deep into any subcomponent views.
+   * 
+   * Query is updated as part of the change-detection cycle. Since change detection
+   * happens after construction of a directive, QueryList will always be empty when observed in the
+   * constructor.
+   * 
+   * The injected object is an unmodifiable live list.
+   * See {@link QueryList} for more details.
+   */
+  class QueryMetadata extends DependencyMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * whether we want to query only direct children (false) or all
+     * children (true).
+     */
+    descendants: boolean;
+    
+    first: boolean;
+    
+    /**
+     * always `false` to differentiate it with {@link ViewQueryMetadata}.
+     */
+    isViewQuery: boolean;
+    
+    /**
+     * what this is querying for.
+     */
+    selector: any;
+    
+    /**
+     * whether this is querying for a variable binding or a directive.
+     */
+    isVarBindingQuery: boolean;
+    
+    /**
+     * returns a list of variable bindings this is querying for.
+     * Only applicable if this is a variable bindings query.
+     */
+    varBindings: string[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChildren(ChildDirective) contentChildren: QueryList<ChildDirective>;
+   * 
+   *   afterContentInit() {
+   *     // contentChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildrenMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants}?: {descendants?: boolean});
+    
+  }
+
+    
+  /**
+   * Configures a content query.
+   * 
+   * Content queries are set before the `afterContentInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Directive({
+   *   selector: 'someDir'
+   * })
+   * class SomeDir {
+   *   @ContentChild(ChildDirective) contentChild;
+   * 
+   *   afterContentInit() {
+   *     // contentChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ContentChildMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChildren(ItemDirective) viewChildren: QueryList<ItemDirective>;
+   * 
+   *   afterViewInit() {
+   *     // viewChildren is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildrenMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | string);
+    
+  }
+
+    
+  /**
+   * Similar to {@link QueryMetadata}, but querying the component view, instead of
+   * the content children.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/eNsFHDf7YjyM6IzKxM1j?p=preview))
+   * 
+   * ```javascript
+   * @Component({...})
+   * @View({
+   *   template: `
+   *     <item> a </item>
+   *     <item> b </item>
+   *     <item> c </item>
+   *   `
+   * })
+   * class MyComponent {
+   *   shown: boolean;
+   * 
+   *   constructor(private @Query(Item) items:QueryList<Item>) {
+   *     items.onChange(() => console.log(items.length));
+   *   }
+   * }
+   * ```
+   * 
+   * Supports the same querying parameters as {@link QueryMetadata}, except
+   * `descendants`. This always queries the whole view.
+   * 
+   * As `shown` is flipped between true and false, items will contain zero of one
+   * items.
+   * 
+   * Specifies that a {@link QueryList} should be injected.
+   * 
+   * The injected object is an iterable and observable live list.
+   * See {@link QueryList} for more details.
+   */
+  class ViewQueryMetadata extends QueryMetadata {
+    
+    constructor(_selector: Type | string, {descendants, first}?: {descendants?: boolean, first?: boolean});
+    
+    /**
+     * always `true` to differentiate it with {@link QueryMetadata}.
+     */
+    isViewQuery: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Configures a view query.
+   * 
+   * View queries are set before the `afterViewInit` callback is called.
+   * 
+   * ### Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'someDir'
+   * })
+   * @View({templateUrl: 'someTemplate', directives: [ItemDirective]})
+   * class SomeDir {
+   *   @ViewChild(ItemDirective) viewChild:ItemDirective;
+   * 
+   *   afterViewInit() {
+   *     // viewChild is set
+   *   }
+   * }
+   * ```
+   */
+  class ViewChildMetadata extends ViewQueryMetadata {
+    
+    constructor(_selector: Type | 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
+   *   }
+   * }
+   * ```
+   */
+  class AttributeMetadata extends DependencyMetadata {
+    
+    constructor(attributeName: string);
+    
+    attributeName: string;
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * 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 `bindings` and `viewBindings`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see {@link ViewMetadata}.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the component class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the component.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ComponentMetadata extends DirectiveMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, exportAs, moduleId, bindings,
+                   viewBindings, changeDetection, queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        viewBindings?: any[],
+        queries?: {[key: string]: any},
+        changeDetection?: ChangeDetectionStrategy,
+      });
+    
+    /**
+     * 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: ChangeDetectionStrategy;
+    
+    /**
+     * 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',
+     *   viewBindings: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+    viewBindings: any[];
+    
+  }
+
+    
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * {@link DirectiveMetadata}s with an embedded view are called {@link ComponentMetadata}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 {@link Injector} 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 {@link Injector}, 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
+   * {@link ViewMetadata}:
+   * 
+   * 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
+   * - `@Host() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root.
+   * - `@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
+   * {@link DirectiveMetadata} 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]',
+   *   inputs: [
+   *     '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 any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the current element, the
+   * parent element, or its parents.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Host() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * `@Host` checks the current element, 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 {@link QueryList}, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a {@link ViewContainerRef} 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 {@link QueryList} 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]',
+   *   inputs: [
+   *     'text: tooltip'
+   *   ],
+   *   host: {
+   *     '(mouseenter)': 'onMouseEnter()',
+   *     '(mouseleave)': '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 {@link ViewContainerRef} to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The {@link ViewContainerRef} 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 {@link ViewMetadata}, 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.
+   * 
+   * ## Lifecycle hooks
+   * 
+   * When the directive class implements some {@link angular2/lifecycle_hooks} the callbacks are
+   * called by the change detection at defined points in time during the life of the directive.
+   * 
+   * ## 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]',
+   *   inputs: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   templateRef: TemplateRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.templateRef = templateRef;
+   *     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.templateRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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.
+   */
+  class DirectiveMetadata extends InjectableMetadata {
+    
+    constructor({selector, inputs, outputs, properties, events, host, bindings, exportAs, moduleId,
+                   queries}?: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      });
+    
+    /**
+     * 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 data-bound input properties for a directive
+     * 
+     * Angular automatically updates input properties during change detection.
+     * 
+     * The `inputs` 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.
+     * 
+     * When `bindingProperty` is not provided, it is assumed to be equal to `directiveProperty`.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ivhfXY?p=preview))
+     * 
+     * The following example creates a component with two data-bound properties.
+     * 
+     * ```typescript
+     * @Component({
+     *   selector: 'bank-account',
+     *   inputs: ['bankName', 'id: account-id']
+     * })
+     * @View({
+     *   template: `
+     *     Bank Name: {{bankName}}
+     *     Account Id: {{id}}
+     *   `
+     * })
+     * class BankAccount {
+     *   bankName: string;
+     *   id: string;
+     * 
+     *   // this property is not bound, and won't be automatically updated by Angular
+     *   normalizedBankName: string;
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+     *   `,
+     *   directives: [BankAccount]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    inputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `inputs`. This is to enable easier migration.
+     */
+    properties: string[];
+    
+    /**
+     * Enumerates the set of event-bound output properties.
+     * 
+     * When an output property emits an event, an event handler attached to that event
+     * the template is invoked.
+     * 
+     * The `outputs` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property that emits events.
+     * - `bindingProperty` specifies the DOM property the event handler is attached to.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/d5CNq7?p=preview))
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'interval-dir',
+     *   outputs: ['everySecond', 'five5Secs: everyFiveSeconds']
+     * })
+     * class IntervalDir {
+     *   everySecond = new EventEmitter();
+     *   five5Secs = new EventEmitter();
+     * 
+     *   constructor() {
+     *     setInterval(() => this.everySecond.next("event"), 1000);
+     *     setInterval(() => this.five5Secs.next("event"), 5000);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `
+     *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+     *     </interval-dir>
+     *   `,
+     *   directives: [IntervalDir]
+     * })
+     * class App {
+     *   everySecond() { console.log('second'); }
+     *   everyFiveSeconds() { console.log('five seconds'); }
+     * }
+     * bootstrap(App);
+     * ```
+     */
+    outputs: string[];
+    
+    /**
+     * @deprecated
+     * Same as `outputs`. This is to enable easier migration.
+     */
+    events: string[];
+    
+    /**
+     * Specify the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Host Listeners
+     * 
+     * Specifies which DOM events 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 evaluation 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 $event local variable.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/DlA5KU?p=preview))
+     * 
+     * The following example declares a directive that attaches a click listener to the button and
+     * counts clicks.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: 'button[counting]',
+     *   host: {
+     *     '(click)': 'onClick($event.target)'
+     *   }
+     * })
+     * class CountClicks {
+     *   numberOfClicks = 0;
+     * 
+     *   onClick(btn) {
+     *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<button counting>Increment</button>`,
+     *   directives: [CountClicks]
+     * })
+     * class App {}
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Host Property Bindings
+     * 
+     * Specifies which DOM properties a directive updates.
+     * 
+     * Angular automatically checks host property bindings during change detection.
+     * If a binding changes, it will update the host element of the directive.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/gNg0ED?p=preview))
+     * 
+     * The following example creates a directive that sets the `valid` and `invalid` classes
+     * on the DOM element that has ng-model directive on it.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[ng-model]',
+     *   host: {
+     *     '[class.valid]': 'valid',
+     *     '[class.invalid]': 'invalid'
+     *   }
+     * })
+     * class NgModelStatus {
+     *   constructor(public control:NgModel) {}
+     *   get valid { return this.control.valid; }
+     *   get invalid { return this.control.invalid; }
+     * }
+     * 
+     * @Component({selector: 'app'})
+     * @View({
+     *   template: `<input [(ng-model)]="prop">`,
+     *   directives: [FORM_DIRECTIVES, NgModelStatus]
+     * })
+     * class App {
+     *   prop;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element.
+     * 
+     * ### Example
+     * 
+     * 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.
+     * 
+     * ```typescript
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     */
+    host: {[key: string]: string};
+    
+    /**
+     * 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',
+     *   bindings: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+    bindings: 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;
+    
+    /**
+     * The module id of the module that contains the directive.
+     * Needed to be able to resolve relative urls for templates and styles.
+     * In Dart, this can be determined automatically and does not need to be set.
+     * In CommonJS, this can always be set to `module.id`.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'someDir',
+     *   moduleId: module.id
+     * })
+     * class SomeDir {
+     * }
+     * 
+     * ```
+     */
+    moduleId: string;
+    
+    /**
+     * Configures the queries that will be injected into the directive.
+     * 
+     * Content queries are set before the `afterContentInit` callback is called.
+     * View queries are set before the `afterViewInit` callback is called.
+     * 
+     * ### Example
+     * 
+     * ```
+     * @Component({
+     *   selector: 'someDir',
+     *   queries: {
+     *     contentChildren: new ContentChildren(ChildDirective),
+     *     viewChildren: new ViewChildren(ChildDirective)
+     *   }
+     * })
+     * @View({
+     *   template: '<child-directive></child-directive>',
+     *   directives: [ChildDirective]
+     * })
+     * class SomeDir {
+     *   contentChildren: QueryList<ChildDirective>,
+     *   viewChildren: QueryList<ChildDirective>
+     * 
+     *   afterContentInit() {
+     *     // contentChildren is set
+     *   }
+     * 
+     *   afterViewInit() {
+     *     // viewChildren is set
+     *   }
+     * }
+     * ```
+     */
+    queries: {[key: string]: any};
+    
+  }
+
+    
+  /**
+   * Declare reusable pipe function.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Pipe({
+   *   name: 'lowercase'
+   * })
+   * class Lowercase {
+   *   transform(v, args) { return v.toLowerCase(); }
+   * }
+   * ```
+   */
+  class PipeMetadata extends InjectableMetadata {
+    
+    constructor({name, pure}: {name: string, pure: boolean});
+    
+    name: string;
+    
+    pure: boolean;
+    
+  }
+
+    
+  /**
+   * Declares a data-bound input property.
+   * 
+   * Angular automatically updates data-bound properties during change detection.
+   * 
+   * `InputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a component with two input properties.
+   * 
+   * ```typescript
+   * @Component({selector: 'bank-account'})
+   * @View({
+   *   template: `
+   *     Bank Name: {{bankName}}
+   *     Account Id: {{id}}
+   *   `
+   * })
+   * class BankAccount {
+   *   @Input() bankName: string;
+   *   @Input('account-id') id: string;
+   * 
+   *   // this property is not bound, and won't be automatically updated by Angular
+   *   normalizedBankName: string;
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <bank-account bank-name="RBC" account-id="4747"></bank-account>
+   *   `,
+   *   directives: [BankAccount]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class InputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    /**
+     * Name used when instantiating a component in the temlate.
+     */
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares an event-bound output property.
+   * 
+   * When an output property emits an event, an event handler attached to that event
+   * the template is invoked.
+   * 
+   * `OutputMetadata` takes an optional parameter that specifies the name
+   * used when instantiating a component in the template. When not provided,
+   * the name of the decorated property is used.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Directive({
+   *   selector: 'interval-dir',
+   * })
+   * class IntervalDir {
+   *   @Output() everySecond = new EventEmitter();
+   *   @Output('everyFiveSeconds') five5Secs = new EventEmitter();
+   * 
+   *   constructor() {
+   *     setInterval(() => this.everySecond.next("event"), 1000);
+   *     setInterval(() => this.five5Secs.next("event"), 5000);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `
+   *     <interval-dir (every-second)="everySecond()" (every-five-seconds)="everyFiveSeconds()">
+   *     </interval-dir>
+   *   `,
+   *   directives: [IntervalDir]
+   * })
+   * class App {
+   *   everySecond() { console.log('second'); }
+   *   everyFiveSeconds() { console.log('five seconds'); }
+   * }
+   * bootstrap(App);
+   * ```
+   */
+  class OutputMetadata {
+    
+    constructor(bindingPropertyName?: string);
+    
+    bindingPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host property binding.
+   * 
+   * Angular automatically checks host property bindings during change detection.
+   * If a binding changes, it will update the host element of the directive.
+   * 
+   * `HostBindingMetadata` takes an optional parameter that specifies the property
+   * name of the host element that will be updated. When not provided,
+   * the class property name is used.
+   * 
+   * ### Example
+   * 
+   * The following example creates a directive that sets the `valid` and `invalid` classes
+   * on the DOM element that has ng-model directive on it.
+   * 
+   * ```typescript
+   * @Directive({selector: '[ng-model]'})
+   * class NgModelStatus {
+   *   constructor(public control:NgModel) {}
+   *   @HostBinding('[class.valid]') get valid { return this.control.valid; }
+   *   @HostBinding('[class.invalid]') get invalid { return this.control.invalid; }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<input [(ng-model)]="prop">`,
+   *   directives: [FORM_DIRECTIVES, NgModelStatus]
+   * })
+   * class App {
+   *   prop;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostBindingMetadata {
+    
+    constructor(hostPropertyName?: string);
+    
+    hostPropertyName: string;
+    
+  }
+
+    
+  /**
+   * Declares a host listener.
+   * 
+   * Angular will invoke the decorated method when the host element emits the specified event.
+   * 
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
+   * event.
+   * 
+   * ### Example
+   * 
+   * The following example declares a directive that attaches a click listener to the button and
+   * counts clicks.
+   * 
+   * ```typescript
+   * @Directive({selector: 'button[counting]'})
+   * class CountClicks {
+   *   numberOfClicks = 0;
+   * 
+   *   @HostListener('click', ['$event.target'])
+   *   onClick(btn) {
+   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *   }
+   * }
+   * 
+   * @Component({selector: 'app'})
+   * @View({
+   *   template: `<button counting>Increment</button>`,
+   *   directives: [CountClicks]
+   * })
+   * class App {}
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostListenerMetadata {
+    
+    constructor(eventName: string, args?: string[]);
+    
+    eventName: string;
+    
+    args: string[];
+    
+  }
+
+    
+  /**
+   * Metadata properties available for configuring Views.
+   * 
+   * 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 {@link ComponentMetadata}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   */
+  class ViewMetadata {
+    
+    constructor({templateUrl, template, directives, pipes, encapsulation, styles, styleUrls}?: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      });
+    
+    /**
+     * Specifies a template URL for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    templateUrl: string;
+    
+    /**
+     * Specifies an inline template for an Angular component.
+     * 
+     * NOTE: Only one of `templateUrl` or `template` can be defined per View.
+     */
+    template: string;
+    
+    /**
+     * Specifies stylesheet URLs for an Angular component.
+     * 
+     * <!-- TODO: what's the url relative to? -->
+     */
+    styleUrls: string[];
+    
+    /**
+     * Specifies an inline stylesheet for an Angular component.
+     */
+    styles: 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: [NgFor]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+    directives: Array<Type | any[]>;
+    
+    pipes: Array<Type | any[]>;
+    
+    /**
+     * Specify how the template and the styles should be encapsulated.
+     * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
+     * has styles,
+     * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+     */
+    encapsulation: ViewEncapsulation;
+    
+  }
+
+    
+  /**
+   * Defines template and style encapsulation options available for Component's {@link View}.
+   * 
+   * See {@link ViewMetadata#encapsulation}.
+   */
+  enum ViewEncapsulation {
+    
+    /**
+     * Emulate `Native` scoping of styles by adding an attribute containing surrogate id to the Host
+     * Element and pre-processing the style rules provided via
+     * {@link ViewMetadata#styles} or {@link ViewMetadata#stylesUrls}, and adding the new Host Element
+     * attribute to all selectors.
+     * 
+     * This is the default option.
+     */
+    Emulated,
+    
+    /**
+     * Use the native encapsulation mechanism of the renderer.
+     * 
+     * For the DOM this means using [Shadow DOM](https://w3c.github.io/webcomponents/spec/shadow/) and
+     * creating a ShadowRoot for Component's Host Element.
+     */
+    Native,
+    
+    /**
+     * Don't provide any template or style encapsulation.
+     */
+    None
+  }
+  
+
+    
+  /**
+   * Interface for the {@link DirectiveMetadata} decorator function.
+   * 
+   * See {@link DirectiveFactory}.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ComponentMetadata} decorator function.
+   * 
+   * See {@link ComponentFactory}.
+   */
+  interface ComponentDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * Interface for the {@link ViewMetadata} decorator function.
+   * 
+   * See {@link ViewFactory}.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+    /**
+     * Chain {@link ViewMetadata} annotation.
+     */
+    View(obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        renderer?: string,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link DirectiveMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any}
+      }): DirectiveDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} 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: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentMetadata;
+    
+    (obj: {
+        selector?: string,
+        inputs?: string[],
+        outputs?: string[],
+        properties?: string[],
+        events?: string[],
+        host?: {[key: string]: string},
+        bindings?: any[],
+        exportAs?: string,
+        moduleId?: string,
+        queries?: {[key: string]: any},
+        viewBindings?: any[],
+        changeDetection?: ChangeDetectionStrategy,
+      }): ComponentDecorator;
+    
+  }
+
+    
+  /**
+   * {@link ViewMetadata} 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: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewMetadata;
+    
+    (obj: {
+        templateUrl?: string,
+        template?: string,
+        directives?: Array<Type | any[]>,
+        pipes?: Array<Type | any[]>,
+        encapsulation?: ViewEncapsulation,
+        styles?: string[],
+        styleUrls?: string[],
+      }): ViewDecorator;
+    
+  }
+
+    
+  /**
+   * {@link AttributeMetadata} 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): AttributeMetadata;
+    
+    (name: string): TypeDecorator;
+    
+  }
+
+    
+  /**
+   * {@link QueryMetadata} 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<SomeType>) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ### 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, {descendants}?: {descendants?: boolean}): QueryMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): ParameterDecorator;
+    
+  }
+
+    
+  interface ContentChildrenFactory {
+    
+    new(selector: Type | string, {descendants}?: {descendants?: boolean}): ContentChildrenMetadata;
+    
+    (selector: Type | string, {descendants}?: {descendants?: boolean}): any;
+    
+  }
+
+    
+  interface ContentChildFactory {
+    
+    new(selector: Type | string): ContentChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildrenFactory {
+    
+    new(selector: Type | string): ViewChildrenMetadata;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  interface ViewChildFactory {
+    
+    new(selector: Type | string): ViewChildFactory;
+    
+    (selector: Type | string): any;
+    
+  }
+
+    
+  /**
+   * {@link PipeMetadata} factory for creating decorators.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Pipe} from "angular2/angular2";
+   * 
+   * @Pipe({...})
+   * class MyPipe {
+   *   constructor() {
+   *     ...
+   *   }
+   * 
+   *   transform(v, args) {}
+   * }
+   * ```
+   */
+  interface PipeFactory {
+    
+    new(obj: {name: string, pure?: boolean}): any;
+    
+    (obj: {name: string, pure?: boolean}): any;
+    
+  }
+
+    
+  /**
+   * {@link InputMetadata} factory for creating decorators.
+   * 
+   * See {@link InputMetadata}.
+   */
+  interface InputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link OutputMetadata} factory for creating decorators.
+   * 
+   * See {@link OutputMetadata}.
+   */
+  interface OutputFactory {
+    
+    new(bindingPropertyName?: string): any;
+    
+    (bindingPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  interface HostBindingFactory {
+    
+    new(hostPropertyName?: string): any;
+    
+    (hostPropertyName?: string): any;
+    
+  }
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  interface HostListenerFactory {
+    
+    new(eventName: string, args?: string[]): any;
+    
+    (eventName: string, args?: string[]): any;
+    
+  }
+
+    
+  /**
+   * {@link ComponentMetadata} factory function.
+   */
+  var Component: ComponentFactory;
+  
+
+    
+  /**
+   * {@link DirectiveMetadata} factory function.
+   */
+  var Directive: DirectiveFactory;
+  
+
+    
+  /**
+   * {@link ViewMetadata} factory function.
+   */
+  var View: ViewFactory;
+  
+
+    
+  /**
+   * {@link AttributeMetadata} factory function.
+   */
+  var Attribute: AttributeFactory;
+  
+
+    
+  /**
+   * {@link QueryMetadata} factory function.
+   */
+  var Query: QueryFactory;
+  
+
+    
+  /**
+   * {@link ContentChildrenMetadata} factory function.
+   */
+  var ContentChildren: ContentChildrenFactory;
+  
+
+    
+  /**
+   * {@link ContentChildMetadata} factory function.
+   */
+  var ContentChild: ContentChildFactory;
+  
+
+    
+  /**
+   * {@link ViewChildrenMetadata} factory function.
+   */
+  var ViewChildren: ViewChildrenFactory;
+  
+
+    
+  /**
+   * {@link ViewChildMetadata} factory function.
+   */
+  var ViewChild: ViewChildFactory;
+  
+
+    
+  /**
+   * {@link di/ViewQueryMetadata} factory function.
+   */
+  var ViewQuery: QueryFactory;
+  
+
+    
+  /**
+   * {@link PipeMetadata} factory function.
+   */
+  var Pipe: PipeFactory;
+  
+
+    
+  /**
+   * {@link InputMetadata} factory function.
+   * 
+   * See {@link InputMetadata}.
+   */
+  var Input: InputFactory;
+  
+
+    
+  /**
+   * {@link OutputMetadata} factory function.
+   * 
+   * See {@link OutputMetadatas}.
+   */
+  var Output: OutputFactory;
+  
+
+    
+  /**
+   * {@link HostBindingMetadata} factory function.
+   */
+  var HostBinding: HostBindingFactory;
+  
+
+    
+  /**
+   * {@link HostListenerMetadata} factory function.
+   */
+  var HostListener: HostListenerFactory;
+  
+
+    
+  /**
+   * 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 = ng.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;
+  
+
+    
+  /**
+   * Declares the interface to be used with {@link Class}.
+   */
+  interface ClassDefinition {
+    
+    /**
+     * Optional argument for specifying the superclass.
+     */
+    extends?: Type;
+    
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionally wrapped in an `Array`, in which case additional parameter
+     * annotations may be specified.
+     * The number of arguments and the number of parameter annotations must match.
+     * 
+     * See {@link Class} for example of usage.
+     */
+    constructor: Function | any[];
+    
+  }
+
+    
+  /**
+   * 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 {@link Class} to annotate the generated class.
+     */
+    annotations: any[];
+    
+    /**
+     * Generate a class from the definition and annotate it with {@link TypeDecorator#annotations}.
+     */
+    Class(obj: ClassDefinition): Type;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that specifies a dependency.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/6uHYJK?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Inject("MyEngine") engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *  bind("MyEngine").toClass(Engine),
+   *  Car
+   * ]);
+   * 
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * When `@Inject()` is not present, {@link Injector} will use the type annotation of the parameter.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine: Engine) {} //same as constructor(@Inject(Engine) engine:Engine)
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Engine, Car]);
+   * expect(injector.get(Car).engine instanceof Engine).toBe(true);
+   * ```
+   */
+  class InjectMetadata {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A parameter metadata that marks a dependency as optional. {@link Injector} provides `null` if
+   * the dependency is not found.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/AsryOm?p=preview))
+   * 
+   * ```typescript
+   * class Engine {}
+   * 
+   * @Injectable()
+   * class Car {
+   *   engine;
+   *   constructor(@Optional() engine:Engine) {
+   *     this.engine = engine;
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car]);
+   * expect(injector.get(Car).engine).toBeNull();
+   * ```
+   */
+  class OptionalMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * A marker metadata that marks a class as available to {@link Injector} for creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wk4DMQ?p=preview))
+   * 
+   * ```typescript
+   * @Injectable()
+   * class UsefulService {}
+   * 
+   * @Injectable()
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(injector.get(NeedsService).service instanceof UsefulService).toBe(true);
+   * ```
+   * {@link Injector} will throw {@link NoAnnotationError} when trying to instantiate a class that
+   * does not have `@Injectable` marker, as shown in the example below.
+   * 
+   * ```typescript
+   * class UsefulService {}
+   * 
+   * class NeedsService {
+   *   constructor(public service:UsefulService) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([NeedsService, UsefulService]);
+   * expect(() => injector.get(NeedsService)).toThrowError();
+   * ```
+   */
+  class InjectableMetadata {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Specifies that an {@link Injector} should retrieve a dependency only from itself.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/NeagAg?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   * 
+   *   dependency;
+   *   constructor(@Self() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * var nd = inj.get(NeedsDependency);
+   * 
+   * expect(nd.dependency instanceof Dependency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency]);
+   * var child = inj.resolveAndCreateChild([NeedsDependency]);
+   * expect(() => child.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that an injector should retrieve a dependency from any injector until reaching the
+   * closest host.
+   * 
+   * In Angular, a component element is automatically declared as a host for all the injectors in
+   * its view.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GX79pV?p=preview))
+   * 
+   * In the following example `App` contains `ParentCmp`, which contains `ChildDirective`.
+   * So `ParentCmp` is the host of `ChildDirective`.
+   * 
+   * `ChildDirective` depends on two services: `HostService` and `OtherService`.
+   * `HostService` is defined at `ParentCmp`, and `OtherService` is defined at `App`.
+   * 
+   * ```typescript
+   * class OtherService {}
+   * class HostService {}
+   * 
+   * @Directive({
+   *   selector: 'child-directive'
+   * })
+   * class ChildDirective {
+   *   constructor(@Optional() @Host() os:OtherService, @Optional() @Host() hs:HostService){
+   *     console.log("os is null", os);
+   *     console.log("hs is NOT null", hs);
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'parent-cmp',
+   *   bindings: [HostService]
+   * })
+   * @View({
+   *   template: `
+   *     Dir: <child-directive></child-directive>
+   *   `,
+   *   directives: [ChildDirective]
+   * })
+   * class ParentCmp {
+   * }
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [OtherService]
+   * })
+   * @View({
+   *   template: `
+   *     Parent: <parent-cmp></parent-cmp>
+   *   `,
+   *   directives: [ParentCmp]
+   * })
+   * class App {
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   */
+  class HostMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Specifies that the dependency resolution should start from the parent injector.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Wchdzb?p=preview))
+   * 
+   * ```typescript
+   * class Dependency {
+   * }
+   * 
+   * @Injectable()
+   * class NeedsDependency {
+   *   dependency;
+   *   constructor(@SkipSelf() dependency:Dependency) {
+   *     this.dependency = dependency;
+   *   }
+   * }
+   * 
+   * var parent = Injector.resolveAndCreate([Dependency]);
+   * var child = parent.resolveAndCreateChild([NeedsDependency]);
+   * expect(child.get(NeedsDependency).dependency instanceof Depedency).toBe(true);
+   * 
+   * var inj = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+   * expect(() => inj.get(NeedsDependency)).toThrowError();
+   * ```
+   */
+  class SkipSelfMetadata {
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * `DependencyMetadata` is used by the framework to extend DI.
+   * This is internal to Angular and should not be used directly.
+   */
+  class DependencyMetadata {
+    
+    token: any;
+    
+  }
+
+    
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * For instance, `forwardRef` is used when the `token` which we need to refer to for the purposes of
+   * DI is declared,
+   * but not yet defined. It is also used when the `token` which we use when creating a query is not
+   * yet defined.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class Door {
+   *   lock: Lock;
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) {
+   *     this.lock = lock;
+   *   }
+   * }
+   * 
+   * // Only at this point Lock is defined.
+   * class Lock {
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Door, Lock]);
+   * var door = injector.get(Door);
+   * expect(door instanceof Door).toBe(true);
+   * expect(door.lock instanceof Lock).toBe(true);
+   * ```
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn): Type;
+  
+
+    
+  /**
+   * Lazily retrieves the reference value from a forwardRef.
+   * 
+   * Acts as the identity function when given a non-forward-ref value.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GU72mJrk1fiodChcmiDR?p=preview))
+   * 
+   * ```typescript
+   * var ref = forwardRef(() => "refValue");
+   * expect(resolveForwardRef(ref)).toEqual("refValue");
+   * expect(resolveForwardRef("regularValue")).toEqual("regularValue");
+   * ```
+   * 
+   * See: {@link forwardRef}
+   */
+  function resolveForwardRef(type: any): any;
+  
+
+    
+  /**
+   * An interface that a function passed into {@link forwardRef} has to implement.
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * var fn:ForwardRefFn = forwardRef(() => Lock);
+   * ```
+   */
+  interface ForwardRefFn {
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * A dependency injection container used for instantiating objects and 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 ([live demo](http://plnkr.co/edit/jzjec0?p=preview))
+   * 
+   * The following example creates an `Injector` configured to create `Engine` and `Car`.
+   * 
+   * ```typescript
+   * @Injectable()
+   * class Engine {
+   * }
+   * 
+   * @Injectable()
+   * class Car {
+   *   constructor(public engine:Engine) {}
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([Car, Engine]);
+   * var car = injector.get(Car);
+   * expect(car instanceof Car).toBe(true);
+   * expect(car.engine instanceof Engine).toBe(true);
+   * ```
+   * 
+   * Notice, we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   */
+  class Injector {
+    
+    /**
+     * Private
+     */
+    constructor(_proto: any, _parent?: Injector, _depProvider?: any, _debugContext?: Function);
+    
+    /**
+     * Turns an array of binding definitions into an array of resolved bindings.
+     * 
+     * A resolution is a process of flattening multiple nested arrays and converting individual
+     * bindings into an array of {@link ResolvedBinding}s.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/AiXTHi?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, [[Engine]]]);
+     * 
+     * expect(bindings.length).toEqual(2);
+     * 
+     * expect(bindings[0] instanceof ResolvedBinding).toBe(true);
+     * expect(bindings[0].key.displayName).toBe("Car");
+     * expect(bindings[0].dependencies.length).toEqual(1);
+     * expect(bindings[0].factory).toBeDefined();
+     * 
+     * expect(bindings[1].key.displayName).toBe("Engine");
+     * });
+     * ```
+     * 
+     * See {@link fromResolvedBindings} for more info.
+     */
+    static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
+    
+    /**
+     * Resolves an array of bindings and creates an injector from those bindings.
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ePOccA?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Car, Engine]);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     * 
+     * This function is slower than the corresponding `fromResolvedBindings`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link fromResolvedBindings}.
+     */
+    static resolveAndCreate(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates an injector from previously resolved bindings.
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/KrSMci?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var bindings = Injector.resolve([Car, Engine]);
+     * var injector = Injector.fromResolvedBindings(bindings);
+     * expect(injector.get(Car) instanceof Car).toBe(true);
+     * ```
+     */
+    static fromResolvedBindings(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Throws {@link NoBindingError} if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/HeXSHg?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.get("validToken")).toEqual("Value");
+     * expect(() => injector.get("invalidToken")).toThrowError();
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.get(Injector)).toBe(injector);
+     * ```
+     */
+    get(token: any): any;
+    
+    /**
+     * Retrieves an instance from the injector based on the provided token.
+     * Returns null if not found.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/tpEbEy?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind("validToken").toValue("Value")
+     * ]);
+     * expect(injector.getOptional("validToken")).toEqual("Value");
+     * expect(injector.getOptional("invalidToken")).toBe(null);
+     * ```
+     * 
+     * `Injector` returns itself when given `Injector` as a token.
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([]);
+     * expect(injector.getOptional(Injector)).toBe(injector);
+     * ```
+     */
+    getOptional(token: any): any;
+    
+    /**
+     * Parent of this injector.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/eosMGo?p=preview))
+     * 
+     * ```typescript
+     * var parent = Injector.resolveAndCreate([]);
+     * var child = parent.resolveAndCreateChild([]);
+     * expect(child.parent).toBe(parent);
+     * ```
+     */
+    parent: Injector;
+    
+    /**
+     * Resolves an array of bindings and creates a child injector from those bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * The passed-in bindings can be an array of `Type`, {@link Binding},
+     * or a recursive array of more bindings.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/opB3T4?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parent = Injector.resolveAndCreate([ParentBinding]);
+     * var child = parent.resolveAndCreateChild([ChildBinding]);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     * 
+     * This function is slower than the corresponding `createChildFromResolved`
+     * because it needs to resolve the passed-in bindings first.
+     * See {@link resolve} and {@link createChildFromResolved}.
+     */
+    resolveAndCreateChild(bindings: Array<Type | Binding | any[]>): Injector;
+    
+    /**
+     * Creates a child injector from previously resolved bindings.
+     * 
+     * <!-- TODO: Add a link to the section of the user guide talking about hierarchical injection.
+     * -->
+     * 
+     * This API is the recommended way to construct injectors in performance-sensitive parts.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/VhyfjN?p=preview))
+     * 
+     * ```typescript
+     * class ParentBinding {}
+     * class ChildBinding {}
+     * 
+     * var parentBindings = Injector.resolve([ParentBinding]);
+     * var childBindings = Injector.resolve([ChildBinding]);
+     * 
+     * var parent = Injector.fromResolvedBindings(parentBindings);
+     * var child = parent.createChildFromResolved(childBindings);
+     * 
+     * expect(child.get(ParentBinding) instanceof ParentBinding).toBe(true);
+     * expect(child.get(ChildBinding) instanceof ChildBinding).toBe(true);
+     * expect(child.get(ParentBinding)).toBe(parent.get(ParentBinding));
+     * ```
+     */
+    createChildFromResolved(bindings: ResolvedBinding[]): Injector;
+    
+    /**
+     * Resolves a binding and instantiates an object in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/yvVXoB?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * 
+     * var car = injector.resolveAndInstantiate(Car);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.resolveAndInstantiate(Car));
+     * ```
+     */
+    resolveAndInstantiate(binding: Type | Binding): any;
+    
+    /**
+     * Instantiates an object using a resolved binding in the context of the injector.
+     * 
+     * The created object does not get cached by the injector.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ptCImQ?p=preview))
+     * 
+     * ```typescript
+     * @Injectable()
+     * class Engine {
+     * }
+     * 
+     * @Injectable()
+     * class Car {
+     *   constructor(public engine:Engine) {}
+     * }
+     * 
+     * var injector = Injector.resolveAndCreate([Engine]);
+     * var carBinding = Injector.resolve([Car])[0];
+     * var car = injector.instantiateResolved(carBinding);
+     * expect(car.engine).toBe(injector.get(Engine));
+     * expect(car).not.toBe(injector.instantiateResolved(carBinding));
+     * ```
+     */
+    instantiateResolved(binding: ResolvedBinding): any;
+    
+    displayName: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Describes how the {@link Injector} should instantiate a given token.
+   * 
+   * See {@link bind}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/GNAyj6K6PfYg2NBzgwZ5?p%3Dpreview&p=preview))
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding("message", { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get("message")).toEqual('Hello');
+   * ```
+   */
+  class Binding {
+    
+    constructor(token: any, {toClass, toValue, toAlias, toFactory, deps, multi}: {
+        toClass?: Type,
+        toValue?: any,
+        toAlias?: any,
+        toFactory?: Function,
+        deps?: Object[],
+        multi?: boolean
+      });
+    
+    /**
+     * Token used when retrieving this binding. Usually, it is a type {@link `Type`}.
+     */
+    token: any;
+    
+    /**
+     * Binds a DI token to an implementation class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/RSTG86qgmoxCyj9SWPwY?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/UFVsMVQIDe7l4waWziES?p=preview))
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("message", { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get("message")).toEqual('Hello');
+     * ```
+     */
+    toValue: any;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * An alias means that {@link Injector} 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 ([live demo](http://plnkr.co/edit/QsatsOJJ6P8T2fMe9gr8?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: any;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjuction with dependencies.
+     */
+    toFactory: Function;
+    
+    /**
+     * Specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/Scoxy0pJNqKGAPZY1VVC?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                       deps: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     * 
+     * Used in conjunction with `toFactory`.
+     */
+    dependencies: Object[];
+    
+    /**
+     * Creates multiple bindings matching the same token (a multi-binding).
+     * 
+     * Multi-bindings are used for creating pluggable service, where the system comes
+     * with some default bindings, and the user can register additonal bindings.
+     * The combination of the default bindings and the additional bindings will be
+     * used to drive the behavior of the system.
+     * 
+     * ### Example
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true}),
+     *   new Binding("Strings", { toValue: "String2", multi: true})
+     * ]);
+     * 
+     * expect(injector.get("Strings")).toEqual(["String1", "String2"]);
+     * ```
+     * 
+     * Multi-bindings and regular bindings cannot be mixed. The following
+     * will throw an exception:
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding("Strings", { toValue: "String1", multi: true }),
+     *   new Binding("Strings", { toValue: "String2"})
+     * ]);
+     * ```
+     */
+    multi: boolean;
+    
+  }
+
+    
+  /**
+   * Helper class for the {@link bind} function.
+   */
+  class BindingBuilder {
+    
+    constructor(token: any);
+    
+    token: any;
+    
+    /**
+     * Binds a DI token to a class.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/ZpBCSYqv6e2ud5KXLdxQ?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```typescript
+     * 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 DI token to a value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/G024PFHmDL0cJFgfZK8O?p=preview))
+     * 
+     * ```typescript
+     * var injector = Injector.resolveAndCreate([
+     *   bind('message').toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get('message')).toEqual('Hello');
+     * ```
+     */
+    toValue(value: any): Binding;
+    
+    /**
+     * Binds a DI token as an alias for an existing token.
+     * 
+     * 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 separate instance of `toClass` will be returned.)
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/uBaoF2pN5cfc5AfZapNw?p=preview))
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy
+     * comparison.
+     * 
+     * ```typescript
+     * 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: /*Type*/ any): Binding;
+    
+    /**
+     * Binds a DI token to a function which computes the value.
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/OejNIfTT3zb1iBxaIYOb?p=preview))
+     * 
+     * ```typescript
+     * 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(factory: Function, dependencies?: any[]): Binding;
+    
+  }
+
+    
+  /**
+   * An internal resolved representation of a {@link Binding} used by the {@link Injector}.
+   * 
+   * It is usually created automatically by `Injector.resolveAndCreate`.
+   * 
+   * It can be created manually, as follows:
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RfEnhh8kUEI0G3qsnIeT?p%3Dpreview&p=preview))
+   * 
+   * ```typescript
+   * var resolvedBindings = Injector.resolve([new Binding('message', {toValue: 'Hello'})]);
+   * var injector = Injector.fromResolvedBindings(resolvedBindings);
+   * 
+   * expect(injector.get('message')).toEqual('Hello');
+   * ```
+   */
+  interface ResolvedBinding {
+    
+    /**
+     * A key, usually a `Type`.
+     */
+    key: Key;
+    
+  }
+
+    
+  /**
+   * @private
+   * An internal resolved representation of a factory function created by resolving {@link Binding}.
+   */
+  class ResolvedFactory {
+    
+    constructor(factory: Function, dependencies: Dependency[]);
+    
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+    factory: Function;
+    
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+    dependencies: Dependency[];
+    
+  }
+
+    
+  /**
+   * @private
+   */
+  class Dependency {
+    
+    constructor(key: Key, optional: boolean, lowerBoundVisibility: any, upperBoundVisibility: any, properties: any[]);
+    
+    static fromKey(key: Key): Dependency;
+    
+    key: Key;
+    
+    optional: boolean;
+    
+    lowerBoundVisibility: any;
+    
+    upperBoundVisibility: any;
+    
+    properties: any[];
+    
+  }
+
+    
+  /**
+   * Creates a {@link Binding}.
+   * 
+   * To construct a {@link Binding}, bind a `token` to either a class, a value, a factory function, or
+   * to an alias to another `token`.
+   * See {@link BindingBuilder} for more details.
+   * 
+   * The `token` is most commonly a class or {@link angular2/di/OpaqueToken}.
+   */
+  function bind(token: any): BindingBuilder;
+  
+
+    
+  /**
+   * A unique object used for retrieving items from the {@link Injector}.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`.
+   * 
+   * `Key` is used internally by {@link Injector} because its system-wide unique `id` allows the
+   * injector to store created objects in a more efficient way.
+   * 
+   * `Key` should not be created directly. {@link Injector} creates keys automatically when resolving
+   * bindings.
+   */
+  class Key {
+    
+    /**
+     * Private
+     */
+    constructor(token: Object, id: number);
+    
+    /**
+     * Retrieves a `Key` for a token.
+     */
+    static get(token: Object): Key;
+    
+    /**
+     * @returns the number of keys registered in the system.
+     */
+    static numberOfKeys: number;
+    
+    token: Object;
+    
+    id: number;
+    
+    /**
+     * Returns a stringified token.
+     */
+    displayName: string;
+    
+  }
+
+    
+  /**
+   * @private
+   * Type literals is a Dart-only feature. This is here only so we can x-compile
+   * to multiple languages.
+   */
+  class TypeLiteral {
+    
+    type: any;
+    
+  }
+
+    
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from {@link Injector}, but the
+   * {@link Injector} does not have a {@link Binding} for {@link Key}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vq8D3FRB9aGbnWJqtEPE?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   */
+  class NoBindingError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   */
+  class AbstractBindingError extends BaseException {
+    
+    constructor(injector: Injector, key: Key, constructResolvingMessage: Function);
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/wYQdNos0Tzql3ei1EV9j?p=info))
+   * 
+   * ```typescript
+   * var injector = Injector.resolveAndCreate([
+   *   bind("one").toFactory((two) => "two", [[new Inject("two")]]),
+   *   bind("two").toFactory((one) => "one", [[new Inject("one")]])
+   * ]);
+   * 
+   * expect(() => injector.get("one")).toThrowError();
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+    
+    constructor(injector: Injector, key: Key);
+    
+  }
+
+    
+  /**
+   * 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.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7aWYdcqTQsP0eNqEdUAf?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor() {
+   *     throw new Error('message');
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * try {
+   *   injector.get(A);
+   * } catch (e) {
+   *   expect(e instanceof InstantiationError).toBe(true);
+   *   expect(e.originalException.message).toEqual("message");
+   *   expect(e.originalStack).toBeDefined();
+   * }
+   * ```
+   */
+  interface InstantiationError extends WrappedException {
+    
+    addKey(injector: Injector, key: Key): void;
+    
+    wrapperMessage: string;
+    
+    causeKey: Key;
+    
+    context: any;
+    
+  }
+
+    
+  /**
+   * Thrown when an object other then {@link Binding} (or `Type`) is passed to {@link Injector}
+   * creation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/YatCFbPAMCL0JSSQ4mvH?p=preview))
+   * 
+   * ```typescript
+   * expect(() => Injector.resolveAndCreate(["not a type"])).toThrowError();
+   * ```
+   */
+  class InvalidBindingError extends BaseException {
+    
+    constructor(binding: any);
+    
+  }
+
+    
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the {@link Injector} from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/rHnZtlNS7vJOPQ6pcVkm?p=preview))
+   * 
+   * ```typescript
+   * class A {
+   *   constructor(b) {}
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A])).toThrowError();
+   * ```
+   * 
+   * This error is also thrown when the class not marked with {@link @Injectable} has parameter types.
+   * 
+   * ```typescript
+   * class B {}
+   * 
+   * class A {
+   *   constructor(b:B) {} // no information about the parameter types of A is available at runtime.
+   * }
+   * 
+   * expect(() => Injector.resolveAndCreate([A,B])).toThrowError();
+   * ```
+   */
+  class NoAnnotationError extends BaseException {
+    
+    constructor(typeOrFunc: any, params: any[][]);
+    
+  }
+
+    
+  /**
+   * Thrown when getting an object by index.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/bRs0SX2OTQiJzqvjgl8P?p=preview))
+   * 
+   * ```typescript
+   * class A {}
+   * 
+   * var injector = Injector.resolveAndCreate([A]);
+   * 
+   * expect(() => injector.getAt(100)).toThrowError();
+   * ```
+   */
+  class OutOfBoundsError extends BaseException {
+    
+    constructor(index: any);
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  interface InjectFactory {
+    
+    new(token: any): InjectMetadata;
+    
+    (token: any): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  interface OptionalFactory {
+    
+    new(): OptionalMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  interface InjectableFactory {
+    
+    new(): InjectableMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  interface SelfFactory {
+    
+    new(): SelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  interface HostFactory {
+    
+    new(): HostMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  interface SkipSelfFactory {
+    
+    new(): SkipSelfMetadata;
+    
+    (): any;
+    
+  }
+
+    
+  /**
+   * Factory for creating {@link InjectMetadata}.
+   */
+  var Inject: InjectFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link OptionalMetadata}.
+   */
+  var Optional: OptionalFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link InjectableMetadata}.
+   */
+  var Injectable: InjectableFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SelfMetadata}.
+   */
+  var Self: SelfFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link HostMetadata}.
+   */
+  var Host: HostFactory;
+  
+
+    
+  /**
+   * Factory for creating {@link SkipSelfMetadata}.
+   */
+  var SkipSelf: SkipSelfFactory;
+  
+
+    
+  /**
+   * The `async` pipe subscribes to an Observable or Promise and returns the latest value it has
+   * emitted.
+   * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+   * 
+   * # Example
+   * The example below binds the `time` Observable to the view. Every 500ms, the `time` Observable
+   * updates the view with the current time.
+   * 
+   * ```
+   * import {Observable} from 'angular2/core';
+   * @Component({
+   *   selector: "task-cmp"
+   * })
+   * @View({
+   *   template: "Time: {{ time | async }}"
+   * })
+   * class Task {
+   *   time = new Observable<number>(observer => {
+   *     setInterval(_ =>
+   *       observer.next(new Date().getTime()), 500);
+   *   });
+   * }
+   * ```
+   */
+  class AsyncPipe implements PipeTransform,  PipeOnDestroy {
+    
+    constructor(_ref: ChangeDetectorRef);
+    
+    onDestroy(): void;
+    
+    transform(obj: Observable | Promise<any>, args?: any[]): any;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a date value to a string based on the requested format.
+   * 
+   * # Usage
+   * 
+   *     expression | date[:format]
+   * 
+   * where `expression` is a date object or a number (milliseconds since UTC epoch) and
+   * `format` indicates which date/time components to include:
+   * 
+   *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
+   *  |-----------|:------:|--------------|-------------------|-----------|-----------|
+   *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
+   *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
+   *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+   *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
+   *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+   *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
+   *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
+   *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
+   *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
+   *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
+   *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
+   *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
+   * 
+   * In javascript, only the components specified will be respected (not the ordering,
+   * punctuations, ...) and details of the formatting will be dependent on the locale.
+   * On the other hand in Dart version, you can also include quoted text as well as some extra
+   * date/time components such as quarter. For more information see:
+   * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
+   * 
+   * `format` can also be one of the following predefined formats:
+   * 
+   *  - `'medium'`: equivalent to `'yMMMdjms'` (e.g. Sep 3, 2010, 12:05:08 PM for en-US)
+   *  - `'short'`: equivalent to `'yMdjm'` (e.g. 9/3/2010, 12:05 PM for en-US)
+   *  - `'fullDate'`: equivalent to `'yMMMMEEEEd'` (e.g. Friday, September 3, 2010 for en-US)
+   *  - `'longDate'`: equivalent to `'yMMMMd'` (e.g. September 3, 2010)
+   *  - `'mediumDate'`: equivalent to `'yMMMd'` (e.g. Sep 3, 2010 for en-US)
+   *  - `'shortDate'`: equivalent to `'yMd'` (e.g. 9/3/2010 for en-US)
+   *  - `'mediumTime'`: equivalent to `'jms'` (e.g. 12:05:08 PM for en-US)
+   *  - `'shortTime'`: equivalent to `'jm'` (e.g. 12:05 PM for en-US)
+   * 
+   * Timezone of the formatted text will be the local system timezone of the end-users machine.
+   * 
+   * # Examples
+   * 
+   * Assuming `dateObj` is (year: 2015, month: 6, day: 15, hour: 21, minute: 43, second: 11)
+   * in the _local_ time and locale is 'en-US':
+   * 
+   *     {{ dateObj | date }}               // output is 'Jun 15, 2015'
+   *     {{ dateObj | date:'medium' }}      // output is 'Jun 15, 2015, 9:43:11 PM'
+   *     {{ dateObj | date:'shortTime' }}   // output is '9:43 PM'
+   *     {{ dateObj | date:'mmss' }}        // output is '43:11'
+   */
+  class DatePipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  let DEFAULT_PIPES: Binding;
+  
+
+    
+  let DEFAULT_PIPES_TOKEN: OpaqueToken;
+  
+
+    
+  /**
+   * Implements json transforms to any object.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user object to json.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "user-cmp"
+   * })
+   * @View({
+   *   template: "User: {{ user | json }}"
+   * })
+   * class Username {
+   *  user:Object
+   *  constructor() {
+   *    this.user = { name: "PatrickJS" };
    *  }
    * }
    * 
+   * ```
+   */
+  class JsonPipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * Creates a new List or String containing only a subset (slice) of the
+   * elements.
+   * 
+   * The starting index of the subset to return is specified by the `start` parameter.
+   * 
+   * The ending index of the subset to return is specified by the optional `end` parameter.
+   * 
+   * # Usage
+   * 
+   *     expression | slice:start[:end]
+   * 
+   * All behavior is based on the expected behavior of the JavaScript API
+   * Array.prototype.slice() and String.prototype.slice()
+   * 
+   * Where the input expression is a [List] or [String], and `start` is:
+   * 
+   * - **a positive integer**: return the item at _start_ index and all items after
+   * in the list or string expression.
+   * - **a negative integer**: return the item at _start_ index from the end and all items after
+   * in the list or string expression.
+   * - **`|start|` greater than the size of the expression**: return an empty list or string.
+   * - **`|start|` negative greater than the size of the expression**: return entire list or
+   * string expression.
+   * 
+   * and where `end` is:
+   * 
+   * - **omitted**: return all items until the end of the input
+   * - **a positive integer**: return all items before _end_ index of the list or string
+   * expression.
+   * - **a negative integer**: return all items before _end_ index from the end of the list
+   * or string expression.
+   * 
+   * When operating on a [List], the returned list is always a copy even when all
+   * the elements are being returned.
+   * 
+   * # Examples
+   * 
+   * ## List Example
+   * 
+   * Assuming `var collection = ['a', 'b', 'c', 'd']`, this `ng-for` directive:
+   * 
+   *     <li *ng-for="var i in collection | slice:1:3">{{i}}</li>
+   * 
+   * produces the following:
+   * 
+   *     <li>b</li>
+   *     <li>c</li>
+   * 
+   * ## String Examples
+   * 
+   *     {{ 'abcdefghij' | slice:0:4 }}       // output is 'abcd'
+   *     {{ 'abcdefghij' | slice:4:0 }}       // output is ''
+   *     {{ 'abcdefghij' | slice:-4 }}      // output is 'ghij'
+   *     {{ 'abcdefghij' | slice:-4,-2 }}      // output is 'gh'
+   *     {{ 'abcdefghij' | slice: -100 }}    // output is 'abcdefghij'
+   *     {{ 'abcdefghij' | slice: 100 }}    // output is ''
+   */
+  class SlicePipe implements PipeTransform {
+    
+    transform(value: any, args?: any[]): any;
+    
+    supports(obj: any): boolean;
+    
+  }
+
+    
+  /**
+   * Implements lowercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text lowercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | lowercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class LowerCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  class NumberPipe {
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+   * configurations are based on the active locale.
+   * 
+   * # Usage
+   * 
+   *     expression | number[:digitInfo]
+   * 
+   * where `expression` is a number and `digitInfo` has the following format:
+   * 
+   *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+   * 
+   * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+   * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+   * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+   * 
+   * For more information on the acceptable range for each of these numbers and other
+   * details see your native internationalization library.
+   * 
+   * # Examples
+   * 
+   *     {{ 123 | number }}              // output is 123
+   *     {{ 123.1 | number: '.2-3' }}    // output is 123.10
+   *     {{ 1 | number: '2.2' }}         // output is 01.00
+   */
+  class DecimalPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local percent.
+   * 
+   * # Usage
+   * 
+   *     expression | percent[:digitInfo]
+   * 
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class PercentPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * WARNING: this pipe uses the Internationalization API.
+   * Therefore it is only reliable in Chrome and Opera browsers.
+   * 
+   * Formats a number as local currency.
+   * 
+   * # Usage
+   * 
+   *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+   * 
+   * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+   * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+   * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+   * is `false`.
+   * For more information about `digitInfo` see {@link DecimalPipe}
+   */
+  class CurrencyPipe extends NumberPipe implements PipeTransform {
+    
+    transform(value: any, args: any[]): string;
+    
+  }
+
+    
+  /**
+   * Implements uppercase transforms to text.
+   * 
+   * # Example
+   * 
+   * In this example we transform the user text uppercase.
+   * 
+   *  ```
+   * @Component({
+   *   selector: "username-cmp"
+   * })
+   * @View({
+   *   template: "Username: {{ user | uppercase }}"
+   * })
+   * class Username {
+   *   user:string;
+   * }
+   * 
+   * ```
+   */
+  class UpperCasePipe implements PipeTransform {
+    
+    transform(value: string, args?: any[]): string;
+    
+  }
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Constructs the set of bindings meant for use at the platform level.
+   * 
+   * These are bindings that should be singletons shared among all Angular applications
+   * running on the page.
+   */
+  function platformBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Construct a default set of bindings which should be included in any Angular
+   * application, regardless of whether it runs on the UI thread or in a web worker.
+   */
+  function applicationCommonBindings(): Array<Type | Binding | any[]>;
+  
+
+    
+  /**
+   * Create an Angular zone.
+   */
+  function createNgZone(): NgZone;
+  
+
+    
+  /**
+   * @private
+   */
+  function platformCommon(bindings?: Array<Type | Binding | any[]>, initializer?: () => void): PlatformRef;
+  
+
+    
+  /**
+   * The Angular platform is the entry point for Angular on a web page. Each page
+   * has exactly one platform, and services (such as reflection) which are common
+   * to every Angular application running on the page are bound in its scope.
+   * 
+   * A page's platform is initialized implicitly when {@link bootstrap}() is called, or
+   * explicitly by calling {@link platform}().
+   */
+  interface PlatformRef {
+    
+    /**
+     * Retrieve the platform {@link Injector}, which is the parent injector for
+     * every Angular application on the page and provides singleton bindings.
+     */
+    injector: Injector;
+    
+    /**
+     * Instantiate a new Angular application on the page.
+     * 
+     * # What is an application?
+     * 
+     * Each Angular application has its own zone, change detection, compiler,
+     * renderer, and other framework components. An application hosts one or more
+     * root components, which can be initialized via `ApplicationRef.bootstrap()`.
+     * 
+     * # Application Bindings
+     * 
+     * Angular applications require numerous bindings to be properly instantiated.
+     * When using `application()` to create a new app on the page, these bindings
+     * must be provided. Fortunately, there are helper functions to configure
+     * typical bindings, as shown in the example below.
+     * 
+     * # Example
+     * ```
+     * var myAppBindings = [MyAppService];
+     * 
+     * platform()
+     *   .application([applicationCommonBindings(), applicationDomBindings(), myAppBindings])
+     *   .bootstrap(MyTopLevelComponent);
+     * ```
+     * # See Also
+     * 
+     * See the {@link bootstrap} documentation for more details.
+     */
+    application(bindings: Array<Type | Binding | any[]>): ApplicationRef;
+    
+    /**
+     * Instantiate a new Angular application on the page, using bindings which
+     * are only available asynchronously. One such use case is to initialize an
+     * application running in a web worker.
+     * 
+     * # Usage
+     * 
+     * `bindingFn` is a function that will be called in the new application's zone.
+     * It should return a {@link Promise} to a list of bindings to be used for the
+     * new application. Once this promise resolves, the application will be
+     * constructed in the same manner as a normal `application()`.
+     */
+    asyncApplication(bindingFn: (zone: NgZone) =>
+                           Promise<Array<Type | Binding | any[]>>): Promise<ApplicationRef>;
+    
+    /**
+     * Destroy the Angular platform and all Angular applications on the page.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * A reference to an Angular application running on a page.
+   * 
+   * For more about Angular applications, see the documentation for {@link bootstrap}.
+   */
+  interface ApplicationRef {
+    
+    /**
+     * Register a listener to be called each time `bootstrap()` is called to bootstrap
+     * a new root component.
+     */
+    registerBootstrapListener(listener: (ref: ComponentRef) => void): void;
+    
+    /**
+     * Bootstrap a new component at the root level of the application.
+     * 
+     * # Bootstrap process
+     * 
+     * When bootstrapping a new root component into an application, Angular mounts the
+     * specified application component onto DOM elements identified by the [componentType]'s
+     * selector and kicks off automatic change detection to finish initializing the component.
+     * 
+     * # Optional Bindings
+     * 
+     * Bindings for the given component can optionally be overridden via the `bindings`
+     * parameter. These bindings will only apply for the root component being added and any
+     * child components under it.
+     * 
+     * # Example
+     * ```
+     * var app = platform.application([applicationCommonBindings(), applicationDomBindings()];
+     * app.bootstrap(FirstRootComponent);
+     * app.bootstrap(SecondRootComponent, [bind(OverrideBinding).toClass(OverriddenBinding)]);
+     * ```
+     */
+    bootstrap(componentType: Type, bindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
+    
+    /**
+     * Retrieve the application {@link Injector}.
+     */
+    injector: Injector;
+    
+    /**
+     * Retrieve the application {@link NgZone}.
+     */
+    zone: NgZone;
+    
+    /**
+     * Dispose of this application and all of its components.
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  class AppRootUrl {
+    
+    constructor(value: string);
+    
+    /**
+     * Returns the base URL of the currently running application.
+     */
+    value: any;
+    
+  }
+
+    
+  /**
+   * Used by the {@link Compiler} when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See {@link Compiler}
+   */
+  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;
+    
+  }
+
+    
+  /**
+   * A service that can be used to get and set the title of a current HTML document.
+   * 
+   * Since an Angular 2 application can't be bootstrapped on the entire HTML document (`<html>` tag)
+   * it is not possible to bind to the `text` property of the `HTMLTitleElement` elements
+   * (representing the `<title>` tag). Instead, this service can be used to set and get the current
+   * title value.
+   */
+  class Title {
+    
+    /**
+     * Get the title of the current HTML document.
+     * @returns {string}
+     */
+    getTitle(): string;
+    
+    /**
+     * Set the title of the current HTML document.
+     * @param newTitle
+     */
+    setTitle(newTitle: string): void;
+    
+  }
+
+    
+  class DirectiveResolver {
+    
+    /**
+     * Return {@link DirectiveMetadata} for a given `Type`.
+     */
+    resolve(type: Type): DirectiveMetadata;
+    
+  }
+
+    
+  /**
+   * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which
+   * can later be used to create and render a Component instance.
+   * 
+   * Most applications should instead use higher-level {@link DynamicComponentLoader} service, which
+   * both compiles and instantiates a Component.
+   */
+  interface Compiler {
+    
+    compileInHost(componentType: Type): Promise<ProtoViewRef>;
+    
+    clearCache(): void;
+    
+  }
+
+    
+  /**
+   * Service exposing low level API for creating, moving and destroying Views.
+   * 
+   * Most applications should use higher-level abstractions like {@link DynamicComponentLoader} and
+   * {@link ViewContainerRef} instead.
+   */
+  interface AppViewManager {
+    
+    /**
+     * Returns a {@link ViewContainerRef} of the View Container at the specified location.
+     */
+    getViewContainer(location: ElementRef): ViewContainerRef;
+    
+    /**
+     * Returns the {@link ElementRef} that makes up the specified Host View.
+     */
+    getHostElement(hostViewRef: HostViewRef): ElementRef;
+    
+    /**
+     * Searches the Component View of the Component specified via `hostLocation` and returns the
+     * {@link ElementRef} for the Element identified via a Variable Name `variableName`.
+     * 
+     * Throws an exception if the specified `hostLocation` is not a Host Element of a Component, or if
+     * variable `variableName` couldn't be found in the Component View of this Component.
+     */
+    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+    /**
+     * Returns the component instance for the provided Host Element.
+     */
+    getComponent(hostLocation: ElementRef): any;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the first element in the global View
+     * (usually DOM Document) that matches the component's selector or `overrideSelector`.
+     * 
+     * This as a low-level way to bootstrap an application and upgrade an existing Element to a
+     * Host Element. Most applications should use {@link DynamicComponentLoader#loadAsRoot} instead.
+     * 
+     * The Component and its View are created based on the `hostProtoViewRef` which can be obtained
+     * by compiling the component with {@link Compiler#compileInHost}.
+     * 
+     * Use {@link AppViewManager#destroyRootHostView} to destroy the created Component and it's Host
+     * View.
+     * 
+     * ## 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): HostViewRef;
+    
+    /**
+     * Destroys the Host View created via {@link AppViewManager#createRootHostView}.
+     * 
+     * Along with the Host View, the Component Instance as well as all nested View and Components are
+     * destroyed as well.
+     */
+    destroyRootHostView(hostViewRef: HostViewRef): void;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into the View Container specified via `viewContainerLocation` at the specified `index`.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     * 
+     * This as a low-level way to create and attach an Embedded via to a View Container. Most
+     * applications should used {@link ViewContainerRef#createEmbeddedView} instead.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Embedded View.
+     */
+    createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number, templateRef: TemplateRef): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into the View Container
+     * found at `viewContainerLocation`. Within the container, the view will be inserted at position
+     * specified via `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoViewRef`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * You can optionally specify `imperativelyCreatedInjector`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     * 
+     * Use {@link AppViewManager#destroyViewInContainer} to destroy the created Host View.
+     */
+    createHostViewInContainer(viewContainerLocation: ElementRef, index: number, protoViewRef: ProtoViewRef, imperativelyCreatedInjector: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Destroys an Embedded or Host View attached to a View Container at the specified `index`.
+     * 
+     * The View Container is located via `viewContainerLocation`.
+     */
+    destroyViewInContainer(viewContainerLocation: ElementRef, index: number): void;
+    
+    /**
+     * See {@link AppViewManager#detachViewInContainer}.
+     */
+    attachViewInContainer(viewContainerLocation: ElementRef, index: number, viewRef: ViewRef): ViewRef;
+    
+    /**
+     * See {@link AppViewManager#attachViewInContainer}.
+     */
+    detachViewInContainer(viewContainerLocation: ElementRef, index: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * An unmodifiable list of items that Angular keeps up to date when the state
+   * of the application changes.
+   * 
+   * The type of object that {@link QueryMetadata} and {@link ViewQueryMetadata} provide.
+   * 
+   * Implements an iterable interface, therefore it can be used in both ES6
+   * javascript `for (var i of items)` loops as well as in Angular templates with
+   * `*ng-for="#i of myList"`.
+   * 
+   * Changes can be observed by subscribing to the changes `Observable`.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/RX8sJnQYl9FWuSCWme5z?p=preview))
+   * ```javascript
+   * @Component({...})
+   * class Container {
+   *   constructor(@Query(Item) items: QueryList<Item>) {
+   *     items.changes.subscribe(_ => console.log(items.length));
+   *   }
+   * }
+   * ```
+   */
+  class QueryList<T> {
+    
+    changes: Observable;
+    
+    length: number;
+    
+    first: T;
+    
+    last: T;
+    
+    /**
+     * returns a new list with the passsed in function applied to each element.
+     */
+    map<U>(fn: (item: T) => U): U[];
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * Service for instantiating a Component and attaching it to a View at a specified location.
+   */
+  interface DynamicComponentLoader {
+    
+    /**
+     * Creates an instance of a Component `type` and attaches it to the first element in the
+     * platform-specific global view that matches the component's selector.
+     * 
+     * In a browser the platform-specific global view is the main DOM Document.
+     * 
+     * If needed, the component's selector can be overridden via `overrideSelector`.
+     * 
+     * You can optionally provide `injector` and this {@link Injector} will be used to instantiate the
+     * Component.
+     * 
+     * To be notified when this Component instance is destroyed, you can also optionally provide
+     * `onDispose` callback.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<child id="child"></child>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, injector: ng.Injector) {
+     *     dynamicComponentLoader.loadAsRoot(ChildComponent, '#child', injector);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *   Parent (
+     *     <child id="child">
+     *        Child
+     *     </child>
+     *   )
+     * </my-app>
+     * ```
+     */
+    loadAsRoot(type: Type, overrideSelector: string, injector: Injector, onDispose?: () => void): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to a View Container located inside of the
+     * Component View of another Component instance.
+     * 
+     * The targeted Component Instance is specified via its `hostLocation` {@link ElementRef}. The
+     * location within the Component View of this Component Instance is specified via `anchorName`
+     * Template Variable Name.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<div #child></div>)
+     *   `
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadIntoLocation(ChildComponent, elementRef, 'child');
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>
+     *    Parent (
+     *      <div #child="" class="ng-binding"></div>
+     *      <child-component class="ng-binding">Child</child-component>
+     *    )
+     * </my-app>
+     * ```
+     */
+    loadIntoLocation(type: Type, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+    /**
+     * Creates an instance of a Component and attaches it to the View Container found at the
+     * `location` specified as {@link ElementRef}.
+     * 
+     * You can optionally provide `bindings` to configure the {@link Injector} provisioned for this
+     * Component Instance.
+     * 
+     * Returns a promise for the {@link ComponentRef} representing the newly created Component.
+     * 
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * }
+     * 
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `Parent`
+     * })
+     * class MyApp {
+     *   constructor(dynamicComponentLoader: ng.DynamicComponentLoader, elementRef: ng.ElementRef) {
+     *     dynamicComponentLoader.loadNextToLocation(ChildComponent, elementRef);
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     * 
+     * Resulting DOM:
+     * 
+     * ```
+     * <my-app>Parent</my-app>
+     * <child-component>Child</child-component>
+     * ```
+     */
+    loadNextToLocation(type: Type, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+  }
+
+    
+  /**
+   * Represents a location in a View that has an injection, change-detection and render context
+   * associated with it.
+   * 
+   * An `ElementRef` is created for each element in the Template that contains a Directive, Component
+   * or data-binding.
+   * 
+   * An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
+   * element.
+   */
+  interface ElementRef extends RenderElementRef {
+    
+    /**
+     * The underlying native element or `null` if direct access to native elements is not supported
+     * (e.g. when the application runs in a web worker).
+     * 
+     * <div class="callout is-critical">
+     *   <header>Use with caution</header>
+     *   <p>
+     *    Use this API as the last resort when direct access to DOM is needed. Use templating and
+     *    data-binding provided by Angular instead. Alternatively you take a look at {@link Renderer}
+     *    which provides API that can safely be used even when direct access to native elements is not
+     *    supported.
+     *   </p>
+     *   <p>
+     *    Relying on direct DOM access creates tight coupling between your application and rendering
+     *    layers which will make it impossible to separate the two and deploy your application into a
+     *    web worker.
+     *   </p>
+     * </div>
+     */
+    nativeElement: any;
+    
+  }
+
+    
+  /**
+   * Represents an Embedded Template that can be used to instantiate Embedded Views.
+   * 
+   * You can access a `TemplateRef`, in two ways. Via a directive placed on a `<template>` element (or
+   * directive prefixed with `*`) and have the `TemplateRef` for this Embedded View injected into the
+   * constructor of the directive using the `TemplateRef` Token. Alternatively you can query for the
+   * `TemplateRef` from a Component or a Directive via {@link Query}.
+   * 
+   * To instantiate Embedded Views based on a Template, use
+   * {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
+   * View Container.
+   */
+  interface TemplateRef {
+    
+    /**
+     * The location in the View where the Embedded View logically belongs to.
+     * 
+     * The data-binding and injection contexts of Embedded Views created from this `TemplateRef`
+     * inherit from the contexts of this location.
+     * 
+     * Typically new Embedded Views are attached to the View Container of this location, but in
+     * advanced use-cases, the View can be attached to a different container while keeping the
+     * data-binding and injection context from the original location.
+     */
+    elementRef: ElementRef;
+    
+    /**
+     * Allows you to check if this Embedded Template defines Local Variable with name matching `name`.
+     */
+    hasLocal(name: string): boolean;
+    
+  }
+
+    
+  /**
+   * Represents an Angular View.
+   * 
+   * <!-- TODO: move the next two paragraphs to the dev guide -->
+   * A View is a fundamental building block of the application UI. It is the smallest grouping of
+   * Elements which are created and destroyed together.
+   * 
+   * Properties of elements in a View can change, but the structure (number and order) of elements in
+   * a View cannot. Changing the structure of Elements can only be done by inserting, moving or
+   * removing nested Views via a {@link ViewContainer}. Each View can contain many View Containers.
+   * <!-- /TODO -->
+   * 
+   * ## Example
+   * 
+   * Given this template...
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * ... we have two {@link ProtoViewRef}s:
+   * 
+   * Outer {@link ProtoViewRef}:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner {@link ProtoViewRef}:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate {@link ProtoViewRef}s.
+   * 
+   * The outer/inner {@link ProtoViewRef}s are then assembled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outer-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: outer-0 -->
+   * ```
+   */
+  interface ViewRef extends HostViewRef {
+    
+    /**
+     * Sets `value` of local variable called `variableName` in this View.
+     */
+    setLocal(variableName: string, value: any): void;
+    
+  }
+
+    
+  /**
+   * Represents a View containing a single Element that is the Host Element of a {@link Component}
+   * instance.
+   * 
+   * A Host View is created for every dynamically created Component that was compiled on its own (as
+   * opposed to as a part of another Component's Template) via {@link Compiler#compileInHost} or one
+   * of the higher-level APIs: {@link AppViewManager#createRootHostView},
+   * {@link AppViewManager#createHostViewInContainer}, {@link ViewContainerRef#createHostView}.
+   */
+  interface HostViewRef {
+    
+  }
+
+    
+  /**
+   * Represents an Angular ProtoView.
+   * 
+   * A ProtoView is a prototypical {@link ViewRef View} that is the result of Template compilation and
+   * is used by Angular to efficiently create an instance of this View based on the compiled Template.
+   * 
+   * Most ProtoViews are created and used internally by Angular and you don't need to know about them,
+   * except in advanced use-cases where you compile components yourself via the low-level
+   * {@link Compiler#compileInHost} API.
+   * 
+   * 
+   * ## Example
+   * 
+   * Given this template:
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * Angular desugars and compiles the template into two ProtoViews:
+   * 
+   * Outer ProtoView:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner ProtoView:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separate ProtoViews.
+   */
+  interface ProtoViewRef {
+    
+  }
+
+    
+  /**
+   * Represents a container where one or more Views can be attached.
+   * 
+   * The container can contain two kinds of Views. Host Views, created by instantiating a
+   * {@link Component} via {@link #createHostView}, and Embedded Views, created by instantiating an
+   * {@link TemplateRef Embedded Template} via {@link #createEmbeddedView}.
+   * 
+   * The location of the View Container within the containing View is specified by the Anchor
+   * `element`. Each View Container can have only one Anchor Element and each Anchor Element can only
+   * have a single View Container.
+   * 
+   * Root elements of Views attached to this container become siblings of the Anchor Element in
+   * the Rendered View.
+   * 
+   * To access a `ViewContainerRef` of an Element, you can either place a {@link Directive} injected
+   * with `ViewContainerRef` on the Element, or you obtain it via
+   * {@link AppViewManager#getViewContainer}.
+   * 
+   * <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
+   */
+  interface ViewContainerRef {
+    
+    /**
+     * Anchor element that specifies the location of this container in the containing View.
+     * <!-- TODO: rename to anchorElement -->
+     */
+    element: ElementRef;
+    
+    /**
+     * Destroys all Views in this container.
+     */
+    clear(): void;
+    
+    /**
+     * Returns the {@link ViewRef} for the View located in this container at the specified index.
+     */
+    get(index: number): ViewRef;
+    
+    /**
+     * Returns the number of Views currently attached to this container.
+     */
+    length: number;
+    
+    /**
+     * Instantiates an Embedded View based on the {@link TemplateRef `templateRef`} and inserts it
+     * into this container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the {@link ViewRef} for the newly created View.
+     */
+    createEmbeddedView(templateRef: TemplateRef, index?: number): ViewRef;
+    
+    /**
+     * Instantiates a single {@link Component} and inserts its Host View into this container at the
+     * specified `index`.
+     * 
+     * The component is instantiated using its {@link ProtoViewRef `protoView`} which can be
+     * obtained via {@link Compiler#compileInHost}.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * You can optionally specify `dynamicallyCreatedBindings`, which configure the {@link Injector}
+     * that will be created for the Host View.
+     * 
+     * Returns the {@link HostViewRef} of the Host View created for the newly instantiated Component.
+     */
+    createHostView(protoViewRef?: ProtoViewRef, index?: number, dynamicallyCreatedBindings?: ResolvedBinding[]): HostViewRef;
+    
+    /**
+     * Inserts a View identified by a {@link ViewRef} into the container at the specified `index`.
+     * 
+     * If `index` is not specified, the new View will be inserted as the last View in the container.
+     * 
+     * Returns the inserted {@link ViewRef}.
+     */
+    insert(viewRef: ViewRef, index?: number): ViewRef;
+    
+    /**
+     * Returns the index of the View, specified via {@link ViewRef}, within the current container or
+     * `-1` if this container doesn't contain the View.
+     */
+    indexOf(viewRef: ViewRef): number;
+    
+    /**
+     * Destroys a View attached to this container at the specified `index`.
+     * 
+     * If `index` is not specified, the last View in the container will be removed.
+     */
+    remove(index?: number): void;
+    
+    /**
+     * Use along with {@link #insert} to move a View within the current container.
+     * 
+     * If the `index` param is omitted, the last {@link ViewRef} is detached.
+     */
+    detach(index?: number): ViewRef;
+    
+  }
+
+    
+  /**
+   * Represents an instance of a Component created via {@link DynamicComponentLoader}.
+   * 
+   * `ComponentRef` provides access to the Component Instance as well other objects related to this
+   * Component Instance and allows you to destroy the Component Instance via the {@link #dispose}
+   * method.
+   */
+  interface ComponentRef {
+    
+    /**
+     * Location of the Host Element of this Component Instance.
+     */
+    location: ElementRef;
+    
+    /**
+     * The instance of the Component.
+     */
+    instance: any;
+    
+    /**
+     * The user defined component type, represented via the constructor function.
+     * 
+     * <!-- TODO: customize wording for Dart docs -->
+     */
+    componentType: Type;
+    
+    /**
+     * The {@link ViewRef} of the Host View of this Component instance.
+     */
+    hostView: HostViewRef;
+    
+    /**
+     * Destroys the component instance and all of the data structures associated with it.
+     * 
+     * TODO(i): rename to destroy to be consistent with AppViewManager and ViewContainerRef
+     */
+    dispose(): void;
+    
+  }
+
+    
+  /**
+   * Provides access to explicitly trigger change detection in an application.
+   * 
+   * By default, `Zone` triggers change detection in Angular on each virtual machine (VM) turn. When
+   * testing, or in some
+   * limited application use cases, a developer can also trigger change detection with the
+   * `lifecycle.tick()` method.
+   * 
+   * Each Angular application has a single `LifeCycle` instance.
+   * 
+   * # Example
+   * 
+   * This is a contrived example, since the bootstrap automatically runs inside of the `Zone`, which
+   * invokes
+   * `lifecycle.tick()` on your behalf.
+   * 
+   * ```javascript
+   * bootstrap(MyApp).then((ref:ComponentRef) => {
+   *   var lifeCycle = ref.injector.get(LifeCycle);
+   *   var myApp = ref.instance;
+   * 
+   *   ref.doSomething();
+   *   lifecycle.tick();
+   * });
+   * ```
+   */
+  interface LifeCycle {
+    
+    /**
+     * Invoke this method to explicitly process change detection and its side-effects.
+     * 
+     *  In development mode, `tick()` also performs a second change detection cycle to ensure that no
+     * further
+     *  changes are detected. If additional changes are picked up during this second cycle, bindings
+     * in
+     * the app have
+     *  side-effects that cannot be resolved in a single change detection pass. In this case, Angular
+     * throws an error,
+     *  since an Angular application can only have one change detection pass during which all change
+     * detection must
+     *  complete.
+     */
+    tick(): void;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  /**
+   * Adds and removes CSS classes based on an {expression} value.
+   * 
+   * The result of expression is used to add and remove CSS classes using the following logic,
+   * based on expression's value type:
+   * - {string} - all the CSS classes (space - separated) are added
+   * - {Array} - all the CSS classes (Array elements) are added
+   * - {Object} - each key corresponds to a CSS class name while values
+   * are interpreted as {boolean} expression. If a given expression
+   * evaluates to {true} a corresponding CSS class is added - otherwise
+   * it is removed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div class="message" [ng-class]="{error: errorCount > 0}">
+   *     Please check errors.
+   * </div>
+   * ```
+   */
+  class NgClass implements DoCheck,  OnDestroy {
+    
+    constructor(_iterableDiffers: IterableDiffers, _keyValueDiffers: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    initialClasses: any;
+    
+    rawClass: any;
+    
+    doCheck(): void;
+    
+    onDestroy(): 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, and also to alias the 'last' to a local variable that will
+   * be set to a boolean indicating if the item is the last one in the iteration
+   * 
+   * 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>`
+   */
+  class NgFor implements DoCheck {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef, _iterableDiffers: IterableDiffers, _cdr: ChangeDetectorRef);
+    
+    ngForOf: any;
+    
+    doCheck(): 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 ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+   * 
+   * ```
+   * <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>`
+   */
+  class NgIf {
+    
+    constructor(_viewContainer: ViewContainerRef, _templateRef: TemplateRef);
+    
+    ngIf: any;
+    
+  }
+
+    
+  /**
+   * Adds or removes styles based on an {expression}.
+   * 
+   * When the expression assigned to `ng-style` evaluates to an object, the corresponding element
+   * styles are updated. Style names to update are taken from the object keys and values - from the
+   * corresponding object values.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div [ng-style]="{'text-align': alignExp}"></div>
+   * ```
+   * 
+   * In the above example the `text-align` style will be updated based on the `alignExp` value
+   * changes.
+   * 
+   * # Syntax
+   * 
+   * - `<div [ng-style]="{'text-align': alignExp}"></div>`
+   * - `<div [ng-style]="styleExp"></div>`
+   */
+  class NgStyle implements DoCheck {
+    
+    constructor(_differs: KeyValueDiffers, _ngEl: ElementRef, _renderer: Renderer);
+    
+    rawStyle: any;
+    
+    doCheck(): 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>
+   * ```
+   */
+  class NgSwitch {
+    
+    ngSwitch: any;
+    
+  }
+
+    
+  /**
+   * 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>
+   * ```
+   */
+  class NgSwitchWhen {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, _switch: NgSwitch);
+    
+    ngSwitchWhen: any;
+    
+  }
+
+    
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   */
+  class NgSwitchDefault {
+    
+    constructor(viewContainer: ViewContainerRef, templateRef: TemplateRef, sswitch: NgSwitch);
+    
+  }
+
+    
+  /**
+   * A collection of 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 `directives`
+   * property of the `@View` annotation.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+   * 
+   * Instead of writing:
+   * 
+   * ```typescript
+   * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could import all the core directives at once:
+   * 
+   * ```typescript
+   * import {CORE_DIRECTIVES} from 'angular2/angular2';
+   * import {OtherDirective} from './myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [CORE_DIRECTIVES, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  let CORE_DIRECTIVES: Type[];
+  
+
+    
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+    constructor(validator: Function);
+    
+    validator: Function;
+    
+    value: any;
+    
+    status: string;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+    valueChanges: Observable;
+    
+    markAsTouched(): void;
+    
+    markAsDirty({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    setParent(parent: ControlGroup | ControlArray): void;
+    
+    updateValidity({onlySelf}?: {onlySelf?: boolean}): void;
+    
+    updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
+    
+    find(path: Array<string | number>| string): AbstractControl;
+    
+    getError(errorCode: string, path?: string[]): any;
+    
+    hasError(errorCode: string, path?: string[]): boolean;
+    
+  }
+
+    
+  /**
+   * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+   * validation state, which is determined by an optional validation function.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with {@link ControlGroup} and {@link ControlArray}.
+   * 
+   * # Usage
+   * 
+   * By default, a `Control` is created for every `<input>` or other form component.
+   * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+   * bound to a DOM element instead. This `Control` can be configured with a custom
+   * validation function.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class Control extends AbstractControl {
+    
+    constructor(value?: any, validator?: Function);
+    
+    /**
+     * Set the value of the control to `value`.
+     * 
+     * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+     * and not its parent component. If `emitEvent` is `true`, this change will cause a
+     * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+     * `false`.
+     * 
+     * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+     * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+     * specified.
+     */
+    updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}?:
+                      {onlySelf?: boolean, emitEvent?: boolean, emitModelToViewChange?: boolean}): void;
+    
+    /**
+     * Register a listener for change events.
+     */
+    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 {@link Control} 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 {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+   * controls, but is of variable length.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlGroup extends AbstractControl {
+    
+    constructor(controls: {[key: string]: AbstractControl}, optionals?: {[key: string]: boolean}, validator?: Function);
+    
+    controls: {[key: string]: AbstractControl};
+    
+    addControl(name: string, control: 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 {@link Control} 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 {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+   * other controls, but is of fixed length.
+   * 
+   * # Adding or removing controls
+   * 
+   * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+   * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+   * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+   * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+   * as broken change detection.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+   */
+  class ControlArray extends AbstractControl {
+    
+    constructor(controls: AbstractControl[], validator?: Function);
+    
+    controls: AbstractControl[];
+    
+    /**
+     * Get the {@link AbstractControl} at the given `index` in the array.
+     */
+    at(index: number): AbstractControl;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the end of the array.
+     */
+    push(control: AbstractControl): void;
+    
+    /**
+     * Insert a new {@link AbstractControl} at the given `index` in the array.
+     */
+    insert(index: number, control: AbstractControl): void;
+    
+    /**
+     * Remove the control at the given `index` in the array.
+     */
+    removeAt(index: number): void;
+    
+    /**
+     * Get the length of the control array.
+     */
+    length: number;
+    
+  }
+
+    
+  class AbstractControlDirective {
+    
+    control: AbstractControl;
+    
+    value: any;
+    
+    valid: boolean;
+    
+    errors: {[key: string]: any};
+    
+    pristine: boolean;
+    
+    dirty: boolean;
+    
+    touched: boolean;
+    
+    untouched: boolean;
+    
+  }
+
+    
+  /**
+   * An interface that {@link NgFormModel} and {@link NgForm} 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;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+  }
+
+    
+  /**
+   * A directive that contains multiple {@link NgControl}.
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer extends AbstractControlDirective {
+    
+    name: string;
+    
+    formDirective: Form;
+    
+    path: string[];
+    
+  }
+
+    
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+   * 
+   * # 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: [FORM_DIRECTIVES],
+   *      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): void {
+   *    // value === {login: 'some login', password: 'some password'}
+   *  }
+   * }
    *  ```
    * 
    * We can also use ng-model to bind a domain model to the form.
@@ -5025,69 +14899,205 @@ declare module ng {
    * @Component({selector: "login-comp"})
    * @View({
    *      directives: [FORM_DIRECTIVES],
-   *      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>"
-   *      })
+   *      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}
-   *  loginForm:ControlGroup;
+   *  credentials: {login:string, password:string};
    * 
-   *  constructor() {
-   *    this.loginForm = new ControlGroup({
-   *      login: new Control(""),
-   *      password: new Control("")
-   *    });
-   *  }
-   * 
-   *  onLogin() {
-   *    // this.credentials.login === 'some login'
-   *    // this.credentials.password === 'some password'
+   *  onLogIn(): void {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
    *  }
    * }
    *  ```
    */
-  class NgFormModel extends ControlContainer implements Form {
+  class NgControlName extends NgControl implements OnChanges, 
+      OnDestroy {
     
-     form: ControlGroup;
+    constructor(parent: ControlContainer, validators: Function[], valueAccessors: ControlValueAccessor[]);
     
-     directives: List<NgControl>;
+    update: any;
     
-     ngSubmit: void;
+    model: any;
     
-     onChange(_: any): void;
+    viewModel: any;
     
-     formDirective: Form;
+    validators: Function[];
     
-     control: ControlGroup;
+    onChanges(changes: {[key: string]: SimpleChange}): void;
     
-     path: List<string>;
+    onDestroy(): void;
     
-     addControl(dir: NgControl): void;
+    viewToModelUpdate(newValue: any): void;
     
-     getControl(dir: NgControl): Control;
+    path: string[];
     
-     removeControl(dir: NgControl): void;
+    formDirective: any;
     
-     addControlGroup(dir: NgControlGroup): void;
+    control: Control;
     
-     removeControlGroup(dir: NgControlGroup): void;
+    validator: Function;
     
-     getControlGroup(dir: NgControlGroup): ControlGroup;
-    
-     updateModel(dir: NgControl, value: any): void;
-    
-     onSubmit(): boolean;
   }
-  
 
+    
   /**
-   * Creates and binds a form object to a DOM element.
+   * Binds an existing {@link Control} to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormControl Example</h2>
+   *       <form>
+   *         <p>Element with existing control: <input type="text"
+   * [ng-form-control]="loginControl"></p>
+   *         <p>Value of existing control: {{loginControl.value}}</p>
+   *       </form>
+   *     </div>
+   *   `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginControl: Control = new Control('');
+   * }
+   *  ```
+   * 
+   * # ng-model
+   * 
+   * We can also use `ng-model` to bind a domain model to the form.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl: Control = new Control('');
+   *  login:string;
+   * }
+   *  ```
+   */
+  class NgFormControl extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    form: Control;
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    path: string[];
+    
+    control: Control;
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Binds a domain model to a form control.
+   * 
+   * # Usage
+   * 
+   * `ng-model` binds an existing domain model to a form control. For a
+   * two-way binding, use `[(ng-model)]` to ensure the model updates in
+   * both directions.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+   *  ```typescript
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `<input type='text' [(ng-model)]="searchQuery">`
+   *      })
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   */
+  class NgModel extends NgControl implements OnChanges {
+    
+    constructor(validators: Function[], valueAccessors: ControlValueAccessor[]);
+    
+    update: any;
+    
+    model: any;
+    
+    viewModel: any;
+    
+    validators: Function[];
+    
+    onChanges(changes: {[key: string]: SimpleChange}): void;
+    
+    control: Control;
+    
+    path: string[];
+    
+    validator: Function;
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * A base class that all control directive extend.
+   * It binds a {@link Control} object to a DOM element.
+   */
+  class NgControl extends AbstractControlDirective {
+    
+    name: string;
+    
+    valueAccessor: ControlValueAccessor;
+    
+    validator: Function;
+    
+    path: string[];
+    
+    viewToModelUpdate(newValue: any): void;
+    
+  }
+
+    
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
    * 
    * # 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({
@@ -5108,45 +15118,236 @@ declare module ng {
    *      `})
    * class SignupComp {
    *  onSignUp(value) {
-   *    // value === {personal: {name: 'some name'},
+   *    // value === {
+   *    //  personal: {name: 'some name'},
    *    //  credentials: {login: 'some login', password: 'some password'}}
    *  }
    * }
    * 
    *  ```
    */
+  class NgControlGroup extends ControlContainer implements OnInit, 
+      OnDestroy {
+    
+    constructor(_parent: ControlContainer);
+    
+    onInit(): void;
+    
+    onDestroy(): void;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    formDirective: Form;
+    
+  }
+
+    
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+   * 
+   * 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.
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h2>NgFormModel Example</h2>
+   *       <form [ng-form-model]="loginForm">
+   *         <p>Login: <input type="text" ng-control="login"></p>
+   *         <p>Password: <input type="password" ng-control="password"></p>
+   *       </form>
+   *       <p>Value:</p>
+   *       <pre>{{value}}</pre>
+   *     </div>
+   *   `,
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor() {
+   *     this.loginForm = new ControlGroup({
+   *       login: new Control(""),
+   *       password: new Control("")
+   *     });
+   *   }
+   * 
+   *   get value(): string {
+   *     return JSON.stringify(this.loginForm.value, null, 2);
+   *   }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```typescript
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [FORM_DIRECTIVES],
+   *      template: `
+   *        <form [ng-form-model]='loginForm'>
+   *          Login <input type='text' ng-control='login' [(ng-model)]='credentials.login'>
+   *          Password <input type='password' ng-control='password'
+   *                          [(ng-model)]='credentials.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(): void {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   */
+  class NgFormModel extends ControlContainer implements Form, 
+      OnChanges {
+    
+    form: ControlGroup;
+    
+    directives: NgControl[];
+    
+    ngSubmit: any;
+    
+    onChanges(_: any): void;
+    
+    formDirective: Form;
+    
+    control: ControlGroup;
+    
+    path: string[];
+    
+    addControl(dir: NgControl): void;
+    
+    getControl(dir: NgControl): Control;
+    
+    removeControl(dir: NgControl): void;
+    
+    addControlGroup(dir: NgControlGroup): void;
+    
+    removeControlGroup(dir: NgControlGroup): void;
+    
+    getControlGroup(dir: NgControlGroup): ControlGroup;
+    
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
+    
+  }
+
+    
+  /**
+   * If `NgForm` is bound in a component, `<form>` elements in that component will be
+   * upgraded to use the Angular form system.
+   * 
+   * # Typical Use
+   * 
+   * Include `FORM_DIRECTIVES` in the `directives` section of a {@link View} annotation
+   * to use `NgForm` and its associated controls.
+   * 
+   * # Structure
+   * 
+   * An Angular form is a collection of {@link Control}s in some hierarchy.
+   * `Control`s can be at the top level or can be organized in {@link ControlGroups}
+   * or {@link ControlArray}s. This hierarchy is reflected in the form's `value`, a
+   * JSON object that mirrors the form structure.
+   * 
+   * # Submission
+   * 
+   * The `ng-submit` event signals when the user triggers a form submission.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+   * 
+   *  ```typescript
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <p>Submit the form to see the data object Angular builds</p>
+   *       <h2>NgForm demo</h2>
+   *       <form #f="form" (ng-submit)="onSubmit(f.value)">
+   *         <h3>Control group: credentials</h3>
+   *         <div ng-control-group="credentials">
+   *           <p>Login: <input type="text" ng-control="login"></p>
+   *           <p>Password: <input type="password" ng-control="password"></p>
+   *         </div>
+   *         <h3>Control group: person</h3>
+   *         <div ng-control-group="person">
+   *           <p>First name: <input type="text" ng-control="firstName"></p>
+   *           <p>Last name: <input type="text" ng-control="lastName"></p>
+   *         </div>
+   *         <button type="submit">Submit Form</button>
+   *       <p>Form data submitted:</p>
+   *       </form>
+   *       <pre>{{data}}</pre>
+   *     </div>
+   * `,
+   *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+   * })
+   * export class App {
+   *   constructor() {}
+   * 
+   *   data: string;
+   * 
+   *   onSubmit(data) {
+   *     this.data = JSON.stringify(data, null, 2);
+   *   }
+   * }
+   *  ```
+   */
   class NgForm extends ControlContainer implements Form {
     
-     form: ControlGroup;
+    form: ControlGroup;
     
-     ngSubmit: void;
+    ngSubmit: any;
     
-     formDirective: Form;
+    formDirective: Form;
     
-     control: ControlGroup;
+    control: ControlGroup;
     
-     path: List<string>;
+    path: string[];
     
-     controls: StringMap<string, AbstractControl>;
+    controls: {[key: string]: AbstractControl};
     
-     addControl(dir: NgControl): void;
+    addControl(dir: NgControl): void;
     
-     getControl(dir: NgControl): Control;
+    getControl(dir: NgControl): Control;
     
-     removeControl(dir: NgControl): void;
+    removeControl(dir: NgControl): void;
     
-     addControlGroup(dir: NgControlGroup): void;
+    addControlGroup(dir: NgControlGroup): void;
     
-     removeControlGroup(dir: NgControlGroup): void;
+    removeControlGroup(dir: NgControlGroup): void;
     
-     getControlGroup(dir: NgControlGroup): ControlGroup;
+    getControlGroup(dir: NgControlGroup): ControlGroup;
     
-     updateModel(dir: NgControl, value: any): void;
+    updateModel(dir: NgControl, value: any): void;
+    
+    onSubmit(): boolean;
     
-     onSubmit(): boolean;
   }
-  
 
+    
   /**
    * A bridge between a control and a native element.
    * 
@@ -5154,14 +15355,15 @@ declare module ng {
    */
   interface ControlValueAccessor {
     
-     writeValue(obj: any): void;
+    writeValue(obj: any): void;
     
-     registerOnChange(fn: any): void;
+    registerOnChange(fn: any): void;
+    
+    registerOnTouched(fn: any): void;
     
-     registerOnTouched(fn: any): void;
   }
-  
 
+    
   /**
    * The default accessor for writing a value and listening to changes that is used by the
    * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
@@ -5173,36 +15375,40 @@ declare module ng {
    */
   class DefaultValueAccessor implements ControlValueAccessor {
     
-     cd: NgControl;
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
     
-     onChange: void;
+    onChange: any;
     
-     onTouched: void;
+    onTouched: any;
     
-     renderer: Renderer;
+    writeValue(value: any): void;
     
-     elementRef: ElementRef;
+    registerOnChange(fn: (_: any) => void): void;
     
-     writeValue(value: any): void;
+    registerOnTouched(fn: () => void): void;
     
-     ngClassUntouched: boolean;
-    
-     ngClassTouched: boolean;
-    
-     ngClassPristine: boolean;
-    
-     ngClassDirty: boolean;
-    
-     ngClassValid: boolean;
-    
-     ngClassInvalid: boolean;
-    
-     registerOnChange(fn: (_: any) => void): void;
-    
-     registerOnTouched(fn: () => void): void;
   }
-  
 
+    
+  class NgControlStatus {
+    
+    constructor(cd: NgControl);
+    
+    ngClassUntouched: boolean;
+    
+    ngClassTouched: boolean;
+    
+    ngClassPristine: boolean;
+    
+    ngClassDirty: boolean;
+    
+    ngClassValid: boolean;
+    
+    ngClassInvalid: boolean;
+    
+  }
+
+    
   /**
    * The accessor for writing a value and listening to changes on a checkbox input element.
    * 
@@ -5213,38 +15419,23 @@ declare module ng {
    */
   class CheckboxControlValueAccessor implements ControlValueAccessor {
     
-     cd: NgControl;
+    constructor(_renderer: Renderer, _elementRef: ElementRef);
     
-     onChange: void;
+    onChange: any;
     
-     onTouched: void;
+    onTouched: any;
     
-     renderer: Renderer;
+    writeValue(value: any): void;
     
-     elementRef: ElementRef;
+    registerOnChange(fn: (_: any) => {}): void;
     
-     writeValue(value: any): void;
+    registerOnTouched(fn: () => {}): void;
     
-     ngClassUntouched: boolean;
-    
-     ngClassTouched: boolean;
-    
-     ngClassPristine: boolean;
-    
-     ngClassDirty: boolean;
-    
-     ngClassValid: boolean;
-    
-     ngClassInvalid: boolean;
-    
-     registerOnChange(fn: (_: any) => {}): void;
-    
-     registerOnTouched(fn: () => {}): void;
   }
-  
 
+    
   /**
-   * Marks <option> as dynamic, so Angular can be notified when options change.
+   * Marks `<option>` as dynamic, so Angular can be notified when options change.
    * 
    * #Example:
    * 
@@ -5255,54 +15446,57 @@ declare module ng {
    * ```
    */
   class NgSelectOption {
+    
   }
-  
 
+    
   /**
    * The accessor for writing a value and listening to changes on a select element.
    */
   class SelectControlValueAccessor implements ControlValueAccessor {
     
-     cd: NgControl;
+    constructor(_renderer: Renderer, _elementRef: ElementRef, query: QueryList<NgSelectOption>);
     
-     value: string;
+    value: string;
     
-     onChange: void;
+    onChange: any;
     
-     onTouched: void;
+    onTouched: any;
     
-     renderer: Renderer;
+    writeValue(value: any): void;
     
-     elementRef: ElementRef;
+    registerOnChange(fn: () => any): void;
     
-     writeValue(value: any): void;
+    registerOnTouched(fn: () => 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.
+   * 
+   * ### Example:
+   * 
+   * ```typescript
+   * @View({
+   *   directives: [FORM_DIRECTIVES]
+   * })
+   * @Component({
+   *   selector: 'my-app'
+   * })
+   * class MyApp {}
+   * ```
    */
-  const FORM_DIRECTIVES : List<Type> ;
+  let FORM_DIRECTIVES: Type[];
   
 
+    
+  let NG_VALIDATORS: OpaqueToken;
+  
+
+    
   /**
    * Provides a set of validators used by form controls.
    * 
@@ -5313,19 +15507,25 @@ declare module ng {
    * ```
    */
   class Validators {
-  }
-  
-  class NgValidator {
     
-     validator: Function;
-  }
-  
-  class NgRequiredValidator extends NgValidator {
+    static required(control:Control): {[key: string]: boolean};
+    
+    static nullValidator(c: any): {[key: string]: boolean};
+    
+    static compose(validators: Function[]): Function;
+    
+    static group(group:ControlGroup): {[key: string]: any[]};
+    
+    static array(array:ControlArray): {[key: string]: any[]};
     
-     validator: Function;
   }
-  
 
+    
+  class DefaultValidators {
+    
+  }
+
+    
   /**
    * Creates a form object from a user-specified configuration.
    * 
@@ -5333,13 +15533,11 @@ declare module ng {
    * 
    * ```
    * import {Component, View, bootstrap} from 'angular2/angular2';
-   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/forms';
+   * import {FormBuilder, Validators, FORM_DIRECTIVES, ControlGroup} from 'angular2/core';
    * 
    * @Component({
    *   selector: 'login-comp',
-   *   viewBindings: [
-   *     FormBuilder
-   *   ]
+   *   viewBindings: [FormBuilder]
    * })
    * @View({
    *   template: `
@@ -5352,9 +15550,7 @@ declare module ng {
    *       </div>
    *     </form>
    *   `,
-   *   directives: [
-   *     FORM_DIRECTIVES
-   *   ]
+   *   directives: [FORM_DIRECTIVES]
    * })
    * class LoginComp {
    *   loginForm: ControlGroup;
@@ -5371,12 +15567,12 @@ declare module ng {
    *   }
    * }
    * 
-   * bootstrap(LoginComp)
+   * bootstrap(LoginComp);
    * ```
    * 
    * This example creates a {@link ControlGroup} that consists of a `login` {@link Control}, and a
-   * nested
-   * {@link ControlGroup} that defines a `password` and a `passwordConfirmation` {@link Control}:
+   * nested {@link ControlGroup} that defines a `password` and a `passwordConfirmation`
+   * {@link Control}:
    * 
    * ```
    *  var loginForm = builder.group({
@@ -5392,292 +15588,705 @@ declare module ng {
    */
   class FormBuilder {
     
-     group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+    group(controlsConfig: {[key: string]: any}, extra?: {[key: string]: any}): ControlGroup;
     
-     control(value: Object, validator?: Function): Control;
+    control(value: Object, validator?: Function): Control;
+    
+    array(controlsConfig: any[], validator?: Function): ControlArray;
     
-     array(controlsConfig: List<any>, validator?: Function): ControlArray;
   }
-  
-  const FORM_BINDINGS : List<Type> ;
-  
-  class RenderDirectiveMetadata {
-    
-     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 DomRenderer extends Renderer {
-    
-     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
-    
-     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
-    
-     destroyView(viewRef: RenderViewRef): void;
-    
-     getNativeElementSync(location: RenderElementRef): any;
-    
-     getRootNodes(fragment: RenderFragmentRef): List<Node>;
-    
-     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
-    
-     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
-    
-     detachFragment(fragmentRef: RenderFragmentRef): 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;
-  }
-  
 
+    
   /**
-   * A dispatcher for all events happening in a view.
-   */
-  interface RenderEventDispatcher {
-    
-
-    /**
-     * 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
-     */
-     dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): void;
-  }
-  
-  class Renderer {
-    
-
-    /**
-     * Creates a root host view that includes the given element.
-     * Note that the fragmentCount needs to be passed in so that we can create a result
-     * synchronously even when dealing with webworkers!
-     * 
-     * @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 {RenderViewWithFragments} the created view including fragments
-     */
-     createRootHostView(hostProtoViewRef: RenderProtoViewRef, fragmentCount: number, hostElementSelector: string): RenderViewWithFragments;
-    
-
-    /**
-     * Creates a regular view out of the given ProtoView.
-     * Note that the fragmentCount needs to be passed in so that we can create a result
-     * synchronously even when dealing with webworkers!
-     */
-     createView(protoViewRef: RenderProtoViewRef, fragmentCount: number): RenderViewWithFragments;
-    
-
-    /**
-     * Destroys the given view after it has been dehydrated and detached
-     */
-     destroyView(viewRef: RenderViewRef): void;
-    
-
-    /**
-     * Attaches a fragment after another fragment.
-     */
-     attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
-    
-
-    /**
-     * Attaches a fragment after an element.
-     */
-     attachFragmentAfterElement(elementRef: RenderElementRef, fragmentRef: RenderFragmentRef): void;
-    
-
-    /**
-     * Detaches a fragment.
-     */
-     detachFragment(fragmentRef: RenderFragmentRef): 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: RenderEventDispatcher): void;
-  }
-  
-
-  /**
-   * Abstract reference to the element which can be marshaled across web-worker boundary.
+   * Shorthand set of bindings used for building Angular forms.
    * 
-   * This interface is used by the Renderer API.
+   * ### Example:
+   * 
+   * ```typescript
+   * bootstrap(MyApp, [FORM_BINDINGS]);
+   * ```
    */
-  interface RenderElementRef {
-    
+  let FORM_BINDINGS: Type[];
+  
 
-    /**
-     * Reference to the `RenderViewRef` where the `RenderElementRef` is inside of.
-     */
-     renderView: RenderViewRef;
     
+  function inspectNativeElement(element: any): DebugElement;
+  
 
+    
+  let ELEMENT_PROBE_BINDINGS: any[];
+  
+
+    
+  /**
+   * A DebugElement contains information from the Angular compiler about an
+   * element and provides access to the corresponding ElementInjector and
+   * underlying DOM Element, as well as a way to query for children.
+   */
+  interface DebugElement {
+    
+    componentInstance: any;
+    
+    nativeElement: any;
+    
+    elementRef: ElementRef;
+    
+    getDirectiveInstance(directiveIndex: number): any;
+    
     /**
-     * Index of the element inside the `RenderViewRef`.
+     * Get child DebugElements from within the Light DOM.
      * 
-     * This is used internally by the Angular framework to locate elements.
+     * @return {DebugElement[]}
      */
-     renderBoundElementIndex: number;
+    children: DebugElement[];
+    
+    /**
+     * Get the root DebugElement children of a component. Returns an empty
+     * list if the current DebugElement is not a component root.
+     * 
+     * @return {DebugElement[]}
+     */
+    componentViewChildren: DebugElement[];
+    
+    triggerEventHandler(eventName: string, eventObj: Event): void;
+    
+    hasDirective(type: Type): boolean;
+    
+    inject(type: Type): any;
+    
+    getLocal(name: string): any;
+    
+    /**
+     * Return the first descendant TestElement matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement}
+     */
+    query(predicate: Predicate<DebugElement>, scope?: Function): DebugElement;
+    
+    /**
+     * Return descendant TestElememts matching the given predicate
+     * and scope.
+     * 
+     * @param {Function: boolean} predicate
+     * @param {Scope} scope
+     * 
+     * @return {DebugElement[]}
+     */
+    queryAll(predicate: Predicate<DebugElement>, scope?: Function): DebugElement[];
+    
   }
-  
-  class RenderViewRef {
-  }
-  
-  class RenderProtoViewRef {
-  }
-  
-  class RenderFragmentRef {
-  }
-  
-  class RenderViewWithFragments {
-    
-     viewRef: RenderViewRef;
-    
-     fragmentRefs: RenderFragmentRef[];
-  }
-  
-  class ViewDefinition {
-    
-     componentId: string;
-    
-     templateAbsUrl: string;
-    
-     template: string;
-    
-     directives: List<RenderDirectiveMetadata>;
-    
-     styleAbsUrls: List<string>;
-    
-     styles: List<string>;
-    
-     encapsulation: ViewEncapsulation;
-  }
-  
-  const DOCUMENT : OpaqueToken ;
-  
 
+    
   /**
-   * A unique id (string) for an angular application.
+   * Returns a DebugElement for a ElementRef.
+   * 
+   * @param {ElementRef}: elementRef
+   * @return {DebugElement}
    */
-  const APP_ID : OpaqueToken ;
-  
-  const DOM_REFLECT_PROPERTIES_AS_ATTRIBUTES : OpaqueToken ;
+  function inspectElement(elementRef: ElementRef): DebugElement;
   
 
+    
+  function asNativeElements(arr: DebugElement[]): any[];
+  
+
+    
+  class Scope {
+    
+    static all(debugElement: DebugElement): DebugElement[];
+    
+    static light(debugElement: DebugElement): DebugElement[];
+    
+    static view(debugElement: DebugElement): DebugElement[];
+    
+  }
+
+    
+  class By {
+    
+    static all(): Function;
+    
+    static css(selector: string): Predicate<DebugElement>;
+    
+    static directive(type: Type): Predicate<DebugElement>;
+    
+  }
+
+    
+  enum ChangeDetectionStrategy {
+    
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+    CheckOnce,
+    
+    /**
+     * `Checked` means that the change detector should be skipped until its mode changes to
+     * `CheckOnce`.
+     */
+    Checked,
+    
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+    CheckAlways,
+    
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+    Detached,
+    
+    /**
+     * `OnPush` means that the change detector's mode will be set to `CheckOnce` during hydration.
+     */
+    OnPush,
+    
+    /**
+     * `Default` means that the change detector's mode will be set to `CheckAlways` during hydration.
+     */
+    Default,
+    
+    /**
+     * This is an experimental feature. Works only in Dart.
+     */
+    OnPushObserve
+  }
+  
+
+    
   /**
-   * Defines when a compiled template should be stored as a string
-   * rather than keeping its Nodes to preserve memory.
+   * An error thrown if application changes model breaking the top-down data flow.
+   * 
+   * This exception is only thrown in dev mode.
+   * 
+   * <!-- TODO: Add a link once the dev mode option is configurable -->
+   * 
+   * ### Example
+   * 
+   * ```typescript
+   * @Component({selector: 'parent'})
+   * @View({
+   *   template: `
+   *     <child [prop]="parentProp"></child>
+   *   `,
+   *   directives: [forwardRef(() => Child)]
+   * })
+   * class Parent {
+   *   parentProp = "init";
+   * }
+   * 
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   constructor(public parent: Parent) {}
+   * 
+   *   set prop(v) {
+   *     // this updates the parent property, which is disallowed during change detection
+   *     // this will result in ExpressionChangedAfterItHasBeenCheckedException
+   *     this.parent.parentProp = "updated";
+   *   }
+   * }
+   * ```
    */
-  const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE : OpaqueToken ;
-  
+  class ExpressionChangedAfterItHasBeenCheckedException extends BaseException {
+    
+    constructor(exp: string, oldValue: any, currValue: any, context: any);
+    
+  }
 
+    
+  /**
+   * Thrown when an expression evaluation raises an exception.
+   * 
+   * This error wraps the original exception to attach additional contextual information that can
+   * be useful for debugging.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/2Kywoz?p=preview))
+   * 
+   * ```typescript
+   * @Directive({selector: 'child', inputs: ['prop']})
+   * class Child {
+   *   prop;
+   * }
+   * 
+   * @Component({
+   *   selector: 'app'
+   * })
+   * @View({
+   *   template: `
+   *     <child [prop]="field.first"></child>
+   *   `,
+   *   directives: [Child]
+   * })
+   * class App {
+   *   field = null;
+   * }
+   * 
+   * bootstrap(App);
+   * ```
+   * 
+   * You can access the original exception and stack through the `originalException` and
+   * `originalStack` properties.
+   */
+  class ChangeDetectionError extends WrappedException {
+    
+    constructor(exp: string, originalException: any, originalStack: any, context: any);
+    
+    /**
+     * Information about the expression that triggered the exception.
+     */
+    location: string;
+    
+  }
+
+    
+  /**
+   * Reference to a component's change detection object.
+   */
+  interface ChangeDetectorRef {
+    
+    /**
+     * Marks all {@link OnPush} ancestors as to be checked.
+     * 
+     * <!-- TODO: Add a link to a chapter on OnPush components -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/GC512b?p=preview))
+     * 
+     * ```typescript
+     * @Component({selector: 'cmp', changeDetection: ChangeDetectionStrategy.OnPush})
+     * @View({template: `Number of ticks: {{numberOfTicks}}`})
+     * class Cmp {
+     *   numberOfTicks = 0;
+     * 
+     *   constructor(ref: ChangeDetectorRef) {
+     *     setInterval(() => {
+     *       this.numberOfTicks ++
+     *       // the following is required, otherwise the view will not be updated
+     *       this.ref.markForCheck();
+     *     }, 1000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   changeDetection: ChangeDetectionStrategy.OnPush
+     * })
+     * @View({
+     *   template: `
+     *     <cmp><cmp>
+     *   `,
+     *   directives: [Cmp]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    markForCheck(): void;
+    
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     * 
+     * This can also be used in combination with {@link detectChanges} to implement local change
+     * detection checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds. We can do that by detaching
+     * the component's change detector and doing a local check every five seconds.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   // in a real application the returned data will be different every time
+     *   get data() {
+     *     return [1,2,3,4,5];
+     *   }
+     * }
+     * 
+     * @Component({selector: 'giant-list'})
+     * @View({
+     *   template: `
+     *     <li *ng-for="#d of dataProvider.data">Data {{d}}</lig>
+     *   `,
+     *   directives: [NgFor]
+     * })
+     * class GiantList {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
+     *     ref.detach();
+     *     setInterval(() => {
+     *       this.ref.detectChanges();
+     *     }, 5000);
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app', bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     <giant-list><giant-list>
+     *   `,
+     *   directives: [GiantList]
+     * })
+     * class App {
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    detach(): void;
+    
+    /**
+     * Checks the change detector and its children.
+     * 
+     * This can also be used in combination with {@link detach} to implement local change detection
+     * checks.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * <!-- TODO: Add a live demo once ref.detectChanges is merged into master -->
+     * 
+     * ### Example
+     * 
+     * The following example defines a component with a large list of readonly data.
+     * Imagine, the data changes constantly, many times per second. For performance reasons,
+     * we want to check and update the list every five seconds.
+     * 
+     * We can do that by detaching the component's change detector and doing a local change detection
+     * check
+     * every five seconds.
+     * 
+     * See {@link detach} for more information.
+     */
+    detectChanges(): void;
+    
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also marks OnPush ancestors as to be checked. This reattached change detector will be
+     * checked during the next change detection run.
+     * 
+     * <!-- TODO: Add a link to a chapter on detach/reattach/local digest -->
+     * 
+     * ### Example ([live demo](http://plnkr.co/edit/aUhZha?p=preview))
+     * 
+     * The following example creates a component displaying `live` data. The component will detach
+     * its change detector from the main change detector tree when the component's live property
+     * is set to false.
+     * 
+     * ```typescript
+     * class DataProvider {
+     *   data = 1;
+     * 
+     *   constructor() {
+     *     setInterval(() => {
+     *       this.data = this.data * 2;
+     *     }, 500);
+     *   }
+     * }
+     * 
+     * @Component({selector: 'live-data', inputs: ['live']})
+     * @View({
+     *   template: `Data: {{dataProvider.data}}`
+     * })
+     * class LiveData {
+     *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
+     * 
+     *   set live(value) {
+     *     if (value)
+     *       this.ref.reattach();
+     *     else
+     *       this.ref.detach();
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'app',
+     *   bindings: [DataProvider]
+     * })
+     * @View({
+     *   template: `
+     *     Live Update: <input type="checkbox" [(ng-model)]="live">
+     *     <live-data [live]="live"><live-data>
+     *   `,
+     *   directives: [LiveData, FORM_DIRECTIVES]
+     * })
+     * class App {
+     *   live = true;
+     * }
+     * 
+     * bootstrap(App);
+     * ```
+     */
+    reattach(): void;
+    
+  }
+
+    
+  /**
+   * Indicates that the result of a {@link PipeMetadata} 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.
+   * 
+   * Example:
+   * 
+   * ```
+   * if (this._latestValue === this._latestReturnedValue) {
+   *    return this._latestReturnedValue;
+   *  } else {
+   *    this._latestReturnedValue = this._latestValue;
+   *    return WrappedValue.wrap(this._latestValue); // this will force update
+   *  }
+   * ```
+   */
+  class WrappedValue {
+    
+    constructor(wrapped: any);
+    
+    static wrap(value: any): WrappedValue;
+    
+    wrapped: any;
+    
+  }
+
+    
+  class SimpleChange {
+    
+    constructor(previousValue: any, currentValue: any);
+    
+    previousValue: any;
+    
+    currentValue: any;
+    
+    isFirstChange(): boolean;
+    
+  }
+
+    
+  /**
+   * To create a Pipe, you must implement this interface.
+   * 
+   * Angular invokes the `transform` method with the value of a binding
+   * as the first argument, and any parameters as the second argument in list form.
+   * 
+   * ## Syntax
+   * 
+   * `value | pipeName[:arg0[:arg1...]]`
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/f5oyIked9M2cKzvZNKHV?p=preview))
+   * 
+   * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2';
+   * 
+   * @Pipe({name: 'repeat'})
+   * export class RepeatPipe implements PipeTransform {
+   *   transform(value: any, args: any[] = []) {
+   *     if (args.length == 0) {
+   *       throw new Error('repeat pipe requires one argument');
+   *     }
+   *     let times: number = args[0];
+   *     return value.repeat(times);
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 'ok' | repeat:3 }}` in a template produces `okokok`.
+   */
+  interface PipeTransform {
+    
+    transform(value: any, args: any[]): any;
+    
+  }
+
+    
+  /**
+   * To create a stateful Pipe, you should implement this interface.
+   * 
+   * A stateful pipe may produce different output, given the same input. It is
+   * likely that a stateful pipe may contain state that should be cleaned up when
+   * a binding is destroyed. For example, a subscription to a stream of data may need to
+   * be disposed, or an interval may need to be cleared.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/hlaejwQAmWayxwc5YXQE?p=preview))
+   * 
+   * In this example, a pipe is created to countdown its input value, updating it every
+   * 50ms. Because it maintains an internal interval, it automatically clears
+   * the interval when the binding is destroyed or the countdown completes.
+   * 
+   * ```
+   * import {Pipe, PipeTransform} from 'angular2/angular2'
+   * @Pipe({name: 'countdown'})
+   * class CountDown implements PipeTransform, PipeOnDestroy {
+   *   remainingTime:Number;
+   *   interval:SetInterval;
+   *   onDestroy() {
+   *     if (this.interval) {
+   *       clearInterval(this.interval);
+   *     }
+   *   }
+   *   transform(value: any, args: any[] = []) {
+   *     if (!parseInt(value, 10)) return null;
+   *     if (typeof this.remainingTime !== 'number') {
+   *       this.remainingTime = parseInt(value, 10);
+   *     }
+   *     if (!this.interval) {
+   *       this.interval = setInterval(() => {
+   *         this.remainingTime-=50;
+   *         if (this.remainingTime <= 0) {
+   *           this.remainingTime = 0;
+   *           clearInterval(this.interval);
+   *           delete this.interval;
+   *         }
+   *       }, 50);
+   *     }
+   *     return this.remainingTime;
+   *   }
+   * }
+   * ```
+   * 
+   * Invoking `{{ 10000 | countdown }}` would cause the value to be decremented by 50,
+   * every 50ms, until it reaches 0.
+   */
+  interface PipeOnDestroy {
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * A repository of different iterable diffing strategies used by NgFor, NgClass, and others.
+   */
+  class IterableDiffers {
+    
+    constructor(factories: IterableDifferFactory[]);
+    
+    static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
+    
+    /**
+     * Takes an array of {@link IterableDifferFactory} and returns a binding used to extend the
+     * inherited {@link IterableDiffers} instance with the provided factories and return a new
+     * {@link IterableDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link IterableDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     IterableDiffers.extend([new ImmutableListDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: IterableDifferFactory[]): Binding;
+    
+    factories: IterableDifferFactory[];
+    
+    find(iterable: Object): IterableDifferFactory;
+    
+  }
+
+    
+  interface IterableDiffer {
+    
+    diff(object: Object): any;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link IterableDiffer}.
+   */
+  interface IterableDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): IterableDiffer;
+    
+  }
+
+    
+  /**
+   * A repository of different Map diffing strategies used by NgClass, NgStyle, and others.
+   */
+  class KeyValueDiffers {
+    
+    constructor(factories: KeyValueDifferFactory[]);
+    
+    static create(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
+    
+    /**
+     * Takes an array of {@link KeyValueDifferFactory} and returns a binding used to extend the
+     * inherited {@link KeyValueDiffers} instance with the provided factories and return a new
+     * {@link KeyValueDiffers} instance.
+     * 
+     * The following example shows how to extend an existing list of factories,
+     * which will only be applied to the injector for this component and its children.
+     * This step is all that's required to make a new {@link KeyValueDiffer} available.
+     * 
+     * # Example
+     * 
+     * ```
+     * @Component({
+     *   viewBindings: [
+     *     KeyValueDiffers.extend([new ImmutableMapDiffer()])
+     *   ]
+     * })
+     * ```
+     */
+    static extend(factories: KeyValueDifferFactory[]): Binding;
+    
+    factories: KeyValueDifferFactory[];
+    
+    find(kv: Object): KeyValueDifferFactory;
+    
+  }
+
+    
+  interface KeyValueDiffer {
+    
+    diff(object: Object): void;
+    
+    onDestroy(): void;
+    
+  }
+
+    
+  /**
+   * Provides a factory for {@link KeyValueDiffer}.
+   */
+  interface KeyValueDifferFactory {
+    
+    supports(objects: Object): boolean;
+    
+    create(cdRef: ChangeDetectorRef): KeyValueDiffer;
+    
+  }
+
+    
   /**
    * Create trace scope.
    * 
@@ -5690,7 +16299,7 @@ declare module ng {
    * 
    * Used to mark scope entry. The return value is used to leave the scope.
    * 
-   *     final myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
+   *     var myScope = wtfCreateScope('MyClass#myMethod(ascii someVal)');
    * 
    *     someMethod() {
    *        var s = myScope('Foo'); // 'Foo' gets stored in tracing UI
@@ -5706,9 +16315,10 @@ declare module ng {
    * needs to be fixed before the app should be profiled. Add try-finally only when you expect that
    * an exception is expected during normal execution while profiling.
    */
-  var wtfCreateScope : WtfScopeFn ;
+  var wtfCreateScope: WtfScopeFn;
   
 
+    
   /**
    * Used to mark end of Scope.
    * 
@@ -5717,9 +16327,10 @@ declare module ng {
    * 
    * Returns the `returnValue for easy chaining.
    */
-  var wtfLeave : <T>(scope: any, returnValue?: T) => T ;
+  var wtfLeave: <T>(scope: any, returnValue?: T) => T;
   
 
+    
   /**
    * Used to mark Async start. Async are similar to scope but they don't have to be strictly nested.
    * The return value is used in the call to [endAsync]. Async ranges only work if WTF has been
@@ -5732,44 +16343,763 @@ declare module ng {
    *        });
    *     }
    */
-  var wtfStartTimeRange : (rangeType: string, action: string) => any ;
+  var wtfStartTimeRange: (rangeType: string, action: string) => any;
   
 
+    
   /**
    * Ends a async time range operation.
    * [range] is the return value from [wtfStartTimeRange] Async ranges only work if WTF has been
    * enabled.
    */
-  var wtfEndTimeRange : (range: any) => void ;
+  var wtfEndTimeRange: (range: any) => void;
   
+
+    
   interface WtfScopeFn {
     
-     (arg0?: any, arg1?: any): any;
-  
+    (arg0?: any, arg1?: any): any;
+    
   }
+
+    
+  /**
+   * Bootstrapping a Webworker Application
+   * 
+   * You instantiate the application side by calling bootstrapWebworker from your webworker index
+   * script.
+   * You can call bootstrapWebworker() exactly as you would call bootstrap() in a regular Angular
+   * application
+   * See the bootstrap() docs for more details.
+   */
+  function bootstrapWebWorker(appComponentType: Type, componentInjectableBindings?: Array<Type | Binding | any[]>): Promise<ComponentRef>;
   
-  var ChangeDetectorRef: InjectableReference;
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: {[key: string]: any});
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var Renderer: InjectableReference;
   
+
+    
+  var RenderProtoViewRef: InjectableReference;
+  
+
+    
+  var ResolvedBinding: InjectableReference;
+  
+
+    
+  var InstantiationError: InjectableReference;
+  
+
+    
+  var PlatformRef: InjectableReference;
+  
+
+    
   var ApplicationRef: InjectableReference;
   
+
+    
   var Compiler: InjectableReference;
   
+
+    
   var AppViewManager: InjectableReference;
   
+
+    
+  var DynamicComponentLoader: InjectableReference;
+  
+
+    
+  var ElementRef: InjectableReference;
+  
+
+    
+  var TemplateRef: InjectableReference;
+  
+
+    
   var ViewRef: InjectableReference;
   
+
+    
   var ProtoViewRef: InjectableReference;
   
+
+    
   var ViewContainerRef: InjectableReference;
   
+
+    
   var ComponentRef: InjectableReference;
   
-  var Key: InjectableReference;
+
+    
+  var LifeCycle: InjectableReference;
+  
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var DebugElement: InjectableReference;
+  
+
+    
+  var ChangeDetectorRef: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
   
 }
 
-declare module "angular2/angular2" {
-  export = ng;
+declare module "angular2/web_worker/worker" {
+  export = ngWorker;
+}
+
+
+
+declare module ngUi {  
+  let PRIMITIVE: Type;
+  
+
+    
+  /**
+   * 
+   * Runtime representation a type that a Component or other object is instances of.
+   * 
+   * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+   * the `MyCustomComponent` constructor function.
+   */
+  interface Type extends Function {
+    
+    new(...args: any[]): any;
+    
+  }
+
+    
+  class Observable {
+    
+    observer(generator: any): Object;
+    
+  }
+
+    
+  /**
+   * Use by directives and components to emit custom Events.
+   * 
+   * ## Examples
+   * 
+   * In the following example, `Zippy` alternatively emits `open` and `close` events when its
+   * title gets clicked:
+   * 
+   * ```
+   * @Component({selector: 'zippy'})
+   * @View({template: `
+   *   <div class="zippy">
+   *     <div (click)="toggle()">Toggle</div>
+   *     <div [hidden]="!visible">
+   *       <ng-content></ng-content>
+   *     </div>
+   *  </div>`})
+   * export class Zippy {
+   *   visible: boolean = true;
+   *   @Output() open: EventEmitter = new EventEmitter();
+   *   @Output() close: EventEmitter = new EventEmitter();
+   * 
+   *   toggle() {
+   *     this.visible = !this.visible;
+   *     if (this.visible) {
+   *       this.open.next(null);
+   *     } else {
+   *       this.close.next(null);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * 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(): any;
+    
+    next(value: any): void;
+    
+    throw(error: any): void;
+    
+    return(value?: any): void;
+    
+  }
+
+    
+  interface Predicate<T> {
+    
+    (value: T, index?: number, array?: T[]): boolean;
+    
+  }
+
+    
+  class WrappedException extends Error {
+    
+    constructor(_wrapperMessage: string, _originalException: any, _originalStack?: any, _context?: any);
+    
+    wrapperMessage: string;
+    
+    wrapperStack: any;
+    
+    originalException: any;
+    
+    originalStack: any;
+    
+    context: any;
+    
+    message: string;
+    
+    toString(): string;
+    
+  }
+
+    
+  /**
+   * An injectable service for executing work inside or outside of the Angular zone.
+   * 
+   * The most common use of this service is to optimize performance when starting a work consisting of
+   * one or more asynchronous tasks that don't require UI updates or error handling to be handled by
+   * Angular. Such tasks can be kicked off via {@link #runOutsideAngular} and if needed, these tasks
+   * can reenter the Angular zone via {@link #run}.
+   * 
+   * <!-- TODO: add/fix links to:
+   *   - docs explaining zones and the use of zones in Angular and change-detection
+   *   - link to runOutsideAngular/run (throughout this file!)
+   *   -->
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
+   * ```
+   * import {Component, View, NgIf, NgZone} from 'angular2/angular2';
+   * 
+   * @Component({
+   *   selector: 'ng-zone-demo'
+   * })
+   * @View({
+   *   template: `
+   *     <h2>Demo: NgZone</h2>
+   * 
+   *     <p>Progress: {{progress}}%</p>
+   *     <p *ng-if="progress >= 100">Done processing {{label}} of Angular zone!</p>
+   * 
+   *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
+   *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
+   *   `,
+   *   directives: [NgIf]
+   * })
+   * export class NgZoneDemo {
+   *   progress: number = 0;
+   *   label: string;
+   * 
+   *   constructor(private _ngZone: NgZone) {}
+   * 
+   *   // Loop inside the Angular zone
+   *   // so the UI DOES refresh after each setTimeout cycle
+   *   processWithinAngularZone() {
+   *     this.label = 'inside';
+   *     this.progress = 0;
+   *     this._increaseProgress(() => console.log('Inside Done!'));
+   *   }
+   * 
+   *   // Loop outside of the Angular zone
+   *   // so the UI DOES NOT refresh after each setTimeout cycle
+   *   processOutsideOfAngularZone() {
+   *     this.label = 'outside';
+   *     this.progress = 0;
+   *     this._ngZone.runOutsideAngular(() => {
+   *       this._increaseProgress(() => {
+   *       // reenter the Angular zone and display done
+   *       this._ngZone.run(() => {console.log('Outside Done!') });
+   *     }}));
+   *   }
+   * 
+   * 
+   *   _increaseProgress(doneCallback: () => void) {
+   *     this.progress += 1;
+   *     console.log(`Current progress: ${this.progress}%`);
+   * 
+   *     if (this.progress < 100) {
+   *       window.setTimeout(() => this._increaseProgress(doneCallback)), 10)
+   *     } else {
+   *       doneCallback();
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  interface NgZone {
+    
+    /**
+     * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+     * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * within the Angular zone.
+     */
+    run(fn: () => any): any;
+    
+    /**
+     * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+     * the function.
+     * 
+     * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+     * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+     * 
+     * Any future tasks or microtasks scheduled from within this function will continue executing from
+     * outside of the Angular zone.
+     * 
+     * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+     */
+    runOutsideAngular(fn: () => any): any;
+    
+  }
+
+    
+  class WebWorkerApplication {
+    
+    constructor(_clientMessageBrokerFactory: ClientMessageBrokerFactory, _serviceMessageBrokerFactory: ServiceMessageBrokerFactory);
+    
+    createClientMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+    createServiceMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Bootstrapping a WebWorker
+   * 
+   * You instantiate a WebWorker application by calling bootstrap with the URI of your worker's index
+   * script
+   * Note: The WebWorker script must call bootstrapWebworker once it is set up to complete the
+   * bootstrapping process
+   */
+  function bootstrap(uri: string): WebWorkerInstance;
+  
+
+    
+  function spawnWebWorker(uri: string): WebWorkerInstance;
+  
+
+    
+  /**
+   * Wrapper class that exposes the {@link WebWorkerApplication}
+   * Isolate instance and underlying {@link MessageBus} for lower level message passing.
+   */
+  class WebWorkerInstance {
+    
+    constructor(app: WebWorkerApplication, worker: Worker, bus: MessageBus);
+    
+    app: WebWorkerApplication;
+    
+    worker: Worker;
+    
+    bus: MessageBus;
+    
+  }
+
+    
+  /**
+   * Message Bus is a low level API used to communicate between the UI and the background.
+   * Communication is based on a channel abstraction. Messages published in a
+   * given channel to one MessageBusSink are received on the same channel
+   * by the corresponding MessageBusSource.
+   */
+  class MessageBus implements MessageBusSource,  MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBus.
+     * MUST be called before calling from or to on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone
+     * and the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false then the source will emit events inside the global zone
+     * and the sink will send messages immediately.
+     */
+    initChannel(channel: string, runInZone?: boolean): void;
+    
+    /**
+     * Assigns this bus to the given zone.
+     * Any callbacks attached to channels where runInZone was set to true on initialization
+     * will be executed in the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSource {
+    
+    /**
+     * Sets up a new channel on the MessageBusSource.
+     * MUST be called before calling from on the channel.
+     * If runInZone is true then the source will emit events inside the angular zone.
+     * if runInZone is false then the source will emit events inside the global zone.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this source to the given zone.
+     * Any channels which are initialized with runInZone set to true will emit events that will be
+     * executed within the given zone.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} that emits every time a message
+     * is received on the given channel.
+     */
+    from(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface MessageBusSink {
+    
+    /**
+     * Sets up a new channel on the MessageBusSink.
+     * MUST be called before calling to on the channel.
+     * If runInZone is true the sink will buffer messages and send only once the zone exits.
+     * if runInZone is false the sink will send messages immediatly.
+     */
+    initChannel(channel: string, runInZone: boolean): void;
+    
+    /**
+     * Assigns this sink to the given zone.
+     * Any channels which are initialized with runInZone set to true will wait for the given zone
+     * to exit before sending messages.
+     */
+    attachToZone(zone: NgZone): void;
+    
+    /**
+     * Returns an {@link EventEmitter} for the given channel
+     * To publish methods to that channel just call next (or add in dart) on the returned emitter
+     */
+    to(channel: string): EventEmitter;
+    
+  }
+
+    
+  interface ClientMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ClientMessageBroker;
+    
+  }
+
+    
+  interface ClientMessageBroker {
+    
+    channel: any;
+    
+    runOnService(args: UiArguments, returnType: Type): Promise<any>;
+    
+  }
+
+    
+  class FnArg {
+    
+    constructor(value: any, type: Type);
+    
+    value: any;
+    
+    type: Type;
+    
+  }
+
+    
+  class UiArguments {
+    
+    constructor(method: string, args?: FnArg[]);
+    
+    method: string;
+    
+    args: FnArg[];
+    
+  }
+
+    
+  interface ServiceMessageBrokerFactory {
+    
+    /**
+     * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
+     */
+    createMessageBroker(channel: string, runInZone?: boolean): ServiceMessageBroker;
+    
+  }
+
+    
+  /**
+   * Helper class for UIComponents that allows components to register methods.
+   * If a registered method message is received from the broker on the worker,
+   * the UIMessageBroker deserializes its arguments and calls the registered method.
+   * If that method returns a promise, the UIMessageBroker returns the result to the worker.
+   */
+  interface ServiceMessageBroker {
+    
+    channel: any;
+    
+    registerMethod(methodName: string, signature: Type[], method: Function, returnType?: Type): void;
+    
+  }
+
+    
+  class ReceivedMessage {
+    
+    constructor(data: {[key: string]: any});
+    
+    method: string;
+    
+    args: any[];
+    
+    id: string;
+    
+    type: string;
+    
+  }
+
+    
+  var NgZone: InjectableReference;
+  
+
+    
+  var ClientMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ClientMessageBroker: InjectableReference;
+  
+
+    
+  var ServiceMessageBrokerFactory: InjectableReference;
+  
+
+    
+  var ServiceMessageBroker: InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/web_worker/ui" {
+  export = ngUi;
 }
 
 
diff --git a/angular2/http-2.0.0-alpha.37.d.ts b/angular2/http-2.0.0-alpha.37.d.ts
new file mode 100644
index 000000000..b1f284954
--- /dev/null
+++ b/angular2/http-2.0.0-alpha.37.d.ts
@@ -0,0 +1,1007 @@
+// Type definitions for Angular v2.0.0-alpha.37
+// 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.
+// ***********************************************************
+
+// angular2/http depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * The http module provides services to perform http requests. To get started, see the {@link Http}
+ * class.
+ */
+declare module ngHttp {
+
+  /**
+   * Mock Connection to represent a {@link Connection} for tests.
+   */
+  class MockConnection implements Connection {
+
+
+    /**
+     * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
+     * additional states. For example, state 5 indicates an aborted connection.
+     */
+     readyState: ReadyStates;
+
+
+    /**
+     * {@link Request} instance used to create the connection.
+     */
+     request: Request;
+
+
+    /**
+     * {@link EventEmitter} of {@link Response}. Can be subscribed to in order to be notified when a
+     * response is available.
+     */
+     response: ng.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
+     * {@link EventEmitter} returned by {@link Http}.
+     *
+     * #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 {@link Response} to the `downloadObserver` of the `Request`
+     * associated with this connection.
+     */
+     mockDownload(res: Response): void;
+
+
+    /**
+     * Emits the provided error object as an error to the {@link Response} {@link EventEmitter}
+     * returned
+     * from {@link Http}.
+     */
+     mockError(err?: Error): void;
+  }
+
+
+  /**
+   * A mock backend for testing the {@link Http} service.
+   *
+   * This class can be injected in tests, and should be used to override bindings
+   * to other backends, such as {@link XHRBackend}.
+   *
+   * #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 implements ConnectionBackend {
+
+
+    /**
+     * {@link EventEmitter}
+     * of {@link MockConnection} 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: ng.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: MockConnection[];
+
+
+    /**
+     * {@link EventEmitter} of {@link MockConnection} 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: ng.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 {@link MockConnection}. 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). {@link Headers} 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 RequestOptionsArgs {
+
+     url?: string;
+
+     method?: RequestMethods;
+
+     search?: string | URLSearchParams;
+
+     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 ResponseOptionsArgs {
+
+     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: ng.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
+   * {@link Request}.
+   */
+  class ConnectionBackend {
+
+     createConnection(request: any): Connection;
+  }
+
+  class BrowserXhr {
+
+     build(): any;
+  }
+
+
+  /**
+   * Injectable version of {@link RequestOptions}, 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
+   * {@link Request}.
+   *
+   * All values are null by default.
+   */
+  class RequestOptions {
+
+
+    /**
+     * 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;
+
+     search: URLSearchParams;
+
+
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values.
+     */
+     merge(options?: RequestOptionsArgs): RequestOptions;
+  }
+
+
+  /**
+   * Injectable version of {@link ResponseOptions}, 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
+   * {@link Response}.
+   *
+   * All values are null by default.
+   */
+  class ResponseOptions {
+
+     body: string | Object;
+
+     status: number;
+
+     headers: Headers;
+
+     statusText: string;
+
+     type: ResponseTypes;
+
+     url: string;
+
+     merge(options?: ResponseOptionsArgs): ResponseOptions;
+  }
+
+
+  /**
+   * Creates {@link XHRConnection} 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, HTTP_BINDINGS, BaseRequestOptions} from 'angular2/http';
+   * @Component({
+   *   viewBindings: [
+   *     HTTP_BINDINGS,
+   *     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 {@link MockConnection} may be interacted with in tests.
+   */
+  class XHRConnection implements Connection {
+
+     request: Request;
+
+
+    /**
+     * Response {@link EventEmitter} which emits a single {@link Response} value on load event of
+     * `XMLHttpRequest`.
+     */
+     response: ng.EventEmitter;
+
+     readyState: ReadyStates;
+
+
+    /**
+     * Calls abort on the underlying XMLHttpRequest.
+     */
+     dispose(): void;
+  }
+
+  class JSONPBackend implements ConnectionBackend {
+
+     createConnection(request: Request): JSONPConnection;
+  }
+
+  class JSONPConnection implements Connection {
+
+     readyState: ReadyStates;
+
+     request: Request;
+
+     response: ng.EventEmitter;
+
+     baseResponseOptions: ResponseOptions;
+
+     finished(data?: any): void;
+
+     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 {@link EventEmitter} which will emit a single {@link Response} when a
+   * response is received.
+   *
+   *
+   * ## Breaking Change
+   *
+   * Previously, methods of `Http` would return an RxJS Observable directly. For now,
+   * the `toRx()` method of {@link EventEmitter} 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, HTTP_BINDINGS} from 'angular2/http';
+   * @Component({selector: 'http-app', viewBindings: [HTTP_BINDINGS]})
+   * @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 {@link EventEmitter} 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" (
+   * {@link XHRBackend} in this case), which could be mocked with dependency injection by replacing
+   * the {@link XHRBackend} 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 {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+     request(url: string | Request, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `get` http method.
+     */
+     get(url: string, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `post` http method.
+     */
+     post(url: string, body: string, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `put` http method.
+     */
+     put(url: string, body: string, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `delete` http method.
+     */
+     delete(url: string, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `patch` http method.
+     */
+     patch(url: string, body: string, options?: RequestOptionsArgs): ng.EventEmitter;
+
+
+    /**
+     * Performs a request with `head` http method.
+     */
+     head(url: string, options?: RequestOptionsArgs): ng.EventEmitter;
+  }
+
+  class Jsonp extends Http {
+
+
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+     request(url: string | Request, options?: RequestOptionsArgs): ng.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(): string[];
+
+
+    /**
+     * Sets or overrides header value for given name.
+     */
+     set(header: string, value: string | string[]): void;
+
+
+    /**
+     * Returns values of all headers.
+     */
+     values(): string[][];
+
+
+    /**
+     * Returns list of header values for a given name.
+     */
+     getAll(header: string): string[];
+
+
+    /**
+     * This method is not implemented.
+     */
+     entries(): void;
+  }
+
+
+  /**
+   * Acceptable response types to be associated with a {@link Response}, 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,
+
+     HeadersReceived,
+
+     Loading,
+
+     Done,
+
+     Cancelled
+  }
+
+
+  /**
+   * Supported http methods.
+   */
+  enum RequestMethods {
+
+     Get,
+
+     Post,
+
+     Put,
+
+     Delete,
+
+     Options,
+
+     Head,
+
+     Patch
+  }
+
+
+  /**
+   * Acceptable credentials option to be associated with a {@link Request}, 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 {@link Request}, 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 {@link Request}, 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,
+   * with several extensions for merging URLSearchParams objects:
+   *   - setAll()
+   *   - appendAll()
+   *   - replaceAll()
+   */
+  class URLSearchParams {
+
+     paramsMap: Map<string, string[]>;
+
+     rawParams: string;
+
+     clone(): URLSearchParams;
+
+     has(param: string): boolean;
+
+     get(param: string): string;
+
+     getAll(param: string): string[];
+
+     set(param: string, val: string): void;
+
+     setAll(searchParams: URLSearchParams): void;
+
+     append(param: string, val: string): void;
+
+     appendAll(searchParams: URLSearchParams): void;
+
+     replaceAll(searchParams: URLSearchParams): void;
+
+     toString(): string;
+
+     delete(param: string): void;
+  }
+
+
+  /**
+   * Provides a basic set of injectables to use the {@link Http} service in any application.
+   *
+   * #Example
+   *
+   * ```
+   * import {HTTP_BINDINGS, Http} from 'http/http';
+   * @Component({selector: 'http-app', viewBindings: [HTTP_BINDINGS]})
+   * @View({template: '{{data}}'})
+   * class MyApp {
+   *   constructor(http:Http) {
+   *     http.request('data.txt').subscribe(res => this.data = res.text());
+   *   }
+   * }
+   * ```
+   */
+  const HTTP_BINDINGS : any[] ;
+
+  const JSONP_BINDINGS : any[] ;
+
+}
+
+declare module "angular2/http" {
+  export = ngHttp;
+}
+
+
diff --git a/angular2/http-2.0.0-alpha.38.d.ts b/angular2/http-2.0.0-alpha.38.d.ts
new file mode 100644
index 000000000..415aec767
--- /dev/null
+++ b/angular2/http-2.0.0-alpha.38.d.ts
@@ -0,0 +1,1310 @@
+// Type definitions for Angular v2.0.0-local_sha.f77234e
+// 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.
+// ***********************************************************
+
+// angular2/http depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * The http module provides services to perform http requests. To get started, see the {@link Http}
+ * class.
+ */
+declare module ngHttp {  
+  /**
+   * Mock Connection to represent a {@link Connection} for tests.
+   */
+  class MockConnection implements Connection {
+    
+    constructor(req: Request);
+    
+    /**
+     * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
+     * additional states. For example, state 5 indicates an aborted connection.
+     */
+    readyState: ReadyStates;
+    
+    /**
+     * {@link Request} instance used to create the connection.
+     */
+    request: Request;
+    
+    /**
+     * {@link ng.EventEmitter} of {@link Response}. Can be subscribed to in order to be notified when a
+     * response is available.
+     */
+    response: any;
+    
+    /**
+     * Sends a mock response to the connection. This response is the value that is emitted to the
+     * {@link ng.EventEmitter} returned by {@link Http}.
+     * 
+     * #Example
+     * 
+     * ```
+     * var connection;
+     * backend.connections.toRx().subscribe(c => connection = c);
+     * http.request('data.json').toRx().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 {@link Response} to the `downloadObserver` of the `Request`
+     * associated with this connection.
+     */
+    mockDownload(res: Response): void;
+    
+    /**
+     * Emits the provided error object as an error to the {@link Response} {@link ng.EventEmitter}
+     * returned
+     * from {@link Http}.
+     */
+    mockError(err?: Error): void;
+    
+  }
+
+    
+  /**
+   * A mock backend for testing the {@link Http} service.
+   * 
+   * This class can be injected in tests, and should be used to override bindings
+   * to other backends, such as {@link XHRBackend}.
+   * 
+   * #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.toRx().subscribe(c => connection = c);
+   *   http.request('data.json').toRx().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 implements ConnectionBackend {
+    
+    constructor();
+    
+    /**
+     * {@link ng.EventEmitter}
+     * of {@link MockConnection} 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/core';
+     * 
+     * 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.toRx().subscribe(c => connection = c);
+     *   http.request('something.json').toRx().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: any;
+    
+    /**
+     * 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: MockConnection[];
+    
+    /**
+     * {@link ng.EventEmitter} of {@link MockConnection} 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: any;
+    
+    /**
+     * 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 {@link MockConnection}. 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.
+   * 
+   * `Request` instances are typically created by higher-level classes, like {@link Http} and
+   * {@link Jsonp}, but it may occasionally be useful to explicitly create `Request` instances.
+   * One such example is when creating services that wrap higher-level services, like {@link Http},
+   * where it may be useful to generate a `Request` with arbitrary headers and search params.
+   * 
+   * ```typescript
+   * import {Injectable, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Request, RequestMethods} from 'angular2/http';
+   * 
+   * @Injectable()
+   * class AutoAuthenticator {
+   *   constructor(public http:Http) {}
+   *   request(url:string) {
+   *     return this.http.request(new Request({
+   *       method: RequestMethods.Get,
+   *       url: url,
+   *       search: 'password=123'
+   *     }));
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([HTTP_BINDINGS, AutoAuthenticator]);
+   * var authenticator = injector.get(AutoAuthenticator);
+   * authenticator.request('people.json').toRx().subscribe(res => {
+   *   //URL should have included '?password=123'
+   *   console.log('people', res.json());
+   * });
+   * ```
+   */
+  class Request {
+    
+    constructor(requestOptions: RequestOptions);
+    
+    /**
+     * Http method with which to perform the request.
+     */
+    method: RequestMethods;
+    
+    /**
+     * {@link Headers} instance
+     */
+    headers: Headers;
+    
+    /**
+     * Url of the remote resource
+     */
+    url: string;
+    
+    /**
+     * 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').toRx().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 {
+    
+    constructor(responseOptions: ResponseOptions);
+    
+    /**
+     * 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.
+   */
+  type RequestOptionsArgs = {
+    url?: string;
+    method?: string | RequestMethods;
+    search?: string | URLSearchParams;
+    headers?: Headers;
+    // TODO: Support Blob, ArrayBuffer, JSON, URLSearchParams, FormData
+    body?: string;
+  }
+
+    
+  /**
+   * Interface for options to construct a Response, based on
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
+   */
+  type ResponseOptionsArgs = {
+    // TODO: Support Blob, ArrayBuffer, JSON
+    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: any;
+    
+  }
+
+    
+  /**
+   * Abstract class from which real backends are derived.
+   * 
+   * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
+   * {@link Request}.
+   */
+  class ConnectionBackend {
+    
+    constructor();
+    
+    createConnection(request: any): Connection;
+    
+  }
+
+    
+  class BrowserXhr {
+    
+    constructor();
+    
+    build(): any;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link RequestOptions}, with default values.
+   * 
+   * Default values:
+   *  * method: {@link RequestMethods RequestMethods.Get}
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link RequestOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create and send {@link Request Requests}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LEKVSx?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Request}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/oyBoEvNtDhOSfi9YxaVb?p=preview))
+   * 
+   * ```
+   * import {BaseRequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new BaseRequestOptions();
+   * var req = new Request(options.merge({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * }));
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // null
+   * console.log('req.url:', req.url); // https://google.com
+   * ```
+   */
+  class BaseRequestOptions extends RequestOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a request options object to be optionally provided when instantiating a
+   * {@link Request}.
+   * 
+   * This class is based on the `RequestInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#requestinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the {@link BaseRequestOptions}
+   * class, which sub-classes `RequestOptions`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7Wvi3lfLq41aQPKlxB4O?p=preview))
+   * 
+   * ```typescript
+   * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new RequestOptions({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * });
+   * var req = new Request(options);
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // https://google.com
+   * ```
+   */
+  class RequestOptions {
+    
+    constructor({method, headers, body, url, search}?: RequestOptionsArgs);
+    
+    /**
+     * Http method with which to execute a {@link Request}.
+     * Acceptable methods are defined in the {@link RequestMethods} enum.
+     */
+    method: RequestMethods | string;
+    
+    /**
+     * {@link Headers} to be attached to a {@link Request}.
+     */
+    headers: Headers;
+    
+    /**
+     * Body to be used when creating a {@link Request}.
+     */
+    body: string;
+    
+    /**
+     * Url with which to perform a {@link Request}.
+     */
+    url: string;
+    
+    /**
+     * Search parameters to be included in a {@link Request}.
+     */
+    search: URLSearchParams;
+    
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * Note that `headers` and `search` will override existing values completely if present in
+     * the `options` object. If these values should be merged, it should be done prior to calling
+     * `merge` on the `RequestOptions` instance.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/6w8XA8YTkDRcPYpdB9dk?p=preview))
+     * 
+     * ```typescript
+     * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+     * 
+     * var options = new RequestOptions({
+     *   method: RequestMethods.Post
+     * });
+     * var req = new Request(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('req.method:', RequestMethods[req.method]); // Post
+     * console.log('options.url:', options.url); // null
+     * console.log('req.url:', req.url); // https://google.com
+     * ```
+     */
+    merge(options?: RequestOptionsArgs): RequestOptions;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link ResponseOptions}, with default values.
+   * 
+   * Default values:
+   *  * status: 200
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link ResponseOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create {@link Response Responses}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/qv8DLT?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Headers, Http, BaseResponseOptions, ResponseOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseResponseOptions {
+   *   headers:Headers = new Headers({network: 'github'});
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(ResponseOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Response}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/VngosOWiaExEtbstDoix?p=preview))
+   * 
+   * ```
+   * import {BaseResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new BaseResponseOptions();
+   * var res = new Response(options.merge({
+   *   body: 'Angular2',
+   *   headers: new Headers({framework: 'angular'})
+   * }));
+   * console.log('res.headers.get("framework"):', res.headers.get('framework')); // angular
+   * console.log('res.text():', res.text()); // Angular2;
+   * ```
+   */
+  class BaseResponseOptions extends ResponseOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a response options object to be optionally provided when instantiating a
+   * {@link Response}.
+   * 
+   * This class is based on the `ResponseInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#responseinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the
+   * {@link BaseResponseOptions} class, which sub-classes `ResponseOptions`.
+   * 
+   * This class may be used in tests to build {@link Response Responses} for
+   * mock responses (see {@link MockBackend}).
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/P9Jkk8e8cz6NVzbcxEsD?p=preview))
+   * 
+   * ```typescript
+   * import {ResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new ResponseOptions({
+   *   body: '{"name":"Jeff"}'
+   * });
+   * var res = new Response(options);
+   * 
+   * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+   * ```
+   */
+  class ResponseOptions {
+    
+    constructor({body, status, headers, statusText, type, url}?: ResponseOptionsArgs);
+    
+    /**
+     * String or Object representing the body of the {@link Response}.
+     */
+    body: string | Object;
+    
+    /**
+     * Http {@link http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html status code}
+     * associated with the response.
+     */
+    status: number;
+    
+    /**
+     * Response {@link Headers headers}
+     */
+    headers: Headers;
+    
+    url: string;
+    
+    /**
+     * Creates a copy of the `ResponseOptions` instance, using the optional input as values to
+     * override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * This may be useful when sharing a base `ResponseOptions` object inside tests,
+     * where certain properties may change from test to test.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/1lXquqFfgduTFBWjNoRE?p=preview))
+     * 
+     * ```typescript
+     * import {ResponseOptions, Response} from 'angular2/http';
+     * 
+     * var options = new ResponseOptions({
+     *   body: {name: 'Jeff'}
+     * });
+     * var res = new Response(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('options.url:', options.url); // null
+     * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+     * console.log('res.url:', res.url); // https://google.com
+     * ```
+     */
+    merge(options?: ResponseOptionsArgs): ResponseOptions;
+    
+  }
+
+    
+  /**
+   * Creates {@link XHRConnection} 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, HTTP_BINDINGS, BaseRequestOptions} from 'angular2/http';
+   * @Component({
+   *   viewBindings: [
+   *     HTTP_BINDINGS,
+   *     bind(Http).toFactory((backend, options) => {
+   *       return new Http(backend, options);
+   *     }, [MyNodeBackend, BaseRequestOptions])]
+   * })
+   * class MyComponent {
+   *   constructor(http:Http) {
+   *     http('people.json').toRx().subscribe(res => this.people = res.json());
+   *   }
+   * }
+   * ```
+   */
+  class XHRBackend implements ConnectionBackend {
+    
+    constructor(_browserXHR: BrowserXhr, _baseResponseOptions: ResponseOptions);
+    
+    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 {@link MockConnection} may be interacted with in tests.
+   */
+  class XHRConnection implements Connection {
+    
+    constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions);
+    
+    request: Request;
+    
+    /**
+     * Response {@link ng.EventEmitter} which emits a single {@link Response} value on load event of
+     * `XMLHttpRequest`.
+     */
+    response: any;
+    
+    readyState: ReadyStates;
+    
+  }
+
+    
+  interface JSONPBackend extends ConnectionBackend {
+    
+    createConnection(request: Request): JSONPConnection;
+    
+  }
+
+    
+  interface JSONPConnection extends Connection {
+    
+    readyState: ReadyStates;
+    
+    request: Request;
+    
+    response: any;
+    
+    baseResponseOptions: ResponseOptions;
+    
+    finished(data?: any): 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 {@link ng.Observable} which will emit a single {@link Response} when a
+   * response is received.
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * import {Http, HTTP_BINDINGS} from 'angular2/http';
+   * @Component({selector: 'http-app', viewBindings: [HTTP_BINDINGS]})
+   * @View({templateUrl: 'people.html'})
+   * class PeopleComponent {
+   *   constructor(http: Http) {
+   *     http.get('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);
+   *   }
+   * }
+   * ```
+   * 
+   * 
+   * #Example
+   * 
+   * ```
+   * http.get('people.json').observer({next: (value) => this.people = people});
+   * ```
+   * 
+   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
+   * {@link XHRBackend} in this case), which could be mocked with dependency injection by replacing
+   * the {@link XHRBackend} binding, as in the following example:
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * 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 {
+    
+    constructor(_backend: ConnectionBackend, _defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `get` http method.
+     */
+    get(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `post` http method.
+     */
+    post(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `put` http method.
+     */
+    put(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `delete` http method.
+     */
+    delete(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `patch` http method.
+     */
+    patch(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `head` http method.
+     */
+    head(url: string, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  class Jsonp extends Http {
+    
+    constructor(backend: ConnectionBackend, defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  /**
+   * 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 between this `Headers` implementation and the spec is the
+   * lack of an `entries` method.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/MTdwT6?p=preview))
+   * 
+   * ```
+   * import {Headers} from 'angular2/http';
+   * 
+   * var firstHeaders = new Headers();
+   * firstHeaders.append('Content-ng.Type', 'image/jpeg');
+   * console.log(firstHeaders.get('Content-ng.Type')) //'image/jpeg'
+   * 
+   * // Create headers from Plain Old JavaScript Object
+   * var secondHeaders = new Headers({
+   *   'X-My-Custom-Header': 'Angular'
+   * });
+   * console.log(secondHeaders.get('X-My-Custom-Header')); //'Angular'
+   * 
+   * var thirdHeaders = new Headers(secondHeaders);
+   * console.log(thirdHeaders.get('X-My-Custom-Header')); //'Angular'
+   * ```
+   */
+  class Headers {
+    
+    constructor(headers?: Headers | StringMap<string, any>);
+    
+    /**
+     * 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: (value: string, name: string, headers: Headers) => any): 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(): string[];
+    
+    /**
+     * Sets or overrides header value for given name.
+     */
+    set(header: string, value: string | string[]): void;
+    
+    /**
+     * Returns values of all headers.
+     */
+    values(): string[][];
+    
+    /**
+     * Returns list of header values for a given name.
+     */
+    getAll(header: string): string[];
+    
+    /**
+     * This method is not implemented.
+     */
+    entries(): void;
+    
+  }
+
+    
+  /**
+   * Acceptable response types to be associated with a {@link Response}, 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,
+    
+    HeadersReceived,
+    
+    Loading,
+    
+    Done,
+    
+    Cancelled
+  }
+  
+
+    
+  /**
+   * Supported http methods.
+   */
+  enum RequestMethods {
+    
+    Get,
+    
+    Post,
+    
+    Put,
+    
+    Delete,
+    
+    Options,
+    
+    Head,
+    
+    Patch
+  }
+  
+
+    
+  /**
+   * Map-like representation of url search parameters, based on
+   * [URLSearchParams](https://url.spec.whatwg.org/#urlsearchparams) in the url living standard,
+   * with several extensions for merging URLSearchParams objects:
+   *   - setAll()
+   *   - appendAll()
+   *   - replaceAll()
+   */
+  class URLSearchParams {
+    
+    constructor(rawParams?: string);
+    
+    paramsMap: Map<string, string[]>;
+    
+    rawParams: string;
+    
+    clone(): URLSearchParams;
+    
+    has(param: string): boolean;
+    
+    get(param: string): string;
+    
+    getAll(param: string): string[];
+    
+    set(param: string, val: string): void;
+    
+    setAll(searchParams: URLSearchParams): void;
+    
+    append(param: string, val: string): void;
+    
+    appendAll(searchParams: URLSearchParams): void;
+    
+    replaceAll(searchParams: URLSearchParams): void;
+    
+    toString(): string;
+    
+    delete(param: string): void;
+    
+  }
+
+    
+  /**
+   * Provides a basic set of injectables to use the {@link Http} service in any application.
+   * 
+   * The `HTTP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/snj7Nv?p=preview))
+   * 
+   * ```
+   * import {bootstrap, Component, NgFor, View} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [HTTP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Object[];
+   *   constructor(http:Http) {
+   *     http.get('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     });
+   *   }
+   *   active:boolean = false;
+   *   toggleActiveState() {
+   *     this.active = !this.active;
+   *   }
+   * }
+   * 
+   * bootstrap(App)
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * The primary public API included in `HTTP_BINDINGS` is the {@link Http} class.
+   * However, other bindings required by `Http` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `HTTP_BINDINGS` include:
+   *  * {@link Http}
+   *  * {@link XHRBackend}
+   *  * `BrowserXHR` - Private factory to create `XMLHttpRequest` instances
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `HTTP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/aCMEXi?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link XHRBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7LWALD?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Response, XHRBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   HTTP_BINDINGS,
+   *   MockBackend,
+   *   bind(XHRBackend).toAlias(MockBackend)
+   * ]);
+   * var http = injector.get(Http);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * http.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let HTTP_BINDINGS: any[];
+  
+
+    
+  /**
+   * Provides a basic set of bindings to use the {@link Jsonp} service in any application.
+   * 
+   * The `JSONP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vmeN4F?p=preview))
+   * 
+   * ```
+   * import {Component, NgFor, View} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [JSONP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Array<Object>;
+   *   constructor(jsonp:Jsonp) {
+   *     jsonp.request('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     })
+   *   }
+   * }
+   * ```
+   * 
+   * The primary public API included in `JSONP_BINDINGS` is the {@link Jsonp} class.
+   * However, other bindings required by `Jsonp` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `JSONP_BINDINGS` include:
+   *  * {@link Jsonp}
+   *  * {@link JSONPBackend}
+   *  * `BrowserJsonp` - Private factory
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `JSONP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/TFug7x?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [JSONP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link JSONPBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/HDqZWL?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp, Response, JSONPBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * var injector = Injector.resolveAndCreate([
+   *   JSONP_BINDINGS,
+   *   MockBackend,
+   *   bind(JSONPBackend).toAlias(MockBackend)
+   * ]);
+   * var jsonp = injector.get(Jsonp);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * jsonp.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let JSONP_BINDINGS: any[];
+  
+
+    
+  var JSONPBackend: ng.InjectableReference;
+  
+
+    
+  var JSONPConnection: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/http" {
+  export = ngHttp;
+}
+
+
diff --git a/angular2/http-2.0.0-alpha.39.d.ts b/angular2/http-2.0.0-alpha.39.d.ts
new file mode 100644
index 000000000..573d346a5
--- /dev/null
+++ b/angular2/http-2.0.0-alpha.39.d.ts
@@ -0,0 +1,1310 @@
+// Type definitions for Angular v2.0.0-local_sha.7d5c3eb
+// 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.
+// ***********************************************************
+
+// angular2/http depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * The http module provides services to perform http requests. To get started, see the {@link Http}
+ * class.
+ */
+declare module ngHttp {  
+  /**
+   * Mock Connection to represent a {@link Connection} for tests.
+   */
+  class MockConnection implements Connection {
+    
+    constructor(req: Request);
+    
+    /**
+     * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
+     * additional states. For example, state 5 indicates an aborted connection.
+     */
+    readyState: ReadyStates;
+    
+    /**
+     * {@link Request} instance used to create the connection.
+     */
+    request: Request;
+    
+    /**
+     * {@link ng.EventEmitter} of {@link Response}. Can be subscribed to in order to be notified when a
+     * response is available.
+     */
+    response: any;
+    
+    /**
+     * Sends a mock response to the connection. This response is the value that is emitted to the
+     * {@link ng.EventEmitter} returned by {@link Http}.
+     * 
+     * #Example
+     * 
+     * ```
+     * var connection;
+     * backend.connections.toRx().subscribe(c => connection = c);
+     * http.request('data.json').toRx().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 {@link Response} to the `downloadObserver` of the `Request`
+     * associated with this connection.
+     */
+    mockDownload(res: Response): void;
+    
+    /**
+     * Emits the provided error object as an error to the {@link Response} {@link ng.EventEmitter}
+     * returned
+     * from {@link Http}.
+     */
+    mockError(err?: Error): void;
+    
+  }
+
+    
+  /**
+   * A mock backend for testing the {@link Http} service.
+   * 
+   * This class can be injected in tests, and should be used to override bindings
+   * to other backends, such as {@link XHRBackend}.
+   * 
+   * #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.toRx().subscribe(c => connection = c);
+   *   http.request('data.json').toRx().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 implements ConnectionBackend {
+    
+    constructor();
+    
+    /**
+     * {@link ng.EventEmitter}
+     * of {@link MockConnection} 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/core';
+     * 
+     * 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.toRx().subscribe(c => connection = c);
+     *   http.request('something.json').toRx().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: any;
+    
+    /**
+     * 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: MockConnection[];
+    
+    /**
+     * {@link ng.EventEmitter} of {@link MockConnection} 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: any;
+    
+    /**
+     * 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 {@link MockConnection}. 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.
+   * 
+   * `Request` instances are typically created by higher-level classes, like {@link Http} and
+   * {@link Jsonp}, but it may occasionally be useful to explicitly create `Request` instances.
+   * One such example is when creating services that wrap higher-level services, like {@link Http},
+   * where it may be useful to generate a `Request` with arbitrary headers and search params.
+   * 
+   * ```typescript
+   * import {Injectable, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Request, RequestMethods} from 'angular2/http';
+   * 
+   * @Injectable()
+   * class AutoAuthenticator {
+   *   constructor(public http:Http) {}
+   *   request(url:string) {
+   *     return this.http.request(new Request({
+   *       method: RequestMethods.Get,
+   *       url: url,
+   *       search: 'password=123'
+   *     }));
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([HTTP_BINDINGS, AutoAuthenticator]);
+   * var authenticator = injector.get(AutoAuthenticator);
+   * authenticator.request('people.json').toRx().subscribe(res => {
+   *   //URL should have included '?password=123'
+   *   console.log('people', res.json());
+   * });
+   * ```
+   */
+  class Request {
+    
+    constructor(requestOptions: RequestOptions);
+    
+    /**
+     * Http method with which to perform the request.
+     */
+    method: RequestMethods;
+    
+    /**
+     * {@link Headers} instance
+     */
+    headers: Headers;
+    
+    /**
+     * Url of the remote resource
+     */
+    url: string;
+    
+    /**
+     * 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').toRx().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 {
+    
+    constructor(responseOptions: ResponseOptions);
+    
+    /**
+     * 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.
+   */
+  type RequestOptionsArgs = {
+    url?: string;
+    method?: string | RequestMethods;
+    search?: string | URLSearchParams;
+    headers?: Headers;
+    // TODO: Support Blob, ArrayBuffer, JSON, URLSearchParams, FormData
+    body?: string;
+  }
+
+    
+  /**
+   * Interface for options to construct a Response, based on
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
+   */
+  type ResponseOptionsArgs = {
+    // TODO: Support Blob, ArrayBuffer, JSON
+    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: any;
+    
+  }
+
+    
+  /**
+   * Abstract class from which real backends are derived.
+   * 
+   * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
+   * {@link Request}.
+   */
+  class ConnectionBackend {
+    
+    constructor();
+    
+    createConnection(request: any): Connection;
+    
+  }
+
+    
+  class BrowserXhr {
+    
+    constructor();
+    
+    build(): any;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link RequestOptions}, with default values.
+   * 
+   * Default values:
+   *  * method: {@link RequestMethods RequestMethods.Get}
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link RequestOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create and send {@link Request Requests}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LEKVSx?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Request}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/oyBoEvNtDhOSfi9YxaVb?p=preview))
+   * 
+   * ```
+   * import {BaseRequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new BaseRequestOptions();
+   * var req = new Request(options.merge({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * }));
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // null
+   * console.log('req.url:', req.url); // https://google.com
+   * ```
+   */
+  class BaseRequestOptions extends RequestOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a request options object to be optionally provided when instantiating a
+   * {@link Request}.
+   * 
+   * This class is based on the `RequestInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#requestinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the {@link BaseRequestOptions}
+   * class, which sub-classes `RequestOptions`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7Wvi3lfLq41aQPKlxB4O?p=preview))
+   * 
+   * ```typescript
+   * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new RequestOptions({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * });
+   * var req = new Request(options);
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // https://google.com
+   * ```
+   */
+  class RequestOptions {
+    
+    constructor({method, headers, body, url, search}?: RequestOptionsArgs);
+    
+    /**
+     * Http method with which to execute a {@link Request}.
+     * Acceptable methods are defined in the {@link RequestMethods} enum.
+     */
+    method: RequestMethods | string;
+    
+    /**
+     * {@link Headers} to be attached to a {@link Request}.
+     */
+    headers: Headers;
+    
+    /**
+     * Body to be used when creating a {@link Request}.
+     */
+    body: string;
+    
+    /**
+     * Url with which to perform a {@link Request}.
+     */
+    url: string;
+    
+    /**
+     * Search parameters to be included in a {@link Request}.
+     */
+    search: URLSearchParams;
+    
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * Note that `headers` and `search` will override existing values completely if present in
+     * the `options` object. If these values should be merged, it should be done prior to calling
+     * `merge` on the `RequestOptions` instance.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/6w8XA8YTkDRcPYpdB9dk?p=preview))
+     * 
+     * ```typescript
+     * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+     * 
+     * var options = new RequestOptions({
+     *   method: RequestMethods.Post
+     * });
+     * var req = new Request(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('req.method:', RequestMethods[req.method]); // Post
+     * console.log('options.url:', options.url); // null
+     * console.log('req.url:', req.url); // https://google.com
+     * ```
+     */
+    merge(options?: RequestOptionsArgs): RequestOptions;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link ResponseOptions}, with default values.
+   * 
+   * Default values:
+   *  * status: 200
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link ResponseOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create {@link Response Responses}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/qv8DLT?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Headers, Http, BaseResponseOptions, ResponseOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseResponseOptions {
+   *   headers:Headers = new Headers({network: 'github'});
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(ResponseOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Response}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/VngosOWiaExEtbstDoix?p=preview))
+   * 
+   * ```
+   * import {BaseResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new BaseResponseOptions();
+   * var res = new Response(options.merge({
+   *   body: 'Angular2',
+   *   headers: new Headers({framework: 'angular'})
+   * }));
+   * console.log('res.headers.get("framework"):', res.headers.get('framework')); // angular
+   * console.log('res.text():', res.text()); // Angular2;
+   * ```
+   */
+  class BaseResponseOptions extends ResponseOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a response options object to be optionally provided when instantiating a
+   * {@link Response}.
+   * 
+   * This class is based on the `ResponseInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#responseinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the
+   * {@link BaseResponseOptions} class, which sub-classes `ResponseOptions`.
+   * 
+   * This class may be used in tests to build {@link Response Responses} for
+   * mock responses (see {@link MockBackend}).
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/P9Jkk8e8cz6NVzbcxEsD?p=preview))
+   * 
+   * ```typescript
+   * import {ResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new ResponseOptions({
+   *   body: '{"name":"Jeff"}'
+   * });
+   * var res = new Response(options);
+   * 
+   * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+   * ```
+   */
+  class ResponseOptions {
+    
+    constructor({body, status, headers, statusText, type, url}?: ResponseOptionsArgs);
+    
+    /**
+     * String or Object representing the body of the {@link Response}.
+     */
+    body: string | Object;
+    
+    /**
+     * Http {@link http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html status code}
+     * associated with the response.
+     */
+    status: number;
+    
+    /**
+     * Response {@link Headers headers}
+     */
+    headers: Headers;
+    
+    url: string;
+    
+    /**
+     * Creates a copy of the `ResponseOptions` instance, using the optional input as values to
+     * override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * This may be useful when sharing a base `ResponseOptions` object inside tests,
+     * where certain properties may change from test to test.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/1lXquqFfgduTFBWjNoRE?p=preview))
+     * 
+     * ```typescript
+     * import {ResponseOptions, Response} from 'angular2/http';
+     * 
+     * var options = new ResponseOptions({
+     *   body: {name: 'Jeff'}
+     * });
+     * var res = new Response(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('options.url:', options.url); // null
+     * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+     * console.log('res.url:', res.url); // https://google.com
+     * ```
+     */
+    merge(options?: ResponseOptionsArgs): ResponseOptions;
+    
+  }
+
+    
+  /**
+   * Creates {@link XHRConnection} 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, HTTP_BINDINGS, BaseRequestOptions} from 'angular2/http';
+   * @Component({
+   *   viewBindings: [
+   *     HTTP_BINDINGS,
+   *     bind(Http).toFactory((backend, options) => {
+   *       return new Http(backend, options);
+   *     }, [MyNodeBackend, BaseRequestOptions])]
+   * })
+   * class MyComponent {
+   *   constructor(http:Http) {
+   *     http('people.json').toRx().subscribe(res => this.people = res.json());
+   *   }
+   * }
+   * ```
+   */
+  class XHRBackend implements ConnectionBackend {
+    
+    constructor(_browserXHR: BrowserXhr, _baseResponseOptions: ResponseOptions);
+    
+    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 {@link MockConnection} may be interacted with in tests.
+   */
+  class XHRConnection implements Connection {
+    
+    constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions);
+    
+    request: Request;
+    
+    /**
+     * Response {@link ng.EventEmitter} which emits a single {@link Response} value on load event of
+     * `XMLHttpRequest`.
+     */
+    response: any;
+    
+    readyState: ReadyStates;
+    
+  }
+
+    
+  interface JSONPBackend extends ConnectionBackend {
+    
+    createConnection(request: Request): JSONPConnection;
+    
+  }
+
+    
+  interface JSONPConnection extends Connection {
+    
+    readyState: ReadyStates;
+    
+    request: Request;
+    
+    response: any;
+    
+    baseResponseOptions: ResponseOptions;
+    
+    finished(data?: any): 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 {@link ng.Observable} which will emit a single {@link Response} when a
+   * response is received.
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * import {Http, HTTP_BINDINGS} from 'angular2/http';
+   * @Component({selector: 'http-app', viewBindings: [HTTP_BINDINGS]})
+   * @View({templateUrl: 'people.html'})
+   * class PeopleComponent {
+   *   constructor(http: Http) {
+   *     http.get('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);
+   *   }
+   * }
+   * ```
+   * 
+   * 
+   * #Example
+   * 
+   * ```
+   * http.get('people.json').observer({next: (value) => this.people = people});
+   * ```
+   * 
+   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
+   * {@link XHRBackend} in this case), which could be mocked with dependency injection by replacing
+   * the {@link XHRBackend} binding, as in the following example:
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * 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 {
+    
+    constructor(_backend: ConnectionBackend, _defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `get` http method.
+     */
+    get(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `post` http method.
+     */
+    post(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `put` http method.
+     */
+    put(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `delete` http method.
+     */
+    delete(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `patch` http method.
+     */
+    patch(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `head` http method.
+     */
+    head(url: string, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  class Jsonp extends Http {
+    
+    constructor(backend: ConnectionBackend, defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  /**
+   * 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 between this `Headers` implementation and the spec is the
+   * lack of an `entries` method.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/MTdwT6?p=preview))
+   * 
+   * ```
+   * import {Headers} from 'angular2/http';
+   * 
+   * var firstHeaders = new Headers();
+   * firstHeaders.append('Content-ng.Type', 'image/jpeg');
+   * console.log(firstHeaders.get('Content-ng.Type')) //'image/jpeg'
+   * 
+   * // Create headers from Plain Old JavaScript Object
+   * var secondHeaders = new Headers({
+   *   'X-My-Custom-Header': 'Angular'
+   * });
+   * console.log(secondHeaders.get('X-My-Custom-Header')); //'Angular'
+   * 
+   * var thirdHeaders = new Headers(secondHeaders);
+   * console.log(thirdHeaders.get('X-My-Custom-Header')); //'Angular'
+   * ```
+   */
+  class Headers {
+    
+    constructor(headers?: Headers | {[key: string]: any});
+    
+    /**
+     * 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: (value: string, name: string, headers: Headers) => any): 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(): string[];
+    
+    /**
+     * Sets or overrides header value for given name.
+     */
+    set(header: string, value: string | string[]): void;
+    
+    /**
+     * Returns values of all headers.
+     */
+    values(): string[][];
+    
+    /**
+     * Returns list of header values for a given name.
+     */
+    getAll(header: string): string[];
+    
+    /**
+     * This method is not implemented.
+     */
+    entries(): void;
+    
+  }
+
+    
+  /**
+   * Acceptable response types to be associated with a {@link Response}, 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,
+    
+    HeadersReceived,
+    
+    Loading,
+    
+    Done,
+    
+    Cancelled
+  }
+  
+
+    
+  /**
+   * Supported http methods.
+   */
+  enum RequestMethods {
+    
+    Get,
+    
+    Post,
+    
+    Put,
+    
+    Delete,
+    
+    Options,
+    
+    Head,
+    
+    Patch
+  }
+  
+
+    
+  /**
+   * Map-like representation of url search parameters, based on
+   * [URLSearchParams](https://url.spec.whatwg.org/#urlsearchparams) in the url living standard,
+   * with several extensions for merging URLSearchParams objects:
+   *   - setAll()
+   *   - appendAll()
+   *   - replaceAll()
+   */
+  class URLSearchParams {
+    
+    constructor(rawParams?: string);
+    
+    paramsMap: Map<string, string[]>;
+    
+    rawParams: string;
+    
+    clone(): URLSearchParams;
+    
+    has(param: string): boolean;
+    
+    get(param: string): string;
+    
+    getAll(param: string): string[];
+    
+    set(param: string, val: string): void;
+    
+    setAll(searchParams: URLSearchParams): void;
+    
+    append(param: string, val: string): void;
+    
+    appendAll(searchParams: URLSearchParams): void;
+    
+    replaceAll(searchParams: URLSearchParams): void;
+    
+    toString(): string;
+    
+    delete(param: string): void;
+    
+  }
+
+    
+  /**
+   * Provides a basic set of injectables to use the {@link Http} service in any application.
+   * 
+   * The `HTTP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/snj7Nv?p=preview))
+   * 
+   * ```
+   * import {bootstrap, Component, NgFor, View} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [HTTP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Object[];
+   *   constructor(http:Http) {
+   *     http.get('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     });
+   *   }
+   *   active:boolean = false;
+   *   toggleActiveState() {
+   *     this.active = !this.active;
+   *   }
+   * }
+   * 
+   * bootstrap(App)
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * The primary public API included in `HTTP_BINDINGS` is the {@link Http} class.
+   * However, other bindings required by `Http` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `HTTP_BINDINGS` include:
+   *  * {@link Http}
+   *  * {@link XHRBackend}
+   *  * `BrowserXHR` - Private factory to create `XMLHttpRequest` instances
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `HTTP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/aCMEXi?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link XHRBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7LWALD?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Response, XHRBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   HTTP_BINDINGS,
+   *   MockBackend,
+   *   bind(XHRBackend).toAlias(MockBackend)
+   * ]);
+   * var http = injector.get(Http);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * http.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let HTTP_BINDINGS: any[];
+  
+
+    
+  /**
+   * Provides a basic set of bindings to use the {@link Jsonp} service in any application.
+   * 
+   * The `JSONP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vmeN4F?p=preview))
+   * 
+   * ```
+   * import {Component, NgFor, View} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [JSONP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Array<Object>;
+   *   constructor(jsonp:Jsonp) {
+   *     jsonp.request('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     })
+   *   }
+   * }
+   * ```
+   * 
+   * The primary public API included in `JSONP_BINDINGS` is the {@link Jsonp} class.
+   * However, other bindings required by `Jsonp` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `JSONP_BINDINGS` include:
+   *  * {@link Jsonp}
+   *  * {@link JSONPBackend}
+   *  * `BrowserJsonp` - Private factory
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `JSONP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/TFug7x?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [JSONP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link JSONPBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/HDqZWL?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp, Response, JSONPBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * var injector = Injector.resolveAndCreate([
+   *   JSONP_BINDINGS,
+   *   MockBackend,
+   *   bind(JSONPBackend).toAlias(MockBackend)
+   * ]);
+   * var jsonp = injector.get(Jsonp);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * jsonp.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let JSONP_BINDINGS: any[];
+  
+
+    
+  var JSONPBackend: ng.InjectableReference;
+  
+
+    
+  var JSONPConnection: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/http" {
+  export = ngHttp;
+}
+
+
diff --git a/angular2/http.d.ts b/angular2/http.d.ts
new file mode 100644
index 000000000..573d346a5
--- /dev/null
+++ b/angular2/http.d.ts
@@ -0,0 +1,1310 @@
+// Type definitions for Angular v2.0.0-local_sha.7d5c3eb
+// 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.
+// ***********************************************************
+
+// angular2/http depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * The http module provides services to perform http requests. To get started, see the {@link Http}
+ * class.
+ */
+declare module ngHttp {  
+  /**
+   * Mock Connection to represent a {@link Connection} for tests.
+   */
+  class MockConnection implements Connection {
+    
+    constructor(req: Request);
+    
+    /**
+     * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
+     * additional states. For example, state 5 indicates an aborted connection.
+     */
+    readyState: ReadyStates;
+    
+    /**
+     * {@link Request} instance used to create the connection.
+     */
+    request: Request;
+    
+    /**
+     * {@link ng.EventEmitter} of {@link Response}. Can be subscribed to in order to be notified when a
+     * response is available.
+     */
+    response: any;
+    
+    /**
+     * Sends a mock response to the connection. This response is the value that is emitted to the
+     * {@link ng.EventEmitter} returned by {@link Http}.
+     * 
+     * #Example
+     * 
+     * ```
+     * var connection;
+     * backend.connections.toRx().subscribe(c => connection = c);
+     * http.request('data.json').toRx().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 {@link Response} to the `downloadObserver` of the `Request`
+     * associated with this connection.
+     */
+    mockDownload(res: Response): void;
+    
+    /**
+     * Emits the provided error object as an error to the {@link Response} {@link ng.EventEmitter}
+     * returned
+     * from {@link Http}.
+     */
+    mockError(err?: Error): void;
+    
+  }
+
+    
+  /**
+   * A mock backend for testing the {@link Http} service.
+   * 
+   * This class can be injected in tests, and should be used to override bindings
+   * to other backends, such as {@link XHRBackend}.
+   * 
+   * #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.toRx().subscribe(c => connection = c);
+   *   http.request('data.json').toRx().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 implements ConnectionBackend {
+    
+    constructor();
+    
+    /**
+     * {@link ng.EventEmitter}
+     * of {@link MockConnection} 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/core';
+     * 
+     * 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.toRx().subscribe(c => connection = c);
+     *   http.request('something.json').toRx().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: any;
+    
+    /**
+     * 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: MockConnection[];
+    
+    /**
+     * {@link ng.EventEmitter} of {@link MockConnection} 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: any;
+    
+    /**
+     * 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 {@link MockConnection}. 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.
+   * 
+   * `Request` instances are typically created by higher-level classes, like {@link Http} and
+   * {@link Jsonp}, but it may occasionally be useful to explicitly create `Request` instances.
+   * One such example is when creating services that wrap higher-level services, like {@link Http},
+   * where it may be useful to generate a `Request` with arbitrary headers and search params.
+   * 
+   * ```typescript
+   * import {Injectable, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Request, RequestMethods} from 'angular2/http';
+   * 
+   * @Injectable()
+   * class AutoAuthenticator {
+   *   constructor(public http:Http) {}
+   *   request(url:string) {
+   *     return this.http.request(new Request({
+   *       method: RequestMethods.Get,
+   *       url: url,
+   *       search: 'password=123'
+   *     }));
+   *   }
+   * }
+   * 
+   * var injector = Injector.resolveAndCreate([HTTP_BINDINGS, AutoAuthenticator]);
+   * var authenticator = injector.get(AutoAuthenticator);
+   * authenticator.request('people.json').toRx().subscribe(res => {
+   *   //URL should have included '?password=123'
+   *   console.log('people', res.json());
+   * });
+   * ```
+   */
+  class Request {
+    
+    constructor(requestOptions: RequestOptions);
+    
+    /**
+     * Http method with which to perform the request.
+     */
+    method: RequestMethods;
+    
+    /**
+     * {@link Headers} instance
+     */
+    headers: Headers;
+    
+    /**
+     * Url of the remote resource
+     */
+    url: string;
+    
+    /**
+     * 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').toRx().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 {
+    
+    constructor(responseOptions: ResponseOptions);
+    
+    /**
+     * 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.
+   */
+  type RequestOptionsArgs = {
+    url?: string;
+    method?: string | RequestMethods;
+    search?: string | URLSearchParams;
+    headers?: Headers;
+    // TODO: Support Blob, ArrayBuffer, JSON, URLSearchParams, FormData
+    body?: string;
+  }
+
+    
+  /**
+   * Interface for options to construct a Response, based on
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
+   */
+  type ResponseOptionsArgs = {
+    // TODO: Support Blob, ArrayBuffer, JSON
+    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: any;
+    
+  }
+
+    
+  /**
+   * Abstract class from which real backends are derived.
+   * 
+   * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
+   * {@link Request}.
+   */
+  class ConnectionBackend {
+    
+    constructor();
+    
+    createConnection(request: any): Connection;
+    
+  }
+
+    
+  class BrowserXhr {
+    
+    constructor();
+    
+    build(): any;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link RequestOptions}, with default values.
+   * 
+   * Default values:
+   *  * method: {@link RequestMethods RequestMethods.Get}
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link RequestOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create and send {@link Request Requests}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/LEKVSx?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Request}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/oyBoEvNtDhOSfi9YxaVb?p=preview))
+   * 
+   * ```
+   * import {BaseRequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new BaseRequestOptions();
+   * var req = new Request(options.merge({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * }));
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // null
+   * console.log('req.url:', req.url); // https://google.com
+   * ```
+   */
+  class BaseRequestOptions extends RequestOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a request options object to be optionally provided when instantiating a
+   * {@link Request}.
+   * 
+   * This class is based on the `RequestInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#requestinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the {@link BaseRequestOptions}
+   * class, which sub-classes `RequestOptions`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7Wvi3lfLq41aQPKlxB4O?p=preview))
+   * 
+   * ```typescript
+   * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+   * 
+   * var options = new RequestOptions({
+   *   method: RequestMethods.Post,
+   *   url: 'https://google.com'
+   * });
+   * var req = new Request(options);
+   * console.log('req.method:', RequestMethods[req.method]); // Post
+   * console.log('options.url:', options.url); // https://google.com
+   * ```
+   */
+  class RequestOptions {
+    
+    constructor({method, headers, body, url, search}?: RequestOptionsArgs);
+    
+    /**
+     * Http method with which to execute a {@link Request}.
+     * Acceptable methods are defined in the {@link RequestMethods} enum.
+     */
+    method: RequestMethods | string;
+    
+    /**
+     * {@link Headers} to be attached to a {@link Request}.
+     */
+    headers: Headers;
+    
+    /**
+     * Body to be used when creating a {@link Request}.
+     */
+    body: string;
+    
+    /**
+     * Url with which to perform a {@link Request}.
+     */
+    url: string;
+    
+    /**
+     * Search parameters to be included in a {@link Request}.
+     */
+    search: URLSearchParams;
+    
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * Note that `headers` and `search` will override existing values completely if present in
+     * the `options` object. If these values should be merged, it should be done prior to calling
+     * `merge` on the `RequestOptions` instance.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/6w8XA8YTkDRcPYpdB9dk?p=preview))
+     * 
+     * ```typescript
+     * import {RequestOptions, Request, RequestMethods} from 'angular2/http';
+     * 
+     * var options = new RequestOptions({
+     *   method: RequestMethods.Post
+     * });
+     * var req = new Request(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('req.method:', RequestMethods[req.method]); // Post
+     * console.log('options.url:', options.url); // null
+     * console.log('req.url:', req.url); // https://google.com
+     * ```
+     */
+    merge(options?: RequestOptionsArgs): RequestOptions;
+    
+  }
+
+    
+  /**
+   * Subclass of {@link ResponseOptions}, with default values.
+   * 
+   * Default values:
+   *  * status: 200
+   *  * headers: empty {@link Headers} object
+   * 
+   * This class could be extended and bound to the {@link ResponseOptions} class
+   * when configuring an {@link Injector}, in order to override the default options
+   * used by {@link Http} to create {@link Response Responses}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/qv8DLT?p=preview))
+   * 
+   * ```typescript
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Headers, Http, BaseResponseOptions, ResponseOptions} from 'angular2/http';
+   * import {App} from './myapp';
+   * 
+   * class MyOptions extends BaseResponseOptions {
+   *   headers:Headers = new Headers({network: 'github'});
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(ResponseOptions).toClass(MyOptions)]);
+   * ```
+   * 
+   * The options could also be extended when manually creating a {@link Response}
+   * object.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/VngosOWiaExEtbstDoix?p=preview))
+   * 
+   * ```
+   * import {BaseResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new BaseResponseOptions();
+   * var res = new Response(options.merge({
+   *   body: 'Angular2',
+   *   headers: new Headers({framework: 'angular'})
+   * }));
+   * console.log('res.headers.get("framework"):', res.headers.get('framework')); // angular
+   * console.log('res.text():', res.text()); // Angular2;
+   * ```
+   */
+  class BaseResponseOptions extends ResponseOptions {
+    
+    constructor();
+    
+  }
+
+    
+  /**
+   * Creates a response options object to be optionally provided when instantiating a
+   * {@link Response}.
+   * 
+   * This class is based on the `ResponseInit` description in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#responseinit).
+   * 
+   * All values are null by default. Typical defaults can be found in the
+   * {@link BaseResponseOptions} class, which sub-classes `ResponseOptions`.
+   * 
+   * This class may be used in tests to build {@link Response Responses} for
+   * mock responses (see {@link MockBackend}).
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/P9Jkk8e8cz6NVzbcxEsD?p=preview))
+   * 
+   * ```typescript
+   * import {ResponseOptions, Response} from 'angular2/http';
+   * 
+   * var options = new ResponseOptions({
+   *   body: '{"name":"Jeff"}'
+   * });
+   * var res = new Response(options);
+   * 
+   * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+   * ```
+   */
+  class ResponseOptions {
+    
+    constructor({body, status, headers, statusText, type, url}?: ResponseOptionsArgs);
+    
+    /**
+     * String or Object representing the body of the {@link Response}.
+     */
+    body: string | Object;
+    
+    /**
+     * Http {@link http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html status code}
+     * associated with the response.
+     */
+    status: number;
+    
+    /**
+     * Response {@link Headers headers}
+     */
+    headers: Headers;
+    
+    url: string;
+    
+    /**
+     * Creates a copy of the `ResponseOptions` instance, using the optional input as values to
+     * override
+     * existing values. This method will not change the values of the instance on which it is being
+     * called.
+     * 
+     * This may be useful when sharing a base `ResponseOptions` object inside tests,
+     * where certain properties may change from test to test.
+     * 
+     * Example ([live demo](http://plnkr.co/edit/1lXquqFfgduTFBWjNoRE?p=preview))
+     * 
+     * ```typescript
+     * import {ResponseOptions, Response} from 'angular2/http';
+     * 
+     * var options = new ResponseOptions({
+     *   body: {name: 'Jeff'}
+     * });
+     * var res = new Response(options.merge({
+     *   url: 'https://google.com'
+     * }));
+     * console.log('options.url:', options.url); // null
+     * console.log('res.json():', res.json()); // Object {name: "Jeff"}
+     * console.log('res.url:', res.url); // https://google.com
+     * ```
+     */
+    merge(options?: ResponseOptionsArgs): ResponseOptions;
+    
+  }
+
+    
+  /**
+   * Creates {@link XHRConnection} 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, HTTP_BINDINGS, BaseRequestOptions} from 'angular2/http';
+   * @Component({
+   *   viewBindings: [
+   *     HTTP_BINDINGS,
+   *     bind(Http).toFactory((backend, options) => {
+   *       return new Http(backend, options);
+   *     }, [MyNodeBackend, BaseRequestOptions])]
+   * })
+   * class MyComponent {
+   *   constructor(http:Http) {
+   *     http('people.json').toRx().subscribe(res => this.people = res.json());
+   *   }
+   * }
+   * ```
+   */
+  class XHRBackend implements ConnectionBackend {
+    
+    constructor(_browserXHR: BrowserXhr, _baseResponseOptions: ResponseOptions);
+    
+    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 {@link MockConnection} may be interacted with in tests.
+   */
+  class XHRConnection implements Connection {
+    
+    constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions);
+    
+    request: Request;
+    
+    /**
+     * Response {@link ng.EventEmitter} which emits a single {@link Response} value on load event of
+     * `XMLHttpRequest`.
+     */
+    response: any;
+    
+    readyState: ReadyStates;
+    
+  }
+
+    
+  interface JSONPBackend extends ConnectionBackend {
+    
+    createConnection(request: Request): JSONPConnection;
+    
+  }
+
+    
+  interface JSONPConnection extends Connection {
+    
+    readyState: ReadyStates;
+    
+    request: Request;
+    
+    response: any;
+    
+    baseResponseOptions: ResponseOptions;
+    
+    finished(data?: any): 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 {@link ng.Observable} which will emit a single {@link Response} when a
+   * response is received.
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * import {Http, HTTP_BINDINGS} from 'angular2/http';
+   * @Component({selector: 'http-app', viewBindings: [HTTP_BINDINGS]})
+   * @View({templateUrl: 'people.html'})
+   * class PeopleComponent {
+   *   constructor(http: Http) {
+   *     http.get('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);
+   *   }
+   * }
+   * ```
+   * 
+   * 
+   * #Example
+   * 
+   * ```
+   * http.get('people.json').observer({next: (value) => this.people = people});
+   * ```
+   * 
+   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
+   * {@link XHRBackend} in this case), which could be mocked with dependency injection by replacing
+   * the {@link XHRBackend} binding, as in the following example:
+   * 
+   * #Example
+   * 
+   * ```typescript
+   * 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 {
+    
+    constructor(_backend: ConnectionBackend, _defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `get` http method.
+     */
+    get(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `post` http method.
+     */
+    post(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `put` http method.
+     */
+    put(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `delete` http method.
+     */
+    delete(url: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `patch` http method.
+     */
+    patch(url: string, body: string, options?: RequestOptionsArgs): any;
+    
+    /**
+     * Performs a request with `head` http method.
+     */
+    head(url: string, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  class Jsonp extends Http {
+    
+    constructor(backend: ConnectionBackend, defaultOptions: RequestOptions);
+    
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a {@link Request} instance. If the first argument is a url, an optional {@link RequestOptions}
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of {@link BaseRequestOptions} before performing the request.
+     */
+    request(url: string | Request, options?: RequestOptionsArgs): any;
+    
+  }
+
+    
+  /**
+   * 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 between this `Headers` implementation and the spec is the
+   * lack of an `entries` method.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/MTdwT6?p=preview))
+   * 
+   * ```
+   * import {Headers} from 'angular2/http';
+   * 
+   * var firstHeaders = new Headers();
+   * firstHeaders.append('Content-ng.Type', 'image/jpeg');
+   * console.log(firstHeaders.get('Content-ng.Type')) //'image/jpeg'
+   * 
+   * // Create headers from Plain Old JavaScript Object
+   * var secondHeaders = new Headers({
+   *   'X-My-Custom-Header': 'Angular'
+   * });
+   * console.log(secondHeaders.get('X-My-Custom-Header')); //'Angular'
+   * 
+   * var thirdHeaders = new Headers(secondHeaders);
+   * console.log(thirdHeaders.get('X-My-Custom-Header')); //'Angular'
+   * ```
+   */
+  class Headers {
+    
+    constructor(headers?: Headers | {[key: string]: any});
+    
+    /**
+     * 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: (value: string, name: string, headers: Headers) => any): 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(): string[];
+    
+    /**
+     * Sets or overrides header value for given name.
+     */
+    set(header: string, value: string | string[]): void;
+    
+    /**
+     * Returns values of all headers.
+     */
+    values(): string[][];
+    
+    /**
+     * Returns list of header values for a given name.
+     */
+    getAll(header: string): string[];
+    
+    /**
+     * This method is not implemented.
+     */
+    entries(): void;
+    
+  }
+
+    
+  /**
+   * Acceptable response types to be associated with a {@link Response}, 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,
+    
+    HeadersReceived,
+    
+    Loading,
+    
+    Done,
+    
+    Cancelled
+  }
+  
+
+    
+  /**
+   * Supported http methods.
+   */
+  enum RequestMethods {
+    
+    Get,
+    
+    Post,
+    
+    Put,
+    
+    Delete,
+    
+    Options,
+    
+    Head,
+    
+    Patch
+  }
+  
+
+    
+  /**
+   * Map-like representation of url search parameters, based on
+   * [URLSearchParams](https://url.spec.whatwg.org/#urlsearchparams) in the url living standard,
+   * with several extensions for merging URLSearchParams objects:
+   *   - setAll()
+   *   - appendAll()
+   *   - replaceAll()
+   */
+  class URLSearchParams {
+    
+    constructor(rawParams?: string);
+    
+    paramsMap: Map<string, string[]>;
+    
+    rawParams: string;
+    
+    clone(): URLSearchParams;
+    
+    has(param: string): boolean;
+    
+    get(param: string): string;
+    
+    getAll(param: string): string[];
+    
+    set(param: string, val: string): void;
+    
+    setAll(searchParams: URLSearchParams): void;
+    
+    append(param: string, val: string): void;
+    
+    appendAll(searchParams: URLSearchParams): void;
+    
+    replaceAll(searchParams: URLSearchParams): void;
+    
+    toString(): string;
+    
+    delete(param: string): void;
+    
+  }
+
+    
+  /**
+   * Provides a basic set of injectables to use the {@link Http} service in any application.
+   * 
+   * The `HTTP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/snj7Nv?p=preview))
+   * 
+   * ```
+   * import {bootstrap, Component, NgFor, View} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [HTTP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Object[];
+   *   constructor(http:Http) {
+   *     http.get('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     });
+   *   }
+   *   active:boolean = false;
+   *   toggleActiveState() {
+   *     this.active = !this.active;
+   *   }
+   * }
+   * 
+   * bootstrap(App)
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * The primary public API included in `HTTP_BINDINGS` is the {@link Http} class.
+   * However, other bindings required by `Http` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `HTTP_BINDINGS` include:
+   *  * {@link Http}
+   *  * {@link XHRBackend}
+   *  * `BrowserXHR` - Private factory to create `XMLHttpRequest` instances
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `HTTP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/aCMEXi?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link XHRBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/7LWALD?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {HTTP_BINDINGS, Http, Response, XHRBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   HTTP_BINDINGS,
+   *   MockBackend,
+   *   bind(XHRBackend).toAlias(MockBackend)
+   * ]);
+   * var http = injector.get(Http);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * http.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let HTTP_BINDINGS: any[];
+  
+
+    
+  /**
+   * Provides a basic set of bindings to use the {@link Jsonp} service in any application.
+   * 
+   * The `JSONP_BINDINGS` should be included either in a component's injector,
+   * or in the root injector when bootstrapping an application.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/vmeN4F?p=preview))
+   * 
+   * ```
+   * import {Component, NgFor, View} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp} from 'angular2/http';
+   * 
+   * @Component({
+   *   selector: 'app',
+   *   bindings: [JSONP_BINDINGS]
+   * })
+   * @View({
+   *   template: `
+   *     <div>
+   *       <h1>People</h1>
+   *       <ul>
+   *         <li *ng-for="#person of people">
+   *           {{person.name}}
+   *         </li>
+   *       </ul>
+   *     </div>
+   *   `,
+   *   directives: [NgFor]
+   * })
+   * export class App {
+   *   people: Array<Object>;
+   *   constructor(jsonp:Jsonp) {
+   *     jsonp.request('people.json').toRx().subscribe(res => {
+   *       this.people = res.json();
+   *     })
+   *   }
+   * }
+   * ```
+   * 
+   * The primary public API included in `JSONP_BINDINGS` is the {@link Jsonp} class.
+   * However, other bindings required by `Jsonp` are included,
+   * which may be beneficial to override in certain cases.
+   * 
+   * The bindings included in `JSONP_BINDINGS` include:
+   *  * {@link Jsonp}
+   *  * {@link JSONPBackend}
+   *  * `BrowserJsonp` - Private factory
+   *  * {@link RequestOptions} - Bound to {@link BaseRequestOptions} class
+   *  * {@link ResponseOptions} - Bound to {@link BaseResponseOptions} class
+   * 
+   * There may be cases where it makes sense to extend the base request options,
+   * such as to add a search string to be appended to all URLs.
+   * To accomplish this, a new binding for {@link RequestOptions} should
+   * be added in the same injector as `JSONP_BINDINGS`.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/TFug7x?p=preview))
+   * 
+   * ```
+   * import {bind, bootstrap} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+   * 
+   * class MyOptions extends BaseRequestOptions {
+   *   search: string = 'coreTeam=true';
+   * }
+   * 
+   * bootstrap(App, [JSONP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+   *   .catch(err => console.error(err));
+   * ```
+   * 
+   * Likewise, to use a mock backend for unit tests, the {@link JSONPBackend}
+   * binding should be bound to {@link MockBackend}.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/HDqZWL?p=preview))
+   * 
+   * ```
+   * import {bind, Injector} from 'angular2/angular2';
+   * import {JSONP_BINDINGS, Jsonp, Response, JSONPBackend, MockBackend} from 'angular2/http';
+   * 
+   * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
+   * var injector = Injector.resolveAndCreate([
+   *   JSONP_BINDINGS,
+   *   MockBackend,
+   *   bind(JSONPBackend).toAlias(MockBackend)
+   * ]);
+   * var jsonp = injector.get(Jsonp);
+   * var backend = injector.get(MockBackend);
+   * 
+   * // Listen for any new requests
+   * backend.connections.observer({
+   *   next: connection => {
+   *     var response = new Response({body: people});
+   *     setTimeout(() => {
+   *       // Send a response to the request
+   *       connection.mockRespond(response);
+   *     });
+   *   });
+   * 
+   * jsonp.get('people.json').observer({
+   *   next: res => {
+   *     // Response came from mock backend
+   *     console.log('first person', res.json()[0].name);
+   *   }
+   * });
+   * ```
+   */
+  let JSONP_BINDINGS: any[];
+  
+
+    
+  var JSONPBackend: ng.InjectableReference;
+  
+
+    
+  var JSONPConnection: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/http" {
+  export = ngHttp;
+}
+
+
diff --git a/angular2/router-2.0.0-alpha.35.d.ts b/angular2/router-2.0.0-alpha.35.d.ts
index 295593850..0bba14cbb 100644
--- a/angular2/router-2.0.0-alpha.35.d.ts
+++ b/angular2/router-2.0.0-alpha.35.d.ts
@@ -81,7 +81,7 @@ declare module ngRouter {
      * ]);
      * ```
      */
-     config(definitions: List<RouteDefinition>): Promise<any>;
+     config(definitions: Array<RouteDefinition>): Promise<any>;
     
 
     /**
@@ -135,7 +135,7 @@ declare module ngRouter {
      * 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>): Instruction;
+     generate(linkParams: Array<any>): Instruction;
   }
   
   class RootRouter extends Router {
@@ -258,7 +258,7 @@ declare module ngRouter {
      * 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): Instruction;
+     generate(linkParams: Array<any>, parentComponent: any): Instruction;
   }
   
   class LocationStrategy {
@@ -343,7 +343,7 @@ declare module ngRouter {
    */
   class Pipeline {
     
-     steps: List<Function>;
+     steps: Array<Function>;
     
      process(instruction: Instruction): Promise<any>;
   }
@@ -547,7 +547,7 @@ declare module ngRouter {
     
      urlPath: string;
     
-     urlParams: List<string>;
+     urlParams: Array<string>;
     
      params: StringMap<string, any>;
     
@@ -568,7 +568,7 @@ declare module ngRouter {
     
      child: Url;
     
-     auxiliary: List<Url>;
+     auxiliary: Array<Url>;
     
      params: StringMap<string, any>;
     
@@ -594,9 +594,9 @@ declare module ngRouter {
   
   }
   
-  const routerDirectives : List<any> ;
+  const routerDirectives : Array<any> ;
   
-  var routerInjectables : List<any> ;
+  var routerInjectables : Array<any> ;
   
   class Route implements RouteDefinition {
     
@@ -669,7 +669,7 @@ declare module ngRouter {
   
   const ROUTE_DATA : OpaqueToken ;
   
-  var RouteConfig : (configs: List<RouteDefinition>) => ClassDecorator ;
+  var RouteConfig : (configs: Array<RouteDefinition>) => ClassDecorator ;
   
   interface ComponentDefinition {
     
diff --git a/angular2/router-2.0.0-alpha.36.d.ts b/angular2/router-2.0.0-alpha.36.d.ts
new file mode 100644
index 000000000..c86237638
--- /dev/null
+++ b/angular2/router-2.0.0-alpha.36.d.ts
@@ -0,0 +1,689 @@
+// Type definitions for Angular v2.0.0-alpha.36
+// 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.
+// ***********************************************************
+
+// angular2/router depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ngRouter {
+
+  /**
+   * # 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`.
+   */
+  class Router {
+    
+     navigating: boolean;
+    
+     lastNavigationAttempt: 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': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+     config(definitions: Array<RouteDefinition>): 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, _skipLocationChange?: boolean): Promise<any>;
+    
+
+    /**
+     * Navigate via the provided instruction. Returns a promise that resolves when navigation is
+     * complete.
+     */
+     navigateInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+     commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+
+    /**
+     * Subscribe to URL updates from the router
+     */
+     subscribe(onNext: (value: any) => void): Object;
+    
+
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+     deactivate(instruction: Instruction): 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: Array<any>): Instruction;
+  }
+  
+  class RootRouter extends Router {
+    
+     commit(instruction: Instruction, _skipLocationChange?: boolean): 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 {
+    
+     childRouter: Router;
+    
+     name: string;
+    
+
+    /**
+     * Given an instruction, update the contents of this outlet.
+     */
+     commit(instruction: Instruction): Promise<any>;
+    
+
+    /**
+     * Called by Router during recognition phase
+     */
+     canDeactivate(nextInstruction: Instruction): Promise<boolean>;
+    
+
+    /**
+     * Called by Router during recognition phase
+     */
+     canReuse(nextInstruction: Instruction): Promise<boolean>;
+    
+     deactivate(nextInstruction: Instruction): Promise<any>;
+  }
+  
+
+  /**
+   * 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.
+   */
+  class RouterLink {
+    
+     visibleHref: string;
+    
+     routeParams: any;
+    
+     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: RouteDefinition): 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: Array<any>, parentComponent: any): Instruction;
+  }
+  
+  class LocationStrategy {
+    
+     path(): string;
+    
+     pushState(ctx: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+    
+     onPopState(fn: (_: any) => 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 PathLocationStrategy 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: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
+  }
+  
+  const APP_BASE_HREF : OpaqueToken ;
+  
+
+  /**
+   * Responsible for performing each step of navigation.
+   * "Steps" are conceptually similar to "middleware"
+   */
+  class Pipeline {
+    
+     steps: Array<Function>;
+    
+     process(instruction: Instruction): Promise<any>;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [onActivate], which is called by the router at the end of a
+   * successful route navigation.
+   * 
+   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
+   * depending on the result of [canReuse].
+   * 
+   * If `onActivate` returns a promise, the route change will wait until the promise settles to
+   * instantiate and activate child components.
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements OnActivate {
+   *   onActivate(next, prev) {
+   *     this.log = 'Finished navigating from ' + prev.urlPath + ' to ' + next.urlPath;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnActivate {
+    
+     onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [onDeactivate], which is called by the router before destroying
+   * a component as part of a route change.
+   * 
+   * If `onDeactivate` returns a promise, the route change will wait until the promise settles.
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse() {
+   *     return true;
+   *   }
+   * 
+   *   onReuse(next, prev) {
+   *     this.params = next.params;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnDeactivate {
+    
+     onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [onReuse], which is called by the router at the end of a
+   * successful route navigation when [canReuse] is implemented and returns or resolves to true.
+   * 
+   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
+   * depending on the result of [canReuse].
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse() {
+   *     return true;
+   *   }
+   * 
+   *   onReuse(next, prev) {
+   *     this.params = next.params;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnReuse {
+    
+     onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [canDeactivate], which is called by the router to determine
+   * if a component can be removed as part of a navigation.
+   * 
+   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled.
+   * 
+   * If `canDeactivate` throws or rejects, the navigation is also cancelled.
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanDeactivate {
+   *   canDeactivate(next, prev) {
+   *     return askUserIfTheyAreSureTheyWantToQuit();
+   *   }
+   * }
+   *  ```
+   */
+  interface CanDeactivate {
+    
+     canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [canReuse], which is called by the router to determine whether a
+   * component should be reused across routes, or whether to destroy and instantiate a new component.
+   * 
+   * If `canReuse` returns or resolves to `true`, the component instance will be reused.
+   * 
+   * If `canReuse` throws or rejects, the navigation will be cancelled.
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next, prev) {
+   *     return next.params.id == prev.params.id;
+   *   }
+   * 
+   *   onReuse(next, prev) {
+   *     this.id = next.params.id;
+   *   }
+   * }
+   *  ```
+   */
+  interface CanReuse {
+    
+     canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+  
+
+  /**
+   * Defines route lifecycle method [canActivate], which is called by the router to determine
+   * if a component can be instantiated as part of a navigation.
+   * 
+   * Note that unlike other lifecycle hooks, this one uses an annotation rather than an interface.
+   * This is because [canActivate] is called before the component is instantiated.
+   * 
+   * If `canActivate` returns or resolves to `false`, the navigation is cancelled.
+   * 
+   * If `canActivate` throws or rejects, the navigation is also cancelled.
+   * 
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'control-panel-cmp'
+   * })
+   * @CanActivate(() => checkIfUserIsLoggedIn())
+   * class ControlPanelCmp {
+   *   // ...
+   * }
+   *  ```
+   */
+  var CanActivate : (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
+        ClassDecorator ;
+  
+
+  /**
+   * `Instruction` is a tree of `ComponentInstructions`, with all the information needed
+   * to transition each component in the app to a given route, including all auxiliary routes.
+   * 
+   * This is a public API.
+   */
+  class Instruction {
+    
+     component: ComponentInstruction;
+    
+     child: Instruction;
+    
+     auxInstruction: StringMap<string, Instruction>;
+    
+     replaceChild(child: Instruction): Instruction;
+  }
+  
+
+  /**
+   * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
+   * composed of a tree of these `ComponentInstruction`s.
+   * 
+   * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
+   * to route lifecycle hooks, like {@link CanActivate}.
+   */
+  class ComponentInstruction {
+    
+     reuse: boolean;
+    
+     urlPath: string;
+    
+     urlParams: Array<string>;
+    
+     params: StringMap<string, any>;
+    
+     componentType: any;
+    
+     resolveComponentType(): Promise<Type>;
+    
+     specificity: any;
+    
+     terminal: any;
+    
+     routeData(): Object;
+  }
+  
+  class Url {
+    
+     path: string;
+    
+     child: Url;
+    
+     auxiliary: Array<Url>;
+    
+     params: StringMap<string, any>;
+    
+     toString(): string;
+    
+     segmentToString(): string;
+  }
+  
+  class OpaqueToken {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Runtime representation of a type.
+   * 
+   * In JavaScript a Type is a constructor function.
+   */
+  interface Type extends Function {
+    
+     new(args: any): any;
+  
+  }
+  
+  const ROUTE_DATA : OpaqueToken ;
+  
+  const ROUTER_DIRECTIVES : Array<any> ;
+  
+  const ROUTER_BINDINGS : Array<any> ;
+  
+  class Route implements RouteDefinition {
+    
+     data: any;
+    
+     path: string;
+    
+     component: Type;
+    
+     as: string;
+    
+     loader: Function;
+    
+     redirectTo: string;
+  }
+  
+  class Redirect implements RouteDefinition {
+    
+     path: string;
+    
+     redirectTo: string;
+    
+     as: string;
+    
+     loader: Function;
+    
+     data: any;
+  }
+  
+  class AuxRoute implements RouteDefinition {
+    
+     data: any;
+    
+     path: string;
+    
+     component: Type;
+    
+     as: string;
+    
+     loader: Function;
+    
+     redirectTo: string;
+  }
+  
+  class AsyncRoute implements RouteDefinition {
+    
+     data: any;
+    
+     path: string;
+    
+     loader: Function;
+    
+     as: string;
+  }
+  
+  interface RouteDefinition {
+    
+     path: string;
+    
+     component?: Type | ComponentDefinition;
+    
+     loader?: Function;
+    
+     redirectTo?: string;
+    
+     as?: string;
+    
+     data?: any;
+  }
+  
+  var RouteConfig : (configs: Array<RouteDefinition>) => ClassDecorator ;
+  
+  interface ComponentDefinition {
+    
+     type: string;
+    
+     loader?: Function;
+    
+     component?: Type;
+  }
+  
+}
+
+declare module "angular2/router" {
+  export = ngRouter;
+}
+
+
diff --git a/angular2/router-2.0.0-alpha.37.d.ts b/angular2/router-2.0.0-alpha.37.d.ts
new file mode 100644
index 000000000..69ea2a5af
--- /dev/null
+++ b/angular2/router-2.0.0-alpha.37.d.ts
@@ -0,0 +1,738 @@
+// Type definitions for Angular v2.0.0-alpha.37
+// 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.
+// ***********************************************************
+
+// angular2/router depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ngRouter {
+
+  /**
+   * # 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`.
+   */
+  class Router {
+
+     navigating: boolean;
+
+     lastNavigationAttempt: 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;
+
+
+    /**
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
+     */
+     auxRouter(hostComponent: any): Router;
+
+
+    /**
+     * Register an outlet to notified of primary route changes.
+     *
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+     registerPrimaryOutlet(outlet: RouterOutlet): Promise<boolean>;
+
+
+    /**
+     * Register an outlet to notified of auxiliary route changes.
+     *
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+     registerAuxOutlet(outlet: RouterOutlet): Promise<boolean>;
+
+
+    /**
+     * Given an instruction, returns `true` if the instruction is currently active,
+     * otherwise `false`.
+     */
+     isRouteActive(instruction: Instruction): boolean;
+
+
+    /**
+     * Dynamically update the routing configuration and trigger a navigation.
+     *
+     * # Usage
+     *
+     * ```
+     * router.config([
+     *   { 'path': '/', 'component': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+     config(definitions: RouteDefinition[]): 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, _skipLocationChange?: boolean): Promise<any>;
+
+
+    /**
+     * Navigate via the provided instruction. Returns a promise that resolves when navigation is
+     * complete.
+     */
+     navigateInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+
+
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+     commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+
+
+    /**
+     * Subscribe to URL updates from the router
+     */
+     subscribe(onNext: (value: any) => void): Object;
+
+
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+     deactivate(instruction: Instruction): 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: any[]): Instruction;
+  }
+
+  class RootRouter extends Router {
+
+     commit(instruction: Instruction, _skipLocationChange?: boolean): 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 {
+
+     name: string;
+
+
+    /**
+     * Called by the Router to instantiate a new component during the commit phase of a navigation.
+     * This method in turn is responsible for calling the `onActivate` hook of its child.
+     */
+     activate(nextInstruction: ComponentInstruction): Promise<any>;
+
+
+    /**
+     * Called by the {@link Router} during the commit phase of a navigation when an outlet
+     * reuses a component between different routes.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+     reuse(nextInstruction: ComponentInstruction): Promise<any>;
+
+
+    /**
+     * Called by the {@link Router} when an outlet reuses a component across navigations.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+     deactivate(nextInstruction: ComponentInstruction): Promise<any>;
+
+
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     *
+     * If this resolves to `false`, the given navigation is cancelled.
+     *
+     * This method delegates to the child component's `canDeactivate` hook if it exists,
+     * and otherwise resolves to true.
+     */
+     canDeactivate(nextInstruction: ComponentInstruction): Promise<boolean>;
+
+
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     *
+     * If the new child component has a different Type than the existing child component,
+     * this will resolve to `false`. You can't reuse an old component when the new component
+     * is of a different Type.
+     *
+     * Otherwise, this method delegates to the child component's `canReuse` hook if it exists,
+     * or resolves to true if the hook is not present.
+     */
+     canReuse(nextInstruction: ComponentInstruction): 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.
+   */
+  class RouterLink {
+
+     visibleHref: string;
+
+     isRouteActive: boolean;
+
+     routeParams: any;
+
+     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: RouteDefinition): 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: any[], parentComponent: any): Instruction;
+  }
+
+  class LocationStrategy {
+
+     path(): string;
+
+     pushState(ctx: any, title: string, url: string): void;
+
+     forward(): void;
+
+     back(): void;
+
+     onPopState(fn: (_: any) => 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 PathLocationStrategy 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 {
+
+     platformStrategy: LocationStrategy;
+
+     path(): string;
+
+     normalize(url: string): string;
+
+     normalizeAbsolutely(url: string): string;
+
+     go(url: string): void;
+
+     forward(): void;
+
+     back(): void;
+
+     subscribe(onNext: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
+  }
+
+  const APP_BASE_HREF : OpaqueToken ;
+
+
+  /**
+   * Responsible for performing each step of navigation.
+   * "Steps" are conceptually similar to "middleware"
+   */
+  class Pipeline {
+
+     steps: Function[];
+
+     process(instruction: Instruction): Promise<any>;
+  }
+
+
+  /**
+   * Defines route lifecycle method [onActivate], which is called by the router at the end of a
+   * successful route navigation.
+   *
+   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
+   * depending on the result of [canReuse].
+   *
+   * If `onActivate` returns a promise, the route change will wait until the promise settles to
+   * instantiate and activate child components.
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements OnActivate {
+   *   onActivate(next, prev) {
+   *     this.log = 'Finished navigating from ' + prev.urlPath + ' to ' + next.urlPath;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnActivate {
+
+     onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+
+
+  /**
+   * Defines route lifecycle method [onDeactivate], which is called by the router before destroying
+   * a component as part of a route change.
+   *
+   * If `onDeactivate` returns a promise, the route change will wait until the promise settles.
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse() {
+   *     return true;
+   *   }
+   *
+   *   onReuse(next, prev) {
+   *     this.params = next.params;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnDeactivate {
+
+     onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+
+
+  /**
+   * Defines route lifecycle method [onReuse], which is called by the router at the end of a
+   * successful route navigation when [canReuse] is implemented and returns or resolves to true.
+   *
+   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
+   * depending on the result of [canReuse].
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse() {
+   *     return true;
+   *   }
+   *
+   *   onReuse(next, prev) {
+   *     this.params = next.params;
+   *   }
+   * }
+   *  ```
+   */
+  interface OnReuse {
+
+     onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+
+
+  /**
+   * Defines route lifecycle method [canDeactivate], which is called by the router to determine
+   * if a component can be removed as part of a navigation.
+   *
+   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled.
+   *
+   * If `canDeactivate` throws or rejects, the navigation is also cancelled.
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanDeactivate {
+   *   canDeactivate(next, prev) {
+   *     return askUserIfTheyAreSureTheyWantToQuit();
+   *   }
+   * }
+   *  ```
+   */
+  interface CanDeactivate {
+
+     canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+
+
+  /**
+   * Defines route lifecycle method [canReuse], which is called by the router to determine whether a
+   * component should be reused across routes, or whether to destroy and instantiate a new component.
+   *
+   * If `canReuse` returns or resolves to `true`, the component instance will be reused.
+   *
+   * If `canReuse` throws or rejects, the navigation will be cancelled.
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'my-cmp'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next, prev) {
+   *     return next.params.id == prev.params.id;
+   *   }
+   *
+   *   onReuse(next, prev) {
+   *     this.id = next.params.id;
+   *   }
+   * }
+   *  ```
+   */
+  interface CanReuse {
+
+     canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+  }
+
+
+  /**
+   * Defines route lifecycle method [canActivate], which is called by the router to determine
+   * if a component can be instantiated as part of a navigation.
+   *
+   * Note that unlike other lifecycle hooks, this one uses an annotation rather than an interface.
+   * This is because [canActivate] is called before the component is instantiated.
+   *
+   * If `canActivate` returns or resolves to `false`, the navigation is cancelled.
+   *
+   * If `canActivate` throws or rejects, the navigation is also cancelled.
+   *
+   * ## Example
+   * ```
+   * @Directive({
+   *   selector: 'control-panel-cmp'
+   * })
+   * @CanActivate(() => checkIfUserIsLoggedIn())
+   * class ControlPanelCmp {
+   *   // ...
+   * }
+   *  ```
+   */
+  var CanActivate : (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
+        ClassDecorator ;
+
+
+  /**
+   * `Instruction` is a tree of `ComponentInstructions`, with all the information needed
+   * to transition each component in the app to a given route, including all auxiliary routes.
+   *
+   * This is a public API.
+   */
+  class Instruction {
+
+     component: ComponentInstruction;
+
+     child: Instruction;
+
+     auxInstruction: StringMap<string, Instruction>;
+
+     replaceChild(child: Instruction): Instruction;
+  }
+
+
+  /**
+   * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
+   * composed of a tree of these `ComponentInstruction`s.
+   *
+   * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
+   * to route lifecycle hooks, like {@link CanActivate}.
+   *
+   * `ComponentInstruction`s are [https://en.wikipedia.org/wiki/Hash_consing](hash consed). You should
+   * never construct one yourself with "new." Instead, rely on {@link PathRecognizer} to construct
+   * `ComponentInstruction`s.
+   *
+   * You should not modify this object. It should be treated as immutable.
+   */
+  class ComponentInstruction {
+
+     reuse: boolean;
+
+     urlPath: string;
+
+     urlParams: string[];
+
+     params: StringMap<string, any>;
+
+     componentType: any;
+
+     resolveComponentType(): Promise<ng.Type>;
+
+     specificity: any;
+
+     terminal: any;
+
+     routeData(): Object;
+  }
+
+
+  /**
+   * This class represents a parsed URL
+   */
+  class Url {
+
+     path: string;
+
+     child: Url;
+
+     auxiliary: Url[];
+
+     params: StringMap<string, any>;
+
+     toString(): string;
+
+     segmentToString(): string;
+  }
+
+  class OpaqueToken {
+
+     toString(): string;
+  }
+
+  const ROUTE_DATA : OpaqueToken ;
+
+  const ROUTER_DIRECTIVES : any[] ;
+
+  const ROUTER_BINDINGS : any[] ;
+
+  class Route implements RouteDefinition {
+
+     data: any;
+
+     path: string;
+
+     component: ng.Type;
+
+     as: string;
+
+     loader: Function;
+
+     redirectTo: string;
+  }
+
+  class Redirect implements RouteDefinition {
+
+     path: string;
+
+     redirectTo: string;
+
+     as: string;
+
+     loader: Function;
+
+     data: any;
+  }
+
+  class AuxRoute implements RouteDefinition {
+
+     data: any;
+
+     path: string;
+
+     component: ng.Type;
+
+     as: string;
+
+     loader: Function;
+
+     redirectTo: string;
+  }
+
+  class AsyncRoute implements RouteDefinition {
+
+     data: any;
+
+     path: string;
+
+     loader: Function;
+
+     as: string;
+  }
+
+  interface RouteDefinition {
+
+     path: string;
+
+     component?: ng.Type | ComponentDefinition;
+
+     loader?: Function;
+
+     redirectTo?: string;
+
+     as?: string;
+
+     data?: any;
+  }
+
+  var RouteConfig : (configs: RouteDefinition[]) => ClassDecorator ;
+
+  interface ComponentDefinition {
+
+     type: string;
+
+     loader?: Function;
+
+     component?: ng.Type;
+  }
+
+}
+
+declare module "angular2/router" {
+  export = ngRouter;
+}
+
+
diff --git a/angular2/router-2.0.0-alpha.38.d.ts b/angular2/router-2.0.0-alpha.38.d.ts
new file mode 100644
index 000000000..43574e3d5
--- /dev/null
+++ b/angular2/router-2.0.0-alpha.38.d.ts
@@ -0,0 +1,1330 @@
+// Type definitions for Angular v2.0.0-local_sha.f77234e
+// 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.
+// ***********************************************************
+
+// angular2/router depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ngRouter {  
+  /**
+   * 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 {@link RouterOutlet}.
+   * 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 recognize it and serialize it into an
+   * `Instruction`.
+   * The router uses the `RouteRegistry` to get an `Instruction`.
+   */
+  class Router {
+    
+    constructor(registry: RouteRegistry, parent: Router, hostComponent: any);
+    
+    navigating: boolean;
+    
+    lastNavigationAttempt: 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;
+    
+    /**
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
+     */
+    auxRouter(hostComponent: any): Router;
+    
+    /**
+     * Register an outlet to notified of primary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerPrimaryOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Register an outlet to notified of auxiliary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerAuxOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Given an instruction, returns `true` if the instruction is currently active,
+     * otherwise `false`.
+     */
+    isRouteActive(instruction: Instruction): boolean;
+    
+    /**
+     * Dynamically update the routing configuration and trigger a navigation.
+     * 
+     * # Usage
+     * 
+     * ```
+     * router.config([
+     *   { 'path': '/', 'component': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+    config(definitions: RouteDefinition[]): Promise<any>;
+    
+    /**
+     * Navigate based on the provided Route Link DSL. It's preferred to navigate with this method
+     * over `navigateByUrl`.
+     * 
+     * # Usage
+     * 
+     * This method takes an array representing the Route Link DSL:
+     * ```
+     * ['./MyCmp', {param: 3}]
+     * ```
+     * See the {@link RouterLink} directive for more.
+     */
+    navigate(linkParams: any[]): Promise<any>;
+    
+    /**
+     * Navigate to a URL. Returns a promise that resolves when navigation is complete.
+     * It's preferred to navigate with `navigate` instead of this method, since URLs are more brittle.
+     * 
+     * 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.
+     */
+    navigateByUrl(url: string, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Navigate via the provided instruction. Returns a promise that resolves when navigation is
+     * complete.
+     */
+    navigateByInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+    commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Subscribe to URL updates from the router
+     */
+    subscribe(onNext: (value: any) => void): Object;
+    
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+    deactivate(instruction: Instruction): 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: any[]): Instruction;
+    
+  }
+
+    
+  /**
+   * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
+   * 
+   * ## Use
+   * 
+   * ```
+   * <router-outlet></router-outlet>
+   * ```
+   */
+  interface RouterOutlet {
+    
+    name: string;
+    
+    /**
+     * Called by the Router to instantiate a new component during the commit phase of a navigation.
+     * This method in turn is responsible for calling the `onActivate` hook of its child.
+     */
+    activate(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} during the commit phase of a navigation when an outlet
+     * reuses a component between different routes.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+    reuse(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} when an outlet reuses a component across navigations.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+    deactivate(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If this resolves to `false`, the given navigation is cancelled.
+     * 
+     * This method delegates to the child component's `canDeactivate` hook if it exists,
+     * and otherwise resolves to true.
+     */
+    canDeactivate(nextInstruction: ComponentInstruction): Promise<boolean>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If the new child component has a different ng.Type than the existing child component,
+     * this will resolve to `false`. You can't reuse an old component when the new component
+     * is of a different ng.Type.
+     * 
+     * Otherwise, this method delegates to the child component's `canReuse` hook if it exists,
+     * or resolves to true if the hook is not present.
+     */
+    canReuse(nextInstruction: ComponentInstruction): 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.
+   */
+  class RouterLink {
+    
+    constructor(_router: Router, _location: Location);
+    
+    visibleHref: string;
+    
+    isRouteActive: boolean;
+    
+    routeParams: any;
+    
+    onClick(): boolean;
+    
+  }
+
+    
+  /**
+   * `RouteParams` is an immutable map of parameters for the given route
+   * based on the url matcher and optional parameters for that route.
+   * 
+   * You can inject `RouteParams` into the constructor of a component to use it.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {path: '/user/:id', component: UserCmp, as: 'UserCmp'},
+   * ])
+   * class AppCmp {}
+   * 
+   * @Component({...})
+   * @View({ template: 'user: {{id}}' })
+   * class UserCmp {
+   *   string: id;
+   *   constructor(params: RouteParams) {
+   *     this.id = params.get('id');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
+   */
+  class RouteParams {
+    
+    constructor(params: StringMap<string, string>);
+    
+    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: RouteDefinition): 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: any[], parentComponent: any): Instruction;
+    
+  }
+
+    
+  /**
+   * `LocationStrategy` is responsible for representing and reading route state
+   * from the the browser's URL. Angular provides two strategies:
+   * {@link HashLocationStrategy} (default) and {@link PathLocationStrategy}.
+   * 
+   * This is used under the hood of the {@link Location} service.
+   * 
+   * Applications should use the {@link Router} or {@link Location} services to
+   * interact with application route state.
+   * 
+   * For instance, {@link HashLocationStrategy} produces URLs like
+   * `http://example.com#/foo`, and {@link PathLocationStrategy} produces
+   * `http://example.com/foo` as an equivalent URL.
+   * 
+   * See these two classes for more.
+   */
+  class LocationStrategy {
+    
+    path(): string;
+    
+    pushState(ctx: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+    onPopState(fn: (_: any) => any): void;
+    
+    getBaseHref(): string;
+    
+  }
+
+    
+  /**
+   * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [hash fragment](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax)
+   * of the browser's URL.
+   * 
+   * `HashLocationStrategy` is the default binding for {@link LocationStrategy}
+   * provided in {@link routerBindings} and {@link ROUTER_BINDINGS}.
+   * 
+   * For instance, if you call `location.go('/foo')`, the browser's URL will become
+   * `example.com#/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp) // includes binding to HashLocationStrategy
+   * ]);
+   * ```
+   */
+  class HashLocationStrategy extends LocationStrategy {
+    
+    constructor();
+    
+    onPopState(fn: EventListener): void;
+    
+    getBaseHref(): string;
+    
+    path(): string;
+    
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+  }
+
+    
+  /**
+   * `PathLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [path](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax) of the
+   * browser's URL.
+   * 
+   * If you're using `PathLocationStrategy`, you must provide a binding for
+   * {@link APP_BASE_HREF} to a string representing the URL prefix that should
+   * be preserved when generating and recognizing URLs.
+   * 
+   * For instance, if you provide an `APP_BASE_HREF` of `'/my/app'` and call
+   * `location.go('/foo')`, the browser's URL will become
+   * `example.com/my/app/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View, bind} from 'angular2/angular2';
+   * import {
+   *   APP_BASE_HREF
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location,
+   *   LocationStrategy,
+   *   PathLocationStrategy
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   bind(LocationStrategy).toClass(PathLocationStrategy),
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
+   */
+  class PathLocationStrategy extends LocationStrategy {
+    
+    constructor();
+    
+    onPopState(fn: EventListener): void;
+    
+    getBaseHref(): string;
+    
+    path(): string;
+    
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+  }
+
+    
+  /**
+   * `Location` is a service that applications can use to interact with a browser's URL.
+   * Depending on which {@link LocationStrategy} is used, `Location` will either persist
+   * to the URL's path or the URL's hash segment.
+   * 
+   * Note: it's better to use {@link Router#navigate} service to trigger route changes. Use
+   * `Location` only if you need to interact with or create normalized URLs outside of
+   * routing.
+   * 
+   * `Location` is 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
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  class Location {
+    
+    constructor(platformStrategy: LocationStrategy, href?: string);
+    
+    platformStrategy: LocationStrategy;
+    
+    /**
+     * Returns the normalized URL path.
+     */
+    path(): string;
+    
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     */
+    normalize(url: string): string;
+    
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     * If the given URL doesn't begin with a leading slash (`'/'`), this method adds one
+     * before normalizing.
+     */
+    normalizeAbsolutely(url: string): string;
+    
+    /**
+     * Changes the browsers URL to the normalized version of the given URL, and pushes a
+     * new item onto the platform's history.
+     */
+    go(url: string): void;
+    
+    /**
+     * Navigates forward in the platform's history.
+     */
+    forward(): void;
+    
+    /**
+     * Navigates back in the platform's history.
+     */
+    back(): void;
+    
+    /**
+     * Subscribe to the platform's `popState` events.
+     */
+    subscribe(onNext: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
+    
+  }
+
+    
+  /**
+   * The `APP_BASE_HREF` token represents the base href to be used with the
+   * {@link PathLocationStrategy}.
+   * 
+   * If you're using {@link PathLocationStrategy}, you must provide a binding to a string
+   * representing the URL prefix that should be preserved when generating and recognizing
+   * URLs.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   PathLocationStrategy,
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
+   */
+  let APP_BASE_HREF: OpaqueToken;
+  
+
+    
+  /**
+   * Defines route lifecycle method `onActivate`, which is called by the router at the end of a
+   * successful route navigation.
+   * 
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called depending on the result of {@link CanReuse}.
+   * 
+   * The `onActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
+   * 
+   * If `onActivate` returns a promise, the route change will wait until the promise settles to
+   * instantiate and activate child components.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnActivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements OnActivate {
+   *   onActivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.log = 'Finished navigating from ' + prev.urlPath + ' to ' + next.urlPath;
+   *   }
+   * }
+   * ```
+   */
+  interface OnActivate {
+    
+    onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `onDeactivate`, which is called by the router before destroying
+   * a component as part of a route change.
+   * 
+   * The `onDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
+   * If `onDeactivate` returns a promise, the route change will wait until the promise settles.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements OnDeactivate {
+   *   onDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return this.doFadeAwayAnimation();
+   *   }
+   * }
+   *  ```
+   */
+  interface OnDeactivate {
+    
+    onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `onReuse`, which is called by the router at the end of a
+   * successful route navigation when {@link CanReuse} is implemented and returns or resolves to true.
+   * 
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called, depending on the result of {@link CanReuse}.
+   * 
+   * The `onReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return true;
+   *   }
+   * 
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.params = next.params;
+   *   }
+   * }
+   * ```
+   */
+  interface OnReuse {
+    
+    onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `canDeactivate`, which is called by the router to determine
+   * if a component can be removed as part of a navigation.
+   * 
+   * The `canDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the
+   * first representing the current route being navigated to, and the second parameter
+   * representing the previous route.
+   * 
+   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled. If it returns or
+   * resolves to `true`, then the navigation continues, and the component will be deactivated
+   * (the {@link OnDeactivate} hook will be run) and removed.
+   * 
+   * If `canDeactivate` throws or rejects, the navigation is also cancelled.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanDeactivate {
+   *   canDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return askUserIfTheyAreSureTheyWantToQuit();
+   *   }
+   * }
+   *  ```
+   */
+  interface CanDeactivate {
+    
+    canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `canReuse`, which is called by the router to determine whether a
+   * component should be reused across routes, or whether to destroy and instantiate a new component.
+   * 
+   * The `canReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
+   * If `canReuse` returns or resolves to `true`, the component instance will be reused and the
+   * {@link OnDeactivate} hook will be run. If `canReuse` returns or resolves to `false`, a new
+   * component will be instantiated, and the existing component will be deactivated and removed as
+   * part of the navigation.
+   * 
+   * If `canReuse` throws or rejects, the navigation will be cancelled.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return next.params.id == prev.params.id;
+   *   }
+   * 
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.id = next.params.id;
+   *   }
+   * }
+   *  ```
+   */
+  interface CanReuse {
+    
+    canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle hook `CanActivate`, which is called by the router to determine
+   * if a component can be instantiated as part of a navigation.
+   * 
+   * The `CanActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing
+   * the current route being navigated to, and the second parameter representing the previous route or
+   * `null`.
+   * 
+   * Note that unlike other lifecycle hooks, this one uses an annotation rather than an interface.
+   * This is because the `CanActivate` function is called before the component is instantiated.
+   * 
+   * If `CanActivate` returns or resolves to `false`, the navigation is cancelled.
+   * If `CanActivate` throws or rejects, the navigation is also cancelled.
+   * If `CanActivate` returns or resolves to `true`, navigation continues, the component is
+   * instantiated, and the {@link OnActivate} hook of that component is called if implemented.
+   * 
+   * ## Example
+   * ```
+   * import {Component} from 'angular2/angular2';
+   * import {CanActivate} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'control-panel-cmp'
+   * })
+   * @View({
+   *  template: '<div>Control Panel: ...</div>'
+   * })
+   * @CanActivate(() => checkIfUserIsLoggedIn())
+   * class ControlPanelCmp {
+   *   // ...
+   * }
+   *  ```
+   */
+  var CanActivate: (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
+          ClassDecorator;
+  
+
+    
+  /**
+   * `Instruction` is a tree of {@link ComponentInstruction}s with all the information needed
+   * to transition each component in the app to a given route, including all auxiliary routes.
+   * 
+   * `Instruction`s can be created using {@link Router#generate}, and can be used to
+   * perform route changes with {@link Router#navigateByInstruction}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(router: Router) {
+   *     var instruction = router.generate(['/MyRoute']);
+   *     router.navigateByInstruction(instruction);
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
+   */
+  class Instruction {
+    
+    constructor(component: ComponentInstruction, child: Instruction, auxInstruction: StringMap<string, Instruction>);
+    
+    component: ComponentInstruction;
+    
+    child: Instruction;
+    
+    auxInstruction: StringMap<string, Instruction>;
+    
+    /**
+     * Returns a new instruction that shares the state of the existing instruction, but with
+     * the given child {@link Instruction} replacing the existing child.
+     */
+    replaceChild(child: Instruction): Instruction;
+    
+  }
+
+    
+  /**
+   * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
+   * composed of a tree of these `ComponentInstruction`s.
+   * 
+   * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
+   * to route lifecycle hooks, like {@link CanActivate}.
+   * 
+   * `ComponentInstruction`s are [https://en.wikipedia.org/wiki/Hash_consing](hash consed). You should
+   * never construct one yourself with "new." Instead, rely on {@link Router/PathRecognizer} to
+   * construct `ComponentInstruction`s.
+   * 
+   * You should not modify this object. It should be treated as immutable.
+   */
+  interface ComponentInstruction {
+    
+    reuse: boolean;
+    
+    urlPath: string;
+    
+    urlParams: string[];
+    
+    params: StringMap<string, any>;
+    
+    /**
+     * Returns the component type of the represented route, or `null` if this instruction
+     * hasn't been resolved.
+     */
+    componentType: any;
+    
+    /**
+     * Returns a promise that will resolve to component type of the represented route.
+     * If this instruction references an {@link AsyncRoute}, the `loader` function of that route
+     * will run.
+     */
+    resolveComponentType(): Promise<ng.Type>;
+    
+    /**
+     * Returns the specificity of the route associated with this `Instruction`.
+     */
+    specificity: any;
+    
+    /**
+     * Returns `true` if the component type of this instruction has no child {@link RouteConfig},
+     * or `false` if it does.
+     */
+    terminal: any;
+    
+    /**
+     * Returns the route data of the given route that was specified in the {@link RouteDefinition},
+     * or `null` if no route data was specified.
+     */
+    routeData(): Object;
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  let ROUTE_DATA: OpaqueToken;
+  
+
+    
+  /**
+   * Token used to bind the component with the top-level {@link RouteConfig}s for the
+   * application.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_PRIMARY_COMPONENT: OpaqueToken;
+  
+
+    
+  /**
+   * A list of directives. To use the router directives like {@link RouterOutlet} and
+   * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+   * component.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *    // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  let ROUTER_DIRECTIVES: any[];
+  
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add this to your application.
+   * 
+   * Note that you also need to bind to {@link ROUTER_PRIMARY_COMPONENT}.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_BINDINGS: any[];
+  
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add these bindings to
+   * your application.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  function routerBindings(primaryComponent: ng.Type): Array<any>;
+  
+
+    
+  /**
+   * `Route` is a type of {@link RouteDefinition} used to route a path to a component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', component: HomeCmp, as: 'HomeCmp' }
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class Route implements RouteDefinition {
+    
+    constructor({path, component, as, data}:
+                      {path: string, component: ng.Type, as?: string, data?: any});
+    
+    data: any;
+    
+    path: string;
+    
+    component: ng.Type;
+    
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
+    
+  }
+
+    
+  /**
+   * `Redirect` is a type of {@link RouteDefinition} used to route a path to an asynchronously loaded
+   * component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `redirectTo` is a string representing the new URL to be matched against.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/', redirectTo: '/home'},
+   *   {path: '/home', component: HomeCmp}
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class Redirect implements RouteDefinition {
+    
+    constructor({path, redirectTo}: {path: string, redirectTo: string});
+    
+    path: string;
+    
+    redirectTo: string;
+    
+    as: string;
+    
+    loader: Function;
+    
+    data: any;
+    
+  }
+
+    
+  /**
+   * `AuxRoute` is a type of {@link RouteDefinition} used to define an auxiliary route.
+   * 
+   * It takes an object with the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig, AuxRoute} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   new AuxRoute({path: '/home', component: HomeCmp})
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class AuxRoute implements RouteDefinition {
+    
+    constructor({path, component, as}: {path: string, component: ng.Type, as?: string});
+    
+    data: any;
+    
+    path: string;
+    
+    component: ng.Type;
+    
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
+    
+  }
+
+    
+  /**
+   * `AsyncRoute` is a type of {@link RouteDefinition} used to route a path to an asynchronously
+   * loaded component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `loader` is a function that returns a promise that resolves to a component.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', loader: () => Promise.resolve(MyLoadedCmp), as: 'MyLoadedCmp'}
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class AsyncRoute implements RouteDefinition {
+    
+    constructor({path, loader, as, data}: {path: string, loader: Function, as?: string, data?: any});
+    
+    data: any;
+    
+    path: string;
+    
+    loader: Function;
+    
+    as: string;
+    
+  }
+
+    
+  /**
+   * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
+   * 
+   * Supported keys:
+   * - `path` (required)
+   * - `component`, `loader`,  `redirectTo` (requires exactly one of these)
+   * - `as` (optional)
+   * - `data` (optional)
+   * 
+   * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}.
+   */
+  interface RouteDefinition {
+    
+    path: string;
+    
+    component?: ng.Type | ComponentDefinition;
+    
+    loader?: Function;
+    
+    redirectTo?: string;
+    
+    as?: string;
+    
+    data?: any;
+    
+  }
+
+    
+  var RouteConfig: (configs: RouteDefinition[]) => ClassDecorator;
+  
+
+    
+  interface ComponentDefinition {
+    
+    type: string;
+    
+    loader?: Function;
+    
+    component?: ng.Type;
+    
+  }
+
+    
+  var RouterOutlet: ng.InjectableReference;
+  
+
+    
+  var ComponentInstruction: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/router" {
+  export = ngRouter;
+}
+
+
diff --git a/angular2/router-2.0.0-alpha.39.d.ts b/angular2/router-2.0.0-alpha.39.d.ts
new file mode 100644
index 000000000..be33ebf93
--- /dev/null
+++ b/angular2/router-2.0.0-alpha.39.d.ts
@@ -0,0 +1,1330 @@
+// Type definitions for Angular v2.0.0-39
+// 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.
+// ***********************************************************
+
+// angular2/router depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+
+
+
+
+/**
+ * @module
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ngRouter {  
+  /**
+   * 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 {@link RouterOutlet}.
+   * 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 recognize it and serialize it into an
+   * `Instruction`.
+   * The router uses the `RouteRegistry` to get an `Instruction`.
+   */
+  class Router {
+    
+    constructor(registry: RouteRegistry, parent: Router, hostComponent: any);
+    
+    navigating: boolean;
+    
+    lastNavigationAttempt: 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;
+    
+    /**
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
+     */
+    auxRouter(hostComponent: any): Router;
+    
+    /**
+     * Register an outlet to notified of primary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerPrimaryOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Register an outlet to notified of auxiliary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerAuxOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Given an instruction, returns `true` if the instruction is currently active,
+     * otherwise `false`.
+     */
+    isRouteActive(instruction: Instruction): boolean;
+    
+    /**
+     * Dynamically update the routing configuration and trigger a navigation.
+     * 
+     * # Usage
+     * 
+     * ```
+     * router.config([
+     *   { 'path': '/', 'component': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+    config(definitions: RouteDefinition[]): Promise<any>;
+    
+    /**
+     * Navigate based on the provided Route Link DSL. It's preferred to navigate with this method
+     * over `navigateByUrl`.
+     * 
+     * # Usage
+     * 
+     * This method takes an array representing the Route Link DSL:
+     * ```
+     * ['./MyCmp', {param: 3}]
+     * ```
+     * See the {@link RouterLink} directive for more.
+     */
+    navigate(linkParams: any[]): Promise<any>;
+    
+    /**
+     * Navigate to a URL. Returns a promise that resolves when navigation is complete.
+     * It's preferred to navigate with `navigate` instead of this method, since URLs are more brittle.
+     * 
+     * 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.
+     */
+    navigateByUrl(url: string, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Navigate via the provided instruction. Returns a promise that resolves when navigation is
+     * complete.
+     */
+    navigateByInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+    commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    
+    /**
+     * Subscribe to URL updates from the router
+     */
+    subscribe(onNext: (value: any) => void): Object;
+    
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+    deactivate(instruction: Instruction): 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: any[]): Instruction;
+    
+  }
+
+    
+  /**
+   * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
+   * 
+   * ## Use
+   * 
+   * ```
+   * <router-outlet></router-outlet>
+   * ```
+   */
+  interface RouterOutlet {
+    
+    name: string;
+    
+    /**
+     * Called by the Router to instantiate a new component during the commit phase of a navigation.
+     * This method in turn is responsible for calling the `onActivate` hook of its child.
+     */
+    activate(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} during the commit phase of a navigation when an outlet
+     * reuses a component between different routes.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+    reuse(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} when an outlet reuses a component across navigations.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
+     */
+    deactivate(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If this resolves to `false`, the given navigation is cancelled.
+     * 
+     * This method delegates to the child component's `canDeactivate` hook if it exists,
+     * and otherwise resolves to true.
+     */
+    canDeactivate(nextInstruction: ComponentInstruction): Promise<boolean>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If the new child component has a different ng.Type than the existing child component,
+     * this will resolve to `false`. You can't reuse an old component when the new component
+     * is of a different ng.Type.
+     * 
+     * Otherwise, this method delegates to the child component's `canReuse` hook if it exists,
+     * or resolves to true if the hook is not present.
+     */
+    canReuse(nextInstruction: ComponentInstruction): 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.
+   */
+  class RouterLink {
+    
+    constructor(_router: Router, _location: Location);
+    
+    visibleHref: string;
+    
+    isRouteActive: boolean;
+    
+    routeParams: any;
+    
+    onClick(): boolean;
+    
+  }
+
+    
+  /**
+   * `RouteParams` is an immutable map of parameters for the given route
+   * based on the url matcher and optional parameters for that route.
+   * 
+   * You can inject `RouteParams` into the constructor of a component to use it.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {path: '/user/:id', component: UserCmp, as: 'UserCmp'},
+   * ])
+   * class AppCmp {}
+   * 
+   * @Component({...})
+   * @View({ template: 'user: {{id}}' })
+   * class UserCmp {
+   *   string: id;
+   *   constructor(params: RouteParams) {
+   *     this.id = params.get('id');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
+   */
+  class RouteParams {
+    
+    constructor(params: {[key: string]: string});
+    
+    params: {[key: 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: RouteDefinition): 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: any[], parentComponent: any): Instruction;
+    
+  }
+
+    
+  /**
+   * `LocationStrategy` is responsible for representing and reading route state
+   * from the the browser's URL. Angular provides two strategies:
+   * {@link HashLocationStrategy} (default) and {@link PathLocationStrategy}.
+   * 
+   * This is used under the hood of the {@link Location} service.
+   * 
+   * Applications should use the {@link Router} or {@link Location} services to
+   * interact with application route state.
+   * 
+   * For instance, {@link HashLocationStrategy} produces URLs like
+   * `http://example.com#/foo`, and {@link PathLocationStrategy} produces
+   * `http://example.com/foo` as an equivalent URL.
+   * 
+   * See these two classes for more.
+   */
+  class LocationStrategy {
+    
+    path(): string;
+    
+    pushState(ctx: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+    onPopState(fn: (_: any) => any): void;
+    
+    getBaseHref(): string;
+    
+  }
+
+    
+  /**
+   * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [hash fragment](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax)
+   * of the browser's URL.
+   * 
+   * `HashLocationStrategy` is the default binding for {@link LocationStrategy}
+   * provided in {@link routerBindings} and {@link ROUTER_BINDINGS}.
+   * 
+   * For instance, if you call `location.go('/foo')`, the browser's URL will become
+   * `example.com#/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp) // includes binding to HashLocationStrategy
+   * ]);
+   * ```
+   */
+  class HashLocationStrategy extends LocationStrategy {
+    
+    constructor();
+    
+    onPopState(fn: EventListener): void;
+    
+    getBaseHref(): string;
+    
+    path(): string;
+    
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+  }
+
+    
+  /**
+   * `PathLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [path](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax) of the
+   * browser's URL.
+   * 
+   * If you're using `PathLocationStrategy`, you must provide a binding for
+   * {@link APP_BASE_HREF} to a string representing the URL prefix that should
+   * be preserved when generating and recognizing URLs.
+   * 
+   * For instance, if you provide an `APP_BASE_HREF` of `'/my/app'` and call
+   * `location.go('/foo')`, the browser's URL will become
+   * `example.com/my/app/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View, bind} from 'angular2/angular2';
+   * import {
+   *   APP_BASE_HREF
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location,
+   *   LocationStrategy,
+   *   PathLocationStrategy
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   bind(LocationStrategy).toClass(PathLocationStrategy),
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
+   */
+  class PathLocationStrategy extends LocationStrategy {
+    
+    constructor();
+    
+    onPopState(fn: EventListener): void;
+    
+    getBaseHref(): string;
+    
+    path(): string;
+    
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+  }
+
+    
+  /**
+   * `Location` is a service that applications can use to interact with a browser's URL.
+   * Depending on which {@link LocationStrategy} is used, `Location` will either persist
+   * to the URL's path or the URL's hash segment.
+   * 
+   * Note: it's better to use {@link Router#navigate} service to trigger route changes. Use
+   * `Location` only if you need to interact with or create normalized URLs outside of
+   * routing.
+   * 
+   * `Location` is 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
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  class Location {
+    
+    constructor(platformStrategy: LocationStrategy, href?: string);
+    
+    platformStrategy: LocationStrategy;
+    
+    /**
+     * Returns the normalized URL path.
+     */
+    path(): string;
+    
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     */
+    normalize(url: string): string;
+    
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     * If the given URL doesn't begin with a leading slash (`'/'`), this method adds one
+     * before normalizing.
+     */
+    normalizeAbsolutely(url: string): string;
+    
+    /**
+     * Changes the browsers URL to the normalized version of the given URL, and pushes a
+     * new item onto the platform's history.
+     */
+    go(url: string): void;
+    
+    /**
+     * Navigates forward in the platform's history.
+     */
+    forward(): void;
+    
+    /**
+     * Navigates back in the platform's history.
+     */
+    back(): void;
+    
+    /**
+     * Subscribe to the platform's `popState` events.
+     */
+    subscribe(onNext: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
+    
+  }
+
+    
+  /**
+   * The `APP_BASE_HREF` token represents the base href to be used with the
+   * {@link PathLocationStrategy}.
+   * 
+   * If you're using {@link PathLocationStrategy}, you must provide a binding to a string
+   * representing the URL prefix that should be preserved when generating and recognizing
+   * URLs.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   PathLocationStrategy,
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
+   */
+  let APP_BASE_HREF: OpaqueToken;
+  
+
+    
+  /**
+   * Defines route lifecycle method `onActivate`, which is called by the router at the end of a
+   * successful route navigation.
+   * 
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called depending on the result of {@link CanReuse}.
+   * 
+   * The `onActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
+   * 
+   * If `onActivate` returns a promise, the route change will wait until the promise settles to
+   * instantiate and activate child components.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnActivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements OnActivate {
+   *   onActivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.log = 'Finished navigating from ' + prev.urlPath + ' to ' + next.urlPath;
+   *   }
+   * }
+   * ```
+   */
+  interface OnActivate {
+    
+    onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `onDeactivate`, which is called by the router before destroying
+   * a component as part of a route change.
+   * 
+   * The `onDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
+   * If `onDeactivate` returns a promise, the route change will wait until the promise settles.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements OnDeactivate {
+   *   onDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return this.doFadeAwayAnimation();
+   *   }
+   * }
+   *  ```
+   */
+  interface OnDeactivate {
+    
+    onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `onReuse`, which is called by the router at the end of a
+   * successful route navigation when {@link CanReuse} is implemented and returns or resolves to true.
+   * 
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called, depending on the result of {@link CanReuse}.
+   * 
+   * The `onReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return true;
+   *   }
+   * 
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.params = next.params;
+   *   }
+   * }
+   * ```
+   */
+  interface OnReuse {
+    
+    onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `canDeactivate`, which is called by the router to determine
+   * if a component can be removed as part of a navigation.
+   * 
+   * The `canDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the
+   * first representing the current route being navigated to, and the second parameter
+   * representing the previous route.
+   * 
+   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled. If it returns or
+   * resolves to `true`, then the navigation continues, and the component will be deactivated
+   * (the {@link OnDeactivate} hook will be run) and removed.
+   * 
+   * If `canDeactivate` throws or rejects, the navigation is also cancelled.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanDeactivate {
+   *   canDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return askUserIfTheyAreSureTheyWantToQuit();
+   *   }
+   * }
+   *  ```
+   */
+  interface CanDeactivate {
+    
+    canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle method `canReuse`, which is called by the router to determine whether a
+   * component should be reused across routes, or whether to destroy and instantiate a new component.
+   * 
+   * The `canReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
+   * If `canReuse` returns or resolves to `true`, the component instance will be reused and the
+   * {@link OnDeactivate} hook will be run. If `canReuse` returns or resolves to `false`, a new
+   * component will be instantiated, and the existing component will be deactivated and removed as
+   * part of the navigation.
+   * 
+   * If `canReuse` throws or rejects, the navigation will be cancelled.
+   * 
+   * ## Example
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'my-cmp'
+   * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements CanReuse, OnReuse {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return next.params.id == prev.params.id;
+   *   }
+   * 
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     this.id = next.params.id;
+   *   }
+   * }
+   *  ```
+   */
+  interface CanReuse {
+    
+    canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
+  }
+
+    
+  /**
+   * Defines route lifecycle hook `CanActivate`, which is called by the router to determine
+   * if a component can be instantiated as part of a navigation.
+   * 
+   * The `CanActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing
+   * the current route being navigated to, and the second parameter representing the previous route or
+   * `null`.
+   * 
+   * Note that unlike other lifecycle hooks, this one uses an annotation rather than an interface.
+   * This is because the `CanActivate` function is called before the component is instantiated.
+   * 
+   * If `CanActivate` returns or resolves to `false`, the navigation is cancelled.
+   * If `CanActivate` throws or rejects, the navigation is also cancelled.
+   * If `CanActivate` returns or resolves to `true`, navigation continues, the component is
+   * instantiated, and the {@link OnActivate} hook of that component is called if implemented.
+   * 
+   * ## Example
+   * ```
+   * import {Component} from 'angular2/angular2';
+   * import {CanActivate} from 'angular2/router';
+   * 
+   * @Component({
+   *   selector: 'control-panel-cmp'
+   * })
+   * @View({
+   *  template: '<div>Control Panel: ...</div>'
+   * })
+   * @CanActivate(() => checkIfUserIsLoggedIn())
+   * class ControlPanelCmp {
+   *   // ...
+   * }
+   *  ```
+   */
+  var CanActivate: (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
+          ClassDecorator;
+  
+
+    
+  /**
+   * `Instruction` is a tree of {@link ComponentInstruction}s with all the information needed
+   * to transition each component in the app to a given route, including all auxiliary routes.
+   * 
+   * `Instruction`s can be created using {@link Router#generate}, and can be used to
+   * perform route changes with {@link Router#navigateByInstruction}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(router: Router) {
+   *     var instruction = router.generate(['/MyRoute']);
+   *     router.navigateByInstruction(instruction);
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
+   */
+  class Instruction {
+    
+    constructor(component: ComponentInstruction, child: Instruction, auxInstruction: {[key: string]: Instruction});
+    
+    component: ComponentInstruction;
+    
+    child: Instruction;
+    
+    auxInstruction: {[key: string]: Instruction};
+    
+    /**
+     * Returns a new instruction that shares the state of the existing instruction, but with
+     * the given child {@link Instruction} replacing the existing child.
+     */
+    replaceChild(child: Instruction): Instruction;
+    
+  }
+
+    
+  /**
+   * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
+   * composed of a tree of these `ComponentInstruction`s.
+   * 
+   * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
+   * to route lifecycle hooks, like {@link CanActivate}.
+   * 
+   * `ComponentInstruction`s are [https://en.wikipedia.org/wiki/Hash_consing](hash consed). You should
+   * never construct one yourself with "new." Instead, rely on {@link Router/PathRecognizer} to
+   * construct `ComponentInstruction`s.
+   * 
+   * You should not modify this object. It should be treated as immutable.
+   */
+  interface ComponentInstruction {
+    
+    reuse: boolean;
+    
+    urlPath: string;
+    
+    urlParams: string[];
+    
+    params: {[key: string]: any};
+    
+    /**
+     * Returns the component type of the represented route, or `null` if this instruction
+     * hasn't been resolved.
+     */
+    componentType: any;
+    
+    /**
+     * Returns a promise that will resolve to component type of the represented route.
+     * If this instruction references an {@link AsyncRoute}, the `loader` function of that route
+     * will run.
+     */
+    resolveComponentType(): Promise<ng.Type>;
+    
+    /**
+     * Returns the specificity of the route associated with this `Instruction`.
+     */
+    specificity: any;
+    
+    /**
+     * Returns `true` if the component type of this instruction has no child {@link RouteConfig},
+     * or `false` if it does.
+     */
+    terminal: any;
+    
+    /**
+     * Returns the route data of the given route that was specified in the {@link RouteDefinition},
+     * or `null` if no route data was specified.
+     */
+    routeData(): Object;
+    
+  }
+
+    
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
+  class OpaqueToken {
+    
+    constructor(_desc: string);
+    
+    toString(): string;
+    
+  }
+
+    
+  let ROUTE_DATA: OpaqueToken;
+  
+
+    
+  /**
+   * Token used to bind the component with the top-level {@link RouteConfig}s for the
+   * application.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_PRIMARY_COMPONENT: OpaqueToken;
+  
+
+    
+  /**
+   * A list of directives. To use the router directives like {@link RouterOutlet} and
+   * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+   * component.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *    // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  let ROUTER_DIRECTIVES: any[];
+  
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add this to your application.
+   * 
+   * Note that you also need to bind to {@link ROUTER_PRIMARY_COMPONENT}.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_BINDINGS: any[];
+  
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add these bindings to
+   * your application.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  function routerBindings(primaryComponent: ng.Type): Array<any>;
+  
+
+    
+  /**
+   * `Route` is a type of {@link RouteDefinition} used to route a path to a component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', component: HomeCmp, as: 'HomeCmp' }
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class Route implements RouteDefinition {
+    
+    constructor({path, component, as, data}:
+                      {path: string, component: ng.Type, as?: string, data?: any});
+    
+    data: any;
+    
+    path: string;
+    
+    component: ng.Type;
+    
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
+    
+  }
+
+    
+  /**
+   * `Redirect` is a type of {@link RouteDefinition} used to route a path to an asynchronously loaded
+   * component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `redirectTo` is a string representing the new URL to be matched against.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/', redirectTo: '/home'},
+   *   {path: '/home', component: HomeCmp}
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class Redirect implements RouteDefinition {
+    
+    constructor({path, redirectTo}: {path: string, redirectTo: string});
+    
+    path: string;
+    
+    redirectTo: string;
+    
+    as: string;
+    
+    loader: Function;
+    
+    data: any;
+    
+  }
+
+    
+  /**
+   * `AuxRoute` is a type of {@link RouteDefinition} used to define an auxiliary route.
+   * 
+   * It takes an object with the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig, AuxRoute} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   new AuxRoute({path: '/home', component: HomeCmp})
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class AuxRoute implements RouteDefinition {
+    
+    constructor({path, component, as}: {path: string, component: ng.Type, as?: string});
+    
+    data: any;
+    
+    path: string;
+    
+    component: ng.Type;
+    
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
+    
+  }
+
+    
+  /**
+   * `AsyncRoute` is a type of {@link RouteDefinition} used to route a path to an asynchronously
+   * loaded component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `loader` is a function that returns a promise that resolves to a component.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', loader: () => Promise.resolve(MyLoadedCmp), as: 'MyLoadedCmp'}
+   * ])
+   * class MyApp {}
+   * ```
+   */
+  class AsyncRoute implements RouteDefinition {
+    
+    constructor({path, loader, as, data}: {path: string, loader: Function, as?: string, data?: any});
+    
+    data: any;
+    
+    path: string;
+    
+    loader: Function;
+    
+    as: string;
+    
+  }
+
+    
+  /**
+   * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
+   * 
+   * Supported keys:
+   * - `path` (required)
+   * - `component`, `loader`,  `redirectTo` (requires exactly one of these)
+   * - `as` (optional)
+   * - `data` (optional)
+   * 
+   * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}.
+   */
+  interface RouteDefinition {
+    
+    path: string;
+    
+    component?: ng.Type | ComponentDefinition;
+    
+    loader?: Function;
+    
+    redirectTo?: string;
+    
+    as?: string;
+    
+    data?: any;
+    
+  }
+
+    
+  var RouteConfig: (configs: RouteDefinition[]) => ClassDecorator;
+  
+
+    
+  interface ComponentDefinition {
+    
+    type: string;
+    
+    loader?: Function;
+    
+    component?: ng.Type;
+    
+  }
+
+    
+  var RouterOutlet: ng.InjectableReference;
+  
+
+    
+  var ComponentInstruction: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/router" {
+  export = ngRouter;
+}
+
+
diff --git a/angular2/router.d.ts b/angular2/router.d.ts
index 295593850..be33ebf93 100644
--- a/angular2/router.d.ts
+++ b/angular2/router.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular v2.0.0-alpha.35
+// Type definitions for Angular v2.0.0-39
 // Project: http://angular.io/
 // Definitions by: angular team <https://github.com/angular/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -23,52 +23,70 @@
  * @description
  * Maps application URLs into application states, to support deep-linking and navigation.
  */
-declare module ngRouter {
-
+declare module ngRouter {  
   /**
-   * # Router
-   * The router is responsible for mapping URLs to components.
+   * 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.
+   * The router holds reference to a number of {@link RouterOutlet}.
+   * 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
+   * When the router navigates from a URL, it must first recognize it and serialize it into an
    * `Instruction`.
    * The router uses the `RouteRegistry` to get an `Instruction`.
    */
   class Router {
     
-     navigating: boolean;
+    constructor(registry: RouteRegistry, parent: Router, hostComponent: any);
     
-     lastNavigationAttempt: string;
+    navigating: boolean;
     
-     registry: RouteRegistry;
+    lastNavigationAttempt: string;
     
-     parent: Router;
+    registry: RouteRegistry;
     
-     hostComponent: any;
+    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;
+    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.
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
      */
-     registerOutlet(outlet: RouterOutlet): Promise<boolean>;
+    auxRouter(hostComponent: any): Router;
+    
+    /**
+     * Register an outlet to notified of primary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerPrimaryOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Register an outlet to notified of auxiliary route changes.
+     * 
+     * You probably don't need to use this unless you're writing a reusable component.
+     */
+    registerAuxOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+    /**
+     * Given an instruction, returns `true` if the instruction is currently active,
+     * otherwise `false`.
+     */
+    isRouteActive(instruction: Instruction): boolean;
     
-
     /**
      * Dynamically update the routing configuration and trigger a navigation.
      * 
@@ -81,69 +99,72 @@ declare module ngRouter {
      * ]);
      * ```
      */
-     config(definitions: List<RouteDefinition>): Promise<any>;
+    config(definitions: RouteDefinition[]): Promise<any>;
+    
+    /**
+     * Navigate based on the provided Route Link DSL. It's preferred to navigate with this method
+     * over `navigateByUrl`.
+     * 
+     * # Usage
+     * 
+     * This method takes an array representing the Route Link DSL:
+     * ```
+     * ['./MyCmp', {param: 3}]
+     * ```
+     * See the {@link RouterLink} directive for more.
+     */
+    navigate(linkParams: any[]): Promise<any>;
     
-
     /**
      * Navigate to a URL. Returns a promise that resolves when navigation is complete.
+     * It's preferred to navigate with `navigate` instead of this method, since URLs are more brittle.
      * 
      * 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, _skipLocationChange?: boolean): Promise<any>;
+    navigateByUrl(url: string, _skipLocationChange?: boolean): Promise<any>;
     
-
     /**
      * Navigate via the provided instruction. Returns a promise that resolves when navigation is
      * complete.
      */
-     navigateInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    navigateByInstruction(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
     
-
     /**
      * Updates this router and all descendant routers according to the given instruction
      */
-     commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
+    commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
     
-
     /**
      * Subscribe to URL updates from the router
      */
-     subscribe(onNext: (value: any) => void): void;
+    subscribe(onNext: (value: any) => void): Object;
     
-
     /**
      * Removes the contents of this router's outlet and all descendant outlets
      */
-     deactivate(instruction: Instruction): Promise<any>;
+    deactivate(instruction: Instruction): Promise<any>;
     
-
     /**
      * Given a URL, returns an instruction representing the component graph
      */
-     recognize(url: string): Promise<Instruction>;
+    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>;
+    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>): Instruction;
-  }
-  
-  class RootRouter extends Router {
+    generate(linkParams: any[]): Instruction;
     
-     commit(instruction: Instruction, _skipLocationChange?: boolean): Promise<any>;
   }
-  
 
+    
   /**
    * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
    * 
@@ -153,34 +174,54 @@ declare module ngRouter {
    * <router-outlet></router-outlet>
    * ```
    */
-  class RouterOutlet {
+  interface RouterOutlet {
     
-     childRouter: Router;
+    name: string;
     
-     name: string;
-    
-
     /**
-     * Given an instruction, update the contents of this outlet.
+     * Called by the Router to instantiate a new component during the commit phase of a navigation.
+     * This method in turn is responsible for calling the `onActivate` hook of its child.
      */
-     commit(instruction: Instruction): Promise<any>;
+    activate(nextInstruction: ComponentInstruction): Promise<any>;
     
-
     /**
-     * Called by Router during recognition phase
+     * Called by the {@link Router} during the commit phase of a navigation when an outlet
+     * reuses a component between different routes.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
      */
-     canDeactivate(nextInstruction: Instruction): Promise<boolean>;
+    reuse(nextInstruction: ComponentInstruction): Promise<any>;
     
-
     /**
-     * Called by Router during recognition phase
+     * Called by the {@link Router} when an outlet reuses a component across navigations.
+     * This method in turn is responsible for calling the `onReuse` hook of its child.
      */
-     canReuse(nextInstruction: Instruction): Promise<boolean>;
+    deactivate(nextInstruction: ComponentInstruction): Promise<any>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If this resolves to `false`, the given navigation is cancelled.
+     * 
+     * This method delegates to the child component's `canDeactivate` hook if it exists,
+     * and otherwise resolves to true.
+     */
+    canDeactivate(nextInstruction: ComponentInstruction): Promise<boolean>;
+    
+    /**
+     * Called by the {@link Router} during recognition phase of a navigation.
+     * 
+     * If the new child component has a different ng.Type than the existing child component,
+     * this will resolve to `false`. You can't reuse an old component when the new component
+     * is of a different ng.Type.
+     * 
+     * Otherwise, this method delegates to the child component's `canReuse` hook if it exists,
+     * or resolves to true if the hook is not present.
+     */
+    canReuse(nextInstruction: ComponentInstruction): Promise<boolean>;
     
-     deactivate(nextInstruction: Instruction): Promise<any>;
   }
-  
 
+    
   /**
    * The RouterLink directive lets you link to specific parts of your app.
    * 
@@ -212,21 +253,61 @@ declare module ngRouter {
    */
   class RouterLink {
     
-     visibleHref: string;
+    constructor(_router: Router, _location: Location);
     
-     routeParams: void;
+    visibleHref: string;
+    
+    isRouteActive: boolean;
+    
+    routeParams: any;
+    
+    onClick(): boolean;
     
-     onClick(): boolean;
   }
-  
+
+    
+  /**
+   * `RouteParams` is an immutable map of parameters for the given route
+   * based on the url matcher and optional parameters for that route.
+   * 
+   * You can inject `RouteParams` into the constructor of a component to use it.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {path: '/user/:id', component: UserCmp, as: 'UserCmp'},
+   * ])
+   * class AppCmp {}
+   * 
+   * @Component({...})
+   * @View({ template: 'user: {{id}}' })
+   * class UserCmp {
+   *   string: id;
+   *   constructor(params: RouteParams) {
+   *     this.id = params.get('id');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
+   */
   class RouteParams {
     
-     params: StringMap<string, string>;
+    constructor(params: {[key: string]: string});
+    
+    params: {[key: string]: string};
+    
+    get(param: 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
@@ -234,221 +315,450 @@ declare module ngRouter {
    */
   class RouteRegistry {
     
-
     /**
      * Given a component and a configuration object, add the route to this registry
      */
-     config(parentComponent: any, config: RouteDefinition): void;
+    config(parentComponent: any, config: RouteDefinition): void;
     
-
     /**
      * Reads the annotations of a component and configures the registry based on them
      */
-     configFromComponent(component: any): void;
+    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>;
+    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): Instruction;
+    generate(linkParams: any[], parentComponent: any): Instruction;
+    
   }
-  
+
+    
+  /**
+   * `LocationStrategy` is responsible for representing and reading route state
+   * from the the browser's URL. Angular provides two strategies:
+   * {@link HashLocationStrategy} (default) and {@link PathLocationStrategy}.
+   * 
+   * This is used under the hood of the {@link Location} service.
+   * 
+   * Applications should use the {@link Router} or {@link Location} services to
+   * interact with application route state.
+   * 
+   * For instance, {@link HashLocationStrategy} produces URLs like
+   * `http://example.com#/foo`, and {@link PathLocationStrategy} produces
+   * `http://example.com/foo` as an equivalent URL.
+   * 
+   * See these two classes for more.
+   */
   class LocationStrategy {
     
-     path(): string;
+    path(): string;
     
-     pushState(ctx: any, title: string, url: string): void;
+    pushState(ctx: any, title: string, url: string): void;
     
-     forward(): void;
+    forward(): void;
     
-     back(): void;
+    back(): void;
     
-     onPopState(fn: (_: any) => any): void;
+    onPopState(fn: (_: any) => any): void;
+    
+    getBaseHref(): string;
     
-     getBaseHref(): string;
   }
-  
+
+    
+  /**
+   * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [hash fragment](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax)
+   * of the browser's URL.
+   * 
+   * `HashLocationStrategy` is the default binding for {@link LocationStrategy}
+   * provided in {@link routerBindings} and {@link ROUTER_BINDINGS}.
+   * 
+   * For instance, if you call `location.go('/foo')`, the browser's URL will become
+   * `example.com#/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp) // includes binding to HashLocationStrategy
+   * ]);
+   * ```
+   */
   class HashLocationStrategy extends LocationStrategy {
     
-     onPopState(fn: EventListener): void;
+    constructor();
     
-     getBaseHref(): string;
+    onPopState(fn: EventListener): void;
     
-     path(): string;
+    getBaseHref(): string;
     
-     pushState(state: any, title: string, url: string): void;
+    path(): string;
     
-     forward(): void;
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): 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.
+   * `PathLocationStrategy` is a {@link LocationStrategy} used to configure the
+   * {@link Location} service to represent its state in the
+   * [path](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax) of the
+   * browser's URL.
    * 
-   * Responsible for normalizing the URL against the application's base href.
+   * If you're using `PathLocationStrategy`, you must provide a binding for
+   * {@link APP_BASE_HREF} to a string representing the URL prefix that should
+   * be preserved when generating and recognizing URLs.
+   * 
+   * For instance, if you provide an `APP_BASE_HREF` of `'/my/app'` and call
+   * `location.go('/foo')`, the browser's URL will become
+   * `example.com/my/app/foo`.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View, bind} from 'angular2/angular2';
+   * import {
+   *   APP_BASE_HREF
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location,
+   *   LocationStrategy,
+   *   PathLocationStrategy
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   bind(LocationStrategy).toClass(PathLocationStrategy),
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
+   */
+  class PathLocationStrategy extends LocationStrategy {
+    
+    constructor();
+    
+    onPopState(fn: EventListener): void;
+    
+    getBaseHref(): string;
+    
+    path(): string;
+    
+    pushState(state: any, title: string, url: string): void;
+    
+    forward(): void;
+    
+    back(): void;
+    
+  }
+
+    
+  /**
+   * `Location` is a service that applications can use to interact with a browser's URL.
+   * Depending on which {@link LocationStrategy} is used, `Location` will either persist
+   * to the URL's path or the URL's hash segment.
+   * 
+   * Note: it's better to use {@link Router#navigate} service to trigger route changes. Use
+   * `Location` only if you need to interact with or create normalized URLs outside of
+   * routing.
+   * 
+   * `Location` is 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
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   routerBindings,
+   *   RouteConfig,
+   *   Location
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(location: Location) {
+   *     location.go('/foo');
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
    */
   class Location {
     
-     path(): string;
+    constructor(platformStrategy: LocationStrategy, href?: string);
     
-     normalize(url: string): string;
+    platformStrategy: LocationStrategy;
     
-     normalizeAbsolutely(url: string): string;
+    /**
+     * Returns the normalized URL path.
+     */
+    path(): string;
     
-     go(url: string): void;
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     */
+    normalize(url: string): string;
     
-     forward(): void;
+    /**
+     * Given a string representing a URL, returns the normalized URL path.
+     * If the given URL doesn't begin with a leading slash (`'/'`), this method adds one
+     * before normalizing.
+     */
+    normalizeAbsolutely(url: string): string;
     
-     back(): void;
+    /**
+     * Changes the browsers URL to the normalized version of the given URL, and pushes a
+     * new item onto the platform's history.
+     */
+    go(url: string): void;
+    
+    /**
+     * Navigates forward in the platform's history.
+     */
+    forward(): void;
+    
+    /**
+     * Navigates back in the platform's history.
+     */
+    back(): void;
+    
+    /**
+     * Subscribe to the platform's `popState` events.
+     */
+    subscribe(onNext: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
     
-     subscribe(onNext: (value: any) => void, onThrow?: (exception: any) => void, onReturn?: () => void): void;
   }
-  
-  const APP_BASE_HREF : OpaqueToken ;
-  
 
+    
   /**
-   * Responsible for performing each step of navigation.
-   * "Steps" are conceptually similar to "middleware"
+   * The `APP_BASE_HREF` token represents the base href to be used with the
+   * {@link PathLocationStrategy}.
+   * 
+   * If you're using {@link PathLocationStrategy}, you must provide a binding to a string
+   * representing the URL prefix that should be preserved when generating and recognizing
+   * URLs.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   routerBindings(AppCmp),
+   *   PathLocationStrategy,
+   *   bind(APP_BASE_HREF).toValue('/my/app')
+   * ]);
+   * ```
    */
-  class Pipeline {
-    
-     steps: List<Function>;
-    
-     process(instruction: Instruction): Promise<any>;
-  }
+  let APP_BASE_HREF: OpaqueToken;
   
 
+    
   /**
-   * Defines route lifecycle method [onActivate], which is called by the router at the end of a
+   * Defines route lifecycle method `onActivate`, which is called by the router at the end of a
    * successful route navigation.
    * 
-   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
-   * depending on the result of [canReuse].
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called depending on the result of {@link CanReuse}.
+   * 
+   * The `onActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
    * 
    * If `onActivate` returns a promise, the route change will wait until the promise settles to
    * instantiate and activate child components.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnActivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'my-cmp'
    * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
    * class MyCmp implements OnActivate {
-   *   onActivate(next, prev) {
+   *   onActivate(next: ComponentInstruction, prev: ComponentInstruction) {
    *     this.log = 'Finished navigating from ' + prev.urlPath + ' to ' + next.urlPath;
    *   }
    * }
-   *  ```
+   * ```
    */
   interface OnActivate {
     
-     onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    onActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
   }
-  
 
+    
   /**
-   * Defines route lifecycle method [onDeactivate], which is called by the router before destroying
+   * Defines route lifecycle method `onDeactivate`, which is called by the router before destroying
    * a component as part of a route change.
    * 
+   * The `onDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
    * If `onDeactivate` returns a promise, the route change will wait until the promise settles.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component, View} from 'angular2/angular2';
+   * import {OnDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'my-cmp'
    * })
-   * class MyCmp implements CanReuse, OnReuse {
-   *   canReuse() {
-   *     return true;
-   *   }
-   * 
-   *   onReuse(next, prev) {
-   *     this.params = next.params;
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
+   * class MyCmp implements OnDeactivate {
+   *   onDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
+   *     return this.doFadeAwayAnimation();
    *   }
    * }
    *  ```
    */
   interface OnDeactivate {
     
-     onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    onDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
   }
-  
 
+    
   /**
-   * Defines route lifecycle method [onReuse], which is called by the router at the end of a
-   * successful route navigation when [canReuse] is implemented and returns or resolves to true.
+   * Defines route lifecycle method `onReuse`, which is called by the router at the end of a
+   * successful route navigation when {@link CanReuse} is implemented and returns or resolves to true.
    * 
-   * For a single component's navigation, only one of either [onActivate] or [onReuse] will be called,
-   * depending on the result of [canReuse].
+   * For a single component's navigation, only one of either {@link OnActivate} or {@link OnReuse}
+   * will be called, depending on the result of {@link CanReuse}.
+   * 
+   * The `onReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route or `null`.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'my-cmp'
    * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
    * class MyCmp implements CanReuse, OnReuse {
-   *   canReuse() {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
    *     return true;
    *   }
    * 
-   *   onReuse(next, prev) {
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
    *     this.params = next.params;
    *   }
    * }
-   *  ```
+   * ```
    */
   interface OnReuse {
     
-     onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    onReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
   }
-  
 
+    
   /**
-   * Defines route lifecycle method [canDeactivate], which is called by the router to determine
+   * Defines route lifecycle method `canDeactivate`, which is called by the router to determine
    * if a component can be removed as part of a navigation.
    * 
-   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled.
+   * The `canDeactivate` hook is called with two {@link ComponentInstruction}s as parameters, the
+   * first representing the current route being navigated to, and the second parameter
+   * representing the previous route.
+   * 
+   * If `canDeactivate` returns or resolves to `false`, the navigation is cancelled. If it returns or
+   * resolves to `true`, then the navigation continues, and the component will be deactivated
+   * (the {@link OnDeactivate} hook will be run) and removed.
    * 
    * If `canDeactivate` throws or rejects, the navigation is also cancelled.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanDeactivate, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'my-cmp'
    * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
    * class MyCmp implements CanDeactivate {
-   *   canDeactivate(next, prev) {
+   *   canDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
    *     return askUserIfTheyAreSureTheyWantToQuit();
    *   }
    * }
@@ -456,29 +766,43 @@ declare module ngRouter {
    */
   interface CanDeactivate {
     
-     canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    canDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
   }
-  
 
+    
   /**
-   * Defines route lifecycle method [canReuse], which is called by the router to determine whether a
+   * Defines route lifecycle method `canReuse`, which is called by the router to determine whether a
    * component should be reused across routes, or whether to destroy and instantiate a new component.
    * 
-   * If `canReuse` returns or resolves to `true`, the component instance will be reused.
+   * The `canReuse` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing the current route being navigated to, and the second parameter representing the
+   * previous route.
+   * 
+   * If `canReuse` returns or resolves to `true`, the component instance will be reused and the
+   * {@link OnDeactivate} hook will be run. If `canReuse` returns or resolves to `false`, a new
+   * component will be instantiated, and the existing component will be deactivated and removed as
+   * part of the navigation.
    * 
    * If `canReuse` throws or rejects, the navigation will be cancelled.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component, View} from 'angular2/angular2';
+   * import {CanReuse, OnReuse, ComponentInstruction} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'my-cmp'
    * })
+   * @View({
+   *  template: '<div>hello!</div>'
+   * })
    * class MyCmp implements CanReuse, OnReuse {
-   *   canReuse(next, prev) {
+   *   canReuse(next: ComponentInstruction, prev: ComponentInstruction) {
    *     return next.params.id == prev.params.id;
    *   }
    * 
-   *   onReuse(next, prev) {
+   *   onReuse(next: ComponentInstruction, prev: ComponentInstruction) {
    *     this.id = next.params.id;
    *   }
    * }
@@ -486,199 +810,516 @@ declare module ngRouter {
    */
   interface CanReuse {
     
-     canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    canReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any;
+    
   }
-  
 
+    
   /**
-   * Defines route lifecycle method [canActivate], which is called by the router to determine
+   * Defines route lifecycle hook `CanActivate`, which is called by the router to determine
    * if a component can be instantiated as part of a navigation.
    * 
+   * The `CanActivate` hook is called with two {@link ComponentInstruction}s as parameters, the first
+   * representing
+   * the current route being navigated to, and the second parameter representing the previous route or
+   * `null`.
+   * 
    * Note that unlike other lifecycle hooks, this one uses an annotation rather than an interface.
-   * This is because [canActivate] is called before the component is instantiated.
+   * This is because the `CanActivate` function is called before the component is instantiated.
    * 
-   * If `canActivate` returns or resolves to `false`, the navigation is cancelled.
-   * 
-   * If `canActivate` throws or rejects, the navigation is also cancelled.
+   * If `CanActivate` returns or resolves to `false`, the navigation is cancelled.
+   * If `CanActivate` throws or rejects, the navigation is also cancelled.
+   * If `CanActivate` returns or resolves to `true`, navigation continues, the component is
+   * instantiated, and the {@link OnActivate} hook of that component is called if implemented.
    * 
    * ## Example
    * ```
-   * @Directive({
+   * import {Component} from 'angular2/angular2';
+   * import {CanActivate} from 'angular2/router';
+   * 
+   * @Component({
    *   selector: 'control-panel-cmp'
    * })
+   * @View({
+   *  template: '<div>Control Panel: ...</div>'
+   * })
    * @CanActivate(() => checkIfUserIsLoggedIn())
    * class ControlPanelCmp {
    *   // ...
    * }
    *  ```
    */
-  var CanActivate : (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
-        ClassDecorator ;
+  var CanActivate: (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
+          ClassDecorator;
   
 
+    
   /**
-   * `Instruction` is a tree of `ComponentInstructions`, with all the information needed
+   * `Instruction` is a tree of {@link ComponentInstruction}s with all the information needed
    * to transition each component in the app to a given route, including all auxiliary routes.
    * 
-   * This is a public API.
+   * `Instruction`s can be created using {@link Router#generate}, and can be used to
+   * perform route changes with {@link Router#navigateByInstruction}.
+   * 
+   * ## Example
+   * 
+   * ```
+   * import {bootstrap, Component, View} from 'angular2/angular2';
+   * import {Router, ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   constructor(router: Router) {
+   *     var instruction = router.generate(['/MyRoute']);
+   *     router.navigateByInstruction(instruction);
+   *   }
+   * }
+   * 
+   * bootstrap(AppCmp, routerBindings(AppCmp));
+   * ```
    */
   class Instruction {
     
-     component: ComponentInstruction;
+    constructor(component: ComponentInstruction, child: Instruction, auxInstruction: {[key: string]: Instruction});
     
-     child: Instruction;
+    component: ComponentInstruction;
     
-     auxInstruction: StringMap<string, Instruction>;
+    child: Instruction;
+    
+    auxInstruction: {[key: string]: Instruction};
+    
+    /**
+     * Returns a new instruction that shares the state of the existing instruction, but with
+     * the given child {@link Instruction} replacing the existing child.
+     */
+    replaceChild(child: Instruction): Instruction;
     
-     replaceChild(child: Instruction): Instruction;
   }
-  
 
+    
   /**
    * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
    * composed of a tree of these `ComponentInstruction`s.
    * 
    * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
    * to route lifecycle hooks, like {@link CanActivate}.
+   * 
+   * `ComponentInstruction`s are [https://en.wikipedia.org/wiki/Hash_consing](hash consed). You should
+   * never construct one yourself with "new." Instead, rely on {@link Router/PathRecognizer} to
+   * construct `ComponentInstruction`s.
+   * 
+   * You should not modify this object. It should be treated as immutable.
    */
-  class ComponentInstruction {
+  interface ComponentInstruction {
     
-     reuse: boolean;
+    reuse: boolean;
     
-     urlPath: string;
+    urlPath: string;
     
-     urlParams: List<string>;
+    urlParams: string[];
     
-     params: StringMap<string, any>;
+    params: {[key: string]: any};
     
-     componentType: void;
+    /**
+     * Returns the component type of the represented route, or `null` if this instruction
+     * hasn't been resolved.
+     */
+    componentType: any;
     
-     resolveComponentType(): Promise<Type>;
+    /**
+     * Returns a promise that will resolve to component type of the represented route.
+     * If this instruction references an {@link AsyncRoute}, the `loader` function of that route
+     * will run.
+     */
+    resolveComponentType(): Promise<ng.Type>;
     
-     specificity: void;
+    /**
+     * Returns the specificity of the route associated with this `Instruction`.
+     */
+    specificity: any;
     
-     terminal: void;
+    /**
+     * Returns `true` if the component type of this instruction has no child {@link RouteConfig},
+     * or `false` if it does.
+     */
+    terminal: any;
+    
+    /**
+     * Returns the route data of the given route that was specified in the {@link RouteDefinition},
+     * or `null` if no route data was specified.
+     */
+    routeData(): Object;
     
-     routeData(): Object;
   }
-  
-  class Url {
+
     
-     path: string;
-    
-     child: Url;
-    
-     auxiliary: List<Url>;
-    
-     params: StringMap<string, any>;
-    
-     toString(): string;
-    
-     segmentToString(): string;
-  }
-  
+  /**
+   * Creates a token that can be used in a DI Binding.
+   * 
+   * ### Example ([live demo](http://plnkr.co/edit/Ys9ezXpj2Mnoy3Uc8KBp?p=preview))
+   * 
+   * ```typescript
+   * var t = new OpaqueToken("binding");
+   * 
+   * var injector = Injector.resolveAndCreate([
+   *   bind(t).toValue("bindingValue")
+   * ]);
+   * 
+   * expect(injector.get(t)).toEqual("bindingValue");
+   * ```
+   * 
+   * Using an `OpaqueToken` is preferable to using strings as tokens because of possible collisions
+   * caused by multiple bindings using the same string as two different tokens.
+   * 
+   * Using an `OpaqueToken` is preferable to using an `Object` as tokens because it provides better
+   * error messages.
+   */
   class OpaqueToken {
     
-     toString(): string;
+    constructor(_desc: string);
+    
+    toString(): string;
+    
   }
+
+    
+  let ROUTE_DATA: OpaqueToken;
   
 
-  /**
-   * Runtime representation of a type.
-   * 
-   * In JavaScript a Type is a constructor function.
-   */
-  interface Type extends Function {
     
-     new(args: any): any;
+  /**
+   * Token used to bind the component with the top-level {@link RouteConfig}s for the
+   * application.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_PRIMARY_COMPONENT: OpaqueToken;
   
-  }
+
+    
+  /**
+   * A list of directives. To use the router directives like {@link RouterOutlet} and
+   * {@link RouterLink}, add this to your `directives` array in the {@link View} decorator of your
+   * component.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *    // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  let ROUTER_DIRECTIVES: any[];
   
-  const routerDirectives : List<any> ;
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add this to your application.
+   * 
+   * Note that you also need to bind to {@link ROUTER_PRIMARY_COMPONENT}.
+   * 
+   * You can use the {@link routerBindings} function in your {@link bootstrap} bindings to
+   * simplify setting up these bindings.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {
+   *   ROUTER_DIRECTIVES,
+   *   ROUTER_BINDINGS,
+   *   ROUTER_PRIMARY_COMPONENT,
+   *   RouteConfig
+   * } from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [
+   *   ROUTER_BINDINGS,
+   *   bind(ROUTER_PRIMARY_COMPONENT).toValue(AppCmp)
+   * ]);
+   * ```
+   */
+  let ROUTER_BINDINGS: any[];
   
-  var routerInjectables : List<any> ;
+
+    
+  /**
+   * A list of {@link Binding}s. To use the router, you must add these bindings to
+   * your application.
+   * 
+   * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
+   * 
+   * ```
+   * import {Component, View} from 'angular2/angular2';
+   * import {ROUTER_DIRECTIVES, routerBindings, RouteConfig} from 'angular2/router';
+   * 
+   * @Component({...})
+   * @View({directives: [ROUTER_DIRECTIVES]})
+   * @RouteConfig([
+   *  {...},
+   * ])
+   * class AppCmp {
+   *   // ...
+   * }
+   * 
+   * bootstrap(AppCmp, [routerBindings(AppCmp)]);
+   * ```
+   */
+  function routerBindings(primaryComponent: ng.Type): Array<any>;
   
+
+    
+  /**
+   * `Route` is a type of {@link RouteDefinition} used to route a path to a component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', component: HomeCmp, as: 'HomeCmp' }
+   * ])
+   * class MyApp {}
+   * ```
+   */
   class Route implements RouteDefinition {
     
-     data: any;
+    constructor({path, component, as, data}:
+                      {path: string, component: ng.Type, as?: string, data?: any});
     
-     path: string;
+    data: any;
     
-     component: Type;
+    path: string;
     
-     as: string;
+    component: ng.Type;
     
-     loader: Function;
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
     
-     redirectTo: string;
   }
-  
+
+    
+  /**
+   * `Redirect` is a type of {@link RouteDefinition} used to route a path to an asynchronously loaded
+   * component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `redirectTo` is a string representing the new URL to be matched against.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/', redirectTo: '/home'},
+   *   {path: '/home', component: HomeCmp}
+   * ])
+   * class MyApp {}
+   * ```
+   */
   class Redirect implements RouteDefinition {
     
-     path: string;
+    constructor({path, redirectTo}: {path: string, redirectTo: string});
     
-     redirectTo: string;
+    path: string;
     
-     as: string;
+    redirectTo: string;
     
-     loader: Function;
+    as: string;
+    
+    loader: Function;
+    
+    data: any;
     
-     data: any;
   }
-  
+
+    
+  /**
+   * `AuxRoute` is a type of {@link RouteDefinition} used to define an auxiliary route.
+   * 
+   * It takes an object with the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `component` a component type.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig, AuxRoute} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   new AuxRoute({path: '/home', component: HomeCmp})
+   * ])
+   * class MyApp {}
+   * ```
+   */
   class AuxRoute implements RouteDefinition {
     
-     data: any;
+    constructor({path, component, as}: {path: string, component: ng.Type, as?: string});
     
-     path: string;
+    data: any;
     
-     component: Type;
+    path: string;
     
-     as: string;
+    component: ng.Type;
     
-     loader: Function;
+    as: string;
+    
+    loader: Function;
+    
+    redirectTo: string;
     
-     redirectTo: string;
   }
-  
+
+    
+  /**
+   * `AsyncRoute` is a type of {@link RouteDefinition} used to route a path to an asynchronously
+   * loaded component.
+   * 
+   * It has the following properties:
+   * - `path` is a string that uses the route matcher DSL.
+   * - `loader` is a function that returns a promise that resolves to a component.
+   * - `as` is an optional `CamelCase` string representing the name of the route.
+   * - `data` is an optional property of any type representing arbitrary route metadata for the given
+   * route. It is injectable via the {@link ROUTE_DATA} token.
+   * 
+   * ## Example
+   * ```
+   * import {RouteConfig} from 'angular2/router';
+   * 
+   * @RouteConfig([
+   *   {path: '/home', loader: () => Promise.resolve(MyLoadedCmp), as: 'MyLoadedCmp'}
+   * ])
+   * class MyApp {}
+   * ```
+   */
   class AsyncRoute implements RouteDefinition {
     
-     data: any;
+    constructor({path, loader, as, data}: {path: string, loader: Function, as?: string, data?: any});
     
-     path: string;
+    data: any;
     
-     loader: Function;
+    path: string;
+    
+    loader: Function;
+    
+    as: string;
     
-     as: string;
   }
-  
+
+    
+  /**
+   * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
+   * 
+   * Supported keys:
+   * - `path` (required)
+   * - `component`, `loader`,  `redirectTo` (requires exactly one of these)
+   * - `as` (optional)
+   * - `data` (optional)
+   * 
+   * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}.
+   */
   interface RouteDefinition {
     
-     path: string;
+    path: string;
     
-     component?: Type | ComponentDefinition;
+    component?: ng.Type | ComponentDefinition;
     
-     loader?: Function;
+    loader?: Function;
     
-     redirectTo?: string;
+    redirectTo?: string;
     
-     as?: string;
+    as?: string;
+    
+    data?: any;
     
-     data?: any;
   }
+
+    
+  var RouteConfig: (configs: RouteDefinition[]) => ClassDecorator;
   
-  const ROUTE_DATA : OpaqueToken ;
-  
-  var RouteConfig : (configs: List<RouteDefinition>) => ClassDecorator ;
-  
+
+    
   interface ComponentDefinition {
     
-     type: string;
+    type: string;
     
-     loader?: Function;
+    loader?: Function;
+    
+    component?: ng.Type;
     
-     component?: Type;
   }
+
+    
+  var RouterOutlet: ng.InjectableReference;
+  
+
+    
+  var ComponentInstruction: ng.InjectableReference;
+  
+
   
 }
 
diff --git a/angular2/test_lib-2.0.0-alpha.38.d.ts b/angular2/test_lib-2.0.0-alpha.38.d.ts
new file mode 100644
index 000000000..f298b8e3c
--- /dev/null
+++ b/angular2/test_lib-2.0.0-alpha.38.d.ts
@@ -0,0 +1,408 @@
+// Type definitions for Angular v2.0.0-local_sha.f77234e
+// 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.
+// ***********************************************************
+
+// angular2/test_lib depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+///<reference path="../jasmine/jasmine.d.ts"/>
+
+
+
+declare module ngTestLib {  
+  /**
+   * Allows injecting dependencies in `beforeEach()` and `it()`.
+   * 
+   * Example:
+   * 
+   * ```
+   * beforeEach(inject([Dependency, AClass], (dep, object) => {
+   *   // some code that uses `dep` and `object`
+   *   // ...
+   * }));
+   * 
+   * it('...', inject([AClass, AsyncTestCompleter], (object, async) => {
+   *   object.doSomething().then(() => {
+   *     expect(...);
+   *     async.done();
+   *   });
+   * })
+   * ```
+   * 
+   * Notes:
+   * - injecting an `AsyncTestCompleter` allow completing async tests - this is the equivalent of
+   *   adding a `done` parameter in Jasmine,
+   * - inject is currently a function because of some Traceur limitation the syntax should eventually
+   *   becomes `it('...', @Inject (object: AClass, async: AsyncTestCompleter) => { ... });`
+   * 
+   * @param {Array} tokens
+   * @param {Function} fn
+   * @return {FunctionWithParamTokens}
+   */
+  function inject(tokens: any[], fn: Function): FunctionWithParamTokens;
+  
+
+    
+  var proxy: ClassDecorator;
+  
+
+    
+  var afterEach: Function;
+  
+
+    
+  type SyncTestFn = () => void
+
+    
+  interface NgMatchers extends jasmine.Matchers {
+    
+    toBe(expected: any): boolean;
+    
+    toEqual(expected: any): boolean;
+    
+    toBePromise(): boolean;
+    
+    toBeAnInstanceOf(expected: any): boolean;
+    
+    toHaveText(expected: any): boolean;
+    
+    toHaveCssClass(expected: any): boolean;
+    
+    toImplement(expected: any): boolean;
+    
+    toContainError(expected: any): boolean;
+    
+    toThrowErrorWith(expectedMessage: any): boolean;
+    
+    not: NgMatchers;
+    
+  }
+
+    
+  var expect: (actual: any) => NgMatchers;
+  
+
+    
+  class AsyncTestCompleter {
+    
+    constructor(_done: Function);
+    
+    done(): void;
+    
+  }
+
+    
+  function describe(...args: any[]): void;
+  
+
+    
+  function ddescribe(...args: any[]): void;
+  
+
+    
+  function xdescribe(...args: any[]): void;
+  
+
+    
+  function beforeEach(fn: FunctionWithParamTokens | SyncTestFn): void;
+  
+
+    
+  /**
+   * Allows overriding default bindings defined in test_injector.js.
+   * 
+   * The given function must return a list of DI bindings.
+   * 
+   * Example:
+   * 
+   *   beforeEachBindings(() => [
+   *     bind(Compiler).toClass(MockCompiler),
+   *     bind(SomeToken).toValue(myValue),
+   *   ]);
+   */
+  function beforeEachBindings(fn: any): void;
+  
+
+    
+  function it(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function xit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function iit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  interface GuinessCompatibleSpy extends jasmine.Spy {
+    
+    /**
+     * By chaining the spy with and.returnValue, all calls to the function will return a specific
+     * value.
+     */
+    andReturn(val: any): void;
+    
+    /**
+     * By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied
+     * function.
+     */
+    andCallFake(fn: Function): GuinessCompatibleSpy;
+    
+    /**
+     * removes all recorded calls
+     */
+    reset(): void;
+    
+  }
+
+    
+  class SpyObject {
+    
+    constructor(type?: any);
+    
+    static stub(object?: any, config?: any, overrides?: any): void;
+    
+    noSuchMethod(args: any): void;
+    
+    spy(name: any): void;
+    
+    prop(name: any, value: any): void;
+    
+  }
+
+    
+  function isInInnerZone(): boolean;
+  
+
+    
+  interface RootTestComponent {
+    
+    debugElement: ng.DebugElement;
+    
+    detectChanges(): void;
+    
+    destroy(): void;
+    
+  }
+
+    
+  /**
+   * Builds a RootTestComponent for use in component level tests.
+   */
+  class TestComponentBuilder {
+    
+    constructor(_injector: ng.Injector);
+    
+    /**
+     * Overrides only the html of a {@link ComponentMetadata}.
+     * All the other properties of the component's {@link ng.ViewMetadata} are preserved.
+     * 
+     * @param {ng.Type} component
+     * @param {string} html
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideTemplate(componentType: ng.Type, template: string): TestComponentBuilder;
+    
+    /**
+     * Overrides a component's {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {view} View
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideView(componentType: ng.Type, view: ng.ViewMetadata): TestComponentBuilder;
+    
+    /**
+     * Overrides the directives from the component {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {ng.Type} from
+     * @param {ng.Type} to
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideDirective(componentType: ng.Type, from: ng.Type, to: ng.Type): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideViewBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Builds and returns a RootTestComponent.
+     * 
+     * @return {Promise<RootTestComponent>}
+     */
+    createAsync(rootComponentType: ng.Type): Promise<RootTestComponent>;
+    
+  }
+
+    
+  function createTestInjector(bindings: Array<ng.Type | ng.Binding | any[]>): ng.Injector;
+  
+
+    
+  class FunctionWithParamTokens {
+    
+    constructor(_tokens: any[], _fn: Function);
+    
+    /**
+     * Returns the value of the executed function.
+     */
+    execute(injector: ng.Injector): any;
+    
+    hasToken(token: any): boolean;
+    
+  }
+
+    
+  /**
+   * Wraps a function to be executed in the fakeAsync zone:
+   * - microtasks are manually executed by calling `flushMicrotasks()`,
+   * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+   * 
+   * If there are any pending timers at the end of the function, an exception will be thrown.
+   * 
+   * @param fn
+   * @returns {Function} The function wrapped to be executed in the fakeAsync zone
+   */
+  function fakeAsync(fn: Function): Function;
+  
+
+    
+  function clearPendingTimers(): void;
+  
+
+    
+  /**
+   * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+   * 
+   * The microtasks queue is drained at the very start of this function and after any timer callback
+   * has been executed.
+   * 
+   * @param {number} millis Number of millisecond, defaults to 0
+   */
+  function tick(millis?: number): void;
+  
+
+    
+  /**
+   * Flush any pending microtasks.
+   */
+  function flushMicrotasks(): void;
+  
+
+    
+  class Log {
+    
+    constructor();
+    
+    add(value: any): void;
+    
+    fn(value: any): void;
+    
+    clear(): void;
+    
+    result(): string;
+    
+  }
+
+    
+  class BrowserDetection {
+    
+    constructor(ua: string);
+    
+    isFirefox: boolean;
+    
+    isAndroid: boolean;
+    
+    isEdge: boolean;
+    
+    isIE: boolean;
+    
+    isWebkit: boolean;
+    
+    isIOS7: boolean;
+    
+    isSlow: boolean;
+    
+    supportsIntlApi: boolean;
+    
+  }
+
+    
+  var browserDetection: BrowserDetection;
+  
+
+    
+  function dispatchEvent(element: any, eventType: any): void;
+  
+
+    
+  function el(html: string): HTMLElement;
+  
+
+    
+  function containsRegexp(input: string): RegExp;
+  
+
+    
+  function normalizeCSS(css: string): string;
+  
+
+    
+  function stringifyElement(el: any): string;
+  
+
+    
+  var RootTestComponent: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/test_lib" {
+  export = ngTestLib;
+}
+
+
diff --git a/angular2/test_lib-2.0.0-alpha.39.d.ts b/angular2/test_lib-2.0.0-alpha.39.d.ts
new file mode 100644
index 000000000..ccd64b21b
--- /dev/null
+++ b/angular2/test_lib-2.0.0-alpha.39.d.ts
@@ -0,0 +1,408 @@
+// Type definitions for Angular v2.0.0-local_sha.7d5c3eb
+// 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.
+// ***********************************************************
+
+// angular2/test_lib depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+///<reference path="../jasmine/jasmine.d.ts"/>
+
+
+
+declare module ngTestLib {  
+  /**
+   * Allows injecting dependencies in `beforeEach()` and `it()`.
+   * 
+   * Example:
+   * 
+   * ```
+   * beforeEach(inject([Dependency, AClass], (dep, object) => {
+   *   // some code that uses `dep` and `object`
+   *   // ...
+   * }));
+   * 
+   * it('...', inject([AClass, AsyncTestCompleter], (object, async) => {
+   *   object.doSomething().then(() => {
+   *     expect(...);
+   *     async.done();
+   *   });
+   * })
+   * ```
+   * 
+   * Notes:
+   * - injecting an `AsyncTestCompleter` allow completing async tests - this is the equivalent of
+   *   adding a `done` parameter in Jasmine,
+   * - inject is currently a function because of some Traceur limitation the syntax should eventually
+   *   becomes `it('...', @Inject (object: AClass, async: AsyncTestCompleter) => { ... });`
+   * 
+   * @param {Array} tokens
+   * @param {Function} fn
+   * @return {FunctionWithParamTokens}
+   */
+  function inject(tokens: any[], fn: Function): FunctionWithParamTokens;
+  
+
+    
+  var proxy: ClassDecorator;
+  
+
+    
+  var afterEach: Function;
+  
+
+    
+  type SyncTestFn = () => void
+
+    
+  interface NgMatchers extends jasmine.Matchers {
+    
+    toBe(expected: any): boolean;
+    
+    toEqual(expected: any): boolean;
+    
+    toBePromise(): boolean;
+    
+    toBeAnInstanceOf(expected: any): boolean;
+    
+    toHaveText(expected: any): boolean;
+    
+    toHaveCssClass(expected: any): boolean;
+    
+    toImplement(expected: any): boolean;
+    
+    toContainError(expected: any): boolean;
+    
+    toThrowErrorWith(expectedMessage: any): boolean;
+    
+    not: NgMatchers;
+    
+  }
+
+    
+  var expect: (actual: any) => NgMatchers;
+  
+
+    
+  class AsyncTestCompleter {
+    
+    constructor(_done: Function);
+    
+    done(): void;
+    
+  }
+
+    
+  function describe(...args: any[]): void;
+  
+
+    
+  function ddescribe(...args: any[]): void;
+  
+
+    
+  function xdescribe(...args: any[]): void;
+  
+
+    
+  function beforeEach(fn: FunctionWithParamTokens | SyncTestFn): void;
+  
+
+    
+  /**
+   * Allows overriding default bindings defined in test_injector.js.
+   * 
+   * The given function must return a list of DI bindings.
+   * 
+   * Example:
+   * 
+   *   beforeEachBindings(() => [
+   *     bind(Compiler).toClass(MockCompiler),
+   *     bind(SomeToken).toValue(myValue),
+   *   ]);
+   */
+  function beforeEachBindings(fn: any): void;
+  
+
+    
+  function it(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function xit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function iit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  interface GuinessCompatibleSpy extends jasmine.Spy {
+    
+    /**
+     * By chaining the spy with and.returnValue, all calls to the function will return a specific
+     * value.
+     */
+    andReturn(val: any): void;
+    
+    /**
+     * By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied
+     * function.
+     */
+    andCallFake(fn: Function): GuinessCompatibleSpy;
+    
+    /**
+     * removes all recorded calls
+     */
+    reset(): void;
+    
+  }
+
+    
+  class SpyObject {
+    
+    constructor(type?: any);
+    
+    static stub(object?: any, config?: any, overrides?: any): void;
+    
+    noSuchMethod(args: any): void;
+    
+    spy(name: any): void;
+    
+    prop(name: any, value: any): void;
+    
+  }
+
+    
+  function isInInnerZone(): boolean;
+  
+
+    
+  interface RootTestComponent {
+    
+    debugElement: ng.DebugElement;
+    
+    detectChanges(): void;
+    
+    destroy(): void;
+    
+  }
+
+    
+  /**
+   * Builds a RootTestComponent for use in component level tests.
+   */
+  class TestComponentBuilder {
+    
+    constructor(_injector: ng.Injector);
+    
+    /**
+     * Overrides only the html of a {@link ComponentMetadata}.
+     * All the other properties of the component's {@link ng.ViewMetadata} are preserved.
+     * 
+     * @param {ng.Type} component
+     * @param {string} html
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideTemplate(componentType: ng.Type, template: string): TestComponentBuilder;
+    
+    /**
+     * Overrides a component's {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {view} View
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideView(componentType: ng.Type, view: ng.ViewMetadata): TestComponentBuilder;
+    
+    /**
+     * Overrides the directives from the component {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {ng.Type} from
+     * @param {ng.Type} to
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideDirective(componentType: ng.Type, from: ng.Type, to: ng.Type): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideViewBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Builds and returns a RootTestComponent.
+     * 
+     * @return {Promise<RootTestComponent>}
+     */
+    createAsync(rootComponentType: ng.Type): Promise<RootTestComponent>;
+    
+  }
+
+    
+  function createTestInjector(bindings: Array<ng.Type | ng.Binding | any[]>): ng.Injector;
+  
+
+    
+  class FunctionWithParamTokens {
+    
+    constructor(_tokens: any[], _fn: Function);
+    
+    /**
+     * Returns the value of the executed function.
+     */
+    execute(injector: ng.Injector): any;
+    
+    hasToken(token: any): boolean;
+    
+  }
+
+    
+  /**
+   * Wraps a function to be executed in the fakeAsync zone:
+   * - microtasks are manually executed by calling `flushMicrotasks()`,
+   * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+   * 
+   * If there are any pending timers at the end of the function, an exception will be thrown.
+   * 
+   * @param fn
+   * @returns {Function} The function wrapped to be executed in the fakeAsync zone
+   */
+  function fakeAsync(fn: Function): Function;
+  
+
+    
+  function clearPendingTimers(): void;
+  
+
+    
+  /**
+   * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+   * 
+   * The microtasks queue is drained at the very start of this function and after any timer callback
+   * has been executed.
+   * 
+   * @param {number} millis Number of millisecond, defaults to 0
+   */
+  function tick(millis?: number): void;
+  
+
+    
+  /**
+   * Flush any pending microtasks.
+   */
+  function flushMicrotasks(): void;
+  
+
+    
+  class Log {
+    
+    constructor();
+    
+    add(value: any): void;
+    
+    fn(value: any): void;
+    
+    clear(): void;
+    
+    result(): string;
+    
+  }
+
+    
+  class BrowserDetection {
+    
+    constructor(ua: string);
+    
+    isFirefox: boolean;
+    
+    isAndroid: boolean;
+    
+    isEdge: boolean;
+    
+    isIE: boolean;
+    
+    isWebkit: boolean;
+    
+    isIOS7: boolean;
+    
+    isSlow: boolean;
+    
+    supportsIntlApi: boolean;
+    
+  }
+
+    
+  var browserDetection: BrowserDetection;
+  
+
+    
+  function dispatchEvent(element: any, eventType: any): void;
+  
+
+    
+  function el(html: string): HTMLElement;
+  
+
+    
+  function containsRegexp(input: string): RegExp;
+  
+
+    
+  function normalizeCSS(css: string): string;
+  
+
+    
+  function stringifyElement(el: any): string;
+  
+
+    
+  var RootTestComponent: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/test_lib" {
+  export = ngTestLib;
+}
+
+
diff --git a/angular2/test_lib.d.ts b/angular2/test_lib.d.ts
new file mode 100644
index 000000000..ccd64b21b
--- /dev/null
+++ b/angular2/test_lib.d.ts
@@ -0,0 +1,408 @@
+// Type definitions for Angular v2.0.0-local_sha.7d5c3eb
+// 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.
+// ***********************************************************
+
+// angular2/test_lib depends transitively on these libraries.
+// If you don't have them installed you can install them using TSD
+// https://github.com/DefinitelyTyped/tsd
+
+///<reference path="./angular2.d.ts"/>
+///<reference path="../jasmine/jasmine.d.ts"/>
+
+
+
+declare module ngTestLib {  
+  /**
+   * Allows injecting dependencies in `beforeEach()` and `it()`.
+   * 
+   * Example:
+   * 
+   * ```
+   * beforeEach(inject([Dependency, AClass], (dep, object) => {
+   *   // some code that uses `dep` and `object`
+   *   // ...
+   * }));
+   * 
+   * it('...', inject([AClass, AsyncTestCompleter], (object, async) => {
+   *   object.doSomething().then(() => {
+   *     expect(...);
+   *     async.done();
+   *   });
+   * })
+   * ```
+   * 
+   * Notes:
+   * - injecting an `AsyncTestCompleter` allow completing async tests - this is the equivalent of
+   *   adding a `done` parameter in Jasmine,
+   * - inject is currently a function because of some Traceur limitation the syntax should eventually
+   *   becomes `it('...', @Inject (object: AClass, async: AsyncTestCompleter) => { ... });`
+   * 
+   * @param {Array} tokens
+   * @param {Function} fn
+   * @return {FunctionWithParamTokens}
+   */
+  function inject(tokens: any[], fn: Function): FunctionWithParamTokens;
+  
+
+    
+  var proxy: ClassDecorator;
+  
+
+    
+  var afterEach: Function;
+  
+
+    
+  type SyncTestFn = () => void
+
+    
+  interface NgMatchers extends jasmine.Matchers {
+    
+    toBe(expected: any): boolean;
+    
+    toEqual(expected: any): boolean;
+    
+    toBePromise(): boolean;
+    
+    toBeAnInstanceOf(expected: any): boolean;
+    
+    toHaveText(expected: any): boolean;
+    
+    toHaveCssClass(expected: any): boolean;
+    
+    toImplement(expected: any): boolean;
+    
+    toContainError(expected: any): boolean;
+    
+    toThrowErrorWith(expectedMessage: any): boolean;
+    
+    not: NgMatchers;
+    
+  }
+
+    
+  var expect: (actual: any) => NgMatchers;
+  
+
+    
+  class AsyncTestCompleter {
+    
+    constructor(_done: Function);
+    
+    done(): void;
+    
+  }
+
+    
+  function describe(...args: any[]): void;
+  
+
+    
+  function ddescribe(...args: any[]): void;
+  
+
+    
+  function xdescribe(...args: any[]): void;
+  
+
+    
+  function beforeEach(fn: FunctionWithParamTokens | SyncTestFn): void;
+  
+
+    
+  /**
+   * Allows overriding default bindings defined in test_injector.js.
+   * 
+   * The given function must return a list of DI bindings.
+   * 
+   * Example:
+   * 
+   *   beforeEachBindings(() => [
+   *     bind(Compiler).toClass(MockCompiler),
+   *     bind(SomeToken).toValue(myValue),
+   *   ]);
+   */
+  function beforeEachBindings(fn: any): void;
+  
+
+    
+  function it(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function xit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  function iit(name: any, fn: any, timeOut?: any): void;
+  
+
+    
+  interface GuinessCompatibleSpy extends jasmine.Spy {
+    
+    /**
+     * By chaining the spy with and.returnValue, all calls to the function will return a specific
+     * value.
+     */
+    andReturn(val: any): void;
+    
+    /**
+     * By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied
+     * function.
+     */
+    andCallFake(fn: Function): GuinessCompatibleSpy;
+    
+    /**
+     * removes all recorded calls
+     */
+    reset(): void;
+    
+  }
+
+    
+  class SpyObject {
+    
+    constructor(type?: any);
+    
+    static stub(object?: any, config?: any, overrides?: any): void;
+    
+    noSuchMethod(args: any): void;
+    
+    spy(name: any): void;
+    
+    prop(name: any, value: any): void;
+    
+  }
+
+    
+  function isInInnerZone(): boolean;
+  
+
+    
+  interface RootTestComponent {
+    
+    debugElement: ng.DebugElement;
+    
+    detectChanges(): void;
+    
+    destroy(): void;
+    
+  }
+
+    
+  /**
+   * Builds a RootTestComponent for use in component level tests.
+   */
+  class TestComponentBuilder {
+    
+    constructor(_injector: ng.Injector);
+    
+    /**
+     * Overrides only the html of a {@link ComponentMetadata}.
+     * All the other properties of the component's {@link ng.ViewMetadata} are preserved.
+     * 
+     * @param {ng.Type} component
+     * @param {string} html
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideTemplate(componentType: ng.Type, template: string): TestComponentBuilder;
+    
+    /**
+     * Overrides a component's {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {view} View
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideView(componentType: ng.Type, view: ng.ViewMetadata): TestComponentBuilder;
+    
+    /**
+     * Overrides the directives from the component {@link ng.ViewMetadata}.
+     * 
+     * @param {ng.Type} component
+     * @param {ng.Type} from
+     * @param {ng.Type} to
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideDirective(componentType: ng.Type, from: ng.Type, to: ng.Type): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Overrides one or more injectables configured via `bindings` metadata property of a directive or
+     * component.
+     * Very useful when certain bindings need to be mocked out.
+     * 
+     * The bindings specified via this method are appended to the existing `bindings` causing the
+     * duplicated bindings to
+     * be overridden.
+     * 
+     * @param {ng.Type} component
+     * @param {any[]} bindings
+     * 
+     * @return {TestComponentBuilder}
+     */
+    overrideViewBindings(type: ng.Type, bindings: any[]): TestComponentBuilder;
+    
+    /**
+     * Builds and returns a RootTestComponent.
+     * 
+     * @return {Promise<RootTestComponent>}
+     */
+    createAsync(rootComponentType: ng.Type): Promise<RootTestComponent>;
+    
+  }
+
+    
+  function createTestInjector(bindings: Array<ng.Type | ng.Binding | any[]>): ng.Injector;
+  
+
+    
+  class FunctionWithParamTokens {
+    
+    constructor(_tokens: any[], _fn: Function);
+    
+    /**
+     * Returns the value of the executed function.
+     */
+    execute(injector: ng.Injector): any;
+    
+    hasToken(token: any): boolean;
+    
+  }
+
+    
+  /**
+   * Wraps a function to be executed in the fakeAsync zone:
+   * - microtasks are manually executed by calling `flushMicrotasks()`,
+   * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+   * 
+   * If there are any pending timers at the end of the function, an exception will be thrown.
+   * 
+   * @param fn
+   * @returns {Function} The function wrapped to be executed in the fakeAsync zone
+   */
+  function fakeAsync(fn: Function): Function;
+  
+
+    
+  function clearPendingTimers(): void;
+  
+
+    
+  /**
+   * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+   * 
+   * The microtasks queue is drained at the very start of this function and after any timer callback
+   * has been executed.
+   * 
+   * @param {number} millis Number of millisecond, defaults to 0
+   */
+  function tick(millis?: number): void;
+  
+
+    
+  /**
+   * Flush any pending microtasks.
+   */
+  function flushMicrotasks(): void;
+  
+
+    
+  class Log {
+    
+    constructor();
+    
+    add(value: any): void;
+    
+    fn(value: any): void;
+    
+    clear(): void;
+    
+    result(): string;
+    
+  }
+
+    
+  class BrowserDetection {
+    
+    constructor(ua: string);
+    
+    isFirefox: boolean;
+    
+    isAndroid: boolean;
+    
+    isEdge: boolean;
+    
+    isIE: boolean;
+    
+    isWebkit: boolean;
+    
+    isIOS7: boolean;
+    
+    isSlow: boolean;
+    
+    supportsIntlApi: boolean;
+    
+  }
+
+    
+  var browserDetection: BrowserDetection;
+  
+
+    
+  function dispatchEvent(element: any, eventType: any): void;
+  
+
+    
+  function el(html: string): HTMLElement;
+  
+
+    
+  function containsRegexp(input: string): RegExp;
+  
+
+    
+  function normalizeCSS(css: string): string;
+  
+
+    
+  function stringifyElement(el: any): string;
+  
+
+    
+  var RootTestComponent: ng.InjectableReference;
+  
+
+  
+}
+
+declare module "angular2/test_lib" {
+  export = ngTestLib;
+}
+
+
diff --git a/angularjs-toaster/angularjs-toaster.d.ts b/angularjs-toaster/angularjs-toaster.d.ts
index 398704514..9f450b14b 100644
--- a/angularjs-toaster/angularjs-toaster.d.ts
+++ b/angularjs-toaster/angularjs-toaster.d.ts
@@ -16,7 +16,7 @@ declare module ngtoaster {
     error(params: IPopParams): void
     error(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
         toasterId?:number): void
-    into(params: IPopParams): void
+    info(params: IPopParams): void
     info(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
         toasterId?:number): void
     wait(params: IPopParams): void
diff --git a/angularjs/angular-animate.d.ts b/angularjs/angular-animate.d.ts
index 1ecc3d0d7..babc752b2 100644
--- a/angularjs/angular-animate.d.ts
+++ b/angularjs/angular-animate.d.ts
@@ -26,15 +26,15 @@ declare module angular.animate {
      * AnimateService
      * see http://docs.angularjs.org/api/ngAnimate/service/$animate
      */
-    interface IAnimateService extends angular.IAnimateService {
+    interface IAnimateService {
         /**
         * Globally enables / disables animations.
         *
-        * @param value If provided then set the animation on or off.
         * @param element If provided then the element will be used to represent the enable/disable operation.
+        * @param value If provided then set the animation on or off.
         * @returns current animation state
         */
-        enabled(value?: boolean, element?: JQuery): boolean;
+        enabled(element?: JQuery, value?: boolean): boolean;
 
         /**
          * Performs an inline animation on the element.
diff --git a/angularjs/angular-cookies.d.ts b/angularjs/angular-cookies.d.ts
index e34518b8a..25efc42de 100644
--- a/angularjs/angular-cookies.d.ts
+++ b/angularjs/angular-cookies.d.ts
@@ -16,6 +16,33 @@ declare module "angular-cookies" {
  */
 declare module angular.cookies {
 
+    /**
+    * Cookies options
+    * see https://docs.angularjs.org/api/ngCookies/provider/$cookiesProvider#defaults
+    */
+    interface ICookiesOptions {
+        /**
+        * The cookie will be available only for this path and its sub-paths. 
+        * By default, this would be the URL that appears in your base tag.
+        */
+        path?: string;
+        /**
+        * The cookie will be available only for this domain and its sub-domains.
+        * For obvious security reasons the user agent will not accept the cookie if the 
+        * current domain is not a sub domain or equals to the requested domain.
+        */
+        domain?: string;
+        /**
+        * String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT" or a Date object
+        * indicating the exact date/time this cookie will expire.
+        */
+        expires?: string|Date;
+        /**
+        * The cookie will be available only in secured connection.
+        */
+        secure?: boolean;
+    }
+
     /**
      * CookieService
      * see http://docs.angularjs.org/api/ngCookies.$cookies
@@ -31,10 +58,11 @@ declare module angular.cookies {
     interface ICookiesService {
         get(key: string): string;
         getObject(key: string): any;
+        getObject<T>(key: string): T;
         getAll(): any;
-        put(key: string, value: string, options?: any): void;
-        putObject(key: string, value: any, options?: any): void;
-        remove(key: string, options?: any): void;
+        put(key: string, value: string, options?: ICookiesOptions): void;
+        putObject(key: string, value: any, options?: ICookiesOptions): void;
+        remove(key: string, options?: ICookiesOptions): void;
     }
 
     /**
diff --git a/angularjs/angular-mocks-tests.ts b/angularjs/angular-mocks-tests.ts
index e9cd21642..63ea220f6 100644
--- a/angularjs/angular-mocks-tests.ts
+++ b/angularjs/angular-mocks-tests.ts
@@ -126,18 +126,35 @@ requestHandler = httpBackendService.expect('GET', /test.local/, function (data:
 requestHandler = httpBackendService.expect('GET', /test.local/, { key: 'value' });
 requestHandler = httpBackendService.expect('GET', /test.local/, { key: 'value' }, { header: 'value' });
 requestHandler = httpBackendService.expect('GET', /test.local/, { key: 'value' }, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, 'response data', function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, /response data/, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, function (data: string): boolean { return true; }, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.expect('GET', (url: string) => { return true; }, { key: 'value' }, function (headers: Object): boolean { return true; });
 
 requestHandler = httpBackendService.expectDELETE('http://test.local');
 requestHandler = httpBackendService.expectDELETE('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.expectDELETE(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.expectDELETE((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectGET('http://test.local');
 requestHandler = httpBackendService.expectGET('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.expectGET(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.expectGET((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectHEAD('http://test.local');
 requestHandler = httpBackendService.expectHEAD('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.expectHEAD(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.expectHEAD((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectJSONP('http://test.local');
 requestHandler = httpBackendService.expectJSONP(/test.local/);
+requestHandler = httpBackendService.expectJSONP((url: string) => { return true; });
 
 requestHandler = httpBackendService.expectPATCH('http://test.local');
 requestHandler = httpBackendService.expectPATCH('http://test.local', 'response data');
@@ -157,6 +174,15 @@ requestHandler = httpBackendService.expectPATCH(/test.local/, function (data: st
 requestHandler = httpBackendService.expectPATCH(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectPATCH(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.expectPATCH(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.expectPATCH((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 requestHandler = httpBackendService.expectPOST('http://test.local');
 requestHandler = httpBackendService.expectPOST('http://test.local', 'response data');
@@ -176,6 +202,15 @@ requestHandler = httpBackendService.expectPOST(/test.local/, function (data: str
 requestHandler = httpBackendService.expectPOST(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectPOST(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.expectPOST(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.expectPOST((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 requestHandler = httpBackendService.expectPUT('http://test.local');
 requestHandler = httpBackendService.expectPUT('http://test.local', 'response data');
@@ -195,6 +230,15 @@ requestHandler = httpBackendService.expectPUT(/test.local/, function (data: stri
 requestHandler = httpBackendService.expectPUT(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.expectPUT(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.expectPUT(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.expectPUT((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 requestHandler = httpBackendService.when('GET', 'http://test.local');
 requestHandler = httpBackendService.when('GET', 'http://test.local', 'response data');
@@ -222,18 +266,35 @@ requestHandler = httpBackendService.when('GET', /test.local/, function (data: st
 requestHandler = httpBackendService.when('GET', /test.local/, { key: 'value' });
 requestHandler = httpBackendService.when('GET', /test.local/, { key: 'value' }, { header: 'value' });
 requestHandler = httpBackendService.when('GET', /test.local/, { key: 'value' }, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, 'response data', function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, /response data/, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, function (data: string): boolean { return true; }, function (headers: Object): boolean { return true; });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.when('GET', (url: string) => { return true; }, { key: 'value' }, function (headers: Object): boolean { return true; });
 
 requestHandler = httpBackendService.whenDELETE('http://test.local');
 requestHandler = httpBackendService.whenDELETE('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.whenDELETE(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.whenDELETE((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenGET('http://test.local');
 requestHandler = httpBackendService.whenGET('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.whenGET(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.whenGET((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenHEAD('http://test.local');
 requestHandler = httpBackendService.whenHEAD('http://test.local', { header: 'value' });
 requestHandler = httpBackendService.whenHEAD(/test.local/, { header: 'value' });
+requestHandler = httpBackendService.whenHEAD((url: string) => { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenJSONP('http://test.local');
 requestHandler = httpBackendService.whenJSONP(/test.local/);
+requestHandler = httpBackendService.whenJSONP((url: string) => { return true; });
 
 requestHandler = httpBackendService.whenPATCH('http://test.local');
 requestHandler = httpBackendService.whenPATCH('http://test.local', 'response data');
@@ -253,6 +314,15 @@ requestHandler = httpBackendService.whenPATCH(/test.local/, function (data: stri
 requestHandler = httpBackendService.whenPATCH(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenPATCH(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.whenPATCH(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.whenPATCH((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 requestHandler = httpBackendService.whenPOST('http://test.local');
 requestHandler = httpBackendService.whenPOST('http://test.local', 'response data');
@@ -272,6 +342,15 @@ requestHandler = httpBackendService.whenPOST(/test.local/, function (data: strin
 requestHandler = httpBackendService.whenPOST(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenPOST(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.whenPOST(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.whenPOST((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 requestHandler = httpBackendService.whenPUT('http://test.local');
 requestHandler = httpBackendService.whenPUT('http://test.local', 'response data');
@@ -291,15 +370,34 @@ requestHandler = httpBackendService.whenPUT(/test.local/, function (data: string
 requestHandler = httpBackendService.whenPUT(/test.local/, function (data: string): boolean { return true; }, { header: 'value' });
 requestHandler = httpBackendService.whenPUT(/test.local/, { key: 'value' });
 requestHandler = httpBackendService.whenPUT(/test.local/, { key: 'value' }, { header: 'value' });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, 'response data');
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, 'response data', { header: 'value' });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, /response data/);
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, /response data/, { header: 'value' });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, function (data: string): boolean { return true; });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, function (data: string): boolean { return true; }, { header: 'value' });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, { key: 'value' });
+requestHandler = httpBackendService.whenPUT((url: string) => { return true; }, { key: 'value' }, { header: 'value' });
 
 
 ///////////////////////////////////////
 // IRequestHandler
 ///////////////////////////////////////
+var expectedData = { key: 'value'};
 requestHandler.passThrough();
-requestHandler.respond(function () { });
+requestHandler.passThrough().passThrough();
+requestHandler.respond((method, url, data, headers) => [404, 'data', { header: 'value' }, 'responseText']);
+requestHandler.respond((method, url, data, headers) => [404, 'data', { header: 'value' }, 'responseText']).respond({});
+requestHandler.respond((method, url, data, headers) => { return [404, { key: 'value' }, { header: 'value' }, 'responseText']; });
+requestHandler.respond('data');
+requestHandler.respond('data').respond({});
+requestHandler.respond(expectedData);
 requestHandler.respond({ key: 'value' });
 requestHandler.respond({ key: 'value' }, { header: 'value' });
-requestHandler.respond(404);
+requestHandler.respond({ key: 'value' }, { header: 'value' }, 'responseText');
+requestHandler.respond(404, 'data');
+requestHandler.respond(404, 'data').respond({});
 requestHandler.respond(404, { key: 'value' });
 requestHandler.respond(404, { key: 'value' }, { header: 'value' });
+requestHandler.respond(404, { key: 'value' }, { header: 'value' }, 'responseText');
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index e6b668a7b..d94337273 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Angular JS 1.3 (ngMock, ngMockE2E module)
 // Project: http://angularjs.org
-// Definitions by: Diego Vilar <http://github.com/diegovilar>
+// Definitions by: Diego Vilar <http://github.com/diegovilar>, Tony Curtis <http://github.com/daltin>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="angular.d.ts" />
@@ -10,6 +10,11 @@ declare module "angular-mocks/ngMock" {
     export = _;
 }
 
+declare module "angular-mocks/ngMockE2E" {
+    var _: string;
+    export = _;
+}
+
 declare module "angular-mocks/ngAnimateMock" {
     var _: string;
     export = _;
@@ -97,137 +102,208 @@ declare module angular {
     // see https://docs.angularjs.org/api/ngMock/service/$httpBackend
     ///////////////////////////////////////////////////////////////////////////
     interface IHttpBackendService {
+        /**
+          * Flushes all pending requests using the trained responses.
+          * @param count Number of responses to flush (in the order they arrived). If undefined, all pending requests will be flushed. 
+          */
         flush(count?: number): void;
+        
+        /**
+          * Resets all request expectations, but preserves all backend definitions.
+          */
         resetExpectations(): void;
+        
+        /**
+          * Verifies that all of the requests defined via the expect api were made. If any of the requests were not made, verifyNoOutstandingExpectation throws an exception.
+          */
         verifyNoOutstandingExpectation(): void;
+        
+        /**
+          * Verifies that there are no outstanding requests that need to be flushed.
+          */
         verifyNoOutstandingRequest(): void;
 
-        expect(method: string, url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: string, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: string, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: string, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: string, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
-        expect(method: string, url: RegExp, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation. 
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param method HTTP method.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        expect(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)) :mock.IRequestHandler;
 
-        expectDELETE(url: string, headers?: Object): mock.IRequestHandler;
-        expectDELETE(url: RegExp, headers?: Object): mock.IRequestHandler;
-        expectGET(url: string, headers?: Object): mock.IRequestHandler;
-        expectGET(url: RegExp, headers?: Object): mock.IRequestHandler;
-        expectHEAD(url: string, headers?: Object): mock.IRequestHandler;
-        expectHEAD(url: RegExp, headers?: Object): mock.IRequestHandler;
-        expectJSONP(url: string): mock.IRequestHandler;
-        expectJSONP(url: RegExp): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for DELETE requests.
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url is as expected.
+          * @param headers HTTP headers object to be compared with the HTTP headers in the request.
+        */
+        expectDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler;
 
-        expectPATCH(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPATCH(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for GET requests.
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object to be compared with the HTTP headers in the request.
+          */
+        expectGET(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler;
 
-        expectPOST(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPOST(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for HEAD requests.
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object to be compared with the HTTP headers in the request.
+          */
+        expectHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler;
+        
+        /**
+          * Creates a new request expectation for JSONP requests.
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          */        
+        expectJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler;
 
-        expectPUT(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        expectPUT(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for PATCH requests. 
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        expectPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler;
 
-        when(method: string, url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: string, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: string, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: string, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: string, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
-        when(method: string, url: RegExp, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for POST requests. 
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        expectPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler;
 
-        whenDELETE(url: string, headers?: Object): mock.IRequestHandler;
-        whenDELETE(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        whenDELETE(url: RegExp, headers?: Object): mock.IRequestHandler;
-        whenDELETE(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
+        /**
+          * Creates a new request expectation for PUT requests. 
+          * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false.
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        expectPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler;
 
-        whenGET(url: string, headers?: Object): mock.IRequestHandler;
-        whenGET(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        whenGET(url: RegExp, headers?: Object): mock.IRequestHandler;
-        whenGET(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param method HTTP method.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        when(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
 
-        whenHEAD(url: string, headers?: Object): mock.IRequestHandler;
-        whenHEAD(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
-        whenHEAD(url: RegExp, headers?: Object): mock.IRequestHandler;
-        whenHEAD(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition for DELETE requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
 
-        whenJSONP(url: string): mock.IRequestHandler;
-        whenJSONP(url: RegExp): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition for GET requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenGET(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
 
-        whenPATCH(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPATCH(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition for HEAD requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
 
-        whenPOST(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPOST(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition for JSONP requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler;
 
-        whenPUT(url: string, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
-        whenPUT(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
+        /**
+          * Creates a new backend definition for PATCH requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
+
+        /**
+          * Creates a new backend definition for POST requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
+
+        /**
+          * Creates a new backend definition for PUT requests. 
+          * Returns an object with respond method that controls how a matched request is handled.
+          * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation.
+          * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation.
+          * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation.
+          */
+        whenPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler;
     }
 
     export module mock {
-
         // returned interface by the the mocked HttpBackendService expect/when methods
         interface IRequestHandler {
-            respond(func: Function): void;
-            respond(status: number, data?: any, headers?: any): void;
-            respond(data: any, headers?: any): void;
+          
+            /**
+              * Controls the response for a matched request using a function to construct the response. 
+              * Returns the RequestHandler object for possible overrides.
+              * @param func Function that receives the request HTTP method, url, data, and headers and returns an array containing response status (number), data, headers, and status text.
+              */
+            respond(func: ((method: string, url: string, data: string | Object, headers: Object) => [number, string | Object, Object, string])): IRequestHandler;
 
-            // Available wehn ngMockE2E is loaded
-            passThrough(): void;
+            /**
+              * Controls the response for a matched request using supplied static data to construct the response. 
+              * Returns the RequestHandler object for possible overrides.
+              * @param status HTTP status code to add to the response.
+              * @param data Data to add to the response.
+              * @param headers Headers object to add to the response.
+              * @param responseText Response text to add to the response.
+              */
+            respond(status: number, data: string | Object, headers?: Object, responseText?: string): IRequestHandler;
+
+            /**
+              * Controls the response for a matched request using the HTTP status code 200 and supplied static data to construct the response. 
+              * Returns the RequestHandler object for possible overrides.
+              * @param data Data to add to the response.
+              * @param headers Headers object to add to the response.
+              * @param responseText Response text to add to the response.
+              */
+            respond(data: string | Object, headers?: Object, responseText?: string): IRequestHandler;
+
+            // Available when ngMockE2E is loaded
+            /**
+              * Any request matching a backend definition or expectation with passThrough handler will be passed through to the real backend (an XHR request will be made to the server.)
+              */
+            passThrough(): IRequestHandler;
         }
 
     }
@@ -237,5 +313,6 @@ declare module angular {
 ///////////////////////////////////////////////////////////////////////////////
 // functions attached to global object (window)
 ///////////////////////////////////////////////////////////////////////////////
-declare var module: (...modules: any[]) => any;
+//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs.
+//declare var module: (...modules: any[]) => any;
 declare var inject: angular.IInjectStatic;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 10d806217..5f8270e59 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -260,6 +260,8 @@ module TestQ {
         let result: angular.IPromise<TResult>;
         result = new $q<TResult>((resolve: (value: TResult) => any) => {});
         result = new $q<TResult>((resolve: (value: TResult) => any, reject: (value: any) => any) => {});
+        result = $q<TResult>((resolve: (value: TResult) => any) => {});
+        result = $q<TResult>((resolve: (value: TResult) => any, reject: (value: any) => any) => {});
     }
 
     // $q.all
@@ -294,6 +296,17 @@ module TestQ {
         result = $q.reject('');
     }
 
+    // $q.resolve
+    {
+        let result: angular.IPromise<void>;
+        result = $q.resolve();
+    }
+    {
+        let result: angular.IPromise<TResult>;
+        result = $q.resolve<TResult>(tResult);
+        result = $q.resolve<TResult>(promiseTResult);
+    }
+
     // $q.when
     {
         let result: angular.IPromise<void>;
@@ -325,6 +338,48 @@ httpFoo.success((data, status, headers, config) => {
 });
 
 
+// Deferred signature tests
+module TestDeferred {
+    var any: any;
+
+    interface TResult {
+        a: number;
+        b: string;
+        c: boolean;
+    }
+    var tResult: TResult;
+
+    var deferred: angular.IDeferred<TResult>;
+
+    // deferred.resolve
+    {
+        let result: void;
+        result = <void>deferred.resolve();
+        result = <void>deferred.resolve(tResult);
+    }
+
+    // deferred.reject
+    {
+        let result: void;
+        result = deferred.reject();
+        result = deferred.reject(any);
+    }
+
+    // deferred.notify
+    {
+        let result: void;
+        result = deferred.notify();
+        result = deferred.notify(any);
+    }
+
+    // deferred.promise
+    {
+        let result: angular.IPromise<TResult>;
+        result = deferred.promise;
+    }
+}
+
+
 // Promise signature tests
 module TestPromise {
     var result: any;
@@ -335,34 +390,60 @@ module TestPromise {
         b: string;
         c: boolean;
     }
+    interface TOther {
+        d: number;
+        e: string;
+        f: boolean;
+    }
+
+    var tresult: TResult;
+    var tresultPromise: ng.IPromise<TResult>;
+    var tresultHttpPromise: ng.IHttpPromise<TResult>;
+
+    var tother: TOther;
+    var totherPromise: ng.IPromise<TOther>;
+    var totherHttpPromise: ng.IHttpPromise<TOther>;
 
     var promise: angular.IPromise<TResult>;
-    interface IPromiseSuccessCallback<T, U> {
-        (promiseValue: T): angular.IHttpPromise<U>|angular.IPromise<U>|U|angular.IPromise<void>;
-    }
-    var successCallbackAnyFn: IPromiseSuccessCallback<TResult, any>;
-    var successCallbackTResultFn: IPromiseSuccessCallback<TResult, TResult>;
-    interface IPromiseErrorCallback<T> {
-        (error: any): angular.IHttpPromise<T>|angular.IPromise<T>|T;
-    }
-    var errorCallbackAnyFn: IPromiseErrorCallback<any>;
-    var errorCallbackTResultFn: IPromiseErrorCallback<TResult>;
 
     // promise.then
-    result = <angular.IPromise<any>>promise.then(successCallbackAnyFn);
-    result = <angular.IPromise<any>>promise.then(successCallbackAnyFn, (any) => any);
-    result = <angular.IPromise<any>>promise.then(successCallbackAnyFn, (any) => any, (any) => any);
-    result = <angular.IPromise<TResult>>promise.then<TResult>(successCallbackTResultFn);
-    result = <angular.IPromise<TResult>>promise.then<TResult>(successCallbackTResultFn, (any) => any);
-    result = <angular.IPromise<TResult>>promise.then<TResult>(successCallbackTResultFn, (any) => any, (any) => any);
+    result = <angular.IPromise<any>>promise.then((result) => any);
+    result = <angular.IPromise<any>>promise.then((result) => any, (any) => any);
+    result = <angular.IPromise<any>>promise.then((result) => any, (any) => any, (any) => any);
+
+    result = <angular.IPromise<TResult>>promise.then((result) => result);
+    result = <angular.IPromise<TResult>>promise.then((result) => result, (any) => any);
+    result = <angular.IPromise<TResult>>promise.then((result) => result, (any) => any, (any) => any);
+    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise);
+    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise, (any) => any);
+    result = <angular.IPromise<TResult>>promise.then((result) => tresultPromise, (any) => any, (any) => any);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise, (any) => any);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.then((result) => tresultHttpPromise, (any) => any, (any) => any);
+
+    result = <angular.IPromise<TOther>>promise.then((result) => tother);
+    result = <angular.IPromise<TOther>>promise.then((result) => tother, (any) => any);
+    result = <angular.IPromise<TOther>>promise.then((result) => tother, (any) => any, (any) => any);
+    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise);
+    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise, (any) => any);
+    result = <angular.IPromise<TOther>>promise.then((result) => totherPromise, (any) => any, (any) => any);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise, (any) => any);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.then((result) => totherHttpPromise, (any) => any, (any) => any);
 
     // promise.catch
-    result = <angular.IPromise<any>>promise.catch(errorCallbackAnyFn);
-    result = <angular.IPromise<TResult>>promise.catch<TResult>(errorCallbackTResultFn);
+    result = <angular.IPromise<any>>promise.catch((err) => any);
+    result = <angular.IPromise<TResult>>promise.catch((err) => tresult);
+    result = <angular.IPromise<TResult>>promise.catch((err) => tresultPromise);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TResult>>>promise.catch((err) => tresultHttpPromise);
+    result = <angular.IPromise<TOther>>promise.catch((err) => tother);
+    result = <angular.IPromise<TOther>>promise.catch((err) => totherPromise);
+    result = <angular.IPromise<ng.IHttpPromiseCallbackArg<TOther>>>promise.catch((err) => totherHttpPromise);
 
     // promise.finally
-    result = <angular.IPromise<any>>promise.finally(() => any);
-    result = <angular.IPromise<TResult>>promise.finally<TResult>(() => any);
+    result = <angular.IPromise<TResult>>promise.finally(() => any);
+    result = <angular.IPromise<TResult>>promise.finally(() => tresult);
+    result = <angular.IPromise<TResult>>promise.finally(() => tother);
 }
 
 
@@ -381,13 +462,52 @@ var scope: ng.IScope = element.scope();
 var isolateScope: ng.IScope = element.isolateScope();
 
 
+// $timeout signature tests
+module TestTimeout {
+    interface TResult {
+        a: number;
+        b: string;
+        c: boolean;
+    }
+    var fnTResult: (...args: any[]) => TResult;
+    var promiseAny: angular.IPromise<any>;
+    var $timeout: angular.ITimeoutService;
+
+    // $timeout
+    {
+        let result: angular.IPromise<any>;
+        result = $timeout();
+    }
+    {
+        let result: angular.IPromise<void>;
+        result = $timeout(1);
+        result = $timeout(1, true);
+    }
+    {
+        let result: angular.IPromise<TResult>;
+        result = $timeout(fnTResult);
+        result = $timeout(fnTResult, 1);
+        result = $timeout(fnTResult, 1, true);
+        result = $timeout(fnTResult, 1, true, 1);
+        result = $timeout(fnTResult, 1, true, 1, '');
+        result = $timeout(fnTResult, 1, true, 1, '', true);
+    }
+
+    // $timeout.cancel
+    {
+        let result: boolean;
+        result = $timeout.cancel();
+        result = $timeout.cancel(promiseAny);
+    }
+}
+
 
 function test_IAttributes(attributes: ng.IAttributes){
     return attributes;
 }
 
 test_IAttributes({
-    $normalize: function (classVal){},
+    $normalize: function (classVal){ return "foo" },
     $addClass: function (classVal){},
     $removeClass: function(classVal){},
     $set: function(key, value){},
@@ -836,3 +956,115 @@ function NgModelControllerTyping() {
             });
     };
 }
+
+var $filter:  angular.IFilterService;
+
+function testFilter() {
+
+    var items: string[];
+    $filter("filter")(items, "test");
+    $filter("filter")(items, {name: "test"});
+    $filter("filter")(items, (val, index, array) => {
+        return true;
+    });
+    $filter("filter")(items, (val, index, array) => {
+      return true;
+    }, (actual, expected) => {
+        return actual == expected;
+    });
+}
+
+function testCurrency() {
+    $filter("currency")(126);
+    $filter("currency")(126, "$", 2);
+}
+
+function testNumber() {
+    $filter("number")(167);
+    $filter("number")(167, 2);
+}
+
+function testDate() {
+    $filter("date")(new Date());
+    $filter("date")(new Date(), 'yyyyMMdd');
+    $filter("date")(new Date(), 'yyyyMMdd', '+0430');
+}
+
+function testJson() {
+    var json: string = $filter("json")({test:true}, 2);
+}
+
+function testLowercase() {
+    var lower: string = $filter("lowercase")('test');
+}
+
+function testUppercase() {
+    var lower: string = $filter("uppercase")('test');
+}
+
+function testLimitTo() {
+    var limitTo = $filter("limitTo");
+    var filtered: number[] = $filter("limitTo")([1,2,3], 5);
+    filtered = $filter("limitTo")([1,2,3], 5, 2);
+
+    var filteredString: string = $filter("limitTo")("124", 4);
+    filteredString = $filter("limitTo")(124, 4);
+}
+
+function testOrderBy() {
+    var filtered: number[] = $filter("orderBy")([1,2,3], "test");
+    filtered = $filter("orderBy")([1,2,3], "test", true);
+    filtered = $filter("orderBy")([1,2,3], ['prop1', 'prop2']);
+    filtered = $filter("orderBy")([1,2,3], (val: number) => 1);
+    var filtered2: string[] = $filter("orderBy")(["1","2","3"], (val: string) => 1);
+    filtered2 = $filter("orderBy")(["1","2","3"], [
+        (val: string) => 1,
+        (val: string) => 2
+    ]);
+}
+
+function testDynamicFilter() {
+    // Test with separate variables
+    var dateFilter = $filter("date");
+    var myDate = new Date();
+    dateFilter(myDate , "EEE, MMM d");
+
+    // Test with dynamic name
+    var filterName = 'date';
+    var dynDateFilter = $filter<ng.IFilterDate>(filterName);
+    dynDateFilter(new Date());
+}
+
+interface MyCustomFilter {
+    (value: string): string;
+}
+
+function testCustomFilter() {
+    var filterCustom = $filter<MyCustomFilter>('custom');
+    var filtered: string = filterCustom("test");
+}
+
+function parseTyping() {
+    var $parse: angular.IParseService;
+    var compiledExp = $parse('a.b.c');
+    if (compiledExp.constant) {
+        return compiledExp({});
+    } else if (compiledExp.literal) {
+        return compiledExp({}, {a: {b: {c: 42}}});
+    }
+}
+
+function doBootstrap(element: Element | JQuery, mode: string): ng.auto.IInjectorService {
+    if (mode === 'debug') {
+        return angular.bootstrap(element, ['main', function($provide: ng.auto.IProvideService) {
+            $provide.decorator('$rootScope', function($delegate: ng.IRootScopeService) {
+                $delegate['debug'] = true;
+            });
+        }, 'debug-helpers'], {
+            debugInfoEnabled: true
+        });
+    }
+    return angular.bootstrap(element, ['main'], {
+        debugInfoEnabled: false
+    });
+}
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 17c0c9384..75f0b0e6a 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -41,6 +41,7 @@ declare module angular {
 
     interface IAngularBootstrapConfig {
         strictDi?: boolean;
+        debugInfoEnabled?: boolean;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -56,132 +57,11 @@ declare module angular {
          * @param element DOM element which is the root of angular application.
          * @param modules An array of modules to load into the application.
          *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
+         *     function that will be invoked by the injector as a config block.
          * @param config an object for defining configuration options for the application. The following keys are supported:
          *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
          */
-        bootstrap(element: string, modules?: string, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: string, modules?: Function, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: string, modules?: string[], config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: JQuery, modules?: string, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: JQuery, modules?: Function, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: JQuery, modules?: string[], config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Element, modules?: string, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Element, modules?: Function, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Element, modules?: string[], config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Document, modules?: string, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Document, modules?: Function, config?: IAngularBootstrapConfig): auto.IInjectorService;
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a run block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: Document, modules?: string[], config?: IAngularBootstrapConfig): auto.IInjectorService;
+        bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService;
 
         /**
          * Creates a deep copy of source, which should be an object or an array.
@@ -426,7 +306,7 @@ declare module angular {
          *
          * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives
          */
-        $normalize(name: string): void;
+        $normalize(name: string): string;
 
         /**
          * Adds the CSS class value specified by the classVal parameter to the
@@ -674,7 +554,7 @@ declare module angular {
          */
         $odd: boolean;
 
-	}
+    }
 
     interface IAngularEvent {
         /**
@@ -725,8 +605,9 @@ declare module angular {
     // see http://docs.angularjs.org/api/ng.$timeout
     ///////////////////////////////////////////////////////////////////////////
     interface ITimeoutService {
-        <T>(func: (...args: any[]) => T, delay?: number, invokeApply?: boolean): IPromise<T>;
-        cancel(promise: IPromise<any>): boolean;
+        (delay?: number, invokeApply?: boolean): IPromise<void>;
+        <T>(fn: (...args: any[]) => T, delay?: number, invokeApply?: boolean, ...args: any[]): IPromise<T>;
+        cancel(promise?: IPromise<any>): boolean;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -775,13 +656,125 @@ declare module angular {
      * see https://docs.angularjs.org/api/ng/service/$filter
      */
     interface IFilterService {
+        (name: 'filter'): IFilterFilter;
+        (name: 'currency'): IFilterCurrency;
+        (name: 'number'): IFilterNumber;
+        (name: 'date'): IFilterDate;
+        (name: 'json'): IFilterJson;
+        (name: 'lowercase'): IFilterLowercase;
+        (name: 'uppercase'): IFilterUppercase;
+        (name: 'limitTo'): IFilterLimitTo;
+        (name: 'orderBy'): IFilterOrderBy;
         /**
          * Usage:
          * $filter(name);
          *
          * @param name Name of the filter function to retrieve
          */
-        (name: string): Function;
+        <T>(name: string): T;
+    }
+
+    interface IFilterFilter {
+        <T>(array: T[], expression: string | IFilterFilterPatternObject | IFilterFilterPredicateFunc<T>, comparator?: IFilterFilterComparatorFunc<T>|boolean): T[];
+    }
+
+    interface IFilterFilterPatternObject {
+        [name: string]: any;
+    }
+
+    interface IFilterFilterPredicateFunc<T> {
+        (value: T, index: number, array: T[]): boolean;
+    }
+
+    interface IFilterFilterComparatorFunc<T> {
+        (actual: T, expected: T): boolean;
+    }
+
+    interface IFilterCurrency {
+        /**
+         * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default symbol for current locale is used.
+         * @param amount Input to filter.
+         * @param symbol Currency symbol or identifier to be displayed.
+         * @param fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+         * @return Formatted number
+         */
+        (amount: number, symbol?: string, fractionSize?: number): string;
+    }
+
+    interface IFilterNumber {
+        /**
+         * Formats a number as text.
+         * @param number Number to format.
+         * @param fractionSize Number of decimal places to round the number to. If this is not provided then the fraction size is computed from the current locale's number formatting pattern. In the case of the default locale, it will be 3.
+         * @return Number rounded to decimalPlaces and places a “,” after each third digit.
+         */
+        (value: number|string, fractionSize?: number|string): string;
+    }
+
+    interface IFilterDate {
+        /**
+         * Formats date to a string based on the requested format.
+         *
+         * @param date Date to format either as Date object, milliseconds (string or number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is specified in the string input, the time is considered to be in the local timezone.
+         * @param format Formatting rules (see Description). If not specified, mediumDate is used.
+         * @param timezone Timezone to be used for formatting. It understands UTC/GMT and the continental US time zone abbreviations, but for general use, use a time zone offset, for example, '+0430' (4 hours, 30 minutes east of the Greenwich meridian) If not specified, the timezone of the browser will be used.
+         * @return Formatted string or the input if input is not recognized as date/millis.
+         */
+        (date: Date | number | string, format?: string, timezone?: string): string;
+    }
+
+    interface IFilterJson {
+        /**
+         * Allows you to convert a JavaScript object into JSON string.
+         * @param object Any JavaScript object (including arrays and primitive types) to filter.
+         * @param spacing The number of spaces to use per indentation, defaults to 2.
+         * @return JSON string.
+         */
+        (object: any, spacing?: number): string;
+    }
+
+    interface IFilterLowercase {
+        /**
+         * Converts string to lowercase.
+         */
+        (value: string): string;
+    }
+
+    interface IFilterUppercase {
+        /**
+         * Converts string to uppercase.
+         */
+        (value: string): string;
+    }
+
+    interface IFilterLimitTo {
+        /**
+         * Creates a new array containing only a specified number of elements. The elements are taken from either the beginning or the end of the source array, string or number, as specified by the value and sign (positive or negative) of limit.
+         * @param input Source array to be limited.
+         * @param limit The length of the returned array. If the limit number is positive, limit number of items from the beginning of the source array/string are copied. If the number is negative, limit number of items from the end of the source array are copied. The limit will be trimmed if it exceeds array.length. If limit is undefined, the input will be returned unchanged.
+         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
+         * @return A new sub-array of length limit or less if input array had less than limit elements.
+         */
+        <T>(input: T[], limit: string|number, begin?: string|number): T[];
+        /**
+         * Creates a new string containing only a specified number of elements. The elements are taken from either the beginning or the end of the source string or number, as specified by the value and sign (positive or negative) of limit. If a number is used as input, it is converted to a string.
+         * @param input Source string or number to be limited.
+         * @param limit The length of the returned string. If the limit number is positive, limit number of items from the beginning of the source string are copied. If the number is negative, limit number of items from the end of the source string are copied. The limit will be trimmed if it exceeds input.length. If limit is undefined, the input will be returned unchanged.
+         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
+         * @return A new substring of length limit or less if input had less than limit elements.
+         */
+        (input: string|number, limit: string|number, begin?: string|number): string;
+    }
+
+    interface IFilterOrderBy {
+        /**
+         * Orders a specified array by the expression predicate. It is ordered alphabetically for strings and numerically for numbers. Note: if you notice numbers are not being sorted as expected, make sure they are actually being saved as numbers and not strings.
+         * @param array The array to sort.
+         * @param expression A predicate to be used by the comparator to determine the order of elements.
+         * @param reverse Reverse the order of the array.
+         * @return Reverse the order of the array.
+         */
+        <T>(array: T[], expression: string|string[]|((value: T) => any)|((value: T) => any)[], reverse?: boolean): T[];
     }
 
     /**
@@ -893,6 +886,9 @@ declare module angular {
     interface ICompiledExpression {
         (context: any, locals?: any): any;
 
+        literal: boolean;
+        constant: boolean;
+
         // If value is not provided, undefined is gonna be used since the implementation
         // does not check the parameter. Let's force a value for consistency. If consumer
         // whants to undefine it, pass the undefined value explicitly.
@@ -998,6 +994,8 @@ declare module angular {
     interface IQService {
         new <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
         new <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
+        <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
+        <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
 
         /**
          * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
@@ -1033,12 +1031,20 @@ declare module angular {
          *
          * @param value Value or a promise
          */
-        when<T>(value: IPromise<T>|T): IPromise<T>;
+        resolve<T>(value: IPromise<T>|T): IPromise<T>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         */
+        resolve(): IPromise<void>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          *
          * @param value Value or a promise
          */
+        when<T>(value: IPromise<T>|T): IPromise<T>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         */
         when(): IPromise<void>;
     }
 
@@ -1048,19 +1054,19 @@ declare module angular {
          * 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|IPromise<void>, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
 
         /**
          * Shorthand for promise.then(null, errorCallback)
          */
-        catch<TResult>(onRejected: (reason: any) => IHttpPromise<TResult>|IPromise<TResult>|TResult): IPromise<TResult>;
+        catch<TResult>(onRejected: (reason: any) => IPromise<TResult>|TResult): IPromise<TResult>;
 
         /**
          * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information.
          *
          * Because finally is a reserved word in JavaScript and reserved keywords are not supported as property names by ES3, you'll need to invoke the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible.
          */
-        finally<TResult>(finallyCallback: () => any): IPromise<TResult>;
+        finally(finallyCallback: () => any): IPromise<T>;
     }
 
     interface IDeferred<T> {
@@ -1227,8 +1233,9 @@ declare module angular {
     ///////////////////////////////////////////////////////////////////////////
     interface IControllerService {
         // Although the documentation doesn't state this, locals are optional
-        (controllerConstructor: Function, locals?: any, bindToController?: any): any;
-        (controllerName: string, locals?: any, bindToController?: any): any;
+        <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, bindToController?: any): T;
+        <T>(controllerConstructor: Function, locals?: any, bindToController?: any): T;
+        <T>(controllerName: string, locals?: any, bindToController?: any): T;
     }
 
     interface IControllerProvider extends IServiceProvider {
@@ -1309,51 +1316,25 @@ declare module angular {
         /**
          * Runtime equivalent of the $httpProvider.defaults property. Allows configuration of default headers, withCredentials as well as request and response transformations.
          */
-        defaults: IRequestConfig;
+        defaults: IHttpProviderDefaults;
 
         /**
          * Array of config objects for currently pending requests. This is primarily meant to be used for debugging purposes.
          */
-        pendingRequests: any[];
+        pendingRequests: IRequestConfig[];
     }
 
     /**
      * Object describing the request to be made and how it should be processed.
      * see http://docs.angularjs.org/api/ng/service/$http#usage
      */
-    interface IRequestShortcutConfig {
+    interface IRequestShortcutConfig extends IHttpProviderDefaults {
         /**
          * {Object.<string|Object>}
          * Map of strings or objects which will be turned to ?key1=value1&key2=value2 after the url. If the value is not a string, it will be JSONified.
          */
         params?: any;
 
-        /**
-         * Map of strings or functions which return strings representing HTTP headers to send to the server. If the return value of a function is null, the header will not be sent.
-         */
-        headers?: any;
-
-        /**
-         * Name of HTTP header to populate with the XSRF token.
-         */
-        xsrfHeaderName?: string;
-
-        /**
-         * Name of cookie containing the XSRF token.
-         */
-        xsrfCookieName?: string;
-
-        /**
-         * {boolean|Cache}
-         * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching.
-         */
-        cache?: any;
-
-        /**
-         * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information.
-         */
-        withCredentials?: boolean;
-
         /**
          * {string|Object}
          * Data to be sent as the request message data.
@@ -1361,25 +1342,12 @@ declare module angular {
         data?: any;
 
         /**
-         * {function(data, headersGetter)|Array.<function(data, headersGetter)>}
-         * 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?: any;
-
-        /**
-         * {function(data, headersGetter)|Array.<function(data, headersGetter)>}
-         * Transform function or an array of such functions. The transform function takes the http response body and headers and returns its transformed (typically deserialized) version.
-         */
-        transformResponse?: any;
-
-        /**
-         * {number|Promise}
          * Timeout in milliseconds, or promise that should abort the request when resolved.
          */
-        timeout?: any;
+        timeout?: number|IPromise<any>;
 
         /**
-         * See requestType.
+         * See [XMLHttpRequest.responseType]https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype
          */
         responseType?: string;
     }
@@ -1419,36 +1387,110 @@ declare module angular {
     interface IHttpPromise<T> extends IPromise<IHttpPromiseCallbackArg<T>> {
         success(callback: IHttpPromiseCallback<T>): IHttpPromise<T>;
         error(callback: IHttpPromiseCallback<any>): IHttpPromise<T>;
-        then<TResult>(successCallback: (response: IHttpPromiseCallbackArg<T>) => IPromise<TResult>|TResult, errorCallback?: (response: IHttpPromiseCallbackArg<any>) => any): IPromise<TResult>;
+    }
+
+    // See the jsdoc for transformData() at https://github.com/angular/angular.js/blob/master/src/ng/http.js#L228
+    interface IHttpResquestTransformer {
+        (data: any, headersGetter: IHttpHeadersGetter): any;
+    }
+
+    // The definition of fields are the same as IHttpPromiseCallbackArg
+    interface IHttpResponseTransformer {
+        (data: any, headersGetter: IHttpHeadersGetter, status: number): any;
+    }
+
+    interface IHttpRequestConfigHeaders {
+        [requestType: string]: string|(() => string);
+        common?: string|(() => string);
+        get?: string|(() => string);
+        post?: string|(() => string);
+        put?: string|(() => string);
+        patch?: string|(() => string);
     }
 
     /**
-    * Object that controls the defaults for $http provider
+    * Object that controls the defaults for $http provider. Not all fields of IRequestShortcutConfig can be configured
+    * via defaults and the docs do not say which. The following is based on the inspection of the source code.
     * https://docs.angularjs.org/api/ng/service/$http#defaults
+    * https://docs.angularjs.org/api/ng/service/$http#usage
+    * https://docs.angularjs.org/api/ng/provider/$httpProvider The properties section
     */
     interface IHttpProviderDefaults {
-        cache?: boolean;
+        /**
+         * {boolean|Cache}
+         * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching.
+         */
+        cache?: any;
+
         /**
          * 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.
+         * @see {@link https://docs.angularjs.org/api/ng/service/$http#transforming-requests-and-responses}
          */
-        transformRequest?: ((data: any, headersGetter?: any) => any)|((data: any, headersGetter?: any) => any)[];
-        xsrfCookieName?: string;
+        transformRequest?: IHttpResquestTransformer |IHttpResquestTransformer[];
+
+        /**
+         * Transform function or an array of such functions. The transform function takes the http response body and
+         * headers and returns its transformed (typically deserialized) version.
+         */
+        transformResponse?: IHttpResponseTransformer | IHttpResponseTransformer[];
+
+        /**
+         * Map of strings or functions which return strings representing HTTP headers to send to the server. If the
+         * return value of a function is null, the header will not be sent.
+         * The key of the map is the request verb in lower case. The "common" key applies to all requests.
+         * @see {@link https://docs.angularjs.org/api/ng/service/$http#setting-http-headers}
+         */
+        headers?: IHttpRequestConfigHeaders;
+
+        /** Name of HTTP header to populate with the XSRF token. */
         xsrfHeaderName?: string;
+
+        /** Name of cookie containing the XSRF token. */
+        xsrfCookieName?: string;
+
+        /**
+         * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information.
+         */
         withCredentials?: boolean;
-        headers?: {
-            common?: any;
-            post?: any;
-            put?: any;
-            patch?: any;
-        }
+
+        /**
+        * A function used to the prepare string representation of request parameters (specified as an object). If
+        * specified as string, it is interpreted as a function registered with the $injector. Defaults to
+        * $httpParamSerializer.
+        */
+        paramSerializer?: string | ((obj: any) => string);
+    }
+
+    interface IHttpInterceptor {
+        request?: (config: IRequestConfig) => IRequestConfig|IPromise<IRequestConfig>;
+        requestError?: (rejection: any) => any;
+        response?: <T>(response: IHttpPromiseCallbackArg<T>) => IPromise<T>|T;
+        responseError?: (rejection: any) => any;
+    }
+
+    interface IHttpInterceptorFactory {
+        (...args: any[]): IHttpInterceptor;
     }
 
     interface IHttpProvider extends IServiceProvider {
         defaults: IHttpProviderDefaults;
-        interceptors: any[];
+
+        /**
+         * Register service factories (names or implementations) for interceptors which are called before and after
+         * each request.
+         */
+        interceptors: (string|IHttpInterceptorFactory|(string|IHttpInterceptorFactory)[])[];
         useApplyAsync(): boolean;
         useApplyAsync(value: boolean): IHttpProvider;
+
+        /**
+         *
+         * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods.
+         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+         *    otherwise, returns the current configured value.
+         */
+        useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -1658,18 +1700,6 @@ declare module angular {
         inheritedData(key?: string): any;
     }
 
-    ///////////////////////////////////////////////////////////////////////
-    // AnimateService
-    // see http://docs.angularjs.org/api/ng.$animate
-    ///////////////////////////////////////////////////////////////////////
-    interface IAnimateService {
-        addClass(element: JQuery, className: string, done?: Function): IPromise<any>;
-        enter(element: JQuery, parent: JQuery, after: JQuery, done?: Function): void;
-        leave(element: JQuery, done?: Function): void;
-        move(element: JQuery, parent: JQuery, after: JQuery, done?: Function): void;
-        removeClass(element: JQuery, className: string, done?: Function): void;
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // AUTO module (angular.js)
     ///////////////////////////////////////////////////////////////////////////
@@ -1682,7 +1712,7 @@ declare module angular {
         interface IInjectorService {
             annotate(fn: Function): string[];
             annotate(inlineAnnotatedFunction: any[]): string[];
-            get<T>(name: string): T;
+            get<T>(name: string, caller?: string): T;
             has(name: string): boolean;
             instantiate<T>(typeConstructor: Function, locals?: any): T;
             invoke(inlineAnnotatedFunction: any[]): any;
diff --git a/angulartics/angulartics-tests.ts b/angulartics/angulartics-tests.ts
index cc816a2ab..549b0c4b4 100644
--- a/angulartics/angulartics-tests.ts
+++ b/angulartics/angulartics-tests.ts
@@ -3,7 +3,7 @@
 
 module Analytics {
     angular.module("angulartics.app", ["angulartics"])
-        .config(["$analyticsProvider", ($analyticsProvider: Angulartics.IAnalyticsServiceProvider) => {
+        .config(["$analyticsProvider", ($analyticsProvider:angulartics.IAnalyticsServiceProvider) => {
             angulartics.waitForVendorApi("location", 1000, (message: string) => {
                 console.log(message);
             });
@@ -17,9 +17,10 @@ module Analytics {
                 console.log(action);
             });
 
-            $analyticsProvider.registerPageTrack((path: string, locationObj: ng.ILocationService) => {
+            $analyticsProvider.registerPageTrack((path:string, locationObj:angular.ILocationService) => {
                 console.log("viewed " + path);
             });
+            
+            $analyticsProvider.settings.pageTracking.basePath = "/my/base/path";        
         }]);
 }
-
diff --git a/angulartics/angulartics.d.ts b/angulartics/angulartics.d.ts
index 8c8957569..edb9aefb3 100644
--- a/angulartics/angulartics.d.ts
+++ b/angulartics/angulartics.d.ts
@@ -4,16 +4,15 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../angularjs/angular.d.ts" />
+declare module angulartics {
 
-interface Angulartics {
-    waitForVendorApi(objectName: string, delay: number, containsField?: any, registerFn?: any, onTimeout?: boolean): void;
-}
-
-declare module Angulartics {
+    interface IAngularticsStatic {
+        waitForVendorApi(objectName:string, delay:number, containsField?:any, registerFn?:any, onTimeout?:boolean): void;
+    }
 
     interface IAnalyticsService {
         eventTrack(eventName: string, properties?: any): any;
-        pageTrack(path: string, location?: ng.ILocationService): any;
+        pageTrack(path:string, location?:angular.ILocationService): any;
         setAlias(alias: string): any;
         setUsername(username: string): any;
         setUserProperties(properties: any): any;
@@ -27,13 +26,23 @@ declare module Angulartics {
         withAutoBase(value: boolean): void;
         developerMode(value: boolean): void;
 
-        registerPageTrack(callback: (path: string, location?: ng.ILocationService) => any): void;
+        registerPageTrack(callback:(path:string, location?:angular.ILocationService) => any): void;
         registerEventTrack(callback: (eventName: string, properties?: any) => any): void;
         registerSetAlias(callback: (alias: string) => any): void
         registerSetUsername(callback: (username: string) => any): void
         registerSetUserProperties(callback: (userProperties: any) => any): void
         registerSetSuperProperties(callback: (superProperties: any) => any): void
+        
+        settings: { 
+            pageTracking: { 
+                autoTrackingVirtualPages: boolean,
+                autoTrackingFirstPage: boolean,
+                basePath: string,
+                autoBasePath: boolean
+            },
+            developerMode: boolean
+        }
     }
 }
 
-declare var angulartics:Angulartics;
+declare var angulartics:angulartics.IAngularticsStatic;
diff --git a/apn/apn-tests.ts b/apn/apn-tests.ts
new file mode 100644
index 000000000..b47259d76
--- /dev/null
+++ b/apn/apn-tests.ts
@@ -0,0 +1,146 @@
+///<reference path="apn.d.ts"/>
+import apn = require("apn");
+
+//Hand made TypeScript tests
+//==========================
+
+//Create with a hex string
+var device1 = new apn.Device("ca11ab1e");
+//Create with a Buffer
+var device2 = new apn.Device(new Buffer("ca55e77e"));
+
+//Create the notification
+var notification = new apn.Notification();
+notification.alert = {
+	title: "The Title",
+	body: "This is the body",
+};
+notification.badge = 5;
+//Fluid api
+notification.setAlertTitle("The Title")
+            .setAlertText("This is the body")
+			.setLaunchImage("LaunchImage");
+
+//Establish the connection
+var connection = new apn.Connection({
+	cert: "path/to/cert.pem",
+	key: "path/to/cert.pem"
+});
+//Testing some specialized event listeners
+connection.on("error", (error) => {
+	console.log("push error", error.name, error.message);
+});
+connection.on("transmissionError", (errorCode, notification, device) => {
+	console.log("push failed", errorCode, "notification", notification.alert, "device id: ", device.toString());
+});
+
+//Send it using hex string
+connection.pushNotification(notification, "ba5eba11");
+//Send it using Buffer
+connection.pushNotification(notification, new Buffer("5ca1ab1e"));
+//Send it using Device
+connection.pushNotification(notification, device1);
+
+//Connecting to feedback service
+var feedbackService = new apn.Feedback({
+	cert: "path/to/cert.pem",
+	key: "path/to/cert.pem",
+	interval: 0
+});
+feedbackService.on("error", (error:Error) => {
+	console.log("push feedback error", error.name, error.message);
+});
+function processFeedbackData(device:apn.Device, time:number) {
+}
+feedbackService.on("feedback", (feedbackData) => {
+	feedbackData.forEach((data) => {
+		processFeedbackData(data.device, data.time);
+	})
+});
+feedbackService.start();
+
+
+//Original examples from apn package
+//==================================
+
+//sending-to-multiple-devices.js
+//------------------------------
+
+var tokens = ["<insert token here>", "<insert token here>"];
+
+if(tokens[0] === "<insert token here>") {
+	console.log("Please set token to a valid device token for the push notification service");
+	process.exit();
+}
+
+// Create a connection to the service using mostly default parameters.
+
+var service = new apn.connection({ production: false });
+
+service.on("connected", function() {
+    console.log("Connected");
+});
+
+service.on("transmitted", function(notification, device) {
+    console.log("Notification transmitted to:" + device.token.toString("hex"));
+});
+
+service.on("transmissionError", function(errCode, notification, device) {
+    console.error("Notification caused error: " + errCode + " for device ", device, notification);
+    if (errCode === 8) {
+        console.log("A error code of 8 indicates that the device token is invalid. This could be for a number of reasons - are you using the correct environment? i.e. Production vs. Sandbox");
+    }
+});
+
+service.on("timeout", function () {
+    console.log("Connection Timeout");
+});
+
+service.on("disconnected", function() {
+    console.log("Disconnected from APNS");
+});
+
+service.on("socketError", console.error);
+
+
+// If you plan on sending identical paylods to many devices you can do something like this.
+function pushNotificationToMany() {
+    console.log("Sending the same notification each of the devices with one call to pushNotification.");
+    var note = new apn.notification();
+    note.setAlertText("Hello, from node-apn!");
+    note.badge = 1;
+
+    service.pushNotification(note, tokens);
+}
+
+pushNotificationToMany();
+
+
+// If you have a list of devices for which you want to send a customised notification you can create one and send it to and individual device.
+function pushSomeNotifications() {
+    console.log("Sending a tailored notification to %d devices", tokens.length);
+    tokens.forEach(function(token, i) {
+        var note = new apn.notification();
+        note.setAlertText("Hello, from node-apn! You are number: " + i);
+        note.badge = i;
+
+        service.pushNotification(note, token);
+    });
+}
+
+pushSomeNotifications();
+
+//feedback.js
+//-----------
+
+function handleFeedback(feedbackData:apn.FeedbackData[]) {
+	feedbackData.forEach(function(feedbackItem) {
+		console.log("Device: " + feedbackItem.device.toString() + " has been unreachable, since: " + feedbackItem.time);
+	});
+}
+
+// Setup a connection to the feedback service using a custom interval (10 seconds)
+var feedback = new apn.feedback({ production: false, interval: 10 });
+
+feedback.on("feedback", handleFeedback);
+feedback.on("feedbackError", console.error);
diff --git a/apn/apn.d.ts b/apn/apn.d.ts
new file mode 100644
index 000000000..cd67743da
--- /dev/null
+++ b/apn/apn.d.ts
@@ -0,0 +1,364 @@
+// Type definitions for node-apn
+// Project: https://github.com/argon/node-apn
+// Definitions by: Zenorbi <https://github.com/zenorbi>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../node/node.d.ts"/>
+declare module "apn" {
+	import events = require("events");
+	import net = require("net");
+	export interface ConnectionOptions {
+		/**
+		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+		 */
+		cert?:string|Buffer;
+		/**
+		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+		 */
+		key?:string|Buffer;
+		/**
+		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+		 */
+		ca?:(string|Buffer)[];
+		/**
+		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above.
+		 */
+		pfx?:string|Buffer;
+		/**
+		 * The passphrase for the connection key, if required
+		 */
+		passphrase?:string;
+		/**
+		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+		 */
+		production?:boolean;
+		/**
+		 * Enable when you are using a VoIP certificate to enable paylods up to 4096 bytes.
+		 */
+		voip?:boolean;
+		/**
+		 * Gateway port (Defaults to: `2195`)
+		 */
+		port?:number;
+		/**
+		 * Reject Unauthorized property to be passed through to tls.connect() (Defaults to `true`)
+		 */
+		rejectUnauthorized?:boolean;
+		/**
+		 * Number of notifications to cache for error purposes (See "Handling Errors" below, (Defaults to: `1000`)
+		 */
+		cacheLength?:number;
+		/**
+		 * Whether the cache should grow in response to messages being lost after errors. (Will still emit a 'cacheTooSmall' event) (Defaults to: `true`)
+		 */
+		autoAdjustCache?:boolean;
+		/**
+		 * The maximum number of connections to create for sending messages. (Defaults to: `1`)
+		 */
+		maxConnections?:number;
+		/**
+		 * The duration of time the module should wait, in milliseconds, when trying to establish a connection to Apple before failing. 0 = Disabled. {Defaults to: `10000`}
+		 */
+		connectTimeout?:number;
+		/**
+		 * The duration the socket should stay alive with no activity in milliseconds. 0 = Disabled. (Defaults to: `3600000` - 1h)
+		 */
+		connectionTimeout?:number;
+		/**
+		 * The maximum number of connection failures that will be tolerated before `apn` will "terminate". (Defaults to: 10)
+		 */
+		connectionRetryLimit?:number;
+		/**
+		 * Whether to buffer notifications and resend them after failure. (Defaults to: `true`)
+		 */
+		buffersNotifications?:number;
+		/**
+		 * Whether to aggresively empty the notification buffer while connected - if set to true node-apn may enter a tight loop under heavy load while delivering notifications. (Defaults to: `false`)
+		 */
+		fastMode?:boolean;
+	}
+	export class Connection extends events.EventEmitter {
+		constructor(options:ConnectionOptions);
+		/**
+		 * This is the business end of the module. Create a `Notification` object and pass it in, along with a single recipient or an array of them and node-apn will take care of the rest, delivering the notification to each recipient.
+		 * 
+		 * A "recipient" is either a `Device` object, a `String`, or a `Buffer` containing the device token. `Device` objects are used internally and will be created if necessary. Where applicable, all events will return a `Device` regardless of the type passed to this method.
+		 */
+		pushNotification(notification:Notification, recipient:Device|string|Buffer|(Device|string|Buffer)[]):void;
+		/**
+		 * Used to manually adjust the "cacheLength" property in the options. This is ideal if you choose to use the `cacheTooSmall` event to tweak your environment. It is safe for increasing and reducing cache size.
+		 */
+		setCacheLength(newLength:number):void;
+		/**
+		 * Indicate to node-apn that when the queue of pending notifications is fully drained that it should close all open connections. This will mean that if there are no other pending resources (open sockets, running timers, etc.) the application will terminate. If notifications are pushed after the connection has completely shutdown a new connection will be established and, if applicable, `shutdown` will need to be called again.
+		 */
+		shutdown():void;
+		/**
+		 * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
+		 */
+		on(event: "error", listener: (error:Error) => void):Connection;
+		/**
+		 * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
+		 */
+		on(event: "socketError", listener: (error:Error) => void):Connection;
+		/**
+		 * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
+		 */
+		on(event: "transmitted", listener: (notification:Notification, decive:Device) => void):Connection;
+		/**
+		 * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
+		 */
+		on(event: "completed", listener: () => void):Connection;
+		/**
+		 * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
+		 * 
+		 * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
+		 */
+		on(event: "cacheTooSmall", listener: (sizeDifference:number) => void):Connection;
+		/**
+		 * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
+		 */
+		on(event: "connected", listener: (openSockets:net.Socket[]) => void):Connection;
+		/**
+		 * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
+		 */
+		on(event: "disconnected", listener: (openSockets:net.Socket[]) => void):Connection;
+		/**
+		 * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
+		 */
+		on(event: "timeout", listener: () => void):Connection;
+		/**
+		 * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
+
+		 * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
+		 */
+		on(event: "transmissionError", listener: (errorCode:number, notification:Notification, device:Device|Buffer) => void):Connection;
+		on(event: string, listener: Function):Connection;
+	}
+	export interface NotificationAlertOptions {
+		title?:string;
+		body:string;
+		"title-loc-key"?:string;
+		"title-loc-args"?:string[];
+		"action-loc-key"?:string;
+		"loc-key"?:string;
+		"loc-args"?:string[];
+		"launch-image"?:string;
+	}
+	export class Notification {
+		/**
+		 * The maximum number of retries which should be performed when sending a notification if an error occurs. A value of 0 will only allow one attempt at sending (0 retries). Set to -1 to disable (default).
+		 */
+		public retryLimit:number;
+		/**
+		 * The UNIX timestamp representing when the notification should expire. This does not contribute to the 2048 byte payload size limit. An expiry of 0 indicates that the notification expires immediately.
+		 */
+		public expiry:number;
+		/**
+		 * From Apple's Documentation, Provide one of the following values:
+		 * 
+		 * - 10 - The push message is sent immediately. (Default)
+		 *   > The push notification must trigger an alert, sound, or badge on the device. It is an error use this priority for a push that contains only the content-available key.
+		 * - 5 - The push message is sent at a time that conserves power on the device receiving it.
+		 */
+		public priority:number;
+		/**
+		 * The encoding to use when transmitting the notification to APNS, defaults to `utf8`. `utf16le` is also possible but as each character is represented by a minimum of 2 bytes, will at least halve the possible payload size. If in doubt leave as default.
+		 */
+		public encoding:string;
+		/**
+		 * This object represents the root JSON object that you can add custom information for your application to. The properties below will only be added to the payload (under `aps`) when the notification is prepared for sending.
+		 */
+		public payload:any;
+		/**
+		 * The value to specify for `payload.aps.badge`
+		 */
+		public badge:number;
+		/**
+		 * The value to specify for `payload.aps.sound`
+		 */
+		public sound:string;
+		/**
+		 * The value to specify for `payload.aps.alert` can be either a `String` or an `Object` as outlined by the payload documentation.
+		 */
+		public alert:string|NotificationAlertOptions;
+		/**
+		 * Setting this to true will specify "content-available" in the payload when it is compiled.
+		 */
+		public newsstandAvailable:boolean;
+		/**
+		 * Setting this to true will specify "content-available" in the payload when it is compiled.
+		 */
+		public contentAvailable:boolean;
+		/**
+		 * The value to specify for the `mdm` field where applicable.
+		 */
+		public mdm:string|Object;
+		/**
+		 * The value to specify for `payload.aps['url-args']`. This used for Safari Push NOtifications and should be an array of values in accordance with the Web Payload Documentation.
+		 */
+		public urlArgs:string[];
+		/**
+		 * When this parameter is set and `notification#trim()` is called it will attempt to truncate the string at the nearest space.
+		 */
+		public truncateAtWordEnd:boolean;
+		/**
+		 * You can optionally pass in an object representing the payload, or configure properties on the returned object.
+		 */
+		constructor(payload?:any);
+		/**
+		 * Set the `aps.alert` text body. This will use the most space-efficient means.
+		 */
+		setAlertText(alertText:string):Notification;
+		/**
+		 * Set the `title` property of the `aps.alert` object - used with Safari Push Notifications
+		 */
+		setAlertTitle(alertTitle:string):Notification;
+		/**
+		 * Set the `action` property of the `aps.alert` object - used with Safari Push Notifications
+		 */
+		setAlertAction(alertAction:string):Notification;
+		/**
+		 * Set the `action-loc-key` property of the `aps.alert` object.
+		 */
+		setActionLocKey(key:string):Notification;
+		/**
+		 * Set the `loc-key` property of the `aps.alert` object.
+		 */
+		setLocKey(key:string):Notification;
+		/**
+		 * Set the `loc-args` property of the `aps.alert` object.
+		 */
+		setLocArgs(args:string[]):Notification;
+		/**
+		 * Set the `launch-image` property of the `aps.alert` object.
+		 */
+		setLaunchImage(image:string):Notification;
+		/**
+		 * Set the `mdm` property on the payload.
+		 */
+		setMDM(mdm:string|Object):Notification;
+		/**
+		 * Set the `content-available` property of the `aps` object.
+		 */
+		setNewsstandAvailable(available:boolean):Notification;
+		/**
+		 * Set the `content-available` property of the `aps` object.
+		 */
+		setContentAvailable(available:boolean):Notification;
+		/**
+		 * Set the `url-args` property of the `aps` object.
+		 */
+		setUrlArgs(urlArgs:string[]):Notification;
+		/**
+		 * Attempt to automatically trim the notification alert text body to meet the payload size limit of 2048 bytes.
+		 */
+		trim():number;
+	}
+	export class Device {
+		public token:Buffer;
+		/**
+		 * `deviceToken` can be a `Buffer` or a `String` containing a "hex" representation of the token. Throws an error if the deviceToken supplied is invalid.
+		 */
+		constructor(deviceToken:string|Buffer);
+	}
+	
+	export interface FeedbackOptions {
+		/**
+		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+		 */
+		cert?:string|Buffer;
+		/**
+		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+		 */
+		key?:string|Buffer;
+		/**
+		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+		 */
+		ca?:(string|Buffer)[];
+		/**
+		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will be used instead of certificate and key above.
+		 */
+		pfx?:string|Buffer;
+		/**
+		 * The passphrase for the connection key, if required
+		 */
+		passphrase?:string;
+		/**
+		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+		 */
+		production?:boolean;
+		/**
+		 * Feedback server port (Defaults to: `2196`)
+		 */
+		port?:number;
+		/**
+		 * Sets the behaviour for triggering the `feedback` event. When `true` the event will be triggered once per connection with an array of timestamp and device token tuples. Otherwise a `feedback` event will be emitted once per token received. (Defaults to: true)
+		 */
+		batchFeedback?:boolean;
+		/**
+		 * The maximum number of tokens to pass when emitting the event - a value of 0 will cause all tokens to be passed after connection is reset. After this number of tokens are received the `feedback` event will be emitted. (Only applies when `batchFeedback` is enabled)
+		 */
+		batchSize?:number;
+		/**
+		 * How often to automatically poll the feedback service. Set to `0` to disable. (Defaults to: `3600`)
+		 */
+		interval?:number;
+	}
+	export interface FeedbackData {
+		time:number;
+		device:Device;
+	}
+	/**
+	 * Connection to the Apple Push Notification Feedback Service and if `interval` isn't disabled automatically begins polling the service. Many of the options are the same as `apn.Connection()`
+	 */
+	export class Feedback {
+		constructor(options:FeedbackOptions);
+		/**
+		 * Trigger a query of the feedback service. If `interval` is non-zero then this method will be called automatically.
+		 */
+		start():void;
+		/**
+		 * You can cancel the interval by calling `feedback.cancel()`. If you do not wish to have the service automatically queried then set `interval` to 0 and use `feedback.start()` to manually invoke it one time.
+		 */
+		cancel():void;
+		/**
+		 * Emitted when an error occurs initialising the module. Usually caused by failing to load the certificates.
+		 */
+		on(event: "error", listener: (error:Error) => void):Feedback;
+		/**
+		 * Emitted when an error occurs receiving or processing the feedback and in the case of a socket error occurring. These errors are usually informational and node-apn will automatically recover.
+		 */
+		on(event: "feedbackError", listener: (error:Error) => void):Feedback;
+		/**
+		 * Emitted when data has been received from the feedback service, typically once per connection. `feedbackData` is an array of objects, each containing the `time` returned by the server (epoch time) and the `device` a `Buffer` containing the device token.
+		 */
+		on(event: "feedback", listener: (feedbackData:FeedbackData[]) => void):Feedback;
+		on(event: string, listener: Function):Feedback;
+	}
+	
+	export enum Errors {
+		"noErrorsEncountered"= 0,
+		"processingError"= 1,
+		"missingDeviceToken"= 2,
+		"missingTopic"= 3,
+		"missingPayload"= 4,
+		"invalidTokenSize"= 5,
+		"invalidTopicSize"= 6,
+		"invalidPayloadSize"= 7,
+		"invalidToken"= 8,
+		"apnsShutdown"= 10,
+		"none"= 255,
+		"retryLimitExceeded"= 512,
+		"moduleInitialisationFailed"= 513,
+		"connectionRetryLimitExceeded"= 514, // When a connection is unable to be established. Usually because of a network / SSL error this will be emitted
+		"connectionTerminated"= 515
+	}
+	
+	//Lowercase aliases
+	export {Connection as connection};
+	export {Device as device};
+	export {Errors as error};
+	export {Feedback as feedback};
+	export {Notification as notification};
+}
diff --git a/appletvjs/README.md b/appletvjs/README.md
new file mode 100644
index 000000000..161282ed6
--- /dev/null
+++ b/appletvjs/README.md
@@ -0,0 +1,21 @@
+# AppleTVJS Definitions Usage Notes
+
+## Referencing AppleTVJS definition files in your code
+
+To do that, simply add `/// <reference path="appletvjs.d.ts" />` at the top of your code.
+
+This will allow you to have intellisense in your AppleTVJS typescript code.
+
+## Global objects
+
+AppleTVJS has a global App object instance that is your entry point into the javascript app. There is also a Device and navigationDocument object that is in the global context. To access any of these simply use them in your TypeScript code as so. They have aliases in the type definition file for your convenience.
+
+## The AppleTVJS namespace
+
+All non global objects have interfaces in the AppleTVJS type definition file are contained in the AppleTVJS namespace.
+
+To use them simple provide the namespace like so:
+
+```ts
+var keyboard: AppleTVJS.Keyboard = textfield.getFeature('Keyboard');
+```
diff --git a/appletvjs/appletvjs-tests.ts b/appletvjs/appletvjs-tests.ts
new file mode 100644
index 000000000..8bdda9c63
--- /dev/null
+++ b/appletvjs/appletvjs-tests.ts
@@ -0,0 +1,215 @@
+/// <reference path="appletvjs.d.ts" />
+
+//test the global app events and functions
+function test_AppEvents() {
+	App.onError = function (options: any) {
+		//do something
+	}
+	
+	App.onExit = function (options: any) {
+		//do something
+	}
+	
+	App.onLaunch = function (options: any) {
+		//do something
+	}
+	
+	App.reload({ someProperty: 'Testing...' });
+}
+
+//test the global device object properties
+function test_DeviceProperties() {
+	var appIdentifier = Device.appIdentifier;
+	var appVersion = Device.appVersion;
+	var model = Device.model;
+	var productType = Device.productType;
+	var systemVersion = Device.systemVersion;
+	var vendorIdentifier = Device.vendorIdentifier;
+}
+
+function test_FeatureElement() {
+	var parser = new DOMParser();
+	var document = parser.parseFromString('<menuBar id="menuBar"></menuBar><textField id="textField"></textField>', "application/xml");
+	var textField = document.getElementById("textField");
+	textField.addEventListener("change", function() {
+		change.call(this, textField);
+	});
+	
+	var change = function (textField: AppleTVJS.FeatureElement){
+		var keyboard: AppleTVJS.Keyboard = textField.getFeature('Keyboard');
+		
+		var text = keyboard.text;
+	};
+	
+	var menuBar = document.getElementById("menuBar");
+	textField.addEventListener("change", function() {
+		change.call(this, textField);
+	});
+	
+	var select = function (menuBar: AppleTVJS.FeatureElement) {
+		var menuBarDocument: AppleTVJS.MenuBarDocument = menuBar.getFeature('MenuBarDocument');
+		
+		var document = menuBarDocument.getDocument(menuBar);
+		menuBarDocument.setDocument(document, menuBar);
+		menuBarDocument.setSelectedItem(menuBar);
+	};
+}
+
+function test_MediaItem() {
+	var mediaItem = new AppleTVJS.MediaItem('video', 'http://www.vidme.com/abc123');
+	mediaItem.artworkImageURL = "http://google.com/artwork.png";
+	mediaItem.contentRatingDomain = "movie";
+	mediaItem.contentRatingRanking = 1;
+	mediaItem.description = "Media Item";
+	
+	var highlight = new AppleTVJS.Highlight();
+	highlight.description = "Highlight";
+	highlight.duration = 10;
+	highlight.imageURL = "http://google.com/img.png";
+	highlight.name = "Name of Highlight";
+	highlight.starttime = 10;
+	
+	var highlightGroup = new AppleTVJS.HighlightGroup();
+	highlightGroup.name = "Highlight Group";
+	highlightGroup.hightlights.push(highlight);
+	
+	mediaItem.highlightGroups.push(highlightGroup);
+	
+	var interstitial = new AppleTVJS.Interstitial();
+	interstitial.duration = 10;
+	interstitial.starttime = 20;
+	
+	mediaItem.interstitials.push(interstitial);
+		
+	mediaItem.isExplicit = false;
+	mediaItem.resumeTime = 0;
+	mediaItem.subtitle = "Subtitle";
+	
+	var loadAssetIDCallback = function (assetID: string, error: string) {
+		//do something
+	};
+	
+	mediaItem.loadAssetID = function (url: string, loadAssetIDCallback: (assetID: string, error: string) => void) {
+		//do something
+	};
+	
+	var loadCertificateCallback = function (certificate: string, error: string) {
+		//do something
+	};
+	
+	mediaItem.loadCertificate = function (url: string, loadCertificateCallback: (certificate: string, error: string) => void) {
+		//do something
+	};
+	
+	var loadKeyCallback = function (key: string, renewalDate: string, error: string) {
+		//do something
+	};
+	
+	mediaItem.loadKey = function (url: string, loadKeyCallback: (key: string, renewalDate: string, error: string) => void) {
+		//do something
+	};
+}
+
+//test the global navigation document object
+function test_navigationDocument() {
+	var parser = new DOMParser();
+	var document = parser.parseFromString('<document></document>', "application/xml");
+
+	var documents = navigationDocument.documents;
+
+	navigationDocument.clear();
+	navigationDocument.dismissModal();
+	navigationDocument.insertBeforeDocument(document);
+	navigationDocument.insertBeforeDocument(document, document);
+	navigationDocument.popDocument();
+	navigationDocument.popToDocument(document);
+	navigationDocument.popToRootDocument();
+	navigationDocument.presentModal(document);
+	navigationDocument.pushDocument(document);
+	navigationDocument.removeDocument(document);
+	navigationDocument.replaceDocument(document, document);
+}
+
+function test_Player() {
+	var playlist =  new AppleTVJS.Playlist();
+
+	var mediaItem = new AppleTVJS.MediaItem('audio');
+	playlist.push(mediaItem);
+	playlist.pop();
+	var result: AppleTVJS.MediaItem[] = playlist.splice(0, 1, mediaItem);
+	var length: number = playlist.length;
+	
+	var player = new AppleTVJS.Player();
+	player.playlist = playlist;
+	
+	var parser = new DOMParser();
+	var document = parser.parseFromString('<document></document>', "application/xml");
+	player.overlayDocument = document;
+	
+	player.present();
+	player.pause();
+	player.play();
+	
+	var playbackState: string = player.playbackState;
+	player.seekToTime(10);
+	player.setPlaybackRate(2);
+	player.stop();
+	
+	var currentMediaItem: AppleTVJS.MediaItem = player.currentMediaItem;
+	var nextMediaItem: AppleTVJS.MediaItem = player.nextMediaItem;
+	var previousMediaItem: AppleTVJS.MediaItem = player.previousMediaItem;
+	
+	player.mediaItemDidChange = function (reason: string) {
+		//do something
+	};
+	
+	player.requestSeekToTime = function (result) {
+		//do something
+	};
+	
+	player.shouldHandleStateChange = function (result: boolean) {
+		//do something
+	};
+	
+	player.stateDidChange = function (){
+		//do something
+	};
+	
+	player.stateWillChange = function (){
+		//do something
+	};
+	
+	player.timeBoundaryDidCross = function (){
+		//do something
+	};
+	
+	player.timeDidChange = function (){
+		//do something
+	};
+	
+	player.timedMetadata = function (){
+		//do something
+	};
+}
+
+//test the global settings object
+function test_Settings() {
+	var language = Settings.language;
+	Settings.onRestrictionsChange = function () {
+		//do something
+	}
+	var restrictions = Settings.restrictions;
+	var allowsExplicit = restrictions.allowsExplicit;
+	var maxMovieRank = restrictions.maxMovieRank;
+	var maxMovieRatingForCountry = restrictions.maxMovieRatingForCountry('US');;
+	var allowsExplmaxTVShowRankicit = restrictions.maxTVShowRank;
+	var maxTVShowRatingForCountry = restrictions.maxTVShowRatingForCountry('US');
+	var storeFrontCountryCode = Settings.storefrontCountryCode;
+}
+
+function test_TVError() {
+	var tvError = new AppleTVJS.TVError();
+	tvError.code = "404";
+	tvError.description = "Not found";
+	tvError.domain = "NSMachErrorDomain";
+}
\ No newline at end of file
diff --git a/appletvjs/appletvjs.d.ts b/appletvjs/appletvjs.d.ts
new file mode 100644
index 000000000..7e3847cd2
--- /dev/null
+++ b/appletvjs/appletvjs.d.ts
@@ -0,0 +1,439 @@
+// Type definitions for AppleTVJS
+// Project: https://developer.apple.com/library/prerelease/tvos/documentation/TVMLJS/Reference/TVJSFrameworkReference/index.html
+// Definitions by: Adam Valverde <https://github.com/brainded>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare var App: AppleTVJS.App;
+declare var Device: AppleTVJS.Device;
+declare var navigationDocument: AppleTVJS.NavigationDocument;
+declare var Settings: AppleTVJS.Settings;
+
+declare function evaluateScripts(scripts: string[], complete: (success: boolean) => void): void;
+
+declare module AppleTVJS {
+	interface App {
+
+		/**
+		 * The onError attribute is used to handle any errors sent from the device.
+		 * This attribute must be set to a function that accepts an “options” argument.
+		 * For example App.onError = function (options) {}.
+		 * */
+		onError: (options: any) => void;
+
+		/**
+		 * The onExit attribute is used to complete any actions that need to be cleaned
+		 * up when the app has been exited. This attribute must be set to a function that
+		 * accepts an “options” argument. For example App.onExit = function (options) {}.
+		 * */
+		onExit: (options: any) => void;
+
+		/**
+		 * The onLaunch attribute is used to start any required actions when the app
+		 * launches. This attribute must be set to a function that accepts an “options”
+		 * argument. For example App.onLaunch = function (options) {}.
+		 * */
+		onLaunch: (options: any) => void;
+
+		/**
+		 * This function reloads the initial JavaScript file without quitting the app.
+		 * The optional reloadData parameter provides developers with a way to capture
+		 * and restart the app in it’s current state. If the reloadData parameter is not
+		 * present, the app is restarted in its initial state. This attribute must be set
+		 * to a function that accepts an “options” argument.
+		 * For example App.onError = function (options) {}.
+		 * */
+		reload(options?: any, reloadData?: any): void;
+	}
+
+	interface Device {
+		/** The unique identifier for the app. */
+		appIdentifier: string;
+
+		/** The current app version. */
+		appVersion: string;
+
+		/** A string that identifies the device model. */
+		model: string;
+
+		/** The version of the product installed on the device. */
+		productType: string;
+
+		/** The operating system on the device. */
+		systemVersion: string;
+
+		/** The UUID of the device. */
+		vendorIdentifier: string;
+	}
+
+	interface FeatureElement extends Element {
+		/** Gets a feature for a given element. */
+		getFeature(feature: string): any;
+	}
+
+	class Highlight {
+		/** The name of the highlight. */
+		name: string;
+
+		/** The description of the highlight. */
+		description: string;
+
+		/** The starttime of the highlight. */
+		starttime: number;
+
+		/** The duration of the highlight. */
+		duration: number;
+
+		/** The imageURL of the highlight. */
+		imageURL: string;
+	}
+
+	class HighlightGroup {
+		/** The name of the highlight group. */
+		name: string;
+
+		/** The hightlights in the highlight group. */
+		hightlights: Highlight[];
+	}
+
+	class Interstitial {
+		/** The starttime of the interstitial. */
+		starttime: number;
+		
+		/** The duration of the interstitial. */
+		duration: number;
+	}
+
+	interface Keyboard {
+		/** The text inside of a searchField or textField element. */
+		text: string;
+
+		/**
+		 * A callback function that is called when the text inside
+		 * of searchField or textField element changes.
+		 * */
+		onTextChange: () => void;
+	}
+
+	class MediaItem {
+		/** 
+		 * Creates a new MediaItem object from the information stored in the URL location. 
+		 * @type: Valid values are: audio, video. Defaults to video.
+		 * @url: The URL pointing to the media item information.
+		 * */
+		constructor(type: string, url?: string);
+
+		/** 
+		 * The domain that the rating applies to. 
+		 * There are three valid values for this property: movie, music, and tvshow.
+		 * */
+		contentRatingDomain: string;
+
+		/** 
+		 * The rating for a video item. 
+		 * The rating is a value from 0-1000. This value corresponds to a specific rating 
+		 * used by different countries. For example, a rating value can represent a PG-13 
+		 * rating in the United State and a MA15+ in Australia.
+		 * */
+		contentRatingRanking: number;
+
+		/** 
+		 * A value indicating whether the item has explicit lyrics. 
+		 * This property is ignored if the MediaItem object type is video.
+		 * */
+		isExplicit: boolean;
+
+		/** The URL path to the artwork that accompanies the media item. */
+		artworkImageURL: string;
+
+		/** The description for a media item. */
+		description: string;
+
+		/** The subtitle for a the media item. */
+		subtitle: string;
+
+		/** The title of the media item. */
+		title: string;
+
+		/** 
+		 * The type of media item. 
+		 * The valid values for this attribute are audio and video.
+		 * */
+		type: string;
+
+		/** The URL path to the media item. */
+		url: string;
+
+		/** An array of highlightGroup objects. */
+		highlightGroups: HighlightGroup[];
+
+		/** An array of interstitial objects. */
+		interstitials: Interstitial[];
+
+		/** 
+		 * The number, in seconds, that a media item starts playing at. 
+		 * Use this to begin playing a MediaItem object at a time other than 
+		 * at the beginning of the object. If this property contains anything 
+		 * other than 0, the player displays “Resume” instead of 
+		 * “Play from beginning” on playback.
+		 * */
+		resumeTime: number;
+
+		/** A callback function used to load the asset identifier for an item. */
+		loadAssetID: (url: string, callback: (assetID: string, error: string) => void) => void;
+
+		/** A callback function used to load the security certificate for an item. */
+		loadCertificate: (url: string, callback: (certificate: string, error: string) => void) => void;
+
+		/** A callback function used to load the security key for an item. */
+		loadKey: (url: string, requestData: any, callback: (key: string, renewalDate: string, error: string) => void) => void;
+	}
+
+	interface MenuBarDocument {
+		/**
+		 * Retrieves the document associated with the specified menu item.
+		 * */
+		getDocument(menuItem: Element): Document;
+
+		/**
+		 * Associates a document with a menu item.
+		 * */
+		setDocument(document: Document, menuItem: Element): void;
+
+		/**
+		 * Sets the focus in a menu bar to the specified menu item.
+		 * */
+		setSelectedItem(menuItem: Element): void;
+	}
+
+	interface NavigationDocument {
+		/**
+		 * Inserts a new document directly before a document currently on the stack.
+		 * */
+		insertBeforeDocument(document: Document, beforeDocument?: Document): void;
+
+		/**
+		 * This function searches the stack for the first instance of the document
+		 * contained in the beforeDocument parameter and inserts the document contained
+		 * in the document parameter on top of it.
+		 * */
+		pushDocument(document: Document): void;
+
+		/**
+		 * Replaces a document on the stack with a new document.
+		 * */
+		replaceDocument(document: Document, beforeDocument?: Document): void;
+
+		/** Dismisses the document displayed in modal view. */
+		dismissModal(): void;
+
+		/**
+		 * Displays the passed document on top of the current document.
+		 * */
+		presentModal(document: Document): void;
+
+		/** The documents currently on the stack. */
+		documents: Document[];
+
+		/**
+		 * Removes all documents currently on the stack.
+		 * */
+		clear(): void;
+
+		/**
+		 * Removes the top most document from the stack.
+		 * */
+		popDocument(): void;
+
+		/**
+		 * Removes all of the documents on the stack that are above the passed document.
+		 * */
+		popToDocument(document: Document): void;
+
+		/**
+		 * Removes all documents from the stack except for the bottom most document.
+		 * */
+		popToRootDocument(): void;
+
+		/**
+		 * Removes the specified document from the stack.
+		 * */
+		removeDocument(document: Document): void;
+	}
+
+	class Player {
+		/** The annotations for a video created by placing a DOM document over the video. */
+		overlayDocument: Document;
+
+		/** The play list for a player. */
+		playlist: Playlist;
+
+		/** Shows the player UI if it is not currently visible. */
+		present(): void;
+
+		/** Pauses the currently playing media item. */
+		pause(): void;
+
+		/** Plays the currently selected media item. */
+		play(): void;
+
+		/**
+		 * The current state of the player.
+		 *
+		 * This property can contain the following valid values:
+		 * begin
+		 * end
+		 * loading
+		 * playing
+		 * paused
+		 * scanning
+		 * */
+		playbackState: string;
+
+		/** Sets the playback point to a specified time. */
+		seekToTime(time: number): void;
+
+		/** Sets the playback speed. */
+		setPlaybackRate(playbackRate: number): void;
+
+		/** Stops the currently playing item and dismisses the player UI. */
+		stop(): void;
+
+		/** The currently selected media item in the playlist. */
+		currentMediaItem: MediaItem;
+
+		/** The next media item in the playlist. */
+		nextMediaItem: MediaItem;
+
+		/** The previous MediaItem object in the playlist. */
+		previousMediaItem: MediaItem;
+
+		/**
+		 * An event notifying the listener that the player is about to change media items.
+		 *
+		 * Valid values are:
+		 * errorDidOccur
+		 * fastForwardedToEndOfMediaItem
+		 * mannuallyChanged
+		 * newPlaylist
+		 * playerInvalidated
+		 * playedToEndOfMediaItem
+		 * */
+		mediaItemDidChange: (reason: string) => void;
+
+		/**
+		 * An event that indicates if a seek to time request was accomplished.
+		 *
+		 * The values for this attribute can be one of the following:
+		 * true — The seek performed as requested.
+		 * false or null— The seek was not performed.
+		 * An integer value — The seek will be performed to the stated value and not the initial requested value.
+		 * */
+		requestSeekToTime: (result?: any) => void;
+
+		/** An event that indicates a state change request has occurred. */
+		shouldHandleStateChange: (result: boolean) => void;
+
+		/** An event that indicates the state has changed. */
+		stateDidChange: () => void;
+
+		/** An event that indicates the state is about to change. */
+		stateWillChange: () => void;
+
+		/** An event that indicates a particular playback time has been crossed. */
+		timeBoundaryDidCross: () => void;
+
+		/** An event that happens at a specified interval. */
+		timeDidChange: () => void;
+
+		/** An event that happens whenever a specified piece of metadata occurs. */
+		timedMetadata: () => void;
+	}
+
+	class Playlist {
+		/** Returns the MediaItem located in the indicated array index. */
+		item(index: number): MediaItem;
+		
+		/** The number of items in the playlist. */
+		length: number;
+		
+		/** Removes a media item from the end of a playlist. */
+		pop(): MediaItem;
+		
+		/** Adds a media item to the end of a playlist. */
+		push(object: MediaItem): void;
+		
+		/** Deletes the indicated array elements and replaces them with the specified elements. */
+		splice(index: number, howManu: number, object: MediaItem): MediaItem[];
+	}
+
+	interface Restrictions {
+		/** A boolean value that indicates if explicit media is allowed. */
+		allowsExplicit: boolean;
+
+		/** The maximum movie ranking allowed. */
+		maxMovieRank: number;
+
+		/** The maximum movie rating allowed for the specified country. */
+		maxMovieRatingForCountry(countryCode: string): string;
+
+		/** The maximum television show ranking allowed. */
+		maxTVShowRank: number
+
+		/** Sets the maximum television show rating allowed for the specified country. */
+		maxTVShowRatingForCountry(countryCode: string): string;
+	}
+
+	interface Settings {
+		/** Contains the restriction information on the device. */
+		restrictions: Restrictions;
+
+		/** Contains the language the device displays information in. */
+		language: string;
+
+		/** Contains the country code used by the store on this device. */
+		storefrontCountryCode: string;
+
+		/**
+		* Called when changes to a device’s restriction information changes.
+		*/
+		onRestrictionsChange: () => void;
+	}
+
+	class TVError {
+		/** The error code. */
+		code: string;
+
+		/** A string containing the description of the error. */
+		description: string;
+
+		/**
+		 * A string containing the error domain.
+		 *
+		 * The predefined error domains:
+		 * NSPOSIXErrorDomain - POSIX/BSD errors
+		 * NSOSStatusErrorDomain - OS X/Carbon errors
+		 * NSMachErrorDomain - Mach errors
+		 * */
+		domain: string;
+
+		/**
+		 * The user info dictionary.
+		 *
+		 * These keys may exist in the user info dictionary:
+		 * NSLocalizedDesciptionKey
+		 * NSFilePathErrorKey
+		 * NSStringEncodingErrorKey
+		 * NSUnderlyingErrorKey
+		 * NSURLErrorKey
+		 * NSLocalizedFailureReasonErrorKey
+		 * NSLocalizedRecoverySuggestionErrorKey
+		 * NSLocalizedRecoveryOptionsErrorKey
+		 * NSRecoveryAttempterErrorKey
+		 * NSHelpAnchorErrorKey
+		 * NSURLErrorFailingURLErrorKey
+		 * NSURLErrorFailingURLStringErrorKey
+		 * NSURLErrorFailingURLPeerTrustErrorKey
+		 * */
+		userInfo: any;
+	}
+}
diff --git a/applicationinsights/applicationinsights.d.ts b/applicationinsights/applicationinsights.d.ts
index 6b80adc2a..12dffdd81 100644
--- a/applicationinsights/applicationinsights.d.ts
+++ b/applicationinsights/applicationinsights.d.ts
@@ -4,21 +4,25 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface AutoCollectConsole {
+    constructor(client: Client): AutoCollectConsole;
     enable(isEnabled: boolean): void;
     isInitialized(): boolean;
 }
 
 interface AutoCollectExceptions {
+    constructor(client:Client): AutoCollectExceptions;
     isInitialized(): boolean;
     enable(isEnabled:boolean): void;
 }
 
 interface AutoCollectPerformance {
+    constructor(client: Client): AutoCollectPerformance;
     enable(isEnabled: boolean): void;
     isInitialized(): boolean;
 }
 
 interface AutoCollectRequests {
+    constructor(client: Client): AutoCollectRequests;
     enable(isEnabled: boolean): void;
     isInitialized(): boolean;
 }
@@ -85,14 +89,17 @@ declare module ContractsModule {
         sampleRate: string;
         internalSdkVersion: string;
         internalAgentVersion: string;
+        constructor(): ContextTagKeys;
     }
     interface Domain {
         ver: number;
         properties: any;
+        constructor(): Domain;
     }
     interface Data<TDomain extends ContractsModule.Domain> {
         baseType: string;
         baseData: TDomain;
+        constructor(): Data<TDomain>;
     }
     interface Envelope {
         ver: number;
@@ -112,18 +119,21 @@ declare module ContractsModule {
             [key: string]: string;
         };
         data: Data<Domain>;
+        constructor(): Envelope;
     }
     interface EventData extends ContractsModule.Domain {
         ver: number;
         name: string;
         properties: any;
         measurements: any;
+        constructor(): EventData;
     }
     interface MessageData extends ContractsModule.Domain {
         ver: number;
         message: string;
         severityLevel: ContractsModule.SeverityLevel;
         properties: any;
+        constructor(): MessageData;
     }
     interface ExceptionData extends ContractsModule.Domain {
         ver: number;
@@ -134,6 +144,7 @@ declare module ContractsModule {
         crashThreadId: number;
         properties: any;
         measurements: any;
+        constructor(): ExceptionData;
     }
     interface StackFrame {
         level: number;
@@ -141,6 +152,7 @@ declare module ContractsModule {
         assembly: string;
         fileName: string;
         line: number;
+        constructor(): StackFrame;
     }
     interface ExceptionDetails {
         id: number;
@@ -150,6 +162,7 @@ declare module ContractsModule {
         hasFullStack: boolean;
         stack: string;
         parsedStack: StackFrame[];
+        constructor(): ExceptionDetails;
     }
     interface DataPoint {
         name: string;
@@ -159,11 +172,13 @@ declare module ContractsModule {
         min: number;
         max: number;
         stdDev: number;
+        constructor(): DataPoint;
     }
     interface MetricData extends ContractsModule.Domain {
         ver: number;
         metrics: DataPoint[];
         properties: any;
+        constructor(): MetricData;
     }
     interface PageViewData extends ContractsModule.EventData {
         ver: number;
@@ -172,6 +187,7 @@ declare module ContractsModule {
         duration: string;
         properties: any;
         measurements: any;
+        constructor(): PageViewData;
     }
     interface PageViewPerfData extends ContractsModule.PageViewData {
         ver: number;
@@ -185,6 +201,7 @@ declare module ContractsModule {
         domProcessing: string;
         properties: any;
         measurements: any;
+        constructor(): PageViewPerfData;
     }
     interface RemoteDependencyData extends ContractsModule.Domain {
         ver: number;
@@ -202,6 +219,7 @@ declare module ContractsModule {
         commandName: string;
         dependencyTypeName: string;
         properties: any;
+        constructor(): RemoteDependencyData;
     }
     interface AjaxCallData extends ContractsModule.PageViewData {
         ver: number;
@@ -218,6 +236,7 @@ declare module ContractsModule {
         success: boolean;
         properties: any;
         measurements: any;
+        constructor(): AjaxCallData;
     }
     interface RequestData extends ContractsModule.Domain {
         ver: number;
@@ -231,10 +250,12 @@ declare module ContractsModule {
         url: string;
         properties: any;
         measurements: any;
+        constructor(): RequestData;
     }
     interface SessionStateData extends ContractsModule.Domain {
         ver: number;
         state: ContractsModule.SessionState;
+        constructor(): SessionStateData;
     }
     interface PerformanceCounterData extends ContractsModule.Domain {
         ver: number;
@@ -248,6 +269,7 @@ declare module ContractsModule {
         stdDev: number;
         value: number;
         properties: any;
+        constructor(): PerformanceCounterData;
     }
 }
 
@@ -309,10 +331,14 @@ interface Client {
      * Log a numeric value that is not associated with a specific event. Typically used to send regular reports of performance indicators.
      * To send a single measurement, use just the first two parameters. If you take measurements very frequently, you can reduce the
      * telemetry bandwidth by aggregating multiple measurements and sending the resulting average at intervals.
-     * @param   name    A string that identifies the metric.
-     * @param   value The value of the metric
+     * @param name   A string that identifies the metric.
+     * @param value  The value of the metric
+     * @param count  the number of samples used to get this value
+     * @param min    the min sample for this set
+     * @param max    the max sample for this set
+     * @param stdDev the standard deviation of the set
      */
-    trackMetric(name: string, value: number): void;
+    trackMetric(name: string, value: number, count?:number, min?: number, max?: number, stdDev?: number): void;
     trackRequest(request: any /* http.ServerRequest */, response: any /* http.ServerResponse */, properties?: {
         [key: string]: string;
     }): void;
@@ -381,10 +407,16 @@ declare class ApplicationInsights {
     private static _performance;
     private static _requests;
     private static _isStarted;
+    /**
+     * Initializes a client with the given instrumentation key, if this is not specified, the value will be
+     * read from the environment variable APPINSIGHTS_INSTRUMENTATIONKEY
+     * @returns {ApplicationInsights/Client} a new client
+     */
+    static getClient(instrumentationKey?: string): Client;
     /**
      * Initializes the default client of the client and sets the default configuration
      * @param instrumentationKey the instrumentation key to use. Optional, if this is not specified, the value will be
-     * read from the environment variable APPINSIGHTS_INSTRUMENTATION_KEY
+     * read from the environment variable APPINSIGHTS_INSTRUMENTATIONKEY
      * @returns {ApplicationInsights} this interface
      */
     static setup(instrumentationKey?: string): typeof ApplicationInsights;
diff --git a/archiver/archiver-test.ts b/archiver/archiver-test.ts
new file mode 100644
index 000000000..dcd71ca90
--- /dev/null
+++ b/archiver/archiver-test.ts
@@ -0,0 +1,14 @@
+/// <reference path="archiver.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+import Archiver = require('archiver');
+import FS = require('fs');
+
+var archiver = Archiver.create('zip');
+
+var writeStream = FS.createWriteStream('./archiver.d.ts');
+var readStream = FS.createReadStream('./archiver.d.ts');
+
+archiver.pipe(writeStream);
+archiver.append(readStream, {name: 'archiver.d.ts'});
+archiver.finalize();
\ No newline at end of file
diff --git a/archiver/archiver.d.ts b/archiver/archiver.d.ts
new file mode 100644
index 000000000..570e1424a
--- /dev/null
+++ b/archiver/archiver.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for archiver v0.15.0
+// Project: https://github.com/archiverjs/node-archiver
+// Definitions by: Esri <https://github.com/archiverjs/node-archiver>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import Archiver = require('archiver);
+    var archiver = Archiver.create('zip');
+    archiver.pipe(FS.createWriteStream('xxx'));
+    archiver.append(FS.createReadStream('xxx'));
+    archiver.finalize();
+
+ =============================================== */
+
+/// <reference path="../node/node.d.ts" />
+declare module "archiver" {
+    import * as FS from 'fs';
+    
+    interface nameInterface {
+        name?: string;
+    }
+        
+    interface Archiver {
+        pipe(writeStream: FS.WriteStream): void;
+        append(readStream: FS.ReadStream, name: nameInterface): void;
+        finalize(): void;
+    }
+    
+    interface Options {
+        
+    }
+    
+    function archiver(format: string, options?: Options): Archiver;
+    
+    namespace archiver {
+        function create(format: string, options?: Options): Archiver;
+    }
+    
+    export = archiver;
+}
\ No newline at end of file
diff --git a/async/async-tests.ts b/async/async-tests.ts
index 4fddea875..a6dff0af8 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -5,8 +5,19 @@ var fs, path;
 function callback() {}
 
 async.map(['file1', 'file2', 'file3'], fs.stat, function (err, results) { });
+async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err, results) { });
+async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err, results) { });
 
 async.filter(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.filterSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.filterLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
+async.select(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.selectSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.selectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
+
+async.reject(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.rejectSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
+async.rejectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
 
 async.parallel([
     function () { },
@@ -25,6 +36,11 @@ async.map(data, asyncProcess, function (err, results) {
 });
 
 var openFiles = ['file1', 'file2'];
+var openFilesObj = {
+    file1: "fileOne",
+    file2: "fileTwo"
+}
+
 var saveFile = function () { }
 async.each(openFiles, saveFile, function (err) { });
 async.eachSeries(openFiles, saveFile, function (err) { });
@@ -32,18 +48,34 @@ async.eachSeries(openFiles, saveFile, function (err) { });
 var documents, requestApi;
 async.eachLimit(documents, 20, requestApi, function (err) { });
 
-async.map(['file1', 'file2', 'file3'], fs.stat, function (err, results) { });
-
-async.filter(['file1', 'file2', 'file3'], path.exists, function (results) { });
+// forEachOf* functions. May accept array or object.
+function forEachOfIterator(item, key, forEachOfIteratorCallback) {
+    console.log("ForEach: item=" + item + ", key=" + key);
+    forEachOfIteratorCallback();
+}
+async.forEachOf(openFiles, forEachOfIterator, function (err) { });
+async.forEachOf(openFilesObj, forEachOfIterator, function (err) { });
+async.forEachOfSeries(openFiles, forEachOfIterator, function (err) { });
+async.forEachOfSeries(openFilesObj, forEachOfIterator, function (err) { });
+async.forEachOfLimit(openFiles, 2, forEachOfIterator, function (err) { });
+async.forEachOfLimit(openFilesObj, 2, forEachOfIterator, function (err) { });
 
 var process;
-async.reduce([1, 2, 3], 0, function (memo, item, callback) {
+var numArray = [1, 2, 3];
+function reducer(memo, item, callback) {
     process.nextTick(function () {
         callback(null, memo + item)
     });
-}, function (err, result) { });
+}
+async.reduce(numArray, 0, reducer, function (err, result) { });
+async.inject(numArray, 0, reducer, function (err, result) { });
+async.foldl(numArray, 0, reducer, function (err, result) { });
+async.reduceRight(numArray, 0, reducer, function (err, result) { });
+async.foldr(numArray, 0, reducer, function (err, result) { });
 
 async.detect(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.detectSeries(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.detectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
 
 async.sortBy(['file1', 'file2', 'file3'], function (file, callback) {
     fs.stat(file, function (err, stats) {
@@ -52,10 +84,18 @@ async.sortBy(['file1', 'file2', 'file3'], function (file, callback) {
 }, function (err, results) { });
 
 async.some(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.someLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
+async.any(['file1', 'file2', 'file3'], path.exists, function (result) { });
 
 async.every(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.everyLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
+async.all(['file1', 'file2', 'file3'], path.exists, function (result) { });
 
 async.concat(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
+async.concatSeries(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
+
+
+// Control Flow //
 
 async.series([
     function (callback) {
@@ -77,7 +117,6 @@ async.series<string>([
 ],
 function (err, results) { });
 
-
 async.series({
     one: function (callback) {
         setTimeout(function () {
@@ -173,21 +212,47 @@ async.parallel<number>({
         }, 100);
     },
 },
-function (err, results) { });
+    function (err, results) { });
 
-
-var count = 0;
-
-async.whilst(
-    function () { return count < 5; },
-    function (callback) {
-        count++;
-        setTimeout(callback, 1000);
+async.parallelLimit({
+    one: function (callback) {
+        setTimeout(function () {
+            callback(null, 1);
+        }, 200);
     },
-    function (err) { }
+    two: function (callback) {
+        setTimeout(function () {
+            callback(null, 2);
+        }, 100);
+    },
+},
+    2,
+    function (err, results) { }
 );
 
 
+function whileFn(callback) {
+    count++;
+    setTimeout(callback, 1000);
+}
+
+function whileTest() { return count < 5; }
+var count = 0;
+async.whilst(whileTest, whileFn, function (err) { });
+async.until(whileTest, whileFn, function (err) { });
+async.doWhilst(whileFn, whileTest, function (err) { });
+async.doUntil(whileFn, whileTest, function (err) { });
+
+async.during(function (testCallback) { testCallback(new Error(), false); }, function (callback) { callback() }, function (error) { console.log(error) });
+async.doDuring(function (callback) { callback() }, function (testCallback) { testCallback(new Error(), false); }, function (error) { console.log(error) });
+async.forever(function (errBack) {
+    errBack(new Error("Not going on forever."));
+},
+    function (error) {
+        console.log(error);
+    }
+);
+
 async.waterfall([
     function (callback) {
         callback(null, 'one', 'two');
@@ -279,6 +344,26 @@ q2.unshift(['task3', 'task4', 'task5'], function (error) {
     console.log('Finished tasks');
 });
 
+// create a cargo object with payload 2
+var cargo = async.cargo(function (tasks, callback) {
+    for (var i = 0; i < tasks.length; i++) {
+        console.log('hello ' + tasks[i].name);
+    }
+    callback();
+}, 2);
+
+
+// add some items
+cargo.push({ name: 'foo' }, function (err) {
+    console.log('finished processing foo');
+});
+cargo.push({ name: 'bar' }, function (err) {
+    console.log('finished processing bar');
+});
+cargo.push({ name: 'baz' }, function (err) {
+    console.log('finished processing baz');
+});
+
 var filename = '';
 async.auto({
     get_data: function (callback) { },
@@ -291,6 +376,9 @@ async.auto({
     email_link: ['write_file', <any>function (callback, results) { }]
 });
 
+async.retry(3, function (callback, results) { }, function (err, result) { });
+async.retry({ times: 3, interval: 200 }, function (callback, results) { }, function (err, result) { });
+
 
 async.parallel([
     function (callback) { },
@@ -336,3 +424,20 @@ var slow_fn = function (name, callback) {
 };
 var fn = async.memoize(slow_fn);
 fn('some name', function () {});
+async.unmemoize(fn);
+async.ensureAsync(function () { });
+async.constant(42);
+async.asyncify(function () { });
+
+async.log(function (name, callback) {
+    setTimeout(function () {
+        callback(null, 'hello ' + name);
+    }, 0);
+}, "world"
+    );
+
+async.dir(function (name, callback) {
+    setTimeout(function () {
+        callback(null, { hello: name });
+    }, 1000);
+}, "world");
diff --git a/async/async.d.ts b/async/async.d.ts
index 56370c15d..a8b38c5fc 100644
--- a/async/async.d.ts
+++ b/async/async.d.ts
@@ -1,36 +1,31 @@
-// Type definitions for Async 0.9.2
+// Type definitions for Async 1.4.2
 // Project: https://github.com/caolan/async
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Arseniy Maximov <https://github.com/kern0>
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Arseniy Maximov <https://github.com/kern0>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface Dictionary<T> { [key: string]: T; }
 
-// Common interface between Arrays and Array-like objects
-interface List<T> {
-    [index: number]: T;
-    length: number;
-}
-
 interface ErrorCallback { (err?: Error): void; }
 interface AsyncResultCallback<T> { (err: Error, result: T): void; }
 interface AsyncResultArrayCallback<T> { (err: Error, results: T[]): void; }
 interface AsyncResultObjectCallback<T> { (err: Error, results: Dictionary<T>): void; }
 
+interface AsyncFunction<T> { (callback: (err: Error, result?: T) => void): void; }
 interface AsyncIterator<T> { (item: T, callback: ErrorCallback): void; }
-interface AsyncForEachOfIterator<T> { (item: T, index: number, callback: ErrorCallback): void; }
+interface AsyncForEachOfIterator<T> { (item: T, key: number, callback: ErrorCallback): void; }
 interface AsyncResultIterator<T, R> { (item: T, callback: AsyncResultCallback<R>): void; }
 interface AsyncMemoIterator<T, R> { (memo: R, item: T, callback: AsyncResultCallback<R>): void; }
+interface AsyncBooleanIterator<T> { (item: T, callback: (truthValue: boolean) => void): void; }
 
 interface AsyncWorker<T> { (task: T, callback: ErrorCallback): void; }
-
-interface AsyncFunction<T> { (callback: AsyncResultCallback<T>): void; }
 interface AsyncVoidFunction { (callback: ErrorCallback): void; }
 
 interface AsyncQueue<T> {
     length(): number;
-    concurrency: number;
     started: boolean;
-    paused: boolean;
+    running(): number;
+    idle(): boolean;
+    concurrency: number;
     push(task: T, callback?: ErrorCallback): void;
     push(task: T[], callback?: ErrorCallback): void;
     unshift(task: T, callback?: ErrorCallback): void;
@@ -38,9 +33,8 @@ interface AsyncQueue<T> {
     saturated: () => any;
     empty: () => any;
     drain: () => any;
-    running(): number;
-    idle(): boolean;
-    pause(): void;
+    paused: boolean;
+    pause(): void
     resume(): void;
     kill(): void;
 }
@@ -62,41 +56,64 @@ interface AsyncPriorityQueue<T> {
     kill(): void;
 }
 
+interface AsyncCargo {
+    length(): number;
+    payload: number;
+    push(task: any, callback? : Function): void;
+    push(task: any[], callback? : Function): void;
+    saturated(): void;
+    empty(): void;
+    drain(): void;
+    idle(): boolean;
+    pause(): void;
+    resume(): void;
+    kill(): void;
+}
+
 interface Async {
 
     // Collections
-    each<T>(arr: T[], iterator: AsyncIterator<T>, callback: ErrorCallback): void;
-    eachSeries<T>(arr: T[], iterator: AsyncIterator<T>, callback: ErrorCallback): void;
-    eachLimit<T>(arr: T[], limit: number, iterator: AsyncIterator<T>, callback: ErrorCallback): void;
-    forEachOf<T>(obj: List<T>, iterator: AsyncForEachOfIterator<T>, callback: ErrorCallback): void;
-    forEachOfSeries<T>(obj: List<T>, iterator: AsyncForEachOfIterator<T>, callback: ErrorCallback): void;
-    forEachOfLimit<T>(obj: List<T>, limit: number, iterator: AsyncForEachOfIterator<T>, callback: ErrorCallback): void;
-    map<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback: AsyncResultArrayCallback<R>): any;
-    mapSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback: AsyncResultArrayCallback<R>): any;
-    mapLimit<T, R>(arr: T[], limit: number, iterator: AsyncResultIterator<T, R>, callback: AsyncResultArrayCallback<R>): any;
-    filter<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    select<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    filterSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    selectSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    reject<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    rejectSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (results: T[]) => any): any;
-    reduce<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
-    inject<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
-    foldl<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
+    each<T>(arr: T[], iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
+    eachSeries<T>(arr: T[], iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
+    eachLimit<T>(arr: T[], limit: number, iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
+    forEachOf(obj: any, iterator: (item: any, key: [string|number], callback?: ErrorCallback) => void, callback: ErrorCallback): void;
+    forEachOf<T>(obj: T[], iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
+    forEachOfSeries(obj: any, iterator: (item: any, key: [string|number], callback?: ErrorCallback) => void, callback: ErrorCallback): void;
+    forEachOfSeries<T>(obj: T[], iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
+    forEachOfLimit(obj: any, limit: number, iterator: (item: any, key: [string|number], callback?: ErrorCallback) => void, callback: ErrorCallback): void;
+    forEachOfLimit<T>(obj: T[], limit: number, iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
+    map<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
+    mapSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
+    mapLimit<T, R>(arr: T[], limit: number, iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
+    filter<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    select<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    filterSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    selectSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    filterLimit<T>(arr: T[], limit: number, iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    selectLimit<T>(arr: T[], limit: number, iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    reject<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    rejectSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    rejectLimit<T>(arr: T[], limit: number, iterator: AsyncResultIterator<T, boolean>, callback?: (results: T[]) => any): any;
+    reduce<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
+    inject<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
+    foldl<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
     reduceRight<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
     foldr<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
-    detect<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: AsyncResultArrayCallback<T>): any;
-    detectSeries<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: AsyncResultArrayCallback<T>): any;
-    sortBy<T, V>(arr: T[], iterator: AsyncResultIterator<T, V>, callback: AsyncResultArrayCallback<T>): any;
-    some<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: AsyncResultArrayCallback<T>): any;
-    any<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: AsyncResultArrayCallback<T>): any;
-    every<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (result: boolean) => any): any;
-    all<T>(arr: T[], iterator: AsyncResultIterator<T, boolean>, callback: (result: boolean) => any): any;
-    concat<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback: AsyncResultArrayCallback<R>): any;
-    concatSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback: AsyncResultArrayCallback<R>): any;
+    detect<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: T) => void): any;
+    detectSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: T) => void): any;
+    detectLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: (result: T) => void): any;
+    sortBy<T, V>(arr: T[], iterator: AsyncResultIterator<T, V>, callback?: AsyncResultArrayCallback<T>): any;
+    some<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
+    someLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
+    any<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
+    every<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
+    everyLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
+    all<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
+    concat<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
+    concatSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
 
     // Control Flow
-    series<T>(tasks: Array<AsyncFunction<T>>, callback?: AsyncResultArrayCallback<T>): void;
+    series<T>(tasks: AsyncFunction<T>[], callback?: AsyncResultArrayCallback<T>): void;
     series<T>(tasks: Dictionary<AsyncFunction<T>>, callback?: AsyncResultObjectCallback<T>): void;
     parallel<T>(tasks: Array<AsyncFunction<T>>, callback?: AsyncResultArrayCallback<T>): void;
     parallel<T>(tasks: Dictionary<AsyncFunction<T>>, callback?: AsyncResultObjectCallback<T>): void;
@@ -106,20 +123,36 @@ interface Async {
     doWhilst(fn: AsyncVoidFunction, test: () => boolean, callback: (err: any) => void): void;
     until(test: () => boolean, fn: AsyncVoidFunction, callback: (err: any) => void): void;
     doUntil(fn: AsyncVoidFunction, test: () => boolean, callback: (err: any) => void): void;
-    waterfall(tasks: Function[], callback?: (err: any, ...arguments: any[]) => void): void;
-    queue<T>(worker: AsyncWorker<T>, concurrency: number): AsyncQueue<T>;
+    during(test: (testCallback : (error: Error, truth: boolean) => void) => void, fn: AsyncVoidFunction, callback: (err: any) => void): void;
+    doDuring(fn: AsyncVoidFunction, test: (testCallback: (error: Error, truth: boolean) => void) => void, callback: (err: any) => void): void;
+    forever(next: (errCallback : (err: Error) => void) => void, errBack: (err: Error) => void) : void;
+    waterfall(tasks: Function[], callback?: (err: Error, result: any) => void): void;
+    compose(...fns: Function[]): void;
+    seq(...fns: Function[]): void;
+    applyEach(fns: Function[], argsAndCallback: any[]): void;           // applyEach(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
+    applyEachSeries(fns: Function[], argsAndCallback: any[]): void;     // applyEachSeries(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
+    queue<T>(worker: AsyncWorker<T>, concurrency?: number): AsyncQueue<T>;
     priorityQueue<T>(worker: AsyncWorker<T>, concurrency: number): AsyncPriorityQueue<T>;
-    auto(tasks: any, callback?: AsyncResultArrayCallback<any>): void;
+    cargo(worker : (tasks: any[], callback : ErrorCallback) => void, payload? : number) : AsyncCargo;
+    auto(tasks: any, callback?: (error: Error, results: any) => void): void;
+    retry<T>(opts: number, task: (callback : AsyncResultCallback<T>, results: any) => void, callback: (error: Error, results: any) => void): void;
+    retry<T>(opts: { times: number, interval: number }, task: (callback: AsyncResultCallback<T>, results : any) => void, callback: (error: Error, results: any) => void): void;
     iterator(tasks: Function[]): Function;
     apply(fn: Function, ...arguments: any[]): AsyncFunction<any>;
     nextTick(callback: Function): void;
+    setImmediate(callback: Function): void;
 
-    times<R> (n: number, iterator: AsyncResultIterator<number, R>, callback: AsyncResultArrayCallback<R>): void;
-    timesSeries<R> (n: number, iterator: AsyncResultIterator<number, R>, callback: AsyncResultArrayCallback<R>): void;
+    times<T> (n: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
+    timesSeries<T>(n: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
+    timesLimit<T>(n: number, limit: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
 
     // Utils
     memoize(fn: Function, hasher?: Function): Function;
     unmemoize(fn: Function): Function;
+    ensureAsync(fn: (... argsAndCallback: any[]) => void): Function;
+    constant(...values: any[]): Function;
+    asyncify(fn: Function): Function;
+    wrapSync(fn: Function): Function;
     log(fn: Function, ...arguments: any[]): void;
     dir(fn: Function, ...arguments: any[]): void;
     noConflict(): Async;
diff --git a/async/asyncamd-tests.ts b/async/asyncamd-tests.ts
index 4618a67bf..fc1c25460 100644
--- a/async/asyncamd-tests.ts
+++ b/async/asyncamd-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./async.d.ts" />
+
 import async = require("async");
 
-async.map(["a", "b", "c"], (item, cb) => cb(null, [item.toUpperCase()]), (err, results) => { });
\ No newline at end of file
+async.map(["a", "b", "c"], (item, cb) => cb(null, [item.toUpperCase()]), (err, results) => { });
diff --git a/auto-launch/auto-launch-tests.ts b/auto-launch/auto-launch-tests.ts
new file mode 100644
index 000000000..24d6aad14
--- /dev/null
+++ b/auto-launch/auto-launch-tests.ts
@@ -0,0 +1,24 @@
+/// <reference path="auto-launch.d.ts" />
+
+import AutoLaunch = require('auto-launch');
+
+var a1 = new AutoLaunch({
+    name: 'Foo',
+});
+
+var a2 = new AutoLaunch({
+    name: 'Foo',
+    path: '/Applications/Foo.app',
+    isHidden: true,
+});
+
+a1.enable();
+a2.disable();
+
+a1.isEnabled(function(enabled: boolean) {
+    if (enabled) {
+        return;
+    }
+
+    a1.enable(function(err){ console.log(err.message); });
+});
diff --git a/auto-launch/auto-launch.d.ts b/auto-launch/auto-launch.d.ts
new file mode 100644
index 000000000..0b277c79f
--- /dev/null
+++ b/auto-launch/auto-launch.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for auto-launch 0.1.18
+// Project: https://github.com/Teamwork/node-auto-launch
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface AutoLaunchOption {
+	/**
+	 * Application name.
+	 */
+	name: string;
+	/**
+	 * Hidden on launch or not.  Default is false.
+	 */
+	isHidden?: boolean;
+	/**
+	 * Path to application directory.
+	 * Default is process.execPath.
+	 */
+	path?: string;
+}
+
+declare class AutoLaunch {
+	constructor(opts: AutoLaunchOption);
+	/**
+	 * Enables to launch at start up
+	 */
+	enable(callback?: (err: Error) => void): void;
+	/**
+	 * Disables to launch at start up
+	 */
+	disable(callback?: (err: Error) => void): void;
+	/**
+	 * Returns if auto start up is enabled
+	 */
+	isEnabled(callback: (enabled: boolean) => void): void;
+}
+
+declare module "auto-launch" {
+	var al: typeof AutoLaunch;
+	export = al;
+}
diff --git a/autobahn/autobahn.d.ts b/autobahn/autobahn.d.ts
index ceaf21230..6debcca7c 100644
--- a/autobahn/autobahn.d.ts
+++ b/autobahn/autobahn.d.ts
@@ -4,197 +4,266 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../when/when.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
 
 declare module autobahn {
 
-	export class Session {
-		id: number;
-		realm: string;
-		isOpen: boolean;
-		features: any;
-		caller_disclose_me: boolean;
-		publisher_disclose_me: boolean;
-		subscriptions: ISubscription[][];
-		registrations: IRegistration[];
+    export class Session {
+        id: number;
+        realm: string;
+        isOpen: boolean;
+        features: any;
+        caller_disclose_me: boolean;
+        publisher_disclose_me: boolean;
+        subscriptions: ISubscription[][];
+        registrations: IRegistration[];
 
-		constructor(transport: ITransport, defer: DeferFactory, challenge: OnChallengeHandler);
+        constructor(transport: ITransport, defer: DeferFactory, challenge: OnChallengeHandler);
 
-		join(realm: string, authmethods: string[], authid: string): void;
+        join(realm: string, authmethods: string[], authid: string): void;
 
-		leave(reason: string, message: string): void;
+        leave(reason: string, message: string): void;
 
-		call<TResult>(procedure: string, args?: any[], kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
+        call<TResult>(procedure: string, args?: any[], kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
 
-		publish(topic: string, args?: any[], kwargs?: any, options?: IPublishOptions): When.Promise<IPublication>;
+        publish(topic: string, args?: any[], kwargs?: any, options?: IPublishOptions): When.Promise<IPublication>;
 
-		subscribe(topic: string, handler: SubscribeHandler, options?: ISubscribeOptions): When.Promise<ISubscription>;
+        subscribe(topic: string, handler: SubscribeHandler, options?: ISubscribeOptions): When.Promise<ISubscription>;
 
-		register(procedure: string, endpoint: RegisterEndpoint, options?: IRegisterOptions): When.Promise<IRegistration>;
+        register(procedure: string, endpoint: RegisterEndpoint, options?: IRegisterOptions): When.Promise<IRegistration>;
 
-		unsubscribe(subscription: ISubscription): When.Promise<any>;
+        unsubscribe(subscription: ISubscription): When.Promise<any>;
 
-		unregister(registration: IRegistration): When.Promise<any>;
+        unregister(registration: IRegistration): When.Promise<any>;
 
-		prefix(prefix: string, uri: string): void;
+        prefix(prefix: string, uri: string): void;
 
-		resolve(curie: string): string;
+        resolve(curie: string): string;
 
-		onjoin: (roleFeatures: any) => void;
-		onleave: (reason: string, details: any) => void;
-	}
+        onjoin: (roleFeatures: any) => void;
+        onleave: (reason: string, details: any) => void;
+    }
 
-	interface IInvocation {
-		caller?: number;
-		progress?: boolean;
-		procedure: string;
-	}
+    interface IInvocation {
+        caller?: number;
+        progress?: boolean;
+        procedure: string;
+    }
 
-	interface IEvent {
-		publication: number;
-		publisher?: number;
-		topic: string;
-	}
+    class Invocation implements IInvocation {
+        constructor(caller?: number, progress?: boolean, procedure?: string);
 
-	interface IResult {
-		args: any[];
-		kwargs: any;
-	}
+        procedure: string;
+    }
 
-	interface IError {
-		error: string;
-		args: any[];
-		kwargs: any;
-	}
+    interface IEvent {
+        publication: number;
+        publisher?: number;
+        topic: string;
+    }
 
-	type SubscribeHandler = (args?: any[], kwargs?: any, details?: IEvent) => void;
+    class Event implements IEvent {
+        constructor(publication?: number, publisher?: string, topic?: string);
 
-	interface ISubscription {
-		topic: string;
-		handler: SubscribeHandler;
-		options: ISubscribeOptions;
-		session: Session;
-		id: number;
-		active: boolean;
-		unsubscribe(): When.Promise<any>;
-	}
+        publication: number;
+        topic: string;
+    }
 
-	type RegisterEndpoint = (args?: any[], kwargs?: any, details?: IInvocation) => void;
+    interface IResult {
+        args: any[];
+        kwargs: any;
+    }
 
-	interface IRegistration {
-		procedure: string;
-		endpoint: RegisterEndpoint;
-		options: IRegisterOptions;
-		session: Session;
-		id: number;
-		active: boolean;
-		unregister(): When.Promise<any>;
-	}
+    class Result implements IResult {
+        constructor(args?: any[], kwargs?: any);
 
-	interface IPublication {
-		id: number;
-	}
+        args: any[];
+        kwargs: any;
+    }
 
-	interface ICallOptions {
-		timeout?: number;
-		receive_progress?: boolean;
-		disclose_me?: boolean;
-	}
+    interface IError {
+        error: string;
+        args: any[];
+        kwargs: any;
+    }
 
-	interface IPublishOptions {
-		exclude?: number[];
-		eligible?: number[];
-		disclose_me? : Boolean;
-	}
+    class Error implements IError {
+        constructor(error?: string, args?: any[], kwargs?: any);
 
-	interface ISubscribeOptions {
-		match? : string;
-	}
+        error: string;
+        args: any[];
+        kwargs: any;
+    }
 
-	interface IRegisterOptions {
-		disclose_caller?: boolean;
-	}
+    type SubscribeHandler = (args?: any[], kwargs?: any, details?: IEvent) => void;
 
-	export class Connection {
-		constructor(options?: IConnectionOptions);
+    interface ISubscription {
+        topic: string;
+        handler: SubscribeHandler;
+        options: ISubscribeOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+        unsubscribe(): When.Promise<any>;
+    }
 
-		open(): void;
+    class Subscription implements ISubscription {
+        constructor(topic? : string, handler?: SubscribeHandler, options?: ISubscribeOptions, session?: Session, id?: number);
 
-		close(reason: string, message: string): void;
+        handler: SubscribeHandler;
 
-		onopen: (session: Session, details: any) => void;
-		onclose: (reason: string, details: any) => boolean;
-	}
+        unsubscribe(): When.Promise<any>;
 
-	interface ITransportDefinition {
-		url?: string;
-		protocols?: string[];
-		type: string;
-	}
+        topic: string;
+        options: ISubscribeOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+    }
 
-	type DeferFactory = () => any;
+    type RegisterEndpoint = (args?: any[], kwargs?: any, details?: IInvocation) => void;
 
-	type OnChallengeHandler = (session: Session, method: string, extra: any) => When.Promise<string>;
+    interface IRegistration {
+        procedure: string;
+        endpoint: RegisterEndpoint;
+        options: IRegisterOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+        unregister(): When.Promise<any>;
+    }
 
-	interface IConnectionOptions {
-		use_es6_promises?: boolean;
-		// use explicit deferred factory, e.g. jQuery.Deferred or Q.defer
-		use_deferred?: DeferFactory;
-		transports?: ITransportDefinition[];
-		retry_if_unreachable?: boolean;
-		max_retries?: number;
-		initial_retry_delay?: number;
-		max_retry_delay?: number;
-		retry_delay_growth?: number;
-		retry_delay_jitter?: number;
-		url?: string;
-		protocols?: string[];
-		onchallenge?: (session: Session, method: string, extra: any) => OnChallengeHandler;
-		realm?: string;
-		authmethods?: string[];
-		authid?: string;
-	}
+    class Registration implements IRegistration {
+        constructor(procedure?: string, endpoint?: RegisterEndpoint, options?: IRegisterOptions, session?: Session, id?: number);
 
-	interface ICloseEventDetails {
-		wasClean: boolean;
-		reason: string;
-		code: number;
-	}
+        endpoint: RegisterEndpoint;
 
-	interface ITransport {
-		onopen: () => void;
-		onmessage: (message: any[]) => void;
-		onclose: (details: ICloseEventDetails) => void;
+        unregister(): When.Promise<any>;
 
-		send(message: any[]): void;
-		close(errorCode: number, reason?: string): void;
-	}
+        procedure: string;
+        options: IRegisterOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+    }
 
-	interface ITransportFactory {
-		//constructor(options: any);
-		type: string;
-		create(): ITransport;
-	}
+    interface IPublication {
+        id: number;
+    }
 
-	interface ITransports {
-		register(name: string, factory: any): void;
-		isRegistered(name: string): boolean;
-		get(name: string): any;
-		list(): any[];
-	}
+    class Publication implements IPublication {
+        constructor(id: number);
 
-	interface ILog {
-		debug(...args: any[]): void;
-	}
+        id: number;
+    }
 
-	interface IUtil {
-		assert(condition: boolean, message: string): void;
-	}
+    interface ICallOptions {
+        timeout?: number;
+        receive_progress?: boolean;
+        disclose_me?: boolean;
+    }
 
-	var util: IUtil;
-	var log: ILog;
-	var transports: ITransports;
+    interface IPublishOptions {
+        exclude?: number[];
+        eligible?: number[];
+        disclose_me?: Boolean;
+    }
+
+    interface ISubscribeOptions {
+        match?: string;
+    }
+
+    interface IRegisterOptions {
+        disclose_caller?: boolean;
+    }
+
+    export class Connection {
+        constructor(options?: IConnectionOptions);
+
+        open(): void;
+
+        close(reason: string, message: string): void;
+
+        onopen: (session: Session, details: any) => void;
+        onclose: (reason: string, details: any) => boolean;
+    }
+
+    interface ITransportDefinition {
+        url?: string;
+        protocols?: string[];
+        type: string;
+    }
+
+    type DeferFactory = () => JQueryPromise<any>;
+
+    type OnChallengeHandler = (session: Session, method: string, extra: any) => When.Promise<string>;
+
+    interface IConnectionOptions {
+        use_es6_promises?: boolean;
+        // use explicit deferred factory, e.g. jQuery.Deferred or Q.defer
+        use_deferred?: DeferFactory;
+        transports?: ITransportDefinition[];
+        retry_if_unreachable?: boolean;
+        max_retries?: number;
+        initial_retry_delay?: number;
+        max_retry_delay?: number;
+        retry_delay_growth?: number;
+        retry_delay_jitter?: number;
+        url?: string;
+        protocols?: string[];
+        onchallenge?: (session: Session, method: string, extra: any) => OnChallengeHandler;
+        realm?: string;
+        authmethods?: string[];
+        authid?: string;
+    }
+
+    interface ICloseEventDetails {
+        wasClean: boolean;
+        reason: string;
+        code: number;
+    }
+
+    interface ITransport {
+        onopen: () => void;
+        onmessage: (message: any[]) => void;
+        onclose: (details: ICloseEventDetails) => void;
+
+        send(message: any[]): void;
+        close(errorCode: number, reason?: string): void;
+    }
+
+    interface ITransportFactory {
+        // constructor(options: any);
+        type: string;
+        create(): ITransport;
+    }
+
+    interface ITransports {
+        register(name: string, factory: any): void;
+        isRegistered(name: string): boolean;
+        get(name: string): any;
+        list(): string[];
+    }
+
+    interface ILog {
+        debug(...args: any[]): void;
+    }
+
+    interface IUtil {
+        assert(condition: boolean, message: string): void;
+    }
+
+    interface IAuthCra {
+        derive_key(secret: string, salt: string, iterations: number, keylen: number): string;
+        sign(key: string, challenge: string): string;
+    }
+
+    var util: IUtil;
+    var log: ILog;
+    var transports: ITransports;
+    var auth_cra: IAuthCra;
 }
 
 declare module "autobahn" {
-	export = autobahn;
+    export = autobahn;
 }
diff --git a/axios/axios-tests.ts b/axios/axios-tests.ts
index 93787cf3d..3f692307a 100644
--- a/axios/axios-tests.ts
+++ b/axios/axios-tests.ts
@@ -16,3 +16,13 @@ axios<Repository>({
     method: HttpMethod[HttpMethod.GET],
     headers: {},
 }).then(r => console.log("ID:" + r.data.id + " Name: " + r.data.name));
+
+axios.post("http://example.com/", {}, {
+    transformRequest: (data: any) => data
+});
+
+axios.post("http://example.com/", {}, {
+    transformRequest: [
+        (data: any) => data
+    ]
+});
diff --git a/axios/axios.d.ts b/axios/axios.d.ts
index c2a2873ea..48f57a73a 100644
--- a/axios/axios.d.ts
+++ b/axios/axios.d.ts
@@ -17,7 +17,7 @@ declare module Axios {
      * This is only applicable for request methods 'PUT', 'POST', and 'PATCH'
      * The last function in the array must return a string or an ArrayBuffer
      */
-    transformRequest?: <U>(data:T) => U;
+    transformRequest?: (<U>(data:T) => U)|[<U>(data:T) => U];
 
     /**
      * change the response data to be made before it is passed to then/catch
diff --git a/backbone.layoutmanager/backbone.layoutmanager.d.ts b/backbone.layoutmanager/backbone.layoutmanager.d.ts
index 6c830d0ba..5ce548157 100644
--- a/backbone.layoutmanager/backbone.layoutmanager.d.ts
+++ b/backbone.layoutmanager/backbone.layoutmanager.d.ts
@@ -11,6 +11,7 @@ declare module Backbone {
 
 	interface LayoutOptions<TModel extends Model> extends ViewOptions<TModel> {
 		template?: string;
+        views?: { [viewName: string]: View<TModel> };
 	}
 	
 	interface LayoutManagerOptions {
diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
index d0b06a164..f7c5945ad 100644
--- a/backbone/backbone.d.ts
+++ b/backbone/backbone.d.ts
@@ -19,6 +19,7 @@ declare module Backbone {
 
     interface NavigateOptions {
         trigger?: boolean;
+        replace?: boolean;
     }
 
     interface RouterOptions {
@@ -309,7 +310,8 @@ declare module Backbone {
 
    interface ViewOptions<TModel extends Model> {
       model?: TModel;
-      collection?: Backbone.Collection<TModel>;
+       // TODO: quickfix, this can't be fixed easy. The collection does not need to have the same model as the parent view.
+      collection?: Backbone.Collection<any>;
       el?: any;
       id?: string;
       className?: string;
diff --git a/backgrid/backgrid.d.ts b/backgrid/backgrid.d.ts
index 3a75e6142..d0ddc3e51 100644
--- a/backgrid/backgrid.d.ts
+++ b/backgrid/backgrid.d.ts
@@ -10,10 +10,10 @@ declare module Backgrid {
     interface GridOptions {
         columns: Column[];
         collection: Backbone.Collection<Backbone.Model>;
-        header: Header;
-        body: Body;
-        row: Row;
-        footer: Footer;
+        header?: Header;
+        body?: Body;
+        row?: Row;
+        footer?: Footer;
     }
 
     class Header extends Backbone.View<Backbone.Model> {
@@ -109,6 +109,8 @@ declare module Backgrid {
         header: any;
         tagName: string;
 
+        constructor(options: GridOptions);
+
         initialize(options: any);
         getSelectedModels(): Backbone.Model[];
         insertColumn(...options: any[]): Grid;
diff --git a/bardjs/bardjs-tests.ts b/bardjs/bardjs-tests.ts
index b033ffe3c..312b06496 100644
--- a/bardjs/bardjs-tests.ts
+++ b/bardjs/bardjs-tests.ts
@@ -39,7 +39,7 @@ module bardTests {
         var myService: MyService;
         var $rootScope: angular.IRootScopeService;
 
-        beforeEach(module(bard.$httpBackend, 'myModule'));
+        beforeEach(angular.mock.module(bard.$httpBackend, 'myModule'));
 
         beforeEach(inject(function(_myService_: MyService, _$rootScope_: angular.IRootScopeService) {
             myService = _myService_;
@@ -63,7 +63,7 @@ module bardTests {
     function test_$q() {
         var myService: MyService;
 
-        beforeEach(module(bard.$q, bard.$httpBackend, 'myModule'));
+        beforeEach(angular.mock.module(bard.$q, bard.$httpBackend, 'myModule'));
 
         beforeEach(inject(function(_myService_: MyService) {
             myService = _myService_;
@@ -139,7 +139,7 @@ module bardTests {
      * bard.fakeLogger
      */
     function test_fakeLogger() {
-        beforeEach(module('myModule', bard.fakeLogger));
+        beforeEach(angular.mock.module('myModule', bard.fakeLogger));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeLogger));
         ////
@@ -150,7 +150,7 @@ module bardTests {
      * bard.fakeRouteHelperProvider
      */
     function test_fakeRouteHelperProvider() {
-        beforeEach(module('myModule', bard.fakeRouteHelperProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeRouteHelperProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeRouteHelperProvider));
         ////
@@ -161,7 +161,7 @@ module bardTests {
      * bard.fakeRouteProvider
      */
     function test_fakeRouteProvider() {
-        beforeEach(module('myModule', bard.fakeRouteProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeRouteProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeRouteProvider));
         ////
@@ -172,7 +172,7 @@ module bardTests {
      * bard.fakeStateProvider
      */
     function test_fakeStateProvider() {
-        beforeEach(module('myModule', bard.fakeStateProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeStateProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeStateProvider));
         ////
@@ -183,7 +183,7 @@ module bardTests {
      * bard.fakeToastr
      */
     function test_fakeToastr() {
-        beforeEach(module('myModule', bard.fakeToastr));
+        beforeEach(angular.mock.module('myModule', bard.fakeToastr));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeToastr));
         ////
@@ -232,7 +232,7 @@ module bardTests {
                 _default: $q.when([])
             });
 
-            controller = $controller('MyController');
+            controller = $controller<MyController>('MyController');
             $rootScope.$apply();
         });
     }
@@ -264,7 +264,7 @@ module bardTests {
                 _default: $q.when([])
             });
 
-            controller = $controller('MyController');
+            controller = $controller<MyController>('MyController');
             $rootScope.$apply();
         });
 
diff --git a/basic-auth/basic-auth-tests.ts b/basic-auth/basic-auth-tests.ts
new file mode 100644
index 000000000..54be7af1f
--- /dev/null
+++ b/basic-auth/basic-auth-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="basic-auth.d.ts" />
+
+import auth = require('basic-auth');
+
+auth(null);
diff --git a/basic-auth/basic-auth.d.ts b/basic-auth/basic-auth.d.ts
new file mode 100644
index 000000000..e25f217e4
--- /dev/null
+++ b/basic-auth/basic-auth.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for basic-auth
+// Project: https://github.com/jshttp/basic-auth
+// Definitions by: Clément Bourgeois <https://github.com/moonpyk>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module "basic-auth" {
+    function auth(req: Express.Request): auth.BasicAuthResult;
+
+    namespace auth {
+        interface BasicAuthResult {
+            name: string;
+            pass: string;
+        }
+    }
+
+    export = auth;
+}
diff --git a/better-curry/better-curry-tests.ts b/better-curry/better-curry-tests.ts
new file mode 100644
index 000000000..36e4936e0
--- /dev/null
+++ b/better-curry/better-curry-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="better-curry.d.ts" />
+
+import bc = require('better-curry');
+bc.flatten([1,2,3,[1,2],['a']]) === [];
+bc.MAX_OPTIMIZED = 5;
+
+function fn(...args: number[]): number[] {
+    return [].concat([1]);
+}
+
+function fn2(arg1: string, arg2: any): number {
+    return parseInt(arg1 + String(arg2)) + 1;
+}
+
+bc.predefine(fn, [1,2])() === [];
+bc.predefine(fn, [1,2]).__length === 3;
+
+var f = bc.wrap(fn2, {}, 10, true);
+f('1', 2) === 3;
+
+var delegate = bc.delegate({}, 'ok');
+delegate.access('ok') === delegate;
+delegate.getter('getter').setter('setter') === delegate;
+delegate.all(['1','2']);
+delegate.revoke('adsf').access('asdf');
+
+BetterCurry.wrap(fn2, {}, -1, false).__length === 10;
\ No newline at end of file
diff --git a/better-curry/better-curry.d.ts b/better-curry/better-curry.d.ts
new file mode 100644
index 000000000..f6342bab2
--- /dev/null
+++ b/better-curry/better-curry.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for better-curry
+// Project: https://github.com/pocesar/js-bettercurry
+// Definitions by: Paulo Cesar <https://github.com/pocesar>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare var BetterCurry: BetterCurryModule.BetterCurry;
+
+declare module BetterCurryModule {
+
+    export interface DelegateOptions {
+        as?: string;
+        len?: number;
+        args?: any[];
+        name?: string;
+    }
+
+    export class Delegate<T> {
+        proto: T;
+        target: string;
+        methods: any[];
+        getters: any[];
+        setters: any[];
+        all: (skip?: string[]) => void;
+        method: (name: string|DelegateOptions) => Delegate<T>;
+        getter: (name: string|DelegateOptions) => Delegate<T>;
+        setter: (name: string|DelegateOptions) => Delegate<T>;
+        access: (name: string|DelegateOptions) => Delegate<T>;
+        revoke: (name: string) => Delegate<T>;
+        constructor(proto: T, target: string);
+    }
+
+    export interface OriginalFunctionReminder<T> extends Function {
+        __length: number;
+    }
+
+    export interface BetterCurry {
+        predefine: <T extends Function>(fn: T, args: any[], context?: Object, len?: number, checkArguments?: boolean) => OriginalFunctionReminder<T>;
+        wrap: <T extends Function>(fn: T, context?: Object, len?: number, checkArguments?: boolean) => OriginalFunctionReminder<T>;
+        flatten: (...args: Array<Array<any>|any>) => any[];
+        delegate: <T>(proto: T, target: string) => Delegate<T>;
+        MAX_OPTIMIZED: number;
+    }
+
+}
+
+declare module 'better-curry' {
+    var bc: BetterCurryModule.BetterCurry;
+
+    export = bc;
+}
\ No newline at end of file
diff --git a/big.js/big.js.d.ts b/big.js/big.js.d.ts
index 0e4ac48be..d4ca239e3 100644
--- a/big.js/big.js.d.ts
+++ b/big.js/big.js.d.ts
@@ -6,7 +6,7 @@
 
 declare module BigJsLibrary {
 
-    export enum RoundingMode {
+    export const enum RoundingMode {
         RoundTowardsZero = 0,
         RoundTowardsNearestAwayFromZero = 1,
         RoundTowardsNearestTowardsEven = 2,
@@ -200,4 +200,4 @@ declare module BigJsLibrary {
     }
 }
 
-declare var Big: BigJsLibrary.BigJS;
\ No newline at end of file
+declare var Big: BigJsLibrary.BigJS;
diff --git a/blocks/blocks.d.ts b/blocks/blocks.d.ts
index ad492333e..6e57ec762 100644
--- a/blocks/blocks.d.ts
+++ b/blocks/blocks.d.ts
@@ -579,6 +579,8 @@ interface ViewPrototype {
 		route?: any;
 		url?: string
 	};
+
+	[propertyName: string]: any;
 }
 
 /////////////////////////////////////////
@@ -643,6 +645,8 @@ interface ModelPrototype {
 		destroy?: { url?: string };
 		update?: { url?: string };
 	};
+
+	[propertyName: string]: string | boolean | Object | Validator;
 }
 
 /////////////////////////////////////////
@@ -682,6 +686,7 @@ interface CollectionPrototype {
 		destroy?: { url?: string };
 		update?: { url?: string };
 	};
+	[propertyName: string]: any;
 }
 
 interface Extendable<T> {
diff --git a/bluebird-retry/bluebird-retry-tests.ts b/bluebird-retry/bluebird-retry-tests.ts
new file mode 100644
index 000000000..5d8c32dfc
--- /dev/null
+++ b/bluebird-retry/bluebird-retry-tests.ts
@@ -0,0 +1,35 @@
+/// <reference path="bluebird-retry.d.ts" />
+/// <reference path="../bluebird/bluebird.d.ts" />
+import Promise = require('bluebird');
+import retry = require('bluebird-retry');
+
+function promiseSuccess(text:string) {
+    return Promise.resolve(text);
+};
+
+var count = 0;
+function myfunc() {
+    console.log('myfunc called ' + (++count) + ' times');
+    if (count < 3) {
+        throw new Error('i fail the first two times');
+    } else {
+        return promiseSuccess('i succeed the third time');
+    }
+}
+
+retry(myfunc)
+    .done(function(result) { console.log(result); } );
+
+
+//Options example
+function logFail() {
+    console.log(new Date().toISOString());
+    throw new Error('bail');
+}
+
+var options:retry.Options = {
+    max_tries: 4,
+    interval: 500
+};
+
+retry(logFail, options);
\ No newline at end of file
diff --git a/bluebird-retry/bluebird-retry.d.ts b/bluebird-retry/bluebird-retry.d.ts
new file mode 100644
index 000000000..3719e5e3a
--- /dev/null
+++ b/bluebird-retry/bluebird-retry.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for bluebird-retry
+// Project: https://github.com/jut-io/bluebird-retry
+// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+declare module "bluebird-retry" {
+	import Promise = require('bluebird');
+
+	function retry<T>(func:(param:T)=>void, options?:retry.Options):Promise<T>;
+
+	module retry {
+		export interface Options {
+			interval?:number;
+			backoff?:number;
+			max_interval?:number;
+			timeout?:number;
+			max_tries?:number;
+		}
+
+	}
+
+	export = retry;
+}
\ No newline at end of file
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index d5be272fc..b8eecf2ca 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bluebird.d.ts" />
+///<reference path="bluebird.d.ts"/>
 
 // Tests by: Bart van der Schoor <https://github.com/Bartvds>
 
@@ -369,12 +369,12 @@ fooProm = fooProm.timeout(num, str);
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 fooProm.nodeify();
-fooProm = fooProm.nodeify((err: any) => {
+fooProm = fooProm.nodeify((err: any) => { });
+fooProm = fooProm.nodeify((err: any, foo?: Foo) => { });
 
-});
-fooProm = fooProm.nodeify((err: any, foo?: Foo) => {
-
-});
+fooProm.nodeify({ spread: true });
+fooProm = fooProm.nodeify((err: any) => { }, { spread: true });
+fooProm = fooProm.nodeify((err: any, foo?: Foo) => { }, { spread: true });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -508,6 +508,17 @@ barArrProm = fooProm.map<Foo, Bar>((item: Foo) => {
 	return bar;
 });
 
+barArrProm = fooProm.map<Foo, Bar>((item: Foo, index: number, arrayLength: number) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = fooProm.map<Foo, Bar>((item: Foo) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 barProm = fooProm.reduce<Foo, Bar>((memo: Bar, item: Foo, index: number, arrayLength: number) => {
@@ -526,6 +537,24 @@ fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
 	return bool;
 });
 
+fooArrProm = fooArrProm.filter<Foo>((item: Foo, index: number, arrayLength: number) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo): Bar => bar);
+fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number): Bar => index ? bar : null);
+fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number, arrayLength: number): Bar => bar);
+fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number, arrayLength: number): Promise<Bar> => barProm);
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
@@ -617,13 +646,42 @@ voidProm = Promise.delay(num);
 
 func = Promise.promisify(f);
 func = Promise.promisify(f, obj);
-;
 
 obj = Promise.promisifyAll(obj);
 anyProm = Promise.fromNode(callback => nodeCallbackFunc(callback));
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+declare var util: any;
+
+function defaultFilter(name: string, func: Function) {
+    return util.isIdentifier(name) &&
+        name.charAt(0) !== "_" &&
+        !util.isClass(func);
+}
+
+function DOMPromisifier(originalMethod: Function) {
+    // return a function
+    return function promisified() {
+        var args = [].slice.call(arguments);
+        // Needed so that the original method can be called with the correct receiver
+        var self = this;
+        // which returns a promise
+        return new Promise(function(resolve, reject) {
+            args.push(resolve, reject);
+            originalMethod.apply(self, args);
+        });
+    };
+}
+
+obj = Promise.promisifyAll(obj, {
+	suffix: "",
+	filter: defaultFilter,
+	promisifier: DOMPromisifier
+});
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 //TODO enable generator
 /*
  func = Promise.coroutine(f);
@@ -709,6 +767,26 @@ barArrProm = Promise.map(fooThenArrThen, (item: Foo, index: number, arrayLength:
 	return barThen;
 });
 
+barArrProm = Promise.map(fooThenArrThen, (item: Foo) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArrThen, (item: Foo) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooArrThen
@@ -726,6 +804,27 @@ barArrProm = Promise.map(fooArrThen, (item: Foo, index: number, arrayLength: num
 	return barThen;
 });
 
+barArrProm = Promise.map(fooArrThen, (item: Foo) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArrThen, (item: Foo) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooThenArr
@@ -743,6 +842,27 @@ barArrProm = Promise.map(fooThenArr, (item: Foo, index: number, arrayLength: num
 	return barThen;
 });
 
+barArrProm = Promise.map(fooThenArr, (item: Foo) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArr, (item: Foo) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArr, (item: Foo, index: number, arrayLength: number) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooThenArr, (item: Foo, index: number, arrayLength: number) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooArr
@@ -760,6 +880,27 @@ barArrProm = Promise.map(fooArr, (item: Foo, index: number, arrayLength: number)
 	return barThen;
 });
 
+barArrProm = Promise.map(fooArr, (item: Foo) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArr, (item: Foo) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArr, (item: Foo, index: number, arrayLength: number) => {
+	return bar;
+}, {
+	concurrency: 1
+});
+barArrProm = Promise.map(fooArr, (item: Foo, index: number, arrayLength: number) => {
+	return barThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // reduce()
@@ -853,6 +994,27 @@ fooArrProm = Promise.filter(fooThenArrThen, (item: Foo, index: number, arrayLeng
 	return boolThen;
 });
 
+fooArrProm = Promise.filter(fooThenArrThen, (item: Foo) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArrThen, (item: Foo) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooArrThen
@@ -870,6 +1032,27 @@ fooArrProm = Promise.filter(fooArrThen, (item: Foo, index: number, arrayLength:
 	return boolThen;
 });
 
+fooArrProm = Promise.filter(fooArrThen, (item: Foo) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArrThen, (item: Foo) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArrThen, (item: Foo, index: number, arrayLength: number) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooThenArr
@@ -887,6 +1070,27 @@ fooArrProm = Promise.filter(fooThenArr, (item: Foo, index: number, arrayLength:
 	return boolThen;
 });
 
+fooArrProm = Promise.filter(fooThenArr, (item: Foo) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArr, (item: Foo) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArr, (item: Foo, index: number, arrayLength: number) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooThenArr, (item: Foo, index: number, arrayLength: number) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // fooArr
@@ -904,4 +1108,65 @@ fooArrProm = Promise.filter(fooArr, (item: Foo, index: number, arrayLength: numb
 	return boolThen;
 });
 
+fooArrProm = Promise.filter(fooArr, (item: Foo) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArr, (item: Foo) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArr, (item: Foo, index: number, arrayLength: number) => {
+	return bool;
+}, {
+	concurrency: 1
+});
+fooArrProm = Promise.filter(fooArr, (item: Foo, index: number, arrayLength: number) => {
+	return boolThen;
+}, {
+	concurrency: 1
+});
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// each()
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// fooThenArrThen
+
+fooArrThen = Promise.each(fooThenArrThen, (item: Foo) => bar);
+fooArrThen = Promise.each(fooThenArrThen, (item: Foo) => barThen);
+fooArrThen = Promise.each(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => bar);
+fooArrThen = Promise.each(fooThenArrThen, (item: Foo, index: number, arrayLength: number) => barThen);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// fooArrThen
+
+fooArrThen = Promise.each(fooArrThen, (item: Foo) => bar);
+fooArrThen = Promise.each(fooArrThen, (item: Foo) => barThen);
+fooArrThen = Promise.each(fooArrThen, (item: Foo, index: number, arrayLength: number) => bar);
+fooArrThen = Promise.each(fooArrThen, (item: Foo, index: number, arrayLength: number) => barThen);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// fooThenArr
+
+fooArrThen = Promise.each(fooThenArr, (item: Foo) => bar);
+fooArrThen = Promise.each(fooThenArr, (item: Foo) => barThen);
+fooArrThen = Promise.each(fooThenArr, (item: Foo, index: number, arrayLength: number) => bar);
+fooArrThen = Promise.each(fooThenArr, (item: Foo, index: number, arrayLength: number) => barThen);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// fooArr
+
+fooArrThen = Promise.each(fooArr, (item: Foo) => bar);
+fooArrThen = Promise.each(fooArr, (item: Foo) => barThen);
+fooArrThen = Promise.each(fooArr, (item: Foo, index: number, arrayLength: number) => bar);
+fooArrThen = Promise.each(fooArr, (item: Foo, index: number, arrayLength: number) => barThen);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 573a3e107..350761fdd 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -115,7 +115,7 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * Register a node-style callback on this promise. When this promise is is either fulfilled or rejected, the node callback will be called back with the node.js convention where error reason is the first argument and success value is the second argument. The error argument will be `null` in case of success.
 	 * Returns back this promise instead of creating a new one. If the `callback` argument is not a function, this method does not do anything.
 	 */
-	nodeify(callback: (err: any, value?: R) => void): Promise<R>;
+	nodeify(callback: (err: any, value?: R) => void, options?: Promise.SpreadOption): Promise<R>;
 	nodeify(...sink: any[]): void;
 
 	/**
@@ -311,8 +311,8 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * Same as calling `Promise.map(thisPromise, mapper)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
 	 */
 	// TODO type inference from array-resolving promise?
-	map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
-	map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => U): Promise<U[]>;
+	map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => Promise.Thenable<U>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => U, options?: Promise.ConcurrencyOption): Promise<U[]>;
 
 	/**
 	 * Same as calling `Promise.reduce(thisPromise, Function reducer, initialValue)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
@@ -325,8 +325,13 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * Same as calling ``Promise.filter(thisPromise, filterer)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
 	 */
 	// TODO type inference from array-resolving promise?
-	filter<U>(filterer: (item: U, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<U[]>;
-	filter<U>(filterer: (item: U, index: number, arrayLength: number) => boolean): Promise<U[]>;
+	filter<U>(filterer: (item: U, index: number, arrayLength: number) => Promise.Thenable<boolean>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	filter<U>(filterer: (item: U, index: number, arrayLength: number) => boolean, options?: Promise.ConcurrencyOption): Promise<U[]>;
+
+	/**
+	 * Same as calling ``Promise.each(thisPromise, iterator)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
+	 */
+	each<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | Promise.Thenable<U>): Promise<R[]>;
 
 	/**
 	 * Start the chain of promises with `Promise.try`. Any synchronous exceptions will be turned into rejections on the returned promise.
@@ -415,7 +420,7 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * Note that the original methods on the object are not overwritten but new methods are created with the `Async`-postfix. For example, if you `promisifyAll()` the node.js `fs` object use `fs.statAsync()` to call the promisified `stat` method.
 	 */
 	// TODO how to model promisifyAll?
-	static promisifyAll(target: Object, options?: Object): Object;
+	static promisifyAll(target: Object, options?: Promise.PromisifyAllOptions): Object;
 
 
 	/**
@@ -547,20 +552,20 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * *The original array is not modified.*
 	 */
 	// promise of array with promises of value
-	static map<R, U>(values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
-	static map<R, U>(values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U, options?: Promise.ConcurrencyOption): Promise<U[]>;
 
 	// promise of array with values
-	static map<R, U>(values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
-	static map<R, U>(values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U, options?: Promise.ConcurrencyOption): Promise<U[]>;
 
 	// array with promises of value
-	static map<R, U>(values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
-	static map<R, U>(values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	static map<R, U>(values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U, options?: Promise.ConcurrencyOption): Promise<U[]>;
 
 	// array with values
-	static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
-	static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+	static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>, options?: Promise.ConcurrencyOption): Promise<U[]>;
+	static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => U, options?: Promise.ConcurrencyOption): Promise<U[]>;
 
 	/**
 	 * Reduce an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `reducer` function with the signature `(total, current, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
@@ -593,20 +598,32 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	 * *The original array is not modified.
 	 */
 	// promise of array with promises of value
-	static filter<R>(values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
-	static filter<R>(values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>, option?: Promise.ConcurrencyOption): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean, option?: Promise.ConcurrencyOption): Promise<R[]>;
 
 	// promise of array with values
-	static filter<R>(values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
-	static filter<R>(values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>, option?: Promise.ConcurrencyOption): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean, option?: Promise.ConcurrencyOption): Promise<R[]>;
 
 	// array with promises of value
-	static filter<R>(values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
-	static filter<R>(values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>, option?: Promise.ConcurrencyOption): Promise<R[]>;
+	static filter<R>(values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean, option?: Promise.ConcurrencyOption): Promise<R[]>;
 
 	// array with values
-	static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
-	static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+	static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>, option?: Promise.ConcurrencyOption): Promise<R[]>;
+	static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean, option?: Promise.ConcurrencyOption): Promise<R[]>;
+
+	/**
+	 * Iterate over an array, or a promise of an array, which contains promises (or a mix of promises and values) with the given iterator function with the signature (item, index, value) where item is the resolved value of a respective promise in the input array. Iteration happens serially. If any promise in the input array is rejected the returned promise is rejected as well.
+	 *
+	 * Resolves to the original array unmodified, this method is meant to be used for side effects. If the iterator function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration.
+	 */
+	// promise of array with promises of value
+	static each<R, U>(values: Promise.Thenable<Promise.Thenable<R>[]>, iterator: (item: R, index: number, arrayLength: number) => U | Promise.Thenable<U>): Promise<R[]>;
+	// array with promises of value
+	static each<R, U>(values: Promise.Thenable<R>[], iterator: (item: R, index: number, arrayLength: number) => U | Promise.Thenable<U>): Promise<R[]>;
+	// array with values OR promise of array with values
+	static each<R, U>(values: R[] | Promise.Thenable<R[]>, iterator: (item: R, index: number, arrayLength: number) => U | Promise.Thenable<U>): Promise<R[]>;
 }
 
 declare module Promise {
@@ -623,6 +640,19 @@ declare module Promise {
 	export interface OperationalError extends Error {
 	}
 
+	export interface ConcurrencyOption {
+		concurrency: number;
+	}
+	export interface SpreadOption {
+		spread: boolean;
+	}
+	export interface PromisifyAllOptions {
+		suffix?: string;
+		filter?: (name: string, func: Function, target?: any, passesDefaultFilter?: boolean) => boolean;
+		// The promisifier gets a reference to the original method and should return a function which returns a promise
+		promisifier?: (originalMethod: Function) => () => Thenable<any> ;
+	}
+
 	// Ideally, we'd define e.g. "export class RangeError extends Error {}",
 	// but as Error is defined as an interface (not a class), TypeScript doesn't
 	// allow extending Error, only implementing it.
diff --git a/bootstrap-notify/bootstrap-notify-test.ts b/bootstrap-notify/bootstrap-notify-test.ts
new file mode 100644
index 000000000..a71a83557
--- /dev/null
+++ b/bootstrap-notify/bootstrap-notify-test.ts
@@ -0,0 +1,52 @@
+/// <reference path="bootstrap-notify.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+    
+//Test for bootstrap-notify v3.1.3
+//Copied example directly from Bootstrap-notify site
+	
+$.notify({
+	// options
+	icon: 'glyphicon glyphicon-warning-sign',
+	title: 'Bootstrap notify',
+	message: 'Turning standard Bootstrap alerts into "notify" like notifications',
+	url: 'https://github.com/mouse0270/bootstrap-notify',
+	target: '_blank'
+},{
+	// settings
+	element: 'body',
+	position: null,
+	type: "info",
+	allow_dismiss: true,
+	newest_on_top: false,
+	showProgressbar: false,
+	placement: {
+		from: "top",
+		align: "right"
+	},
+	offset: 20,
+	spacing: 10,
+	z_index: 1031,
+	delay: 5000,
+	timer: 1000,
+	url_target: '_blank',
+	mouse_over: null,
+	animate: {
+		enter: 'animated fadeInDown',
+		exit: 'animated fadeOutUp'
+	},
+	onShow: null,
+	onShown: null,
+	onClose: null,
+	onClosed: null,
+	icon_type: 'class',
+	template: '<div data-notify="container" class="col-xs-11 col-sm-3 alert alert-{0}" role="alert">' +
+		'<button type="button" aria-hidden="true" class="close" data-notify="dismiss">×</button>' +
+		'<span data-notify="icon"></span> ' +
+		'<span data-notify="title">{1}</span> ' +
+		'<span data-notify="message">{2}</span>' +
+		'<div class="progress" data-notify="progressbar">' +
+			'<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
+		'</div>' +
+		'<a href="{3}" target="{4}" data-notify="url"></a>' +
+	'</div>' 
+});
\ No newline at end of file
diff --git a/bootstrap-notify/bootstrap-notify.d.ts b/bootstrap-notify/bootstrap-notify.d.ts
index 2159aa21a..52e0cb472 100644
--- a/bootstrap-notify/bootstrap-notify.d.ts
+++ b/bootstrap-notify/bootstrap-notify.d.ts
@@ -1,68 +1,62 @@
-// Type definitions for bootstrap-notify
-// Project: https://github.com/Nijikokun/bootstrap-notify
-// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
+// Type definitions for bootstrap-notify v3.1.3
+// Project: http://bootstrap-notify.remabledesigns.com/
+// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>, Robert McIntosh <https://github.com/mouse0270>, Robert Voica <https://github.com/robert-voica>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="../jquery/jquery.d.ts" />
+
+/* tslint:disable: interface-name no-any */
+
+interface JQueryStatic {
+	/* tslint:enable: interface-name */
+    notify(message: string): NotifyReturn;
+	notify(opts: NotifyOptions, settings?: NotifySettings): NotifyReturn;
+	notifyDefaults(settings: NotifySettings): void;
+	notifyClose(): void;
+	notifyClose(command: string): void;
+}
 
 interface NotifyOptions {
-    /**
-    Alert style, omit alert- from style name.
-    @param {string} type
-    */
-    type?: string;
-    /**
-    Allow alert to be closable through a close icon.
-    @param {boolean} closable
-    */
-    closable?: boolean;
-    /**
-    Alert transition, pretty sure only fade is supported, you can try others if you wish.
-    @param {string} transition
-    */
-    transition?: string;
-    /**
-    Fade alert out after a certain delay (in ms)
-    @param {string} fadeOut
-    */
-    fadeOut?: NotifyFadeOutSettings;
-    /**
-    Text to show on alert, you can use either html or text. HTML will override text.
-    @param {MessageOptions} message
-    */
-    message?: MessageOptions;
-    /**
-    Called before alert closes.
-    @param {function} onClose
-    */
-    onClose?: () => void;
-    /**
-    Called after alert closes.
-    @param {function} onClosed
-    */
-    onClosed?: () => void;
+	message: string;
+	title?: string;
+	icon?: string;
+	url?: string;
+	target?: string;
 }
 
-interface NotifyFadeOutSettings {
-    enabled?: boolean;
-    delay?: number;
+interface NotifySettings {
+	element?: string;
+	position?: string;
+	type?: string;
+	allow_dismiss?: boolean;
+	allow_duplicates?: boolean;
+	newest_on_top?: boolean;
+	showProgressbar?: boolean;
+	placement?: {
+		from?: string;
+		align?: string;
+	};
+	offset?: number;
+	spacing?: number;
+	z_index?: number;
+	delay?: number;
+	timer?: number;
+	url_target?: string;
+	mouse_over?: string;
+	animate?: {
+		enter?: string;
+		exit?: string;
+	};
+	onShow?: () => void;
+	onShown?: () => void;
+	onClose?: () => void;
+	onClosed?: () => void;
+	icon_type?: string;
+	template?: string;
 }
 
-interface MessageOptions {
-    html?: string;
-    text?: string;
-}
-
-interface Notification {
-    show();
-    hide();
-}
-
-interface JQuery {
-    /**
-    Creates a notification instance with default options.
-    @constructor
-    @param {NotifyOptions} options
-    */
-    notify(options: NotifyOptions): Notification;
+interface NotifyReturn {
+	$ele: JQueryStatic;
+	close: () => void;
+	update: (command: string, update: any) => void;
 }
\ No newline at end of file
diff --git a/bootstrap-slider/bootstrap-slider.d.ts b/bootstrap-slider/bootstrap-slider.d.ts
index 78aeb645c..d66c85ab1 100644
--- a/bootstrap-slider/bootstrap-slider.d.ts
+++ b/bootstrap-slider/bootstrap-slider.d.ts
@@ -137,6 +137,13 @@ interface JQueryEventObject {
     value: number|ChangeValue;
 }
 
+interface SliderStatics {
+	new (selector: string, opts: SliderOptions): Slider;
+	prototype: Slider;
+}
+
+declare var Slider: SliderStatics;
+
 /**
  * This class is actually not used when using the jQuery version of bootstrap-slider
  * The method documentation is still here thouh.
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
index 6f1147cc1..228b7537f 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
@@ -48,6 +48,10 @@ declare module BootstrapV3DatetimePicker {
         direction?: string;
         sideBySide?: boolean;
         daysOfWeekDisabled?: Array<any>;
+        calendarWeeks?: boolean;
+        format?: string | boolean;
+        locale?: string;
+        showTodayButton?: boolean;
     }
 
     interface Datetimepicker {
@@ -97,4 +101,4 @@ interface JQuery {
     on(events: 'dp.error', handler: (eventObject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
 
     data(key: 'DateTimePicker'): BootstrapV3DatetimePicker.Datetimepicker;
-}
\ No newline at end of file
+}
diff --git a/bootstrap/bootstrap.d.ts b/bootstrap/bootstrap.d.ts
index 47a992fba..3545eb310 100644
--- a/bootstrap/bootstrap.d.ts
+++ b/bootstrap/bootstrap.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Bootstrap 2.2
+// Type definitions for Bootstrap 3.3.5
 // Project: http://twitter.github.com/bootstrap/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -27,24 +27,28 @@ interface ScrollSpyOptions {
 interface TooltipOptions {
     animation?: boolean;
     html?: boolean;
-    placement?: any;
+    placement?: string | Function;
     selector?: string;
-    title?: any;
+    title?: string | Function;
     trigger?: string;
-    delay?: any;
-    container?: any;
+    template?: string;
+    delay?: number | Object;
+    container?: string | boolean;
+    viewport?: string | Function | Object;
 }
 
 interface PopoverOptions {
     animation?: boolean;
     html?: boolean;
-    placement?: any;
+    placement?: string | Function;
     selector?: string;
     trigger?: string;
-    title?: any;
+    title?: string | Function;
+    template?: string;
     content?: any;
-    delay?: any;
-    container?: any;
+    delay?: number | Object;
+    container?: string | boolean;
+    viewport?: string | Function | Object;
 }
 
 interface CollapseOptions {
@@ -55,6 +59,8 @@ interface CollapseOptions {
 interface CarouselOptions {
     interval?: number;
     pause?: string;
+    wrap?: boolean;
+    keybord?: boolean;
 }
 
 interface TypeaheadOptions {
@@ -68,7 +74,8 @@ interface TypeaheadOptions {
 }
 
 interface AffixOptions {
-    offset?: any;
+    offset?: number | Function | Object;
+    target?: any;
 }
 
 interface JQuery {
diff --git a/bowser/bowser-tests.ts b/bowser/bowser-tests.ts
new file mode 100644
index 000000000..2f7cb8904
--- /dev/null
+++ b/bowser/bowser-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="./bowser.d.ts" />
+
+import Bowser = require('bowser');
+
+Bowser.msedge === true;
+Bowser.test(['msie']) === true;
+Bowser.a === Bowser.c;
+Bowser.osversion > 10;
+Bowser.osversion === '10.1A';
diff --git a/bowser/bowser.d.ts b/bowser/bowser.d.ts
new file mode 100644
index 000000000..d3509a72b
--- /dev/null
+++ b/bowser/bowser.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for Bowser 1.x
+// Project: https://github.com/ded/bowser
+// Definitions by: Paulo Cesar <https://github.com/pocesar>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'bowser' {
+    var def: BowserModule.IBowser;
+    export = def;
+}
+
+declare module BowserModule {
+
+    export interface IBowserUA {
+        msie: boolean;
+        chrome: boolean;
+        webkit: boolean;
+        phantom: boolean;
+        opera: boolean;
+        safari: boolean;
+        android: boolean;
+        ios: boolean;
+        webos: boolean;
+        msedge: boolean;
+        seamonkey: boolean;
+        firefox: boolean;
+        yandexbrowser: boolean;
+        blackberry: boolean;
+        tablet: boolean;
+        mobile: boolean;
+        silk: boolean;
+        bada: boolean;
+        tizen: boolean;
+        windowsphone: boolean;
+        firefoxos: boolean;
+        gecko: boolean;
+        sailfish: boolean;
+        chromeBook: boolean;
+        /** Grade A browser */
+        a: boolean;
+        /** Grade C browser */
+        c: boolean;
+        /** Grade X browser */
+        x: boolean;
+        name: string;
+        version: string|number;
+        osversion: string|number;
+    }
+
+    export interface IBowser extends IBowserUA {
+        test(browserList: string[]): boolean;
+        _detect(ua: string): IBowser;
+    }
+
+}
diff --git a/breeze/breeze-tests.ts b/breeze/breeze-tests.ts
index f309462af..1f9c87dfa 100644
--- a/breeze/breeze-tests.ts
+++ b/breeze/breeze-tests.ts
@@ -11,7 +11,7 @@ function test_dataType() {
     var x = typ.parentEnum === <breeze.core.IEnum> breeze.DataType;
     var isFalse = breeze.DataType.contains(breeze.DataType.Double);
     var dt = breeze.DataType.fromName("Decimal");
-    
+
 }
 
 function test_dataProperty() {
@@ -33,7 +33,7 @@ function test_dataService() {
     var em = new breeze.EntityManager({
         dataService: ds
     });
-    
+
 }
 
 function test_entityAspect() {
@@ -69,7 +69,7 @@ function test_entityAspect() {
         var errorsAdded = validationChangeArgs.added;
         var errorsCleared = validationChangeArgs.removed;
     });
-    
+
 }
 
 function test_entityKey() {
@@ -132,7 +132,7 @@ function test_entityManager() {
         serviceName: "breeze/NorthwindIBModel",
         metadataStore: metadataStore
     });
-    
+
     return new breeze.QueryOptions({
         mergeStrategy: null,
         fetchStrategy: this.fetchStrategy
@@ -157,7 +157,7 @@ function test_entityManager() {
 
     var cust2 = em1.createEntity("Customer", { companyName: "foo" });
     var cust3 = em1.createEntity("foo", { xxx: 3 }, breeze.EntityState.Added);
-    
+
     em1.attachEntity(cust1, breeze.EntityState.Added);
     em1.clear();
     var em2 = em1.createEmptyCopy();
@@ -246,7 +246,7 @@ function test_entityManager() {
     var custType = <breeze.EntityType> em1.metadataStore.getEntityType("Customer");
     var orderType = <breeze.EntityType> em1.metadataStore.getEntityType("Order");
     if (em1.hasChanges([custType, orderType])) { };
-    
+
     var bundle = em1.exportEntities();
     window.localStorage.setItem("myEntityManager", bundle);
     var bundleFromStorage = window.localStorage.getItem("myEntityManager");
@@ -434,7 +434,7 @@ function test_entityState() {
     return es === breeze.EntityState.Unchanged;
     var es = anEntity.entityAspect.entityState;
     return es.isUnchangedOrModified();
-    
+
     return es === breeze.EntityState.Unchanged || es === breeze.EntityState.Modified;
 }
 
@@ -443,12 +443,14 @@ function test_entityType() {
     var myEntityType: breeze.EntityType;
     var dataProperty1: breeze.DataProperty, dataProperty2: breeze.DataProperty, navigationProperty1: breeze.DataProperty;
     var em1: breeze.EntityManager;
+    /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
     var entityManager = new breeze.EntityType({
         metadataStore: myMetadataStore,
         serviceName: "breeze/NorthwindIBModel",
         name: "person",
         namespace: "myAppNamespace"
     });
+     */
     myEntityType.addProperty(dataProperty1);
     myEntityType.addProperty(dataProperty2);
     myEntityType.addProperty(navigationProperty1);
@@ -759,9 +761,11 @@ function test_validator() {
     orderType = <breeze.EntityType> em1.metadataStore.getEntityType("Order");
     var orderDateProperty = orderType.getProperty("OrderDate");
     orderDateProperty.validators.push(breeze.Validator.date());
+    /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
     var v0 = breeze.Validator.maxLength({ maxLength: 5, displayName: "City" });
     v0.validate("adasdfasdf");
     var errMessage = v0.getMessage();
+     */
     custType = <breeze.EntityType> em1.metadataStore.getEntityType("Customer");
     var customerIdProperty = custType.getProperty("CustomerID");
     customerIdProperty.validators.push(breeze.Validator.guid());
@@ -788,6 +792,7 @@ function test_validator() {
     regionProperty.validators.push(breeze.Validator.string());
     custType = <breeze.EntityType> em1.metadataStore.getEntityType("Customer");
      regionProperty = custType.getProperty("Region");
+    /* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
     regionProperty.validators.push(breeze.Validator.stringLength({ minLength: 2, maxLength: 5 }));
     var validator = breeze.Validator.maxLength({ maxLength: 5, displayName: "City" });
     var result = validator.validate("asdf");
@@ -796,6 +801,7 @@ function test_validator() {
     var errMsg = result.errorMessage;
     var context = result.context;
     var sameValidator = result.validator;
+     */
     var valFn = function (v: any) {
         if (v == null) return true;
         return (v.substr(0,2) === "US");
diff --git a/breeze/breeze.d.ts b/breeze/breeze.d.ts
index 4821ed427..2a60df6d8 100644
--- a/breeze/breeze.d.ts
+++ b/breeze/breeze.d.ts
@@ -459,6 +459,7 @@ declare module breeze {
     interface EntityManagerProperties {
         serviceName?: string;
         dataService?: DataService;
+        metadataStore?: MetadataStore;
         queryOptions?: QueryOptions;
         saveOptions?: SaveOptions;
         validationOptions?: ValidationOptions;
@@ -856,7 +857,7 @@ declare module breeze {
         tag: Object;
         static defaultInstance: SaveOptions;
 
-        constructor(config?: { allowConcurrentSaves?: boolean; });
+        constructor(config?: { allowConcurrentSaves?: boolean; resourceName?: string; dataService?: DataService; tag?: any});
 
         setAsDefault(): SaveOptions;
         using(config: SaveOptionsConfiguration): SaveOptions;
diff --git a/bunyan/bunyan-test.ts b/bunyan/bunyan-test.ts
index b8e51d145..2575f043d 100644
--- a/bunyan/bunyan-test.ts
+++ b/bunyan/bunyan-test.ts
@@ -1,6 +1,6 @@
 /// <reference path="bunyan.d.ts" />
 
-import bunyan = require('bunyan');
+import * as bunyan from 'bunyan';
 
 var ringBufferOptions:bunyan.RingBufferOptions = {
     limit: 100
@@ -40,7 +40,9 @@ var options:bunyan.LoggerOptions = {
         type: 'rotating-file',
         path: '/tmp/test2.log',
         level: bunyan.INFO,
-        closeOnExit: false
+        closeOnExit: false,
+        period: '1d',
+        count: 3
     }, {
         type: 'raw',
         stream: process.stderr,
diff --git a/bunyan/bunyan.d.ts b/bunyan/bunyan.d.ts
index 1f73705c3..081b8a092 100644
--- a/bunyan/bunyan.d.ts
+++ b/bunyan/bunyan.d.ts
@@ -6,9 +6,7 @@
 /// <reference path="../node/node.d.ts" />
 
 declare module "bunyan" {
-    import events = require('events');
-    import EventEmitter = events.EventEmitter;
-    import WritableStream = NodeJS.WritableStream;
+    import { EventEmitter } from 'events';
 
     class Logger extends EventEmitter {
         constructor(options:LoggerOptions);
@@ -52,7 +50,7 @@ declare module "bunyan" {
         name: string;
         streams?: Stream[];
         level?: string | number;
-        stream?: WritableStream;
+        stream?: NodeJS.WritableStream;
         serializers?: Serializers;
         src?: boolean;
     }
@@ -65,8 +63,10 @@ declare module "bunyan" {
         type?: string;
         level?: number | string;
         path?: string;
-        stream?: WritableStream | Stream;
+        stream?: NodeJS.WritableStream | Stream;
         closeOnExit?: boolean;
+        period?: string;
+        count?: number;
     }
 
     export var stdSerializers:Serializers;
diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts
index 95a433517..0b747d2c4 100644
--- a/chai-as-promised/chai-as-promised-tests.ts
+++ b/chai-as-promised/chai-as-promised-tests.ts
@@ -1,23 +1,54 @@
 /// <reference path="chai-as-promised.d.ts" />
+/// <reference path="../promises-a-plus/promises-a-plus.d.ts" />
+/// <reference path="../q/Q.d.ts" />
 
 import chai = require('chai');
 import chaiAsPromised = require('chai-as-promised');
+import Q = require('q');
 
 chai.use(chaiAsPromised);
 
 // ReSharper disable WrongExpressionStatement
-var promise: any;
-chai.expect(promise).to.eventually.equal(3);
-chai.expect(promise).to.become(3);
-chai.expect(promise).to.be.fulfilled;
-chai.expect(promise).to.be.rejected;
-chai.expect(promise).to.be.rejectedWith(Error);
-chai.expect(promise).to.notify(() => console.log('done'));
+// BDD API (expect)
+var thenableNum: PromisesAPlus.Thenable<number>;
+thenableNum = chai.expect(thenableNum).to.eventually.equal(3);
+thenableNum = chai.expect(thenableNum).to.eventually.have.property('foo');
+thenableNum = chai.expect(thenableNum).to.become(3);
+thenableNum = chai.expect(thenableNum).to.be.fulfilled;
+thenableNum = chai.expect(thenableNum).to.be.rejected;
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(Error);
+thenableNum = chai.expect(thenableNum).to.notify(() => console.log('done'));
 
-chai.assert.eventually.equal(promise, 4, 'Message');
-chai.assert.isFulfilled(promise, "optional message");
-chai.assert.becomes(promise, "foo", "optional message");
-chai.assert.doesNotBecome(promise, "foo", "optional message");
-chai.assert.isRejected(promise, "optional message");
-chai.assert.isRejected(promise, Error, "optional message");
-chai.assert.isRejected(promise, /error message matcher/, "optional message");
+// BDD API (should)
+thenableNum = thenableNum.should.be.fulfilled;
+thenableNum = thenableNum.should.eventually.deep.equal(3);
+thenableNum = thenableNum.should.become(3);
+thenableNum = thenableNum.should.be.rejected;
+thenableNum = thenableNum.should.be.rejectedWith(Error);
+thenableNum = thenableNum.should.eventually.equal(3).notify(() => console.log('done'));
+thenableNum = thenableNum.should.be.fulfilled.and.notify(() => console.log('done'));
+
+// Complex examples on https://github.com/domenic/chai-as-promised#working-with-non-promisefriendly-test-runners
+thenableNum.should.be.fulfilled.then(function () {
+  thenableNum.should.equal("after");
+}).should.notify(() => console.log('done'));
+
+Q.all([
+    thenableNum.should.become("happy"),
+    thenableNum.should.eventually.have.property("fun times"),
+    thenableNum.should.be.rejectedWith(TypeError, "only joyful types are allowed")
+]).should.notify(() => console.log('done'));
+
+// Assert API
+var thenableVoid: PromisesAPlus.Thenable<void>;
+thenableVoid = chai.assert.eventually.equal(thenableNum, 4, 'Message');
+thenableVoid = chai.assert.isFulfilled(thenableNum, "optional message");
+thenableVoid = chai.assert.becomes(thenableNum, "foo", "optional message");
+thenableVoid = chai.assert.doesNotBecome(thenableNum, "foo", "optional message");
+thenableVoid = chai.assert.isRejected(thenableNum, "optional message");
+thenableVoid = chai.assert.isRejected(thenableNum, Error, "optional message");
+thenableVoid = chai.assert.isRejected(thenableNum, /error message matcher/, "optional message");
+
+// Check that original chai assertions are not broken
+var undef: void;
+undef = chai.assert.equal(10, 4, 'Message');
diff --git a/chai-as-promised/chai-as-promised.d.ts b/chai-as-promised/chai-as-promised.d.ts
index 106bbf41e..51255b490 100644
--- a/chai-as-promised/chai-as-promised.d.ts
+++ b/chai-as-promised/chai-as-promised.d.ts
@@ -1,9 +1,10 @@
 // Type definitions for chai-as-promised
 // Project: https://github.com/domenic/chai-as-promised/
-// Definitions by: jt000 <https://github.com/jt000>
+// Definitions by: jt000 <https://github.com/jt000>, Yuki Kokubun <https://github.com/Kuniwak>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../chai/chai.d.ts" />
+/// <reference path="../promises-a-plus/promises-a-plus.d.ts" />
 
 declare module 'chai-as-promised' {
     function chaiAsPromised(chai: any, utils: any): void;
@@ -12,25 +13,272 @@ declare module 'chai-as-promised' {
 
 declare module Chai {
 
-    interface Assertion {
-        become(expected: any): Assertion;
-        fulfilled: Assertion;
-        rejected: Assertion;
-        rejectedWith(expected: any): Assertion;
-        notify(fn: Function): Assertion;
+    // For BDD API
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        eventually: PromisedAssertion;
+        become(expected: any): PromisedAssertion;
+        fulfilled: PromisedAssertion;
+        rejected: PromisedAssertion;
+        rejectedWith(expected: any, message?: string): PromisedAssertion;
+        notify(fn: Function): PromisedAssertion;
     }
 
-    interface LanguageChains {
-        eventually: Assertion;
+    // Eventually does not have .then(), but PromisedAssertion have.
+    interface Eventually extends PromisedLanguageChains, PromisedNumericComparison, PromisedTypeComparison {
+        // From chai-as-promised
+        become(expected: PromisesAPlus.Thenable<any>): PromisedAssertion;
+        fulfilled: PromisedAssertion;
+        rejected: PromisedAssertion;
+        rejectedWith(expected: any): PromisedAssertion;
+        notify(fn: Function): PromisedAssertion;
+
+        // From chai
+        not: PromisedAssertion;
+        deep: PromisedDeep;
+        a: PromisedTypeComparison;
+        an: PromisedTypeComparison;
+        include: PromisedInclude;
+        contain: PromisedInclude;
+        ok: PromisedAssertion;
+        true: PromisedAssertion;
+        false: PromisedAssertion;
+        null: PromisedAssertion;
+        undefined: PromisedAssertion;
+        exist: PromisedAssertion;
+        empty: PromisedAssertion;
+        arguments: PromisedAssertion;
+        Arguments: PromisedAssertion;
+        equal: PromisedEqual;
+        equals: PromisedEqual;
+        eq: PromisedEqual;
+        eql: PromisedEqual;
+        eqls: PromisedEqual;
+        property: PromisedProperty;
+        ownProperty: PromisedOwnProperty;
+        haveOwnProperty: PromisedOwnProperty;
+        length: PromisedLength;
+        lengthOf: PromisedLength;
+        match(regexp: RegExp|string, message?: string): PromisedAssertion;
+        string(string: string, message?: string): PromisedAssertion;
+        keys: PromisedKeys;
+        key(string: string): PromisedAssertion;
+        throw: PromisedThrow;
+        throws: PromisedThrow;
+        Throw: PromisedThrow;
+        respondTo(method: string, message?: string): PromisedAssertion;
+        itself: PromisedAssertion;
+        satisfy(matcher: Function, message?: string): PromisedAssertion;
+        closeTo(expected: number, delta: number, message?: string): PromisedAssertion;
+        members: PromisedMembers;
     }
 
+    interface PromisedAssertion extends Eventually, PromisesAPlus.Thenable<any> {
+    }
+
+    interface PromisedLanguageChains {
+        eventually: Eventually;
+
+        // From chai
+        to: PromisedAssertion;
+        be: PromisedAssertion;
+        been: PromisedAssertion;
+        is: PromisedAssertion;
+        that: PromisedAssertion;
+        which: PromisedAssertion;
+        and: PromisedAssertion;
+        has: PromisedAssertion;
+        have: PromisedAssertion;
+        with: PromisedAssertion;
+        at: PromisedAssertion;
+        of: PromisedAssertion;
+        same: PromisedAssertion;
+    }
+
+    interface PromisedNumericComparison {
+        above: PromisedNumberComparer;
+        gt: PromisedNumberComparer;
+        greaterThan: PromisedNumberComparer;
+        least: PromisedNumberComparer;
+        gte: PromisedNumberComparer;
+        below: PromisedNumberComparer;
+        lt: PromisedNumberComparer;
+        lessThan: PromisedNumberComparer;
+        most: PromisedNumberComparer;
+        lte: PromisedNumberComparer;
+        within(start: number, finish: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedNumberComparer {
+        (value: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedTypeComparison {
+        (type: string, message?: string): PromisedAssertion;
+        instanceof: PromisedInstanceOf;
+        instanceOf: PromisedInstanceOf;
+    }
+
+    interface PromisedInstanceOf {
+        (constructor: Object, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedDeep {
+        equal: PromisedEqual;
+        include: PromisedInclude;
+        property: PromisedProperty;
+    }
+
+    interface PromisedEqual {
+        (value: any, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedProperty {
+        (name: string, value?: any, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedOwnProperty {
+        (name: string, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedLength extends PromisedLanguageChains, PromisedNumericComparison {
+        (length: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedInclude {
+        (value: Object, message?: string): PromisedAssertion;
+        (value: string, message?: string): PromisedAssertion;
+        (value: number, message?: string): PromisedAssertion;
+        keys: PromisedKeys;
+        members: PromisedMembers;
+    }
+
+    interface PromisedKeys {
+        (...keys: string[]): PromisedAssertion;
+        (keys: any[]): PromisedAssertion;
+    }
+
+    interface PromisedThrow {
+        (): PromisedAssertion;
+        (expected: string, message?: string): PromisedAssertion;
+        (expected: RegExp, message?: string): PromisedAssertion;
+        (constructor: Error, expected?: string, message?: string): PromisedAssertion;
+        (constructor: Error, expected?: RegExp, message?: string): PromisedAssertion;
+        (constructor: Function, expected?: string, message?: string): PromisedAssertion;
+        (constructor: Function, expected?: RegExp, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedMembers {
+        (set: any[], message?: string): PromisedAssertion;
+    }
+
+    // For Assert API
     interface Assert {
-        eventually: Assert;
-        isFulfilled(promise: any, message?: string): void;
-        becomes(promise: any, expected: any, message?: string): void;
-        doesNotBecome(promise: any, expected: any, message?: string): void;
-        isRejected(promise: any, message?: string): void;
-        isRejected(promise: any, expected: any, message?: string): void;
-        isRejected(promise: any, match: RegExp, message?: string): void;
+        eventually: PromisedAssert;
+        isFulfilled(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
+        becomes(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        doesNotBecome(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, match: RegExp, message?: string): PromisesAPlus.Thenable<void>;
+        notify(fn: Function): PromisesAPlus.Thenable<void>;
+    }
+
+    export interface PromisedAssert {
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): PromisesAPlus.Thenable<void>;
+
+        ok(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notOk(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        equal(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        strictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notStrictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        deepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notDeepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isTrue(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isFalse(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isUndefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isDefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        typeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notTypeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
+
+        instanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        notInstanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
+
+        include(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        include(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        notInclude(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notInclude(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        match(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
+        notMatch(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
+
+        property(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        deepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notDeepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        lengthOf(exp: any, len: number, msg?: string): PromisesAPlus.Thenable<void>;
+        //alias frenzy
+        throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        throws(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        Throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        doesNotThrow(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        operator(val: any, operator: string, val2: any, msg?: string): PromisesAPlus.Thenable<void>;
+        closeTo(act: number, exp: number, delta: number, msg?: string): PromisesAPlus.Thenable<void>;
+
+        sameMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
+        includeMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
+
+        ifError(val: any, msg?: string): PromisesAPlus.Thenable<void>;
     }
 }
diff --git a/chai/chai-2.0.0.d.ts b/chai/chai-2.0.0.d.ts
new file mode 100644
index 000000000..cb685f3ef
--- /dev/null
+++ b/chai/chai-2.0.0.d.ts
@@ -0,0 +1,308 @@
+// Type definitions for chai 2.0.0
+// Project: http://chaijs.com/
+// Definitions by: Jed Mao <https://github.com/jedmao/>,
+//                 Bart van der Schoor <https://github.com/Bartvds>,
+//                 Andrew Brown <https://github.com/AGBrown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module Chai {
+
+    interface ChaiStatic {
+        expect: ExpectStatic;
+        should(): Should;
+        /**
+         * Provides a way to extend the internals of Chai
+         */
+        use(fn: (chai: any, utils: any) => void): any;
+        assert: AssertStatic;
+        config: Config;
+    }
+
+    export interface ExpectStatic extends AssertionStatic {
+    }
+
+    export interface AssertStatic extends Assert {
+    }
+
+    export interface AssertionStatic {
+        (target: any, message?: string): Assertion;
+    }
+
+    interface ShouldAssertion {
+        equal(value1: any, value2: any, message?: string): void;
+        Throw: ShouldThrow;
+        throw: ShouldThrow;
+        exist(value: any, message?: string): void;
+    }
+
+    interface Should extends ShouldAssertion {
+        not: ShouldAssertion;
+        fail(actual: any, expected: any, message?: string, operator?: string): void;
+    }
+
+    interface ShouldThrow {
+        (actual: Function): void;
+        (actual: Function, expected: string|RegExp, message?: string): void;
+        (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
+    }
+
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        not: Assertion;
+        deep: Deep;
+        a: TypeComparison;
+        an: TypeComparison;
+        include: Include;
+        contain: Include;
+        ok: Assertion;
+        true: Assertion;
+        false: Assertion;
+        null: Assertion;
+        undefined: Assertion;
+        exist: Assertion;
+        empty: Assertion;
+        arguments: Assertion;
+        Arguments: Assertion;
+        equal: Equal;
+        equals: Equal;
+        eq: Equal;
+        eql: Equal;
+        eqls: Equal;
+        property: Property;
+        ownProperty: OwnProperty;
+        haveOwnProperty: OwnProperty;
+        length: Length;
+        lengthOf: Length;
+        match(regexp: RegExp|string, message?: string): Assertion;
+        string(string: string, message?: string): Assertion;
+        keys: Keys;
+        key(string: string): Assertion;
+        throw: Throw;
+        throws: Throw;
+        Throw: Throw;
+        respondTo(method: string, message?: string): Assertion;
+        itself: Assertion;
+        satisfy(matcher: Function, message?: string): Assertion;
+        closeTo(expected: number, delta: number, message?: string): Assertion;
+        members: Members;
+    }
+
+    interface LanguageChains {
+        to: Assertion;
+        be: Assertion;
+        been: Assertion;
+        is: Assertion;
+        that: Assertion;
+        which: Assertion;
+        and: Assertion;
+        has: Assertion;
+        have: Assertion;
+        with: Assertion;
+        at: Assertion;
+        of: Assertion;
+        same: Assertion;
+    }
+
+    interface NumericComparison {
+        above: NumberComparer;
+        gt: NumberComparer;
+        greaterThan: NumberComparer;
+        least: NumberComparer;
+        gte: NumberComparer;
+        below: NumberComparer;
+        lt: NumberComparer;
+        lessThan: NumberComparer;
+        most: NumberComparer;
+        lte: NumberComparer;
+        within(start: number, finish: number, message?: string): Assertion;
+    }
+
+    interface NumberComparer {
+        (value: number, message?: string): Assertion;
+    }
+
+    interface TypeComparison {
+        (type: string, message?: string): Assertion;
+        instanceof: InstanceOf;
+        instanceOf: InstanceOf;
+    }
+
+    interface InstanceOf {
+        (constructor: Object, message?: string): Assertion;
+    }
+
+    interface Deep {
+        equal: Equal;
+        include: Include;
+        property: Property;
+    }
+
+    interface Equal {
+        (value: any, message?: string): Assertion;
+    }
+
+    interface Property {
+        (name: string, value?: any, message?: string): Assertion;
+    }
+
+    interface OwnProperty {
+        (name: string, message?: string): Assertion;
+    }
+
+    interface Length extends LanguageChains, NumericComparison {
+        (length: number, message?: string): Assertion;
+    }
+
+    interface Include {
+        (value: Object, message?: string): Assertion;
+        (value: string, message?: string): Assertion;
+        (value: number, message?: string): Assertion;
+        keys: Keys;
+        members: Members;
+    }
+
+    interface Keys {
+        (...keys: string[]): Assertion;
+        (keys: any[]): Assertion;
+    }
+
+    interface Throw {
+        (): Assertion;
+        (expected: string, message?: string): Assertion;
+        (expected: RegExp, message?: string): Assertion;
+        (constructor: Error, expected?: string, message?: string): Assertion;
+        (constructor: Error, expected?: RegExp, message?: string): Assertion;
+        (constructor: Function, expected?: string, message?: string): Assertion;
+        (constructor: Function, expected?: RegExp, message?: string): Assertion;
+    }
+
+    interface Members {
+        (set: any[], message?: string): Assertion;
+    }
+
+    export interface Assert {
+        /**
+         * @param expression Expression to test for truthiness.
+         * @param message Message to display on error.
+         */
+        (expression: any, message?: string): void;
+
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): void;
+
+        ok(val: any, msg?: string): void;
+        notOk(val: any, msg?: string): void;
+
+        equal(act: any, exp: any, msg?: string): void;
+        notEqual(act: any, exp: any, msg?: string): void;
+
+        strictEqual(act: any, exp: any, msg?: string): void;
+        notStrictEqual(act: any, exp: any, msg?: string): void;
+
+        deepEqual(act: any, exp: any, msg?: string): void;
+        notDeepEqual(act: any, exp: any, msg?: string): void;
+
+        isTrue(val: any, msg?: string): void;
+        isFalse(val: any, msg?: string): void;
+
+        isNull(val: any, msg?: string): void;
+        isNotNull(val: any, msg?: string): void;
+
+        isUndefined(val: any, msg?: string): void;
+        isDefined(val: any, msg?: string): void;
+
+        isFunction(val: any, msg?: string): void;
+        isNotFunction(val: any, msg?: string): void;
+
+        isObject(val: any, msg?: string): void;
+        isNotObject(val: any, msg?: string): void;
+
+        isArray(val: any, msg?: string): void;
+        isNotArray(val: any, msg?: string): void;
+
+        isString(val: any, msg?: string): void;
+        isNotString(val: any, msg?: string): void;
+
+        isNumber(val: any, msg?: string): void;
+        isNotNumber(val: any, msg?: string): void;
+
+        isBoolean(val: any, msg?: string): void;
+        isNotBoolean(val: any, msg?: string): void;
+
+        typeOf(val: any, type: string, msg?: string): void;
+        notTypeOf(val: any, type: string, msg?: string): void;
+
+        instanceOf(val: any, type: Function, msg?: string): void;
+        notInstanceOf(val: any, type: Function, msg?: string): void;
+
+        include(exp: string, inc: any, msg?: string): void;
+        include(exp: any[], inc: any, msg?: string): void;
+
+        notInclude(exp: string, inc: any, msg?: string): void;
+        notInclude(exp: any[], inc: any, msg?: string): void;
+
+        match(exp: any, re: RegExp, msg?: string): void;
+        notMatch(exp: any, re: RegExp, msg?: string): void;
+
+        property(obj: Object, prop: string, msg?: string): void;
+        notProperty(obj: Object, prop: string, msg?: string): void;
+        deepProperty(obj: Object, prop: string, msg?: string): void;
+        notDeepProperty(obj: Object, prop: string, msg?: string): void;
+
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        lengthOf(exp: any, len: number, msg?: string): void;
+        //alias frenzy
+        throw(fn: Function, msg?: string): void;
+        throw(fn: Function, regExp: RegExp): void;
+        throw(fn: Function, errType: Function, msg?: string): void;
+        throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        throws(fn: Function, msg?: string): void;
+        throws(fn: Function, regExp: RegExp): void;
+        throws(fn: Function, errType: Function, msg?: string): void;
+        throws(fn: Function, errType: Function, regExp: RegExp): void;
+
+        Throw(fn: Function, msg?: string): void;
+        Throw(fn: Function, regExp: RegExp): void;
+        Throw(fn: Function, errType: Function, msg?: string): void;
+        Throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        doesNotThrow(fn: Function, msg?: string): void;
+        doesNotThrow(fn: Function, regExp: RegExp): void;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): void;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): void;
+
+        operator(val: any, operator: string, val2: any, msg?: string): void;
+        closeTo(act: number, exp: number, delta: number, msg?: string): void;
+
+        sameMembers(set1: any[], set2: any[], msg?: string): void;
+        includeMembers(set1: any[], set2: any[], msg?: string): void;
+
+        ifError(val: any, msg?: string): void;
+    }
+
+    export interface Config {
+        includeStack: boolean;
+    }
+
+    export class AssertionError {
+        constructor(message: string, _props?: any, ssf?: Function);
+        name: string;
+        message: string;
+        showDiff: boolean;
+        stack: string;
+    }
+}
+
+declare var chai: Chai.ChaiStatic;
+
+declare module "chai" {
+    export = chai;
+}
+
+interface Object {
+    should: Chai.Assertion;
+}
diff --git a/chai/chai-tests.ts b/chai/chai-tests.ts
index c34b6cdf1..9b646b152 100644
--- a/chai/chai-tests.ts
+++ b/chai/chai-tests.ts
@@ -31,6 +31,16 @@ function fail() {
     err(() => {
         should.fail('foo', 'bar', 'should fail', 'equal');
     }, 'expected fail to throw an AssertionError');
+
+    err(() => {
+        expect.fail('foo', 'bar');
+    }, 'expected fail to throw an AssertionError');
+    err(() => {
+        expect.fail('foo', 'bar', 'should fail');
+    }, 'expected fail to throw an AssertionError');
+    err(() => {
+        expect.fail('foo', 'bar', 'should fail', 'equal');
+    }, 'expected fail to throw an AssertionError');
 }
 
 // ReSharper disable once InconsistentNaming
@@ -107,11 +117,20 @@ function _undefined() {
     }, 'expected \'\' to be undefined');
 }
 
+function _NaN() {
+    expect(NaN).to.be.NaN;
+    expect(12).to.be.not.NaN;
+    expect("NaN").to.be.not.NaN;
+    (NaN).should.be.NaN;
+    (12).should.be.not.NaN;
+    ("NaN").should.be.not.NaN;
+}
+
 function exist() {
     var foo = 'bar';
     expect(foo).to.exist;
     should.exist(foo);
-    expect(void(0)).to.not.exist;
+    expect(void (0)).to.not.exist;
     should.not.exist(void (0));
 }
 
@@ -128,8 +147,8 @@ function argumentsTest() {
 }
 
 function equal() {
-    expect(undefined).to.equal(void(0));
-    should.equal(undefined, void(0));
+    expect(undefined).to.equal(void (0));
+    should.equal(undefined, void (0));
 }
 
 function _typeof() {
@@ -372,6 +391,9 @@ function match() {
     expect('foobar').to.not.match(/^bar/);
     'foobar'.should.not.match(/^bar/);
 
+    expect('foobar').matches(/^foo/);
+    'foobar'.should.not.matches(/^bar/);
+
     err(() => {
         expect('foobar').to.match(/^bar/i, 'blah');
         'foobar'.should.match(/^bar/i, 'blah');
@@ -490,8 +512,8 @@ function deepEqual3() {
 function deepInclude() {
     expect(['foo', 'bar']).to.deep.include(['bar', 'foo']);
     ['foo', 'bar'].should.deep.include(['bar', 'foo']);
-    expect(['foo', 'bar']).not.to.deep.equal(['foo', 'baz' ]);
-    ['foo', 'bar'].should.not.deep.equal(['foo', 'baz' ]);
+    expect(['foo', 'bar']).not.to.deep.equal(['foo', 'baz']);
+    ['foo', 'bar'].should.not.deep.equal(['foo', 'baz']);
 }
 
 class FakeArgs {
@@ -670,6 +692,20 @@ function ownProperty() {
     }, 'blah: expected { length: 12 } to not have own property \'length\'');
 }
 
+function ownPropertyDescriptor() {
+    expect('test').to.have.ownPropertyDescriptor('length');
+    expect('test').to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
+    expect('test').not.to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
+    expect('test').to.haveOwnPropertyDescriptor('length').to.have.property('enumerable', false);
+    expect('test').to.haveOwnPropertyDescriptor('length').to.contain.keys('value');
+
+    'test'.should.have.ownPropertyDescriptor('length');
+    'test'.should.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
+    'test'.should.not.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
+    'test'.should.haveOwnPropertyDescriptor('length').to.have.property('enumerable', false);
+    'test'.should.haveOwnPropertyDescriptor('length').to.contain.keys('value');
+}
+
 function string() {
     expect('foobar').to.have.string('bar');
     'foobar'.should.have.string('bar');
@@ -707,6 +743,10 @@ function include() {
     ['foo', 'bar'].should.not.include('baz');
     expect(['foo', 'bar']).to.not.include(1);
     ['foo', 'bar'].should.not.include(1);
+    // alias
+
+    expect(['foo', 'bar']).includes('foo');
+    ['foo', 'bar'].should.includes('foo');
 
     err(() => {
         expect(['foo']).to.include('bar', 'blah');
@@ -732,6 +772,14 @@ function keys() {
     ({ foo: 1, bar: 2, baz: 3 }).should.contain.keys('bar', 'foo');
     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('baz');
     ({ foo: 1, bar: 2, baz: 3 }).should.contain.keys('baz');
+    // alias
+
+    expect({ foo: 1, bar: 2, baz: 3 }).contains.keys('baz');
+
+    expect({ foo: 1, bar: 2 }).to.have.all.keys(['foo', 'bar']);
+    expect({ foo: 1, bar: 2 }).to.have.any.keys(['foo', 'bar']);
+    ({ foo: 1, bar: 2, baz: 3 }).should.contain.all.keys('baz');
+    ({ foo: 1, bar: 2, baz: 3 }).should.contain.any.keys('baz');
 
     expect({ foo: 1, bar: 2 }).to.contain.keys('foo');
     ({ foo: 1, bar: 2 }).should.contain.keys('foo');
@@ -830,7 +878,28 @@ function chaining() {
     tea.should.be.a('object').and.have.property('name', 'chai');
 }
 
-class PoorlyConstructedError {}
+function exxtensible() {
+    expect({}).to.be.extensible;
+    expect(Object.preventExtensions({})).to.be.not.extensible;
+    ({}).should.be.extensible;
+    Object.preventExtensions({}).should.not.be.extensible;
+}
+function sealed() {
+    expect({}).to.be.not.sealed;
+    expect(Object.seal({})).to.be.sealed;
+    ({}).should.be.not.sealed;
+    Object.seal({}).should.be.sealed;
+}
+
+function frozen() {
+    expect({}).to.be.not.frozen;
+    expect(Object.freeze({})).to.be.frozen;
+    ({}).should.be.not.frozen;
+    Object.freeze({}).should.be.frozen;
+}
+
+
+class PoorlyConstructedError { }
 function _throw() {
     // See GH-45: some poorly-constructed custom errors don't have useful names
     // on either their constructor or their constructor prototype, but instead
@@ -1023,34 +1092,44 @@ function _throw() {
     }, 'blah: expected [Function] to throw error including \'hello\' but got \'testing\'');
 }
 
-function use(){
+function use() {
     // ReSharper disable once InconsistentNaming
     chai.use((_chai) => {
-      _chai.can.use.any();
+        _chai.can.use.any();
     });
 }
 
+class Klass {
+    val: number;
+    constructor() { this.val = 0; }
+    bar() { }
+
+    static baz() { }
+}
+
 function respondTo() {
-    var bar = {};
+    var obj = new Klass();
 
-    expect(Foo).to.respondTo('bar');
-    Foo.should.respondTo('bar');
-    expect(Foo).to.not.respondTo('foo');
-    Foo.should.not.respondTo('foo');
-    expect(Foo).itself.to.respondTo('func');
-    expect(Foo).itself.not.to.respondTo('bar');
+    expect(Klass).to.respondTo('bar');
+    expect(obj).respondsTo('bar');
+    Klass.should.respondTo('bar');
+    Klass.should.respondsTo('bar');
+    expect(Klass).to.not.respondTo('foo');
+    Klass.should.not.respondTo('foo');
+    expect(Klass).itself.to.respondTo('func');
+    expect(Klass).itself.not.to.respondTo('bar');
 
-    expect(bar).to.respondTo('foo');
-    bar.should.respondTo('foo');
+    expect(obj).not.to.respondTo('foo');
+    obj.should.not.respondTo('foo');
 
     err(() => {
-        expect(Foo).to.respondTo('baz', 'constructor');
-        Foo.should.respondTo('baz', 'constructor');
-    }, /^(constructor: expected)(.*)(\[Function: Foo\])(.*)(to respond to \'baz\')$/);
+        expect(Klass).to.respondTo('baz', 'constructor');
+        Klass.should.respondTo('baz', 'constructor');
+    }, /^(constructor: expected)(.*)(\[Function: Klass\])(.*)(to respond to \'baz\')$/);
 
     err(() => {
-        expect(bar).to.respondTo('baz', 'object');
-        bar.should.respondTo('baz', 'object');
+        expect(obj).to.respondTo('baz', 'object');
+        obj.should.respondTo('baz', 'object');
     }, /^(object: expected)(.*)(\{ foo: \[Function\] \}|\{ Object \()(.*)(to respond to \'baz\')$/);
 }
 
@@ -1116,6 +1195,23 @@ function sameMembers() {
     [5, 4].should.not.have.same.members([6, 3]);
     expect([5, 4]).to.not.have.same.members([5, 4, 2]);
     [5, 4].should.not.have.same.members([5, 4, 2]);
+
+    assert.sameMembers([5, 4], [4, 5]);
+}
+function sameDeepMembers() {
+    expect([{ id: 5 }, { id: 4 }]).to.have.same.deep.members([{ id: 4 }, { id: 5 }]);
+    [{ id: 5 }, { id: 4 }].should.have.same.deep.members([{ id: 4 }, { id: 5 }]);
+    expect([{ id: 5 }, { id: 4 }]).to.have.same.members([{ id: 5 }, { id: 4 }]);
+    [{ id: 5 }, { id: 4 }].should.have.same.members([{ id: 5 }, { id: 4 }]);
+
+    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([]);
+    [{ id: 5 }, { id: 4 }].should.not.have.same.members([]);
+    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([{ id: 6 }, { id: 3 }]);
+    [{ id: 5 }, { id: 4 }].should.not.have.same.members([{ id: 6 }, { id: 3 }]);
+    expect([{ id: 5 }, { id: 4 }]).to.not.have.same.members([{ id: 5 }, { id: 4 }, { id: 2 }]);
+    [{ id: 5 }, { id: 4 }].should.not.have.same.members([{ id: 5 }, { id: 4 }, { id: 2 }]);
+
+    assert.sameDeepMembers([{ id: 5 }, { id: 4 }], [{ id: 4 }, { id: 5 }]);
 }
 
 function members() {
@@ -1127,16 +1223,48 @@ function members() {
     expect([5, 4]).not.members([5, 4, 2]);
 }
 
+function increaseDecreaseChange() {
+    var obj = { val: 10 };
+    var inc = () => { obj.val++; };
+    var dec = () => { obj.val--; };
+    var same = () => { };
+
+    expect(inc).to.increase(obj, "val");
+    expect(inc).increases(obj, "val");
+    expect(inc).to.change(obj, "val");
+
+    expect(dec).to.decrease(obj, "val");
+    expect(dec).decreases(obj, "val");
+    expect(dec).to.change(obj, "val");
+    expect(dec).changes(obj, "val");
+
+    expect(inc).to.not.decrease(obj, "val");
+    expect(dec).to.not.increase(obj, "val");
+    expect(same).to.not.increase(obj, "val");
+    expect(same).to.not.decrease(obj, "val");
+    expect(same).to.not.change(obj, "val");
+
+    inc.should.increase(obj, "val");
+    inc.should.change(obj, "val");
+
+    dec.should.decrease(obj, "val");
+    dec.should.change(obj, "val");
+
+    inc.should.not.decrease(obj, "val");
+    dec.should.not.increase(obj, "val");
+    same.should.not.change(obj, "val");
+}
+
 //tdd
-declare function suite(description: string, action: Function):void;
-declare function test(description: string, action: Function):void;
+declare function suite(description: string, action: Function): void;
+declare function test(description: string, action: Function): void;
 
 interface FieldObj {
     field: any;
 }
 
 class CrashyObject {
-    inspect (): void {
+    inspect(): void {
         throw new Error('Arg\'s inspect() called even though the test passed');
     }
 }
@@ -1172,6 +1300,9 @@ suite('assert', () => {
         assert.ok(true);
         assert.ok(1);
         assert.ok('test');
+        assert.isOk(true);
+        assert.isOk(1);
+        assert.isOk('test');
 
         err(() => {
             assert.ok(false);
@@ -1186,6 +1317,27 @@ suite('assert', () => {
         }, 'expected \'\' to be truthy');
     });
 
+    test('notOk', () => {
+        assert.notOk(false);
+        assert.notOk(0);
+        assert.notOk('');
+        assert.isNotOk(false);
+        assert.isNotOk(0);
+        assert.isNotOk('');
+
+        err(() => {
+            assert.notOk(true);
+        }, 'expected true to be falsy');
+
+        err(() => {
+            assert.notOk(1);
+        }, 'expected 1 to be falsy');
+
+        err(() => {
+            assert.notOk('test');
+        }, 'expected \'test\' to be falsy');
+    });
+
     test('isFalse', () => {
         assert.isFalse(false);
 
@@ -1199,7 +1351,7 @@ suite('assert', () => {
     });
 
     test('equal', () => {
-        assert.equal(void(0), undefined);
+        assert.equal(void (0), undefined);
     });
 
     test('typeof / notTypeOf', () => {
@@ -1288,19 +1440,19 @@ suite('assert', () => {
     });
 
     test('deepEqual', () => {
-        assert.deepEqual({tea: 'chai'}, {tea: 'chai'});
+        assert.deepEqual({ tea: 'chai' }, { tea: 'chai' });
 
         err(() => {
-            assert.deepEqual({tea: 'chai'}, {tea: 'black'});
+            assert.deepEqual({ tea: 'chai' }, { tea: 'black' });
         }, 'expected { tea: \'chai\' } to deeply equal { tea: \'black\' }');
 
         var obja = Object.create({ tea: 'chai' })
-        , objb = Object.create({ tea: 'chai' });
+            , objb = Object.create({ tea: 'chai' });
 
         assert.deepEqual(obja, objb);
 
-        var obj1 = Object.create({tea: 'chai'})
-        , obj2 = Object.create({tea: 'black'});
+        var obj1 = Object.create({ tea: 'chai' })
+            , obj2 = Object.create({ tea: 'black' });
 
         err(() => {
             assert.deepEqual(obj1, obj2);
@@ -1309,13 +1461,13 @@ suite('assert', () => {
 
     test('deepEqual (ordering)', () => {
         var a = { a: 'b', c: 'd' }
-        , b = { c: 'd', a: 'b' };
+            , b = { c: 'd', a: 'b' };
         assert.deepEqual(a, b);
     });
 
     test('deepEqual (circular)', () => {
-        var circularObject:any = {}
-        , secondCircularObject:any = {};
+        var circularObject: any = {}
+            , secondCircularObject: any = {};
         circularObject.field = circularObject;
         secondCircularObject.field = secondCircularObject;
 
@@ -1328,15 +1480,15 @@ suite('assert', () => {
     });
 
     test('notDeepEqual', () => {
-        assert.notDeepEqual({tea: 'jasmine'}, {tea: 'chai'});
+        assert.notDeepEqual({ tea: 'jasmine' }, { tea: 'chai' });
         err(() => {
-            assert.notDeepEqual({tea: 'chai'}, {tea: 'chai'});
+            assert.notDeepEqual({ tea: 'chai' }, { tea: 'chai' });
         }, 'expected { tea: \'chai\' } to not deeply equal { tea: \'chai\' }');
     });
 
     test('notDeepEqual (circular)', () => {
-        var circularObject:any = {}
-        , secondCircularObject:any = { tea: 'jasmine' };
+        var circularObject: any = {}
+            , secondCircularObject: any = { tea: 'jasmine' };
         circularObject.field = circularObject;
         secondCircularObject.field = secondCircularObject;
 
@@ -1380,6 +1532,22 @@ suite('assert', () => {
         }, 'expected undefined to not equal undefined');
     });
 
+    test('isNaN', () => {
+        assert.isNaN(NaN);
+
+        err(() => {
+            assert.isNaN(12);
+        }, 'expected 12 to be NaN');
+    });
+
+    test('isNotNaN', () => {
+        assert.isNotNaN(12);
+
+        err(() => {
+            assert.isNotNaN(NaN);
+        }, 'expected NaN to not NaN');
+    });
+
     test('isFunction', () => {
         var func = () => {
         };
@@ -1431,7 +1599,7 @@ suite('assert', () => {
 
     test('isNotString', () => {
         assert.isNotString(3);
-        assert.isNotString([ 'hello' ]);
+        assert.isNotString(['hello']);
 
         err(() => {
             assert.isNotString('hello');
@@ -1449,7 +1617,7 @@ suite('assert', () => {
 
     test('isNotNumber', () => {
         assert.isNotNumber('hello');
-        assert.isNotNumber([ 5 ]);
+        assert.isNotNumber([5]);
 
         err(() => {
             assert.isNotNumber(4);
@@ -1479,7 +1647,7 @@ suite('assert', () => {
 
     test('include', () => {
         assert.include('foobar', 'bar');
-        assert.include([ 1, 2, 3], 3);
+        assert.include([1, 2, 3], 3);
 
         err(() => {
             assert.include('foobar', 'baz');
@@ -1492,7 +1660,7 @@ suite('assert', () => {
 
     test('notInclude', () => {
         assert.notInclude('foobar', 'baz');
-        assert.notInclude([ 1, 2, 3 ], 4);
+        assert.notInclude([1, 2, 3], 4);
 
         err(() => {
             assert.notInclude('foobar', 'bar');
@@ -1739,4 +1907,42 @@ suite('assert', () => {
         }, 'expected [ 1, 54 ] to have the same members as [ 6, 1, 54 ]');
     });
 
+
+    test('isAbove', () => {
+        assert.isAbove(10, 5);
+
+        err(() => {
+            assert.isAbove(1, 5);
+        }, 'expected 1 to be above 5');
+        err(() => {
+            assert.isAbove(5, 5);
+        }, 'expected 5 to be above 5');
+    });
+
+    test('isBelow', () => {
+        assert.isBelow(5, 10);
+
+        err(() => {
+            assert.isBelow(5, 1);
+        }, 'expected 5 to be above 1');
+        err(() => {
+            assert.isBelow(5, 5);
+        }, 'expected 5 to be below 5');
+    });
+
+    test('extensible', () => { assert.extensible({}); });
+    test('isExtensible', () => { assert.isExtensible({}); });
+    test('notExtensible', () => { assert.notExtensible(Object.preventExtensions({})); });
+    test('isNotExtensible', () => { assert.isNotExtensible(Object.preventExtensions({})); });
+
+    test('sealed', () => { assert.sealed(Object.seal({})); });
+    test('isSealed', () => { assert.isSealed(Object.seal({})); });
+    test('notSealed', () => { assert.notSealed({}); });
+    test('isNotSealed', () => { assert.isNotSealed({}); });
+
+    test('frozen', () => { assert.frozen(Object.freeze({})); });
+    test('isFrozen', () => { assert.isFrozen(Object.freeze({})); });
+    test('notFrozen', () => { assert.notFrozen({}); });
+    test('isNotFrozen', () => { assert.isNotFrozen({}); });
+
 });
diff --git a/chai/chai.d.ts b/chai/chai.d.ts
index f693582c5..28aaf48c2 100644
--- a/chai/chai.d.ts
+++ b/chai/chai.d.ts
@@ -1,308 +1,388 @@
-// Type definitions for chai 2.0.0
-// Project: http://chaijs.com/
-// Definitions by: Jed Mao <https://github.com/jedmao/>,
-//                 Bart van der Schoor <https://github.com/Bartvds>,
-//                 Andrew Brown <https://github.com/AGBrown>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module Chai {
-
-    interface ChaiStatic {
-        expect: ExpectStatic;
-        should(): Should;
-        /**
-         * Provides a way to extend the internals of Chai
-         */
-        use(fn: (chai: any, utils: any) => void): any;
-        assert: AssertStatic;
-        config: Config;
-    }
-
-    export interface ExpectStatic extends AssertionStatic {
-    }
-
-    export interface AssertStatic extends Assert {
-    }
-
-    export interface AssertionStatic {
-        (target: any, message?: string): Assertion;
-    }
-
-    interface ShouldAssertion {
-        equal(value1: any, value2: any, message?: string): void;
-        Throw: ShouldThrow;
-        throw: ShouldThrow;
-        exist(value: any, message?: string): void;
-    }
-
-    interface Should extends ShouldAssertion {
-        not: ShouldAssertion;
-        fail(actual: any, expected: any, message?: string, operator?: string): void;
-    }
-
-    interface ShouldThrow {
-        (actual: Function): void;
-        (actual: Function, expected: string|RegExp, message?: string): void;
-        (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
-    }
-
-    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
-        not: Assertion;
-        deep: Deep;
-        a: TypeComparison;
-        an: TypeComparison;
-        include: Include;
-        contain: Include;
-        ok: Assertion;
-        true: Assertion;
-        false: Assertion;
-        null: Assertion;
-        undefined: Assertion;
-        exist: Assertion;
-        empty: Assertion;
-        arguments: Assertion;
-        Arguments: Assertion;
-        equal: Equal;
-        equals: Equal;
-        eq: Equal;
-        eql: Equal;
-        eqls: Equal;
-        property: Property;
-        ownProperty: OwnProperty;
-        haveOwnProperty: OwnProperty;
-        length: Length;
-        lengthOf: Length;
-        match(regexp: RegExp|string, message?: string): Assertion;
-        string(string: string, message?: string): Assertion;
-        keys: Keys;
-        key(string: string): Assertion;
-        throw: Throw;
-        throws: Throw;
-        Throw: Throw;
-        respondTo(method: string, message?: string): Assertion;
-        itself: Assertion;
-        satisfy(matcher: Function, message?: string): Assertion;
-        closeTo(expected: number, delta: number, message?: string): Assertion;
-        members: Members;
-    }
-
-    interface LanguageChains {
-        to: Assertion;
-        be: Assertion;
-        been: Assertion;
-        is: Assertion;
-        that: Assertion;
-        which: Assertion;
-        and: Assertion;
-        has: Assertion;
-        have: Assertion;
-        with: Assertion;
-        at: Assertion;
-        of: Assertion;
-        same: Assertion;
-    }
-
-    interface NumericComparison {
-        above: NumberComparer;
-        gt: NumberComparer;
-        greaterThan: NumberComparer;
-        least: NumberComparer;
-        gte: NumberComparer;
-        below: NumberComparer;
-        lt: NumberComparer;
-        lessThan: NumberComparer;
-        most: NumberComparer;
-        lte: NumberComparer;
-        within(start: number, finish: number, message?: string): Assertion;
-    }
-
-    interface NumberComparer {
-        (value: number, message?: string): Assertion;
-    }
-
-    interface TypeComparison {
-        (type: string, message?: string): Assertion;
-        instanceof: InstanceOf;
-        instanceOf: InstanceOf;
-    }
-
-    interface InstanceOf {
-        (constructor: Object, message?: string): Assertion;
-    }
-
-    interface Deep {
-        equal: Equal;
-        include: Include;
-        property: Property;
-    }
-
-    interface Equal {
-        (value: any, message?: string): Assertion;
-    }
-
-    interface Property {
-        (name: string, value?: any, message?: string): Assertion;
-    }
-
-    interface OwnProperty {
-        (name: string, message?: string): Assertion;
-    }
-
-    interface Length extends LanguageChains, NumericComparison {
-        (length: number, message?: string): Assertion;
-    }
-
-    interface Include {
-        (value: Object, message?: string): Assertion;
-        (value: string, message?: string): Assertion;
-        (value: number, message?: string): Assertion;
-        keys: Keys;
-        members: Members;
-    }
-
-    interface Keys {
-        (...keys: string[]): Assertion;
-        (keys: any[]): Assertion;
-    }
-
-    interface Throw {
-        (): Assertion;
-        (expected: string, message?: string): Assertion;
-        (expected: RegExp, message?: string): Assertion;
-        (constructor: Error, expected?: string, message?: string): Assertion;
-        (constructor: Error, expected?: RegExp, message?: string): Assertion;
-        (constructor: Function, expected?: string, message?: string): Assertion;
-        (constructor: Function, expected?: RegExp, message?: string): Assertion;
-    }
-
-    interface Members {
-        (set: any[], message?: string): Assertion;
-    }
-
-    export interface Assert {
-        /**
-         * @param expression Expression to test for truthiness.
-         * @param message Message to display on error.
-         */
-        (expression: any, message?: string): void;
-
-        fail(actual?: any, expected?: any, msg?: string, operator?: string): void;
-
-        ok(val: any, msg?: string): void;
-        notOk(val: any, msg?: string): void;
-
-        equal(act: any, exp: any, msg?: string): void;
-        notEqual(act: any, exp: any, msg?: string): void;
-
-        strictEqual(act: any, exp: any, msg?: string): void;
-        notStrictEqual(act: any, exp: any, msg?: string): void;
-
-        deepEqual(act: any, exp: any, msg?: string): void;
-        notDeepEqual(act: any, exp: any, msg?: string): void;
-
-        isTrue(val: any, msg?: string): void;
-        isFalse(val: any, msg?: string): void;
-
-        isNull(val: any, msg?: string): void;
-        isNotNull(val: any, msg?: string): void;
-
-        isUndefined(val: any, msg?: string): void;
-        isDefined(val: any, msg?: string): void;
-
-        isFunction(val: any, msg?: string): void;
-        isNotFunction(val: any, msg?: string): void;
-
-        isObject(val: any, msg?: string): void;
-        isNotObject(val: any, msg?: string): void;
-
-        isArray(val: any, msg?: string): void;
-        isNotArray(val: any, msg?: string): void;
-
-        isString(val: any, msg?: string): void;
-        isNotString(val: any, msg?: string): void;
-
-        isNumber(val: any, msg?: string): void;
-        isNotNumber(val: any, msg?: string): void;
-
-        isBoolean(val: any, msg?: string): void;
-        isNotBoolean(val: any, msg?: string): void;
-
-        typeOf(val: any, type: string, msg?: string): void;
-        notTypeOf(val: any, type: string, msg?: string): void;
-
-        instanceOf(val: any, type: Function, msg?: string): void;
-        notInstanceOf(val: any, type: Function, msg?: string): void;
-
-        include(exp: string, inc: any, msg?: string): void;
-        include(exp: any[], inc: any, msg?: string): void;
-
-        notInclude(exp: string, inc: any, msg?: string): void;
-        notInclude(exp: any[], inc: any, msg?: string): void;
-
-        match(exp: any, re: RegExp, msg?: string): void;
-        notMatch(exp: any, re: RegExp, msg?: string): void;
-
-        property(obj: Object, prop: string, msg?: string): void;
-        notProperty(obj: Object, prop: string, msg?: string): void;
-        deepProperty(obj: Object, prop: string, msg?: string): void;
-        notDeepProperty(obj: Object, prop: string, msg?: string): void;
-
-        propertyVal(obj: Object, prop: string, val: any, msg?: string): void;
-        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
-
-        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): void;
-        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
-
-        lengthOf(exp: any, len: number, msg?: string): void;
-        //alias frenzy
-        throw(fn: Function, msg?: string): void;
-        throw(fn: Function, regExp: RegExp): void;
-        throw(fn: Function, errType: Function, msg?: string): void;
-        throw(fn: Function, errType: Function, regExp: RegExp): void;
-
-        throws(fn: Function, msg?: string): void;
-        throws(fn: Function, regExp: RegExp): void;
-        throws(fn: Function, errType: Function, msg?: string): void;
-        throws(fn: Function, errType: Function, regExp: RegExp): void;
-
-        Throw(fn: Function, msg?: string): void;
-        Throw(fn: Function, regExp: RegExp): void;
-        Throw(fn: Function, errType: Function, msg?: string): void;
-        Throw(fn: Function, errType: Function, regExp: RegExp): void;
-
-        doesNotThrow(fn: Function, msg?: string): void;
-        doesNotThrow(fn: Function, regExp: RegExp): void;
-        doesNotThrow(fn: Function, errType: Function, msg?: string): void;
-        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): void;
-
-        operator(val: any, operator: string, val2: any, msg?: string): void;
-        closeTo(act: number, exp: number, delta: number, msg?: string): void;
-
-        sameMembers(set1: any[], set2: any[], msg?: string): void;
-        includeMembers(set1: any[], set2: any[], msg?: string): void;
-
-        ifError(val: any, msg?: string): void;
-    }
-
-    export interface Config {
-        includeStack: boolean;
-    }
-
-    export class AssertionError {
-        constructor(message: string, _props?: any, ssf?: Function);
-        name: string;
-        message: string;
-        showDiff: boolean;
-        stack: string;
-    }
-}
-
-declare var chai: Chai.ChaiStatic;
-
-declare module "chai" {
-    export = chai;
-}
-
-interface Object {
-    should: Chai.Assertion;
+// Type definitions for chai 3.2.0
+// Project: http://chaijs.com/
+// Definitions by: Jed Mao <https://github.com/jedmao/>,
+//                 Bart van der Schoor <https://github.com/Bartvds>,
+//                 Andrew Brown <https://github.com/AGBrown>,
+//                 Olivier Chevet <https://github.com/olivr70>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// <reference path="../assertion-error/assertion-error.d.ts"/>
+
+declare module Chai {
+
+    interface ChaiStatic {
+        expect: ExpectStatic;
+        should(): Should;
+        /**
+         * Provides a way to extend the internals of Chai
+         */
+        use(fn: (chai: any, utils: any) => void): any;
+        assert: AssertStatic;
+        config: Config;
+        AssertionError: AssertionError;
+    }
+
+    export interface ExpectStatic extends AssertionStatic {
+        fail(actual?: any, expected?: any, message?: string, operator?: string): void;
+    }
+
+    export interface AssertStatic extends Assert {
+    }
+
+    export interface AssertionStatic {
+        (target: any, message?: string): Assertion;
+    }
+
+    interface ShouldAssertion {
+        equal(value1: any, value2: any, message?: string): void;
+        Throw: ShouldThrow;
+        throw: ShouldThrow;
+        exist(value: any, message?: string): void;
+    }
+
+    interface Should extends ShouldAssertion {
+        not: ShouldAssertion;
+        fail(actual: any, expected: any, message?: string, operator?: string): void;
+    }
+
+    interface ShouldThrow {
+        (actual: Function): void;
+        (actual: Function, expected: string|RegExp, message?: string): void;
+        (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
+    }
+
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        not: Assertion;
+        deep: Deep;
+        any: KeyFilter;
+        all: KeyFilter;
+        a: TypeComparison;
+        an: TypeComparison;
+        include: Include;
+        includes: Include;
+        contain: Include;
+        contains: Include;
+        ok: Assertion;
+        true: Assertion;
+        false: Assertion;
+        null: Assertion;
+        undefined: Assertion;
+        NaN: Assertion;
+        exist: Assertion;
+        empty: Assertion;
+        arguments: Assertion;
+        Arguments: Assertion;
+        equal: Equal;
+        equals: Equal;
+        eq: Equal;
+        eql: Equal;
+        eqls: Equal;
+        property: Property;
+        ownProperty: OwnProperty;
+        haveOwnProperty: OwnProperty;
+        ownPropertyDescriptor: OwnPropertyDescriptor;
+        haveOwnPropertyDescriptor: OwnPropertyDescriptor;
+        length: Length;
+        lengthOf: Length;
+        match: Match;
+        matches: Match;
+        string(string: string, message?: string): Assertion;
+        keys: Keys;
+        key(string: string): Assertion;
+        throw: Throw;
+        throws: Throw;
+        Throw: Throw;
+        respondTo: RespondTo;
+        respondsTo: RespondTo;
+        itself: Assertion;
+        satisfy: Satisfy;
+        satisfies: Satisfy;
+        closeTo(expected: number, delta: number, message?: string): Assertion;
+        members: Members;
+        increase: PropertyChange;
+        increases: PropertyChange;
+        decrease: PropertyChange;
+        decreases: PropertyChange;
+        change: PropertyChange;
+        changes: PropertyChange;
+        extensible: Assertion;
+        sealed: Assertion;
+        frozen: Assertion;
+
+    }
+
+    interface LanguageChains {
+        to: Assertion;
+        be: Assertion;
+        been: Assertion;
+        is: Assertion;
+        that: Assertion;
+        which: Assertion;
+        and: Assertion;
+        has: Assertion;
+        have: Assertion;
+        with: Assertion;
+        at: Assertion;
+        of: Assertion;
+        same: Assertion;
+    }
+
+    interface NumericComparison {
+        above: NumberComparer;
+        gt: NumberComparer;
+        greaterThan: NumberComparer;
+        least: NumberComparer;
+        gte: NumberComparer;
+        below: NumberComparer;
+        lt: NumberComparer;
+        lessThan: NumberComparer;
+        most: NumberComparer;
+        lte: NumberComparer;
+        within(start: number, finish: number, message?: string): Assertion;
+    }
+
+    interface NumberComparer {
+        (value: number, message?: string): Assertion;
+    }
+
+    interface TypeComparison {
+        (type: string, message?: string): Assertion;
+        instanceof: InstanceOf;
+        instanceOf: InstanceOf;
+    }
+
+    interface InstanceOf {
+        (constructor: Object, message?: string): Assertion;
+    }
+
+    interface Deep {
+        equal: Equal;
+        include: Include;
+        property: Property;
+        members: Members;
+    }
+
+    interface KeyFilter {
+        keys: Keys;
+    }
+
+    interface Equal {
+        (value: any, message?: string): Assertion;
+    }
+
+    interface Property {
+        (name: string, value?: any, message?: string): Assertion;
+    }
+
+    interface OwnProperty {
+        (name: string, message?: string): Assertion;
+    }
+
+    interface OwnPropertyDescriptor {
+        (name: string, descriptor: PropertyDescriptor, message?: string): Assertion;
+        (name: string, message?: string): Assertion;
+    }
+
+    interface Length extends LanguageChains, NumericComparison {
+        (length: number, message?: string): Assertion;
+    }
+
+    interface Include {
+        (value: Object, message?: string): Assertion;
+        (value: string, message?: string): Assertion;
+        (value: number, message?: string): Assertion;
+        keys: Keys;
+        members: Members;
+        any: KeyFilter;
+        all: KeyFilter;
+    }
+
+    interface Match {
+        (regexp: RegExp|string, message?: string): Assertion;
+    }
+
+    interface Keys {
+        (...keys: string[]): Assertion;
+        (keys: any[]): Assertion;
+        (keys: Object): Assertion;
+    }
+
+    interface Throw {
+        (): Assertion;
+        (expected: string, message?: string): Assertion;
+        (expected: RegExp, message?: string): Assertion;
+        (constructor: Error, expected?: string, message?: string): Assertion;
+        (constructor: Error, expected?: RegExp, message?: string): Assertion;
+        (constructor: Function, expected?: string, message?: string): Assertion;
+        (constructor: Function, expected?: RegExp, message?: string): Assertion;
+    }
+
+    interface RespondTo {
+        (method: string, message?: string): Assertion;
+    }
+
+    interface Satisfy {
+        (matcher: Function, message?: string): Assertion;
+    }
+
+    interface Members {
+        (set: any[], message?: string): Assertion;
+    }
+
+    interface PropertyChange {
+        (object: Object, prop: string, msg?: string): Assertion;
+    }
+
+    export interface Assert {
+        /**
+         * @param expression Expression to test for truthiness.
+         * @param message Message to display on error.
+         */
+        (expression: any, message?: string): void;
+
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): void;
+
+        ok(val: any, msg?: string): void;
+        isOk(val: any, msg?: string): void;
+        notOk(val: any, msg?: string): void;
+        isNotOk(val: any, msg?: string): void;
+
+        equal(act: any, exp: any, msg?: string): void;
+        notEqual(act: any, exp: any, msg?: string): void;
+
+        strictEqual(act: any, exp: any, msg?: string): void;
+        notStrictEqual(act: any, exp: any, msg?: string): void;
+
+        deepEqual(act: any, exp: any, msg?: string): void;
+        notDeepEqual(act: any, exp: any, msg?: string): void;
+
+        isTrue(val: any, msg?: string): void;
+        isFalse(val: any, msg?: string): void;
+
+        isNull(val: any, msg?: string): void;
+        isNotNull(val: any, msg?: string): void;
+
+        isUndefined(val: any, msg?: string): void;
+        isDefined(val: any, msg?: string): void;
+
+        isNaN(val: any, msg?: string): void;
+        isNotNaN(val: any, msg?: string): void;
+
+        isAbove(val: number, abv: number, msg?: string): void;
+        isBelow(val: number, blw: number, msg?: string): void;
+
+        isFunction(val: any, msg?: string): void;
+        isNotFunction(val: any, msg?: string): void;
+
+        isObject(val: any, msg?: string): void;
+        isNotObject(val: any, msg?: string): void;
+
+        isArray(val: any, msg?: string): void;
+        isNotArray(val: any, msg?: string): void;
+
+        isString(val: any, msg?: string): void;
+        isNotString(val: any, msg?: string): void;
+
+        isNumber(val: any, msg?: string): void;
+        isNotNumber(val: any, msg?: string): void;
+
+        isBoolean(val: any, msg?: string): void;
+        isNotBoolean(val: any, msg?: string): void;
+
+        typeOf(val: any, type: string, msg?: string): void;
+        notTypeOf(val: any, type: string, msg?: string): void;
+
+        instanceOf(val: any, type: Function, msg?: string): void;
+        notInstanceOf(val: any, type: Function, msg?: string): void;
+
+        include(exp: string, inc: any, msg?: string): void;
+        include(exp: any[], inc: any, msg?: string): void;
+
+        notInclude(exp: string, inc: any, msg?: string): void;
+        notInclude(exp: any[], inc: any, msg?: string): void;
+
+        match(exp: any, re: RegExp, msg?: string): void;
+        notMatch(exp: any, re: RegExp, msg?: string): void;
+
+        property(obj: Object, prop: string, msg?: string): void;
+        notProperty(obj: Object, prop: string, msg?: string): void;
+        deepProperty(obj: Object, prop: string, msg?: string): void;
+        notDeepProperty(obj: Object, prop: string, msg?: string): void;
+
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        lengthOf(exp: any, len: number, msg?: string): void;
+        //alias frenzy
+        throw(fn: Function, msg?: string): void;
+        throw(fn: Function, regExp: RegExp): void;
+        throw(fn: Function, errType: Function, msg?: string): void;
+        throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        throws(fn: Function, msg?: string): void;
+        throws(fn: Function, regExp: RegExp): void;
+        throws(fn: Function, errType: Function, msg?: string): void;
+        throws(fn: Function, errType: Function, regExp: RegExp): void;
+
+        Throw(fn: Function, msg?: string): void;
+        Throw(fn: Function, regExp: RegExp): void;
+        Throw(fn: Function, errType: Function, msg?: string): void;
+        Throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        doesNotThrow(fn: Function, msg?: string): void;
+        doesNotThrow(fn: Function, regExp: RegExp): void;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): void;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): void;
+
+        operator(val: any, operator: string, val2: any, msg?: string): void;
+        closeTo(act: number, exp: number, delta: number, msg?: string): void;
+
+        sameMembers(set1: any[], set2: any[], msg?: string): void;
+        sameDeepMembers(set1: any[], set2: any[], msg?: string): void;
+        includeMembers(superset: any[], subset: any[], msg?: string): void;
+
+        ifError(val: any, msg?: string): void;
+
+        isExtensible(obj: {}, msg?: string): void;
+        extensible(obj: {}, msg?: string): void;
+        isNotExtensible(obj: {}, msg?: string): void;
+        notExtensible(obj: {}, msg?: string): void;
+
+        isSealed(obj: {}, msg?: string): void;
+        sealed(obj: {}, msg?: string): void;
+        isNotSealed(obj: {}, msg?: string): void;
+        notSealed(obj: {}, msg?: string): void;
+
+        isFrozen(obj: Object, msg?: string): void;
+        frozen(obj: Object, msg?: string): void;
+        isNotFrozen(obj: Object, msg?: string): void;
+        notFrozen(obj: Object, msg?: string): void;
+
+
+    }
+
+    export interface Config {
+        includeStack: boolean;
+    }
+
+    export class AssertionError {
+        constructor(message: string, _props?: any, ssf?: Function);
+        name: string;
+        message: string;
+        showDiff: boolean;
+        stack: string;
+    }
+}
+
+declare var chai: Chai.ChaiStatic;
+
+declare module "chai" {
+    export = chai;
+}
+
+interface Object {
+    should: Chai.Assertion;
 }
diff --git a/chartist/chartist-tests.ts b/chartist/chartist-tests.ts
new file mode 100644
index 000000000..0a5072c6a
--- /dev/null
+++ b/chartist/chartist-tests.ts
@@ -0,0 +1,170 @@
+///<reference path="chartist.d.ts" />
+
+new Chartist.Line('.ct-chart', {
+  labels: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
+  series: [
+    [12, 9, 7, 8, 5],
+    [2, 1, 3.5, 7, 3],
+    [1, 3, 4, 5, 6]
+  ]
+}, {
+  fullWidth: true,
+  chartPadding: {
+    right: 40
+  }
+});
+
+var lineChart = new Chartist.Line('.ct-chart', {
+  labels: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+  series: [
+    [5, 5, 10, 8, 7, 5, 4, null, null, null, 10, 10, 7, 8, 6, 9],
+    [10, 15, null, 12, null, 10, 12, 15, null, null, 12, null, 14, null, null, null],
+    [null, null, null, null, 3, 4, 1, 3, 4,  6,  7,  9, 5, null, null, null]
+  ]
+}, {
+  fullWidth: true,
+  chartPadding: {
+    right: 10
+  },
+  low: 0
+});
+
+new Chartist.Line('.ct-chart', {
+  labels: ['1', '2', '3', '4', '5', '6'],
+  series: [
+    {
+      name: 'Fibonacci sequence',
+      data: [1, 2, 3, 5, 8, 13]
+    },
+    {
+      name: 'Golden section',
+      data: [1, 1.618, 2.618, 4.236, 6.854, 11.09]
+    }
+  ]
+});
+
+var data = {
+  series: [5, 3, 4]
+};
+
+var sum = function(a: number, b: number) { return a + b };
+
+new Chartist.Pie('.ct-chart', data, {
+  labelInterpolationFnc: function(value: number) {
+    return Math.round(value / data.series.reduce(sum) * 100) + '%';
+  }
+});
+
+new Chartist.Pie('.ct-chart', {
+  series: [20, 10, 30, 40]
+}, {
+  donut: true,
+  donutWidth: 60,
+  startAngle: 270,
+  total: 200,
+  showLabel: false
+});
+
+
+// Animation Donut example
+
+var chart = new Chartist.Pie('.ct-chart', {
+  series: [10, 20, 50, 20, 5, 50, 15],
+  labels: [1, 2, 3, 4, 5, 6, 7]
+}, {
+  donut: true,
+  showLabel: false
+});
+
+chart.on('draw', function(data: any) {
+  if(data.type === 'slice') {
+    // Get the total path length in order to use for dash array animation
+    var pathLength = data.element._node.getTotalLength();
+
+    // Set a dasharray that matches the path length as prerequisite to animate dashoffset
+    data.element.attr({
+      'stroke-dasharray': pathLength + 'px ' + pathLength + 'px'
+    });
+
+    // Create animation definition while also assigning an ID to the animation for later sync usage
+    var animationDefinition: any = {
+      'stroke-dashoffset': {
+        id: 'anim' + data.index,
+        dur: 1000,
+        from: -pathLength + 'px',
+        to:  '0px',
+        easing: Chartist.Svg.Easing.easeOutQuint,
+        // We need to use `fill: 'freeze'` otherwise our animation will fall back to initial (not visible)
+        fill: 'freeze'
+      }
+    };
+
+    // If this was not the first slice, we need to time the animation so that it uses the end sync event of the previous animation
+    if(data.index !== 0) {
+      animationDefinition['stroke-dashoffset'].begin = 'anim' + (data.index - 1) + '.end';
+    }
+
+    // We need to set an initial value before the animation starts as we are not in guided mode which would do that for us
+    data.element.attr({
+      'stroke-dashoffset': -pathLength + 'px'
+    });
+
+    // We can't use guided mode as the animations need to rely on setting begin manually
+    // See http://gionkunz.github.io/chartist-js/api-documentation.html#chartistsvg-function-animate
+    data.element.animate(animationDefinition, false);
+  }
+});
+
+new Chartist.Bar('.ct-chart', {
+  labels: ['XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL'],
+  series: [20, 60, 120, 200, 180, 20, 10]
+}, {
+  distributeSeries: true
+});
+
+new Chartist.Bar('.ct-chart', {
+  labels: ['Quarter 1', 'Quarter 2', 'Quarter 3', 'Quarter 4'],
+  series: [
+    [5, 4, 3, 7],
+    [3, 2, 9, 5],
+    [1, 5, 8, 4],
+    [2, 3, 4, 6],
+    [4, 1, 2, 1]
+  ]
+}, {
+  // Default mobile configuration
+  stackBars: true,
+  axisX: {
+    labelInterpolationFnc: function(value: string) {
+      return value.split(/\s+/).map(function(word: string) {
+        return word[0];
+      }).join('');
+    }
+  },
+  axisY: {
+    offset: 20
+  }
+}, [
+  // Options override for media > 400px
+  ['screen and (min-width: 400px)', {
+    reverseData: true,
+    horizontalBars: true,
+    axisX: {
+      labelInterpolationFnc: Chartist.noop
+    },
+    axisY: {
+      offset: 60
+    }
+  }],
+  // Options override for media > 800px
+  ['screen and (min-width: 800px)', {
+    stackBars: false,
+    seriesBarDistance: 10
+  }],
+  // Options override for media > 1000px
+  ['screen and (min-width: 1000px)', {
+    reverseData: false,
+    horizontalBars: false,
+    seriesBarDistance: 15
+  }]
+]);
diff --git a/chartist/chartist.d.ts b/chartist/chartist.d.ts
new file mode 100644
index 000000000..9381aaff0
--- /dev/null
+++ b/chartist/chartist.d.ts
@@ -0,0 +1,268 @@
+// Type definitions for Chartist v0.9.4
+// Project: https://github.com/gionkunz/chartist-js
+// Definitions by: Matt Gibbs <https://github.com/mtgibbs>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module Chartist {
+  interface ChartistStatic {
+    Pie: IChartistPieChart;
+    Bar: IChartistBarChart;
+    Line: IChartistLineChart;
+
+    Svg: any;
+    noop: Function;
+  }
+
+  interface IResponsiveOptionTuple<T extends IChartOptions> extends Array<string | T> {
+    0: string;
+    1: T;
+  }
+
+  interface IChartistBase<T extends IChartOptions> {
+    container: any;
+    data: Object;
+    defaultOptions: T;
+    options: T;
+    responsiveOptions: Array<IResponsiveOptionTuple<T>>;
+
+    // this most likely doesn't need to be exposed to the user
+    eventEmitter: any;
+
+    supportsForeignObject: boolean;
+    supportsAnimations: boolean;
+    resizeListener: any;
+
+    update(data: Object, options?: T, override?: boolean): void;
+    detatch(): void;
+
+    /**
+     * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
+     *
+     * @method on
+     * @param event {string} Name of the event. Check the examples for supported events.
+     * @param handler {Function} The handler function that will be called when an event with the given name was emitted. This function will receive a data argument which contains event data. See the example for more details.
+     */
+    on(event: string, handler: Function): IChartistBase<T>;
+
+    /**
+     * Use this function to un-register event handlers. If the handler function parameter is omitted all handlers for the given event will be un-registered.
+     *
+     * @method off
+     * @param event {string} Name of the event for which a handler should be removed
+     * @param handler {Function} The handler function that that was previously used to register a new event handler. This handler will be removed from the event handler list. If this parameter is omitted then all event handlers for the given event are removed from the list.
+     */
+    off(event: string, handler?: Function): IChartistBase<T>;
+  }
+
+  interface IChartistPieChart extends IChartistBase<IPieChartOptions> {
+    new (target: any, data: Object, options?: IPieChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IPieChartOptions>>): IChartistPieChart;
+  }
+
+  interface IChartistLineChart extends IChartistBase<ILineChartOptions> {
+    new (target: any, data: Object, options?: ILineChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ILineChartOptions>>): IChartistLineChart;
+  }
+
+  interface IChartistBarChart extends IChartistBase<IBarChartOptions> {
+    new (target: any, data: Object, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
+  }
+
+  interface IChartOptions {
+    /**
+     * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
+     */
+    reverseData?: boolean;
+  }
+
+  interface IPieChartOptions extends IChartOptions {
+    /**
+     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
+     */
+    width?: number | string;
+
+    /**
+     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
+     */
+    height?: number | string;
+
+    /**
+     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
+     */
+    chartPadding?: IChartPadding | number;
+
+    /**
+     * Override the class names that are used to generate the SVG structure of the chart
+     */
+    classNames?: IPieChartClasses;
+
+    /**
+     * The start angle of the pie chart in degrees where 0 points north. A higher value offsets the start angle clockwise.
+     */
+    startAngle?: number;
+
+    /**
+     * An optional total you can specify. By specifying a total value, the sum of the values in the series must be this total in order to draw a full pie. You can use this parameter to draw only parts of a pie or gauge charts.
+     */
+    total?: number;
+
+    /**
+     * If specified the donut CSS classes will be used and strokes will be drawn instead of pie slices.
+     */
+    donut?: boolean;
+
+    /**
+     * Specify the donut stroke width, currently done in javascript for convenience.
+     */
+    donutWidth?: number;
+
+    /**
+     * Specify if a label should be shown or not
+     */
+    showLabel?: boolean;
+
+    /**
+     * Label position offset from the standard position which is half distance of the radius. This value can be either positive or negative. Positive values will position the label away from the center.
+     */
+    labelOffset?: number;
+
+    /**
+     * This option can be set to 'inside', 'outside' or 'center'. Positioned with 'inside' the labels will be placed on half the distance of the radius to the border of the Pie by respecting the 'labelOffset'. The 'outside' option will place the labels at the border of the pie and 'center' will place the labels in the absolute center point of the chart. The 'center' option only makes sense in conjunction with the 'labelOffset' option.
+     */
+    labelPosition?: string;
+
+    /**
+     * An interpolation function for the label value
+     */
+    labelInterpolationFnc?: Function;
+
+    /**
+     * Label direction can be 'neutral', 'explode' or 'implode'.  Default is 'neutral'.  The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
+     */
+    labelDirection?: string;
+  }
+
+  interface IChartPadding {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+  }
+
+  interface IPieChartClasses {
+    chartPie?: string;
+    chartDonut?: string;
+    series?: string;
+    slicePie?: string;
+    sliceDonut?: string;
+    label?: string;
+  }
+
+  interface IBarChartOptions extends IChartOptions {
+    axisX?: IBarChartAxis;
+    axisY?: IBarChartAxis;
+    width?: number | string;
+    height?: number | string;
+    high?: number;
+    low?: number;
+    onlyInteger?: boolean;
+    chartPadding?: IChartPadding;
+    seriesBarDistance?: number;
+
+    /**
+     * If set to true this property will cause the series bars to be stacked and form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
+     */
+    stackBars?: boolean;
+
+    horizontalBars?: boolean;
+    distributeSeries?: boolean;
+  }
+
+  interface IBarChartAxis {
+    offset?: number;
+    position?: string;
+    labelOffset?: {
+      x?: number;
+      y?: number;
+    };
+    showLabel?: boolean;
+    showGrid?: boolean;
+    labelInterpolationFnc?: Function;
+    scaleMinSpace?: number;
+    onlyInteger?: boolean;
+  }
+
+  interface IBarChartClasses {
+    chart?: string;
+    horizontalBars?: string;
+    label?: string;
+    labelGroup?: string;
+    series?: string;
+    bar?: string;
+    grid?: string;
+    gridGroup?: string;
+    vertical?: string;
+    horizontal?: string;
+    start?: string;
+    end?: string;
+  }
+
+  interface ILineChartOptions extends IChartOptions {
+    axisX?: ILineChartXAxis;
+    axisY?: ILineChartYAxis;
+    width?: number | string;
+    height?: number | string;
+    showLine?: boolean;
+    showPoint?: boolean;
+    showArea?: boolean;
+    areaBase?: number;
+    lineSmooth?: boolean;
+    low?: number;
+    high?: number;
+    chartPadding?: IChartPadding;
+    fullWidth?: boolean;
+    reverseData?: boolean;
+    classNames?: ILineChartClasses;
+  }
+
+  interface ILineChartAxis {
+    offset?: number;
+    position?: string;
+    labelOffset?: {
+      x?: number;
+      y?: number;
+    };
+    showLabel?: boolean;
+    showGrid?: boolean;
+    labelInterpolationFnc?: Function;
+    type?: any;
+  }
+
+  interface ILineChartXAxis extends ILineChartAxis {
+  }
+
+  interface ILineChartYAxis extends ILineChartAxis {
+    scaleMinSpace?: number;
+    onlyInteger?: boolean;
+  }
+
+  // TODO: Finish documenting all of the defaults
+  interface ILineChartClasses {
+    /**
+     * Default is 'ct-chart-line'
+     */
+    chart?: string;
+    label?: string;
+    labelGroup?: string;
+    series?: string;
+    line?: string;
+    point?: string;
+    area?: string;
+    grid?: string;
+    gridGroup?: string;
+    vertical?: string;
+    horizontal?: string;
+    start?: string;
+    end?: string;
+  }
+}
+
+declare var Chartist: Chartist.ChartistStatic;
diff --git a/chartjs/chart.d.ts b/chartjs/chart.d.ts
index 9da7245f6..d337d144a 100644
--- a/chartjs/chart.d.ts
+++ b/chartjs/chart.d.ts
@@ -27,7 +27,7 @@ interface LinearChartData {
 
 interface CircularChartData {
     value: number;
-    color: string;
+    color?: string;
     highlight?: string;
     label?: string;
 }
diff --git a/cheerio/cheerio-tests.ts b/cheerio/cheerio-tests.ts
index af671cd00..cb74619d4 100644
--- a/cheerio/cheerio-tests.ts
+++ b/cheerio/cheerio-tests.ts
@@ -1,65 +1,294 @@
 /// <reference path="cheerio.d.ts" />
 
-import cheerio = require("cheerio");
+import * as cheerio from 'cheerio';
 
-var $ = cheerio.load("<html></html>");
-var $el = $('selector');
-var $multiEl = $('seletor', 'selector', 'selector');
+/*
+ * LOADING
+ */
+let html =
+`<ul id="fruits">
+  <li class="orange">Apple</li>
+  <li class="class">Orange</li>
+  <li class="pear">Pear</li>
+  <input type="text" />
+</ul>`;
 
-$el.addClass("class").addClass("test");
-$el.hasClass("test");
-$el.removeClass("class").removeClass("test");
+// Preferred Method
+var $ = cheerio.load(html);
+// Directly load element
+cheerio(html);
+cheerio('ul', html);
+cheerio('li', 'ul', html);
 
-$el.attr('class');
-$el.attr('class', 'test');
-$el.removeAttr("class").removeAttr("test");
-
-$el.find("ul").find("> li");
-
-$el.parent().parent();
-$el.next().next();
-$el.prev().prev();
-$el.siblings().siblings();
-
-$el.children().children();
-$el.children("li").children("a");
-
-$el.children().each((index, element) => {
-    return $(element).find('t');
+$ = cheerio.load(html, {
+    normalizeWhitespace: true,
+    xmlMode: true
 });
 
-$el.children().map((index, element) => {
-    return $(element).find('t');
+$ = cheerio.load(html, {
+    normalizeWhitespace: true,
+    xmlMode: true,
+    decodeEntities: true,
+    lowerCaseTags: true,
+    lowerCaseAttributeNames: true,
+    recognizeCDATA: true,
+    recognizeSelfClosing: true
 });
 
-$el.children().filter((index) => {
-    return $el.children().eq(index).find('t').length >= 0;
-});
+/**
+ * Selectors
+ */
+var $el = $('.class');
+var $multiEl = $('selector', 'selector', 'selector');
 
-$el.filter('span').filter('li');
+/**
+ * Attributes
+ */
 
-$el.first().last().find('t');
-
-$('div').eq(0).find('b');
-
-$('#id').append("test html", "other html").find('a');
-$('#id').prepend("test html", "other html").find('a');
-$('#id').after("test html", "other html").find('a');
-$('#id').before("test html", "other html").find('a');
-
-$el.remove('div').remove('a');
-
-$('#id').replaceWith('some html').parent();
-$('#id').empty().parent();
-
-$el.html();
-$el.html("<html></html>").find('div');
-
-$el.text();
-$el.text('some text');
-
-$el.toArray();
-$el.clone().find('a').parent();
-$.root().find('a');
+// attr
+$el.attr('id');
+$el.attr('id', 'favorite').html();
 
+// data
 $el.data();
+$el.data('apple-color');
+$el.data('kind', 'mac');
+
+// val
+$('input[type="text"]').val();
+$('input[type="text"]').val('test').html();
+
+// removeAttr
+$el.removeAttr('class').html();
+
+// hasClass, addClass, removeClass, toggleClass
+$el.addClass('class').addClass('test');
+$el.hasClass('test');
+$el.removeClass('class').removeClass('test');
+$el.addClass('red').removeClass().html();
+$el.toggleClass('fruit green red').html();
+
+// is
+$el.is('#id');
+$el.is($el);
+$el.is(() => {
+  return true;
+});
+
+/**
+ * Forms
+ */
+// serializeArray
+$('<form><input name="foo" value="bar" /></form>').serializeArray();
+
+/**
+ * Traversing
+ */
+ // find
+$el.find('li').length;
+$el.find($('.apple')).length;
+
+// .parent([selector])
+$el.parent().attr('id');
+$el.parent('.class').attr('id');
+
+// .parents([selector])
+$el.parents().length;
+$el.parents('.class').length;
+
+// .parentsUntil([selector][,filter])
+$el.parentsUntil().length;
+$el.parentsUntil('.class').length;
+
+// .closest(selector)
+$el.closest();
+$el.closest('.class');
+
+// .next([selector])
+$el.next().hasClass('class');
+$el.next('.class').hasClass('class');
+
+// .nextAll([selector])
+$el.nextAll().length;
+$el.nextAll('.class').length;
+
+// .nextUntil([selector], [filter])
+$el.nextUntil();
+$el.nextUntil('.class');
+
+// .prev([selector])
+$el.prev().hasClass('class');
+$el.prev('.class').hasClass('class');
+
+// .prevAll([selector])
+$el.prevAll().length;
+$el.prevAll('.class').length;
+
+// .prevUntil([selector], [filter])
+$el.prevUntil();
+$el.prevUntil('.class');
+
+// .slice( start, [end] )
+$el.slice(1).eq(0).text();
+$el.slice(1, 2).length;
+
+// .siblings([selector])
+$el.siblings().length;
+$el.siblings('.class').length;
+
+// .children([selector])
+$el.children().length;
+$el.children('.class').text();
+
+// .contents()
+$el.contents().length;
+
+// .each( function(index, element) )
+$el.each((i, el) => {
+  $(el).html();
+});
+
+// .map( function(index, element) )
+$el.map((i, el) => {
+  return $(el).text();
+}).get().join(' ');
+
+// .filter
+$ = cheerio.load(html);
+$el.filter('.class').attr('class');
+$el.filter($('.class')).attr('class');
+$el.filter($('.class')[0]).attr('class');
+
+$el.filter((i, el) => {
+  return $(el).attr('class') === 'class';
+}).attr('class');
+
+// .not
+$el.not('.class').length;
+$el.not($('.class')).length;
+$el.not($('.class')[0]).length;
+
+$el.not((i, el) => {
+  return $(el).attr('class') === 'class';
+}).length;
+
+// .has
+$el.has('.class').attr('id');
+$el.has($el[0]).attr('id');
+
+// .first()
+$el.children().first().text();
+
+// .last()
+$el.children().last().text();
+
+// .eq( i )
+$el.eq(0).text();
+$el.eq(-1).text();
+
+// .get( [i] )
+$el.get(0).tagName;
+$el.get().length;
+
+// .index()
+// .index( selector )
+// .index( nodeOrSelection )
+$el.index();
+$el.index('li');
+$el.index($('#fruit, li'));
+
+// .end()
+$el.eq(0).end().length;
+
+// .add
+$el.add('.class').length
+
+// .addBack( [filter] )
+$el.eq(0).addBack().length
+$el.eq(0).addBack('.class').length
+
+/**
+ * Manipulation
+ */
+
+// .append( content, [content, ...] )
+$el.append('<li class="plum">Plum</li>').html();
+$el.append('<li class="plum">Plum</li>', '<li class="plum">Plum</li>').html();
+
+// .prepend( content, [content, ...] )
+$el.prepend('<li class="plum">Plum</li>').html();
+$el.prepend('<li class="plum">Plum</li>', '<li class="plum">Plum</li>').html();
+
+// .after( content, [content, ...] )
+$el.after('<li class="plum">Plum</li>').html();
+$el.after('<li class="plum">Plum</li>', '<li class="plum">Plum</li>').html();
+
+// .insertAfter( content )
+$('<li class="plum">Plum</li>').insertAfter('.class').html();
+
+// .before( content, [content, ...] )
+$el.before('<li class="plum">Plum</li>').html();
+$el.before('<li class="plum">Plum</li>', '<li class="plum">Plum</li>').html();
+
+// .insertBefore( content )
+$('<li class="plum">Plum</li>').insertBefore('.class').html();
+
+// .remove( [selector] )
+$el.remove().html();
+$el.remove('.class').html();
+
+// .replaceWith( content )
+$el.replaceWith($('<li class="plum">Plum</li>')).html();
+
+// .empty()
+$el.empty().html();
+
+// .html( [htmlString] )
+$el.html();
+$el.html('<li class="mango">Mango</li>').html();
+
+// .text( [textString] )
+$el.text();
+$el.text('text');
+
+// .wrap( content )
+// See https://github.com/cheeriojs/cheerio/issues/731
+// $el.wrap($('<div class="red-fruit"></div>')).html();
+
+// .css
+$el.css('width');
+$el.css(['width', 'height']);
+$el.css('width', '50px');
+
+/**
+ * Rendering
+ */
+$.html();
+$.html('.class');
+$.xml();
+
+/**
+ * Miscellaneous
+ */
+
+// .clone() ####
+$el.clone().html();
+
+/**
+ * Utilities
+ */
+
+// $.root
+$.root().append('<ul id="vegetables"></ul>').html();
+
+// $.contains( container, contained )
+$.contains($el[0], $el[0]);
+
+// $.parseHTML( data [, context ] [, keepScripts ] )
+$.parseHTML(html);
+$.parseHTML(html, null, true);
+
+/**
+ * Not in doc
+ */
+$el.toArray();
diff --git a/cheerio/cheerio.d.ts b/cheerio/cheerio.d.ts
index fc8e5a70f..3b5b998d9 100644
--- a/cheerio/cheerio.d.ts
+++ b/cheerio/cheerio.d.ts
@@ -17,12 +17,17 @@ interface Cheerio {
     attr(name: string, value: any): Cheerio;
 
     data(): any;
+    data(name: string): any;
+    data(name: string, value: any): any;
 
     val(): string;
     val(value: string): Cheerio;
 
     removeAttr(name: string): Cheerio;
 
+    has(selector: string): Cheerio;
+    has(element: CheerioElement): Cheerio;
+
     hasClass(className: string): boolean;
     addClass(classNames: string): Cheerio;
 
@@ -41,6 +46,9 @@ interface Cheerio {
     is(selection: Cheerio): boolean;
     is(func: (index: number, element: CheerioElement) => boolean): boolean;
 
+    // Form
+    serializeArray(): {name: string, value: string}[];
+
     // Traversing
 
     find(selector: string): Cheerio;
@@ -52,10 +60,12 @@ interface Cheerio {
     parentsUntil(element: CheerioElement, filter?: string): Cheerio;
     parentsUntil(element: Cheerio, filter?: string): Cheerio;
 
+    closest(): Cheerio;
     closest(selector: string): Cheerio;
 
     next(selector?: string): Cheerio;
     nextAll(): Cheerio;
+    nextAll(selector: string): Cheerio;
 
     nextUntil(selector?: string, filter?: string): Cheerio;
     nextUntil(element: CheerioElement, filter?: string): Cheerio;
@@ -63,6 +73,7 @@ interface Cheerio {
 
     prev(selector?: string): Cheerio;
     prevAll(): Cheerio;
+    prevAll(selector: string): Cheerio;
 
     prevUntil(selector?: string, filter?: string): Cheerio;
     prevUntil(element: CheerioElement, filter?: string): Cheerio;
@@ -83,15 +94,24 @@ interface Cheerio {
     filter(selection: Cheerio): Cheerio;
     filter(element: CheerioElement): Cheerio;
     filter(elements: CheerioElement[]): Cheerio;
-    filter(func: (index: number) => boolean): Cheerio;
+    filter(func: (index: number, element: CheerioElement) => boolean): Cheerio;
+
+    not(selector: string): Cheerio;
+    not(selection: Cheerio): Cheerio;
+    not(element: CheerioElement): Cheerio;
+    not(func: (index: number, element: CheerioElement) => boolean): Cheerio;
 
     first(): Cheerio;
     last(): Cheerio;
 
     eq(index: number): Cheerio;
 
-    get(): Document[];
-    get(index: number): Document;
+    get(): CheerioElement[];
+    get(index: number): CheerioElement;
+
+    index(): number;
+    index(selector: string): number;
+    index(selection: Cheerio): number;
 
     end(): Cheerio;
 
@@ -101,6 +121,9 @@ interface Cheerio {
     add(elements: CheerioElement[]): Cheerio;
     add(selection: Cheerio): Cheerio;
 
+    addBack():Cheerio;
+    addBack(filter: string):Cheerio;
+
     // Manipulation
 
     append(content: string, ...contents: any[]): Cheerio;
@@ -118,11 +141,19 @@ interface Cheerio {
     after(content: Document[], ...contents: any[]): Cheerio;
     after(content: Cheerio, ...contents: any[]): Cheerio;
 
+    insertAfter(content: string): Cheerio;
+    insertAfter(content: Document): Cheerio;
+    insertAfter(content: Cheerio): Cheerio;
+
     before(content: string, ...contents: any[]): Cheerio;
     before(content: Document, ...contents: any[]): Cheerio;
     before(content: Document[], ...contents: any[]): Cheerio;
     before(content: Cheerio, ...contents: any[]): Cheerio;
 
+    insertBefore(content: string): Cheerio;
+    insertBefore(content: Document): Cheerio;
+    insertBefore(content: Cheerio): Cheerio;
+
     remove(selector?: string): Cheerio;
 
     replaceWith(content: string): Cheerio;
@@ -138,6 +169,11 @@ interface Cheerio {
     text(): string;
     text(text: string): Cheerio;
 
+    // See https://github.com/cheeriojs/cheerio/issues/731
+    /*wrap(content: string): Cheerio;
+    wrap(content: Document): Cheerio;
+    wrap(content: Cheerio): Cheerio;*/
+
     css(propertyName: string): string;
     css(propertyNames: string[]): string[];
     css(propertyName: string, value: string): Cheerio;
@@ -172,11 +208,7 @@ interface CheerioOptionsInterface {
     normalizeWhitespace?: boolean;
 }
 
-interface CheerioStatic {
-    // Document References
-    // Cheerio https://github.com/cheeriojs/cheerio
-    // JQuery http://api.jquery.com
-
+interface CheerioSelector {
     (selector: string): Cheerio;
     (selector: string, context: string): Cheerio;
     (selector: string, context: CheerioElement): Cheerio;
@@ -187,7 +219,12 @@ interface CheerioStatic {
     (selector: string, context: CheerioElement[], root: string): Cheerio;
     (selector: string, context: Cheerio, root: string): Cheerio;
     (selector: any): Cheerio;
+}
 
+interface CheerioStatic extends CheerioSelector {
+    // Document References
+    // Cheerio https://github.com/cheeriojs/cheerio
+    // JQuery http://api.jquery.com
     xml(): string;
     root(): Cheerio;
     contains(container: CheerioElement, contained: CheerioElement): boolean;
@@ -202,17 +239,28 @@ interface CheerioStatic {
 interface CheerioElement {
     // Document References
     // Node Console
-
+    tagName: string;
     type: string;
     name: string;
     attribs: Object;
     children: CheerioElement[];
+    childNodes: CheerioElement[];
+    lastChild: CheerioElement;
     next: CheerioElement;
+    nextSibling: CheerioElement;
     prev: CheerioElement;
+    previousSibling: CheerioElement;
     parent: CheerioElement;
-    root: CheerioElement;
+    parentNode: CheerioElement;
+    nodeValue: string;
 }
 
+interface CheerioAPI extends CheerioSelector {
+  load(html: string, options?: CheerioOptionsInterface): CheerioStatic;
+}
+
+declare var cheerio:CheerioAPI;
+
 declare module "cheerio" {
-    export function load(html: string, options?: CheerioOptionsInterface): CheerioStatic;
+    export = cheerio;
 }
diff --git a/chocolatechipjs/chocolatechipjs-tests.ts b/chocolatechipjs/chocolatechipjs-tests.ts
index 06b581769..111e69f63 100644
--- a/chocolatechipjs/chocolatechipjs-tests.ts
+++ b/chocolatechipjs/chocolatechipjs-tests.ts
@@ -102,12 +102,14 @@ $('ul').insert("<li>1</li><li>2</li><li>3</li>", 3);
 $('ul').insert("<li>1</li><li>2</li><li>3</li>");
 $('ul').html('<li>1</li><li><2/li><li>3</li>');
 $('ul').html('');
+var listContent = $('ul').html();
 $('ul').prepend('<li class="title">The title</li>');
 $('ul').append('<li>The Last Item</li>');
 var inputName = $('input').attr('name');
 $('input').attr('name', 'wobba');
-var inputName = $('input').prop('name');
-$('input').prop('name', 'wobba');
+var inputProperty = $('input').prop('disabled');
+$('input[type=checked]').prop('checked', true);
+$('input').removeProp('disabled');
 $('input').hasAttr('disabled').css('border', 'solid 1px red');
 $('input').removeAttr('disabled');
 $('article').hasClass('current').css('display', 'block');
diff --git a/chocolatechipjs/chocolatechipjs.d.ts b/chocolatechipjs/chocolatechipjs.d.ts
index 3c84558af..8ba5cc25f 100644
--- a/chocolatechipjs/chocolatechipjs.d.ts
+++ b/chocolatechipjs/chocolatechipjs.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chocolatechip v4.0.2
+// Type definitions for chocolatechip v4.0.4
 // Project: https://github.com/chocolatechipui/ChocolateChipJS
 // Definitions by: Robert Biggs <http://chocolatechip-ui.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -176,7 +176,8 @@ interface ChocolateChipStatic {
    * @param response The response from a Promise.
    * @result
    */
-   json(reponse: Response): JSON;
+  json(reponse: Response): JSON;
+
   /**
    * This method will defer the execution of a function until the call stack is clear.
    *
@@ -198,7 +199,7 @@ interface ChocolateChipStatic {
    * This method makes sure a method always returns an array. If no values are available to return, it returns and empty array. This is to make sure that methods that expect a chainable array will not throw and exception.
    *
    * @param result The result of a method to test if it can be returned in an array.
-   * @return An array hold the results of a method, otherwise an empty array.
+   * @return An array holding the results of a method, otherwise an empty array.
    */
   returnResult(result: HTMLElement[]): any[];
 
@@ -455,7 +456,7 @@ interface ChocolateChipStatic {
    * @data any You can receive any type: string, number, array, object, etc.
    * @return any
    */
-  subscribe(topic: string, callback: (topic: string, data: any) => boolean): boolean;
+  subscribe(topic: string, callback: (topic: string, data: any) => any): boolean;
 
   /**
    * Unsubscribe from a topic. Pass this the topic you wish to unsubscribe from. The subscription will be terminated immediately.
@@ -836,12 +837,12 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
   hasAttr(attributeName: string): ChocolateChipElementArray;
 
   /**
-   * Get the value of an attribute for the first element in the set of matched elements.
+   * Test whether an attribute exists on the first element in the set of matched elements. The value returned is a boolean.
    *
    * @param attributeName The name of the attribute to get.
-   * @return string
+   * @return boolean
    */
-  prop(attributeName: string): string;
+  prop(propertyName: string): boolean;
 
   /**
    * Set an property for the set of matched elements.
@@ -850,7 +851,15 @@ interface ChocolateChipElementArray extends Array<HTMLElement> {
    * @param value A string indicating the value to set the property to.
    * @return HTMLElement[]
    */
-  prop(propertyName: string, value: string): ChocolateChipElementArray;
+  prop(propertyName: string, value: any | boolean): ChocolateChipElementArray;
+  
+  /**
+   * Remove an element property.
+   * 
+   * @param property The property to remove.
+   * @return HTMLElement[]
+   */
+   removeProp(property: string): ChocolateChipElementArray;
 
   /**
    * Adds the specified class(es) to each of the set of matched elements.
diff --git a/chrome/chrome-app.d.ts b/chrome/chrome-app.d.ts
index 5cfa0fbce..f75f7dca6 100644
--- a/chrome/chrome-app.d.ts
+++ b/chrome/chrome-app.d.ts
@@ -138,6 +138,7 @@ declare module chrome.app.window {
 
     interface WindowEvent {
         addListener(callback: () => void): void;
+        removeListener(callback: () => void): void;
     }
 
     var onBoundsChanged: WindowEvent;
diff --git a/chrome/chrome-tests.ts b/chrome/chrome-tests.ts
index cbbe93791..341738435 100644
--- a/chrome/chrome-tests.ts
+++ b/chrome/chrome-tests.ts
@@ -60,10 +60,6 @@ function bookmarksExample() {
                         resizable: false,
                         height: 140,
                         modal: true,
-                        overlay: {
-                            backgroundColor: '#000',
-                            opacity: 0.5
-                        },
                         buttons: {
                             'Yes, Delete It!': function () {
                                 chrome.bookmarks.remove(String(bookmarkNode.id));
@@ -249,3 +245,12 @@ function contentSettings() {
     }
   });
 }
+
+// https://developer.chrome.com/extensions/runtime#method-openOptionsPage
+function testOptionsPage() {
+  chrome.runtime.openOptionsPage();
+  chrome.runtime.openOptionsPage(function() {
+    // Do a thing ...
+  });
+}
+
diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts
index 561d78071..8b2b0b779 100755
--- a/chrome/chrome.d.ts
+++ b/chrome/chrome.d.ts
@@ -119,16 +119,16 @@ declare module chrome.accessibilityFeatures {
 declare module chrome.alarms {
     interface AlarmCreateInfo {
 		/** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-		delayInMinutes?: number;
+        delayInMinutes?: number;
 		/** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-		periodInMinutes?: number;
+        periodInMinutes?: number;
 		/** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-		when?: number;
+        when?: number;
     }
 
     interface Alarm {
 		/** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-		periodInMinutes?: number;
+        periodInMinutes?: number;
 		/** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
         scheduledTime: number;
 		/** Name of this alarm. */
@@ -149,7 +149,7 @@ declare module chrome.alarms {
 	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
 	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
 	 */
-    export function create(alarmInfo: AlarmCreateInfo): void;	
+    export function create(alarmInfo: AlarmCreateInfo): void;
 	/**
 	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
 	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
@@ -157,7 +157,7 @@ declare module chrome.alarms {
 	 * @param name Optional name to identify this alarm. Defaults to the empty string. 
 	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
 	 */
-	export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
 	/**
 	 * Gets an array of all the alarms. 
 	 * @param callback The callback parameter should be a function that looks like this:
@@ -188,7 +188,7 @@ declare module chrome.alarms {
 	 * @param callback The callback parameter should be a function that looks like this:
 	 * function( Alarm alarm) {...}; 
 	 */
-	export function get(callback: (alarm: Alarm) => void): void;
+    export function get(callback: (alarm: Alarm) => void): void;
 	/**
 	 * Retrieves details about the specified alarm. 
 	 * @param name The name of the alarm to get. Defaults to the empty string.
@@ -196,7 +196,7 @@ declare module chrome.alarms {
 	 * function( Alarm alarm) {...}; 
 	 */
     export function get(name: string, callback: (alarm: Alarm) => void): void;
-	
+
 	/** Fired when an alarm has elapsed. Useful for event pages. */
     var onAlarm: AlarmEvent;
 }
@@ -221,12 +221,12 @@ declare module chrome.browser {
      */
     export function openTab(options: Options, callback: () => void): void;
      
-	/**
-	* Opens a new tab in a browser window associated with the current application 
-	* and Chrome profile. If no browser window for the Chrome profile is opened, 
-	* a new one is opened prior to creating the new tab. Since Chrome 42 only. 
-	* @param options Configures how the tab should be opened. 
-	*/
+     /**
+     * Opens a new tab in a browser window associated with the current application 
+     * and Chrome profile. If no browser window for the Chrome profile is opened, 
+     * a new one is opened prior to creating the new tab. Since Chrome 42 only. 
+     * @param options Configures how the tab should be opened. 
+     */
     export function openTab(options: Options): void;
 }
 
@@ -242,21 +242,21 @@ declare module chrome.bookmarks {
 	/** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
     interface BookmarkTreeNode {
 		/** Optional. The 0-based position of this node within its parent folder.  */
-		index?: number;
+        index?: number;
 		/** Optional. When this node was created, in milliseconds since the epoch (new Date(dateAdded)).  */
-		dateAdded?: number;
+        dateAdded?: number;
 		/** The text displayed for the node. */
         title: string;
 		/** Optional. The URL navigated to when a user clicks the bookmark. Omitted for folders.   */
-		url?: string;
+        url?: string;
 		/** Optional. When the contents of this folder last changed, in milliseconds since the epoch.   */
-		dateGroupModified?: number;
+        dateGroupModified?: number;
 		/** The unique identifier for the node. IDs are unique within the current profile, and they remain valid even after the browser is restarted.  */
         id: string;
 		/** Optional. The id of the parent folder. Omitted for the root node.   */
-		parentId?: string;
+        parentId?: string;
 		/** Optional. An ordered list of children of this node.  */
-		children?: BookmarkTreeNode[];
+        children?: BookmarkTreeNode[];
 		/**
 		 * Optional.
  		 * Since Chrome 37. 
@@ -291,7 +291,7 @@ declare module chrome.bookmarks {
 		 * @param callback The callback parameter should be a function that looks like this:
 		 * function(string id, object removeInfo) {...};  
 		 */
-		addListener(callback: (id: string, removeInfo: BookmarkRemoveInfo) => void): void;
+        addListener(callback: (id: string, removeInfo: BookmarkRemoveInfo) => void): void;
     }
 
     interface BookmarkImportEndedEvent extends chrome.events.Event {
@@ -307,7 +307,7 @@ declare module chrome.bookmarks {
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string id, object moveInfo) {...}; 
 		 */
-		addListener(callback: (id: string, moveInfo: BookmarkMoveInfo) => void): void;
+        addListener(callback: (id: string, moveInfo: BookmarkMoveInfo) => void): void;
     }
 
     interface BookmarkImportBeganEvent extends chrome.events.Event {
@@ -323,7 +323,7 @@ declare module chrome.bookmarks {
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string id, object changeInfo) {...}; 
 		 */
-		addListener(callback: (id: string, changeInfo: BookmarkChangeInfo) => void): void;
+        addListener(callback: (id: string, changeInfo: BookmarkChangeInfo) => void): void;
     }
 
     interface BookmarkCreatedEvent extends chrome.events.Event {
@@ -331,7 +331,7 @@ declare module chrome.bookmarks {
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string id, BookmarkTreeNode bookmark) {...}; 
 		 */
-		addListener(callback: (id: string, bookmark: BookmarkTreeNode) => void): void;
+        addListener(callback: (id: string, bookmark: BookmarkTreeNode) => void): void;
     }
 
     interface BookmarkChildrenReordered extends chrome.events.Event {
@@ -339,7 +339,7 @@ declare module chrome.bookmarks {
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string id, object reorderInfo) {...}; 
 		 */
-		addListener(callback: (id: string, reorderInfo: BookmarkReorderInfo) => void): void;
+        addListener(callback: (id: string, reorderInfo: BookmarkReorderInfo) => void): void;
     }
 
 	interface BookmarkSearchQuery {
@@ -370,14 +370,14 @@ declare module chrome.bookmarks {
     var MAX_WRITE_OPERATIONS_PER_HOUR: number;
 	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
     var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-    
+
 	/**
 	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
 	 * @param query A string of words and quoted phrases that are matched against bookmark URLs and titles.
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(array of BookmarkTreeNode results) {...}; 
 	 */
-	export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
+    export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
 	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
 	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced. 
@@ -486,40 +486,40 @@ declare module chrome.browserAction {
 		/** An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is [255, 0, 0, 255]. Can also be a string with a CSS value, with opaque red being #FF0000 or #F00. */
         color: any;
 		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-		tabId?: number;
+        tabId?: number;
     }
 
     interface BadgeTextDetails {
 		/** Any number of characters can be passed, but only about four can fit in the space. */
         text: string;
 		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-		tabId?: number;
+        tabId?: number;
     }
 
     interface TitleDetails {
 		/** The string the browser action should display when moused over. */
         title: string;
 		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-		tabId?: number;
+        tabId?: number;
     }
 
     interface TabDetails {
 		/** Optional. Specify the tab to get the information. If no tab is specified, the non-tab-specific information is returned.  */
-		tabId?: number;
+        tabId?: number;
     }
 
     interface TabIconDetails {
 		/** Optional. Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'  */
-		path?: any;
+        path?: any;
 		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-		tabId?: number;
+        tabId?: number;
 		/** Optional. Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'  */
-		imageData?: ImageData;
+        imageData?: ImageData;
     }
 
     interface PopupDetails {
 		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-		tabId?: number;
+        tabId?: number;
 		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
         popup: string;
     }
@@ -602,11 +602,11 @@ declare module chrome.browserAction {
 declare module chrome.browsingData {
     interface OriginTypes {
 		/** Optional. Websites that have been installed as hosted applications (be careful!).  */
-		protectedWeb?: boolean;
+        protectedWeb?: boolean;
 		/** Optional. Extensions and packaged applications a user has installed (be _really_ careful!).  */
-		extension?: boolean;
+        extension?: boolean;
 		/** Optional. Normal websites.  */
-		unprotectedWeb?: boolean;
+        unprotectedWeb?: boolean;
     }
 
 	/** Options that determine exactly what data will be removed. */
@@ -616,9 +616,9 @@ declare module chrome.browsingData {
  		 * Since Chrome 21. 
 		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'. 
 		 */
-		originTypes?: OriginTypes;
+        originTypes?: OriginTypes;
 		/** Optional. Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).  */
-		since?: number;
+        since?: number;
     }
 
 	/**
@@ -627,31 +627,31 @@ declare module chrome.browsingData {
 	 */
     interface DataTypeSet {
 		/** Optional. Websites' WebSQL data.  */
-		webSQL?: boolean;
+        webSQL?: boolean;
 		/** Optional. Websites' IndexedDB data.  */
-		indexedDB?: boolean;
+        indexedDB?: boolean;
 		/** Optional. The browser's cookies.  */
-		cookies?: boolean;
+        cookies?: boolean;
 		/** Optional. Stored passwords.  */
-		passwords?: boolean;
+        passwords?: boolean;
 		/** Optional. Server-bound certificates.  */
-		serverBoundCertificates?: boolean;
+        serverBoundCertificates?: boolean;
 		/** Optional. The browser's download list.  */
-		downloads?: boolean;
+        downloads?: boolean;
 		/** Optional. The browser's cache. Note: when removing data, this clears the entire cache: it is not limited to the range you specify.  */
-		cache?: boolean;
+        cache?: boolean;
 		/** Optional. Websites' appcaches.  */
-		appcache?: boolean;
+        appcache?: boolean;
 		/** Optional. Websites' file systems.  */
-		fileSystems?: boolean;
+        fileSystems?: boolean;
 		/** Optional. Plugins' data.  */
-		pluginData?: boolean;
+        pluginData?: boolean;
 		/** Optional. Websites' local storage data.  */
-		localStorage?: boolean;
+        localStorage?: boolean;
 		/** Optional. The browser's stored form data.  */
-		formData?: boolean;
+        formData?: boolean;
 		/** Optional. The browser's history.  */
-		history?: boolean;
+        history?: boolean;
 		/**
 		 * Optional.
  		 * Since Chrome 39. 
@@ -666,7 +666,7 @@ declare module chrome.browsingData {
 		dataToRemove: DataTypeSet;
 		/** All of the types will be present in the result, with values of true if they are permitted to be removed (e.g., by enterprise policy) and false if not. */
 		dataRemovalPermitted: DataTypeSet;
-	}
+}
 
 	/**
 	 * Since Chrome 26. 
@@ -794,7 +794,7 @@ declare module chrome.commands {
 		 */
         addListener(callback: (command: string) => void): void;
     }
-	
+
 	/**
 	 * Returns all the registered extension commands for this extension and their shortcut (if active). 
 	 * @param callback Called to return the registered commands. 
@@ -824,29 +824,29 @@ declare module chrome.contentSettings {
 		 * * regular: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),
 		 * * incognito_session_only: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings).
 		 */
-		scope?: string;
+        scope?: string;
     }
 
     interface SetDetails {
 		/** Optional. The resource identifier for the content type.  */
-		resourceIdentifier?: ResourceIdentifier;
+        resourceIdentifier?: ResourceIdentifier;
 		/** The setting applied by this rule. See the description of the individual ContentSetting objects for the possible values. */
         setting: any;
 		/** Optional. The pattern for the secondary URL. Defaults to matching all URLs. For details on the format of a pattern, see Content Setting Patterns.  */
-		secondaryPattern?: string;
+        secondaryPattern?: string;
 		/** Optional. Where to set the setting (default: regular).  */
-		scope?: string;
+        scope?: string;
 		/** The pattern for the primary URL. For details on the format of a pattern, see Content Setting Patterns. */
         primaryPattern: string;
     }
 
     interface GetDetails {
 		/** Optional. The secondary URL for which the content setting should be retrieved. Defaults to the primary URL. Note that the meaning of a secondary URL depends on the content type, and not all content types use secondary URLs.  */
-		secondaryUrl?: string;
+        secondaryUrl?: string;
 		/** Optional. A more specific identifier of the type of content for which the settings should be retrieved.  */
-		resourceIdentifier?: ResourceIdentifier;
+        resourceIdentifier?: ResourceIdentifier;
 		/** Optional. Whether to check the content settings for an incognito session. (default false)  */
-		incognito?: boolean;
+        incognito?: boolean;
 		/** The primary URL for which the content setting should be retrieved. Note that the meaning of a primary URL depends on the content type. */
         primaryUrl: string;
     }
@@ -888,7 +888,7 @@ declare module chrome.contentSettings {
 		/** The resource identifier for the given content type. */
         id: string;
 		/** Optional. A human readable description of the resource.  */
-		description?: string;
+        description?: string;
     }
 
 	/**
@@ -1008,13 +1008,13 @@ declare module chrome.contextMenus {
  		 * Since Chrome 35.
 		 * The text for the context selection, if any. 
 		 */
-		selectionText?: string;
+        selectionText?: string;
 		/**
 		 * Optional.
  		 * Since Chrome 35.
 		 * A flag indicating the state of a checkbox or radio item after it is clicked.
 		 */
-		checked?: boolean;
+        checked?: boolean;
 		/**
 		 * Since Chrome 35.
 		 * The ID of the menu item that was clicked.
@@ -1025,7 +1025,7 @@ declare module chrome.contextMenus {
  		 * Since Chrome 35.
 		 * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
 		 */
-		frameUrl?: string;
+        frameUrl?: string;
 		/**
 		 * Since Chrome 35.
 		 * A flag indicating whether the element is editable (text input, textarea, etc.).
@@ -1036,13 +1036,13 @@ declare module chrome.contextMenus {
  		 * Since Chrome 35. 
 		 * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
 		 */
-		mediaType?: string;
+        mediaType?: string;
 		/**
 		 * Optional.
  		 * Since Chrome 35.
 		 * A flag indicating the state of a checkbox or radio item before it was clicked.
 		 */
-		wasChecked?: boolean;
+        wasChecked?: boolean;
 		/**
 		 * Since Chrome 35. 
 		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu. 
@@ -1053,68 +1053,68 @@ declare module chrome.contextMenus {
  		 * Since Chrome 35.
 		 * If the element is a link, the URL it points to. 
 		 */
-		linkUrl?: string;
+        linkUrl?: string;
 		/**
 		 * Optional.
  		 * Since Chrome 35.
 		 * The parent ID, if any, for the item clicked.
 		 */
-		parentMenuItemId?: any;
+        parentMenuItemId?: any;
 		/**
 		 * Optional.
  		 * Since Chrome 35. 
 		 * Will be present for elements with a 'src' URL.
 		 */
-		srcUrl?: string;
+        srcUrl?: string;
     }
 
     interface CreateProperties {
 		/** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-		documentUrlPatterns?: string[];
+        documentUrlPatterns?: string[];
 		/** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-		checked?: boolean;
+        checked?: boolean;
 		/** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-		title?: string;
+        title?: string;
 		/** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-		contexts?: string[];
+        contexts?: string[];
 		/**
 		 * Optional.
  		 * Since Chrome 20. 
 		 * Whether this context menu item is enabled or disabled. Defaults to true. 
 		 */
-		enabled?: boolean;
+        enabled?: boolean;
 		/** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-		targetUrlPatterns?: string[];
+        targetUrlPatterns?: string[];
 		/**
 		 * Optional.
  		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked. 
 		 * @param info Information sent when a context menu item is clicked. 
 		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions. 
 		 */
-		onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
+        onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
 		/** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-		parentId?: any;
+        parentId?: any;
 		/** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-		type?: string;
+        type?: string;
 		/**
 		 * Optional.
  		 * Since Chrome 21. 
 		 * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
 		 */
-		id?: string;
+        id?: string;
     }
 
-	interface UpdateProperties {
+    interface UpdateProperties {
         documentUrlPatterns?: string[];
         checked?: boolean;
         title?: string;
         contexts?: string[];
 		/** Optional. Since Chrome 20.  */
-		enabled?: boolean;
+        enabled?: boolean;
         targetUrlPatterns?: string[];
         onclick?: Function;
 		/** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-		parentId?: any;
+        parentId?: any;
         type?: string;
     }
 
@@ -1127,7 +1127,7 @@ declare module chrome.contextMenus {
 		 */
         addListener(callback: (info: OnClickData, tab?: chrome.tabs.Tab) => void): void;
     }
-	
+
 	/**
 	 * Since Chrome 38. 
 	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored. 
@@ -1214,7 +1214,7 @@ declare module chrome.cookies {
 		/** True if the cookie is a host-only cookie (i.e. a request's host must exactly match the domain of the cookie). */
         hostOnly: boolean;
 		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. Not provided for session cookies.  */
-		expirationDate?: number;
+        expirationDate?: number;
 		/** The path of the cookie. */
         path: string;
 		/** True if the cookie is marked as HttpOnly (i.e. the cookie is inaccessible to client-side scripts). */
@@ -1233,40 +1233,40 @@ declare module chrome.cookies {
 
     interface GetAllDetails {
 		/** Optional. Restricts the retrieved cookies to those whose domains match or are subdomains of this one.  */
-		domain?: string;
+        domain?: string;
 		/** Optional. Filters the cookies by name.  */
-		name?: string;
+        name?: string;
 		/** Optional. Restricts the retrieved cookies to those that would match the given URL.  */
-		url?: string;
+        url?: string;
 		/** Optional. The cookie store to retrieve cookies from. If omitted, the current execution context's cookie store will be used.  */
-		storeId?: string;
+        storeId?: string;
 		/** Optional. Filters out session vs. persistent cookies.  */
-		session?: boolean;
+        session?: boolean;
 		/** Optional. Restricts the retrieved cookies to those whose path exactly matches this string.  */
-		path?: string;
+        path?: string;
 		/** Optional. Filters the cookies by their Secure property.  */
-		secure?: boolean;
+        secure?: boolean;
     }
 
     interface SetDetails {
 		/** Optional. The domain of the cookie. If omitted, the cookie becomes a host-only cookie.  */
-		domain?: string;
+        domain?: string;
 		/** Optional. The name of the cookie. Empty by default if omitted.  */
-		name?: string;
+        name?: string;
 		/** The request-URI to associate with the setting of the cookie. This value can affect the default domain and path values of the created cookie. If host permissions for this URL are not specified in the manifest file, the API call will fail. */
         url: string;
 		/** Optional. The ID of the cookie store in which to set the cookie. By default, the cookie is set in the current execution context's cookie store.  */
-		storeId?: string;
+        storeId?: string;
 		/** Optional. The value of the cookie. Empty by default if omitted.  */
-		value?: string;
+        value?: string;
 		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. If omitted, the cookie becomes a session cookie.  */
-		expirationDate?: number;
+        expirationDate?: number;
 		/** Optional. The path of the cookie. Defaults to the path portion of the url parameter.  */
-		path?: string;
+        path?: string;
 		/** Optional. Whether the cookie should be marked as HttpOnly. Defaults to false.  */
-		httpOnly?: boolean;
+        httpOnly?: boolean;
 		/** Optional. Whether the cookie should be marked as Secure. Defaults to false.  */
-		secure?: boolean;
+        secure?: boolean;
     }
 
     interface Details {
@@ -1394,7 +1394,7 @@ declare module "chrome.debugger" {
 		url: string;
 		/** Optional. Target favicon URL.  */
 		faviconUrl?: string;
-	}
+    }
 
     interface DebuggerDetachedEvent extends chrome.events.Event {
 		/**
@@ -1706,11 +1706,11 @@ declare module chrome.devtools.inspectedWindow {
 
     interface ReloadOptions {
 		/** Optional. If specified, the string will override the value of the User-Agent HTTP header that's sent while loading the resources of the inspected page. The string will also override the value of the navigator.userAgent property that's returned to any scripts that are running within the inspected page.  */
-		userAgent?: string;
+        userAgent?: string;
 		/** Optional. When true, the loader will ignore the cache for all inspected page resources loaded before the load event is fired. The effect is similar to pressing Ctrl+Shift+R in the inspected window or within the Developer Tools window.  */
-		ignoreCache?: boolean;
+        ignoreCache?: boolean;
 		/** Optional. If specified, the script will be injected into every frame of the inspected page immediately upon load, before any of the frame's scripts. The script will not be injected after subsequent reloads—for example, if the user presses Ctrl+R.  */
-		injectedScript?: boolean;
+        injectedScript?: boolean;
 		/**
 		 * Optional.
  		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function. 
@@ -1732,7 +1732,7 @@ declare module chrome.devtools.inspectedWindow {
 		isException: boolean;
 		/** Set if the evaluated code produces an unhandled exception. */
 		value: string;
-	}
+    }
 
     interface ResourceAddedEvent extends chrome.events.Event {
 		/**
@@ -1943,10 +1943,10 @@ declare module chrome.devtools.panels {
 		 * function( ExtensionSidebarPane result) {...}; 
 		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane. 
 		 */
-		createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
+        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
 		/** Fired when an object is selected in the panel. */
         onSelectionChanged: SelectionChangedEvent;
-	}
+    }
 
     interface ExtensionSidebarPaneShownEvent extends chrome.events.Event {
 		/**
@@ -2108,17 +2108,17 @@ declare module chrome.downloads {
 
     interface DownloadOptions {
 		/** Optional. Post body.  */
-		body?: string;
+        body?: string;
 		/** Optional. Use a file-chooser to allow the user to select a filename regardless of whether filename is set or already exists.  */
-		saveAs?: boolean;
+        saveAs?: boolean;
 		/** The URL to download. */
         url: string;
 		/** Optional. A file path relative to the Downloads directory to contain the downloaded file, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will cause an error. onDeterminingFilename allows suggesting a filename after the file's MIME type and a tentative filename have been determined.  */
-		filename?: string;
+        filename?: string;
 		/** Optional. Extra HTTP headers to send with the request if the URL uses the HTTP[s] protocol. Each header is represented as a dictionary containing the keys name and either value or binaryValue, restricted to those allowed by XMLHttpRequest.  */
-		headers?: HeaderNameValuePair[];
+        headers?: HeaderNameValuePair[];
 		/** Optional. The HTTP method to use if the URL uses the HTTP[S] protocol.  */
-		method?: string;
+        method?: string;
 		/** Optional. The action to take if filename already exists.  */
 		conflictAction?: string;
     }
@@ -2216,58 +2216,58 @@ declare module chrome.downloads {
     interface GetFileIconOptions {
 		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size. 
  */
-		size?: number;
+        size?: number;
     }
 
     interface DownloadQuery {
 		/** Optional. Set elements of this array to DownloadItem properties in order to sort search results. For example, setting orderBy=['startTime'] sorts the DownloadItem by their start time in ascending order. To specify descending order, prefix with a hyphen: '-startTime'.  */
 		orderBy?: string[];
 		/** Optional. Limits results to DownloadItem whose url matches the given regular expression.  */
-		urlRegex?: string;
+        urlRegex?: string;
 		/** Optional. Limits results to DownloadItem that ended before the given ms since the epoch.  */
-		endedBefore?: number;
+        endedBefore?: number;
 		/** Optional. Limits results to DownloadItem whose totalBytes is greater than the given integer.  */
-		totalBytesGreater?: number;
+        totalBytesGreater?: number;
 		/** Optional. Indication of whether this download is thought to be safe or known to be suspicious.  */
-		danger?: string;
+        danger?: string;
 		/** Optional. Number of bytes in the whole file, without considering file compression, or -1 if unknown.  */
-		totalBytes?: number;
+        totalBytes?: number;
 		/** Optional. True if the download has stopped reading data from the host, but kept the connection open.  */
-		paused?: boolean;
+        paused?: boolean;
 		/** Optional. Limits results to DownloadItem whose filename matches the given regular expression.  */
-		filenameRegex?: string;
+        filenameRegex?: string;
 		/** Optional. This array of search terms limits results to DownloadItem whose filename or url contain all of the search terms that do not begin with a dash '-' and none of the search terms that do begin with a dash.  */
 		query?: string[];
 		/** Optional. Limits results to DownloadItem whose totalBytes is less than the given integer.  */
-		totalBytesLess?: number;
+        totalBytesLess?: number;
 		/** Optional. The id of the DownloadItem to query.  */
-		id?: number;
+        id?: number;
 		/** Optional. Number of bytes received so far from the host, without considering file compression.  */
-		bytesReceived?: number;
+        bytesReceived?: number;
 		/** Optional. Limits results to DownloadItem that ended after the given ms since the epoch.  */
-		endedAfter?: number;
+        endedAfter?: number;
 		/** Optional. Absolute local path.  */
-		filename?: string;
+        filename?: string;
 		/** Optional. Indicates whether the download is progressing, interrupted, or complete.  */
-		state?: string;
+        state?: string;
 		/** Optional. Limits results to DownloadItem that started after the given ms since the epoch.  */
-		startedAfter?: number;
+        startedAfter?: number;
 		/** Optional. The file's MIME type.  */
-		mime?: string;
+        mime?: string;
 		/** Optional. Number of bytes in the whole file post-decompression, or -1 if unknown.  */
-		fileSize?: number;
+        fileSize?: number;
 		/** Optional. The time when the download began in ISO 8601 format.  */
-		startTime?: number;
+        startTime?: number;
 		/** Optional. Absolute URL.  */
-		url?: string;
+        url?: string;
 		/** Optional. Limits results to DownloadItem that started before the given ms since the epoch.  */
-		startedBefore?: number;
+        startedBefore?: number;
 		/** Optional. The maximum number of matching DownloadItem returned. Defaults to 1000. Set to 0 in order to return all matching DownloadItem. See search for how to page through results.  */
-		limit?: number;
+        limit?: number;
 		/** Optional. Why a download was interrupted.  */
-		error?: number;
+        error?: number;
 		/** Optional. The time when the download ended in ISO 8601 format.  */
-		endTime?: number;
+        endTime?: number;
 		/** Optional. Whether the downloaded file exists;  */
 		exists?: boolean;
     }
@@ -2487,47 +2487,47 @@ declare module chrome.events {
 	/** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
     interface UrlFilter {
 		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-		schemes?: string[];
+        schemes?: string[];
 		/**
 		 * Optional.
  		 * Since Chrome 23. 
 		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax. 
 		 */
-		urlMatches?: string;
+        urlMatches?: string;
 		/** Optional. Matches if the path segment of the URL contains a specified string.  */
-		pathContains?: string;
+        pathContains?: string;
 		/** Optional. Matches if the host name of the URL ends with a specified string.  */
-		hostSuffix?: string;
+        hostSuffix?: string;
 		/** Optional. Matches if the host name of the URL starts with a specified string.  */
-		hostPrefix?: string;
+        hostPrefix?: string;
 		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-		hostContains?: string;
+        hostContains?: string;
 		/** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlContains?: string;
+        urlContains?: string;
 		/** Optional. Matches if the query segment of the URL ends with a specified string.  */
-		querySuffix?: string;
+        querySuffix?: string;
 		/** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlPrefix?: string;
+        urlPrefix?: string;
 		/** Optional. Matches if the host name of the URL is equal to a specified string.  */
-		hostEquals?: string;
+        hostEquals?: string;
 		/** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlEquals?: string;
+        urlEquals?: string;
 		/** Optional. Matches if the query segment of the URL contains a specified string.  */
-		queryContains?: string;
+        queryContains?: string;
 		/** Optional. Matches if the path segment of the URL starts with a specified string.  */
-		pathPrefix?: string;
+        pathPrefix?: string;
 		/** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-		pathEquals?: string;
+        pathEquals?: string;
 		/** Optional. Matches if the path segment of the URL ends with a specified string.  */
-		pathSuffix?: string;
+        pathSuffix?: string;
 		/** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-		queryEquals?: string;
+        queryEquals?: string;
 		/** Optional. Matches if the query segment of the URL starts with a specified string.  */
-		queryPrefix?: string;
+        queryPrefix?: string;
 		/** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlSuffix?: string;
+        urlSuffix?: string;
 		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-		ports?: any[];
+        ports?: any[];
 		/**
 		 * Optional.
  		 * Since Chrome 28. 
@@ -2597,17 +2597,17 @@ declare module chrome.events {
 		 * function() {...}; 
 		 */
         removeListener(callback: () => void): void;
-		hasListeners(): boolean;
+        hasListeners(): boolean;
     }
 
 	/** Description of a declarative rule for handling events. */
     interface Rule {
 		/** Optional. Optional priority of this rule. Defaults to 100.  */
-		priority?: number;
+        priority?: number;
 		/** List of conditions that can trigger the actions. */
         conditions: any[];
 		/** Optional. Optional identifier that allows referencing this rule.  */
-		id?: string;
+        id?: string;
 		/** List of actions that are triggered if one of the condtions is fulfilled. */
         actions: any[];
 		/**
@@ -2629,9 +2629,9 @@ declare module chrome.events {
 declare module chrome.extension {
     interface FetchProperties {
 		/** Optional. The window to restrict the search to. If omitted, returns all views.  */
-		windowId?: number;
+        windowId?: number;
 		/** Optional. The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'notification', 'popup'.  */
-		type?: string;
+        type?: string;
     }
 
     interface LastError {
@@ -2653,7 +2653,7 @@ declare module chrome.extension {
 		 * Parameter sendResponse: Function to call (at most once) when you have a response. The argument should be any JSON-ifiable object, or undefined if there is no response. If you have more than one onRequest listener in the same document, then only one may send a response. 
 		 */
 		addListener(callback: (sender: runtime.MessageSender, sendResponse: () => void) => void): void;
-	}
+    }
 
 	/**
 	 * Since Chrome 7. 
@@ -2744,14 +2744,14 @@ declare module chrome.fileBrowserHandler {
  		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png'] 
 		 * Since Chrome 23. 
 		 */
-		allowedFileExtensions?: string[];
+        allowedFileExtensions?: string[];
 		/** Suggested name for the file. */
         suggestedName: string;
     }
 
     interface SelectionResult {
 		/** Optional. Selected file entry. It will be null if a file hasn't been selected.  */
-		entry?: Object;
+        entry?: Object;
 		/** Whether the file has been selected. */
         success: boolean;
     }
@@ -2759,7 +2759,7 @@ declare module chrome.fileBrowserHandler {
 	/** Event details payload for fileBrowserHandler.onExecute event. */
     interface FileHandlerExecuteEventDetails {
 		/** Optional. The ID of the tab that raised this event. Tab IDs are unique within a browser session.  */
-		tab_id?: number;
+        tab_id?: number;
 		/** Array of Entry instances representing files that are targets of this action (selected in ChromeOS file browser). */
         entries: any[];
     }
@@ -3235,104 +3235,104 @@ declare module chrome.fileSystemProvider {
  */
 declare module chrome.fontSettings {
 	/** Represents a font name. */
-	interface FontName {
+    interface FontName {
 		/** The display name of the font. */
-		displayName: string;
+        displayName: string;
 		/** The font ID. */
-		fontId: string;
-	}
+        fontId: string;
+    }
 
-	interface DefaultFontSizeDetails {
+    interface DefaultFontSizeDetails {
 		/** The font size in pixels. */
-		pixelSize: number;
-	}
+        pixelSize: number;
+    }
 
-	interface FontDetails {
+    interface FontDetails {
 		/** The generic font family for the font. */
-		genericFamily: string;
+        genericFamily: string;
 		/** Optional. The script for the font. If omitted, the global script font setting is affected.  */
-		script?: string;
-	}
+        script?: string;
+    }
 
-	interface FullFontDetails {
+    interface FullFontDetails {
 		/** The generic font family for which the font setting has changed. */
-		genericFamily: string;
+        genericFamily: string;
 		/** The level of control this extension has over the setting. */
-		levelOfControl: string;
+        levelOfControl: string;
 		/** Optional. The script code for which the font setting has changed.  */
-		script?: string;
+        script?: string;
 		/** The font ID. See the description in getFont. */
-		fontId: string;
-	}
+        fontId: string;
+    }
 
-	interface FontDetailsResult {
+    interface FontDetailsResult {
 		/** The level of control this extension has over the setting. */
-		levelOfControl: string;
+        levelOfControl: string;
 		/** The font ID. Rather than the literal font ID preference value, this may be the ID of the font that the system resolves the preference value to. So, fontId can differ from the font passed to setFont, if, for example, the font is not available on the system. The empty string signifies fallback to the global script font setting. */
-		fontId: string;
-	}
+        fontId: string;
+    }
 
-	interface FontSizeDetails {
+    interface FontSizeDetails {
 		/** The font size in pixels. */
-		pixelSize: number;
+        pixelSize: number;
 		/** The level of control this extension has over the setting. */
-		levelOfControl: string;
-	}
+        levelOfControl: string;
+    }
 
-	interface SetFontSizeDetails {
+    interface SetFontSizeDetails {
 		/** The font size in pixels. */
-		pixelSize: number;
-	}
+        pixelSize: number;
+    }
 
 	interface SetFontDetails extends FontDetails {
 		/** The font ID. The empty string means to fallback to the global script font setting. */
-		fontId: string;
-	}
+        fontId: string;
+    }
 
-	interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event {
+    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(object details) {...}; 
 		 */
-		addListener(callback: (details: FontSizeDetails) => void): void;
-	}
+        addListener(callback: (details: FontSizeDetails) => void): void;
+    }
 
-	interface DefaultFontSizeChangedEvent extends chrome.events.Event {
+    interface DefaultFontSizeChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(object details) {...}; 
 		 */
-		addListener(callback: (details: FontSizeDetails) => void): void;
-	}
+        addListener(callback: (details: FontSizeDetails) => void): void;
+    }
 
-	interface MinimumFontSizeChangedEvent extends chrome.events.Event {
+    interface MinimumFontSizeChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(object details) {...}; 
 		 */
-		addListener(callback: (details: FontSizeDetails) => void): void;
-	}
+        addListener(callback: (details: FontSizeDetails) => void): void;
+    }
 
-	interface FontChangedEvent extends chrome.events.Event {
+    interface FontChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(object details) {...}; 
 		 */
-		addListener(callback: (details: FullFontDetails) => void): void;
-	}
+        addListener(callback: (details: FullFontDetails) => void): void;
+    }
 
 	/**
 	 * Sets the default font size. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
+    export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
 	/**
 	 * Gets the font for a given script and generic font family. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(object details) {...}; 
 	 */
-	export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
+    export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
 	/**
 	 * Gets the default font size. 
 	 * @param details This parameter is currently unused. 
@@ -3346,74 +3346,74 @@ declare module chrome.fontSettings {
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(object details) {...}; 
 	 */
-	export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
+    export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
 	/**
 	 * Sets the minimum font size. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
+    export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
 	 * Gets the default size for fixed width fonts. 
 	 * @param details This parameter is currently unused. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(object details) {...}; 
 	 */
-	export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
+    export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
 	/**
 	 * Clears the default font size set by this extension, if any. 
 	 * @param details This parameter is currently unused. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function clearDefaultFontSize(details?: Object, callback?: Function): void;
+    export function clearDefaultFontSize(details?: Object, callback?: Function): void;
 	/**
 	 * Sets the default size for fixed width fonts. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
+    export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
 	 * Clears the font set by this extension, if any. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function clearFont(details: FontDetails, callback?: Function): void;
+    export function clearFont(details: FontDetails, callback?: Function): void;
 	/**
 	 * Sets the font for a given script and generic font family. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(object details) {...}; 
 	 */
-	export function setFont(details: SetFontDetails, callback?: Function): void;
+    export function setFont(details: SetFontDetails, callback?: Function): void;
 	/**
 	 * Clears the minimum font size set by this extension, if any. 
 	 * @param details This parameter is currently unused. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function clearMinimumFontSize(details?: Object, callback?: Function): void;
+    export function clearMinimumFontSize(details?: Object, callback?: Function): void;
 	/**
 	 * Gets a list of fonts on the system. 
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(array of FontName results) {...}; 
 	 */
-	export function getFontList(callback: (results: FontName[]) => void): void;
+    export function getFontList(callback: (results: FontName[]) => void): void;
 	/**
 	 * Clears the default fixed font size set by this extension, if any. 
 	 * @param details This parameter is currently unused. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function() {...}; 
 	 */
-	export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
+    export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
 
 	/** Fired when the default fixed font size setting changes. */
-	var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
+    var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
 	/** Fired when the default font size setting changes. */
-	var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
+    var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
 	/** Fired when the minimum font size setting changes. */
-	var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
+    var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
 	/** Fired when a font setting changes. */
-	var onFontChanged: FontChangedEvent;
+    var onFontChanged: FontChangedEvent;
 }
 
 ////////////////////
@@ -3534,87 +3534,87 @@ declare module chrome.gcm {
  */
 declare module chrome.history {
 	/** An object encapsulating one visit to a URL. */
-	interface VisitItem {
+    interface VisitItem {
 		/** The transition type for this visit from its referrer. */
-		transition: string;
+        transition: string;
 		/** Optional. When this visit occurred, represented in milliseconds since the epoch. */
-		visitTime?: number;
+        visitTime?: number;
 		/** The unique identifier for this visit. */
-		visitId: string;
+        visitId: string;
 		/** The visit ID of the referrer. */
-		referringVisitId: string;
+        referringVisitId: string;
 		/** The unique identifier for the item. */
-		id: string;
-	}
+        id: string;
+    }
 
 	/** An object encapsulating one result of a history query. */
-	interface HistoryItem {
+    interface HistoryItem {
 		/** Optional. The number of times the user has navigated to this page by typing in the address. */
-		typedCount?: number;
+        typedCount?: number;
 		/** Optional. The title of the page when it was last loaded. */
-		title?: string;
+        title?: string;
 		/** Optional. The URL navigated to by a user. */
-		url?: string;
+        url?: string;
 		/** Optional. When this page was last loaded, represented in milliseconds since the epoch. */
-		lastVisitTime?: number;
+        lastVisitTime?: number;
 		/** Optional. The number of times the user has navigated to this page. */
-		visitCount?: number;
+        visitCount?: number;
 		/** The unique identifier for the item. */
-		id: string;
-	}
+        id: string;
+    }
 
-	interface HistoryQuery {
+    interface HistoryQuery {
 		/** A free-text query to the history service. Leave empty to retrieve all pages. */
-		text: string;
+        text: string;
 		/** Optional. The maximum number of results to retrieve. Defaults to 100. */
-		maxResults?: number;
+        maxResults?: number;
 		/** Optional. Limit results to those visited after this date, represented in milliseconds since the epoch. */
-		startTime?: number;
+        startTime?: number;
 		/** Optional. Limit results to those visited before this date, represented in milliseconds since the epoch. */
-		endTime?: number;
-	}
+        endTime?: number;
+    }
 
-	interface Url {
+    interface Url {
 		/** The URL for the operation. It must be in the format as returned from a call to history.search. */
-		url: string;
-	}
+        url: string;
+    }
 
-	interface Range {
+    interface Range {
 		/** Items added to history before this date, represented in milliseconds since the epoch. */
-		endTime: number;
+        endTime: number;
 		/** Items added to history after this date, represented in milliseconds since the epoch. */
-		startTime: number;
-	}
+        startTime: number;
+    }
 
-	interface RemovedResult {
+    interface RemovedResult {
 		/** True if all history was removed. If true, then urls will be empty. */
-		allHistory: boolean;
+        allHistory: boolean;
 		/** Optional. */
-		urls?: string[];
-	}
+        urls?: string[];
+    }
 
-	interface HistoryVisitedEvent extends chrome.events.Event {
+    interface HistoryVisitedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( HistoryItem result) {...}; 
 		 */
-		addListener(callback: (result: HistoryItem) => void): void;
-	}
+        addListener(callback: (result: HistoryItem) => void): void;
+    }
 
-	interface HistoryVisitRemovedEvent extends chrome.events.Event {
+    interface HistoryVisitRemovedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(object removed) {...}; 
 		 */
-		addListener(callback: (removed: RemovedResult) => void): void;
-	}
+        addListener(callback: (removed: RemovedResult) => void): void;
+    }
 
 	/**
 	 * Searches the history for the last visit time of each page matching the query. 
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(array of HistoryItem results) {...}; 
 	 */
-	export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
+    export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
 	/**
 	 * Adds a URL to the history at the current time with a transition type of "link". 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
@@ -3638,7 +3638,7 @@ declare module chrome.history {
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(array of VisitItem results) {...}; 
 	 */
-	export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
+    export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
 	/**
 	 * Removes all occurrences of the given URL from the history. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
@@ -3647,9 +3647,9 @@ declare module chrome.history {
 	export function deleteUrl(details: Url, callback?: () => void): void;
 
 	/** Fired when a URL is visited, providing the HistoryItem data for that URL. This event fires before the page has loaded. */
-	var onVisited: HistoryVisitedEvent;
+    var onVisited: HistoryVisitedEvent;
 	/** Fired when one or more URLs are removed from the history service. When all visits have been removed the URL is purged from history. */
-	var onVisitRemoved: HistoryVisitRemovedEvent;
+    var onVisitRemoved: HistoryVisitRemovedEvent;
 }
 
 ////////////////////
@@ -3747,8 +3747,8 @@ declare module chrome.identity {
 		 * function( AccountInfo account, boolean signedIn) {...}; 
 		 */
 		addListener(callback: (account: AccountInfo, signedIn: boolean) => void): void;
-	} 
-	
+}
+
 	/**
 	 * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
 	 * getAccounts is only supported on dev channel.
@@ -3797,7 +3797,7 @@ declare module chrome.identity {
 	 * @param path Optional. The path appended to the end of the generated URL. 
 	 */
 	export function getRedirectURL(path?: string): void;
-	
+
 	/**
 	 * Fired when signin state changes for an account on the user's profile. 
 	 * @since Chrome 33.
@@ -3814,13 +3814,13 @@ declare module chrome.identity {
  * @since Chrome 6.
  */
 declare module chrome.idle {
-	interface IdleStateChangedEvent extends chrome.events.Event {
+    interface IdleStateChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( IdleState newState) {...}; 
 		 */
-		addListener(callback: (newState: string) => void): void;
-	}
+        addListener(callback: (newState: string) => void): void;
+    }
 
 	/**
 	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise. 
@@ -3838,7 +3838,7 @@ declare module chrome.idle {
 	export function setDetectionInterval(intervalInSeconds: number): void;
 
 	/** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-	var onStateChanged: IdleStateChangedEvent;
+    var onStateChanged: IdleStateChangedEvent;
 }
 
 ////////////////////
@@ -3851,28 +3851,28 @@ declare module chrome.idle {
  */
 declare module chrome.input.ime {
 	/** See http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent */
-	interface KeyboardEvent {
+    interface KeyboardEvent {
 		/**
 		 * Optional.
 		 * Whether or not the SHIFT key is pressed. 
 		 */
-		shiftKey?: boolean;
+        shiftKey?: boolean;
 		/**
 		 * Optional.
 		 * Whether or not the ALT key is pressed. 
 		 */
-		altKey?: boolean;
+        altKey?: boolean;
 		/** The ID of the request. */
-		requestId: string;
+        requestId: string;
 		/** Value of the key being pressed */
-		key: string;
+        key: string;
 		/**
 		 * Optional.
 		 * Whether or not the CTRL key is pressed. 
 		 */
-		ctrlKey?: boolean;
+        ctrlKey?: boolean;
 		/** One of keyup or keydown. */
-		type: string;
+        type: string;
 		/**
 		 * Optional.
 		 * The extension ID of the sender of this keyevent. 
@@ -3897,14 +3897,14 @@ declare module chrome.input.ime {
 		 * @since Chrome 29.
 		 */
 		capsLock?: boolean;
-	}
+    }
 
 	/** Describes an input Context */
-	interface InputContext {
+    interface InputContext {
 		/** This is used to specify targets of text field operations. This ID becomes invalid as soon as onBlur is called. */
-		contextID: number;
+        contextID: number;
 		/** Type of value this text field edits, (Text, Number, URL, etc) */
-		type: string;
+        type: string;
 		/**
 		 * Whether the text field wants auto-correct. 
 		 * @since Chrome 40.
@@ -3939,21 +3939,21 @@ declare module chrome.input.ime {
 		checked?: boolean;
 		/** Indicates this item is enabled. */
 		enabled?: boolean;
-	}
+    }
 
-	interface ImeParameters {
+    interface ImeParameters {
 		/** MenuItems to use. */
 		items: MenuItem[];
 		/** ID of the engine to use */
-		engineID: string;
-	}
+        engineID: string;
+    }
 
-	interface CommitTextParameters {
+    interface CommitTextParameters {
 		/** The text to commit */
-		text: string;
+        text: string;
 		/** ID of the context where the text will be committed */
-		contextID: number;
-	}
+        contextID: number;
+    }
 
 	interface CandidateUsage {
 		/** The title string of details description. */
@@ -3989,9 +3989,9 @@ declare module chrome.input.ime {
 		usage?: CandidateUsage;
 	}
 
-	interface CandidatesParameters {
+    interface CandidatesParameters {
 		/** ID of the context that owns the candidate window. */
-		contextID: number;
+        contextID: number;
 		/** List of candidates to show in the candidate window */
 		candidates: CandidateTemplate[];
 	}
@@ -4003,59 +4003,59 @@ declare module chrome.input.ime {
 		end: number;
 		/** The type of the underline to modify this segment. */
 		style: string;
-	}
+    }
 
-	interface CompositionParameters {
+    interface CompositionParameters {
 		/** ID of the context where the composition text will be set */
-		contextID: number;
+        contextID: number;
 		/** Text to set */
-		text: string;
+        text: string;
 		/** Optional. List of segments and their associated types. */
 		segments: CompositionParameterSegment[];
 		/** Position in the text of the cursor. */
-		cursor: number;
+        cursor: number;
 		/** Optional. Position in the text that the selection starts at. */
-		selectionStart?: number;
+        selectionStart?: number;
 		/** Optional. Position in the text that the selection ends at. */
-		selectionEnd?: number;
-	}
+        selectionEnd?: number;
+    }
 
-	interface MenuItemParameters {
-		items: Object[];
-		engineId: string;
-	}
+    interface MenuItemParameters {
+        items: Object[];
+        engineId: string;
+    }
 
 	interface CandidateWindowParameterProperties {
 		/**
 		 * Optional.
 		 * True to show the cursor, false to hide it. 
 		 */
-		cursorVisible?: boolean;
+        cursorVisible?: boolean;
 		/**
 		 * Optional.
 		 * True if the candidate window should be rendered vertical, false to make it horizontal. 
 		 */
-		vertical?: boolean;
+        vertical?: boolean;
 		/**
 		 * Optional.
 		 * The number of candidates to display per page. 
 		 */
-		pageSize?: number;
+        pageSize?: number;
 		/**
 		 * Optional.
 		 * True to display the auxiliary text, false to hide it. 
 		 */
-		auxiliaryTextVisible?: boolean;
+        auxiliaryTextVisible?: boolean;
 		/**
 		 * Optional.
 		 * Text that is shown at the bottom of the candidate window. 
 		 */
-		auxiliaryText?: string;
+        auxiliaryText?: string;
 		/**
 		 * Optional.
 		 * True to show the Candidate window, false to hide it. 
 		 */
-		visible?: boolean;
+        visible?: boolean;
 		/** 
 		 * Optional.
 		 * Where to display the candidate window. 
@@ -4068,16 +4068,16 @@ declare module chrome.input.ime {
 		/** ID of the engine to set properties on. */
 		engineID: string;
 		properties: CandidateWindowParameterProperties;
-	}
+    }
 
-	interface ClearCompositionParameters {
+    interface ClearCompositionParameters {
 		/** ID of the context where the composition will be cleared */
-		contextID: number;
-	}
+        contextID: number;
+    }
 
-	interface CursorPositionParameters {
+    interface CursorPositionParameters {
 		/** ID of the candidate to select. */
-		candidateID: number;
+        candidateID: number;
 		/** ID of the context that owns the candidate window. */
 		contextID: number;
 	}
@@ -4093,7 +4093,7 @@ declare module chrome.input.ime {
 		/** ID of the engine receiving the event. */
 		engineID: string;
 		/** ID of the context where the surrounding text will be deleted. */
-		contextID: number;
+        contextID: number;
 		/** The offset from the caret position where deletion will start. This value can be negative. */
 		offset: number;
 		/** The number of characters to be deleted */
@@ -4107,18 +4107,18 @@ declare module chrome.input.ime {
 		focus: number;
 		/** The beginning position of the selection. This value indicates caret position if is no selection. */
 		anchor: number;
-	}
+    }
 
-	interface BlurEvent extends chrome.events.Event {
+    interface BlurEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(integer contextID) {...};
 		 * Parameter contextID: The ID of the text field that has lost focus. The ID is invalid after this call 
 		 */
-		addListener(callback: (contextID: number) => void): void;
-	}
+        addListener(callback: (contextID: number) => void): void;
+    }
 
-	interface CandidateClickedEvent extends chrome.events.Event {
+    interface CandidateClickedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string engineID, integer candidateID, MouseButton button) {...};
@@ -4126,38 +4126,38 @@ declare module chrome.input.ime {
 		 * Parameter candidateID: ID of the candidate that was clicked. 
 		 * Parameter button: Which mouse buttons was clicked. 
 		 */
-		addListener(callback: (engineID: string, candidateID: number, button: string) => void): void;
-	}
+        addListener(callback: (engineID: string, candidateID: number, button: string) => void): void;
+    }
 
-	interface KeyEventEvent extends chrome.events.Event {
+    interface KeyEventEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string engineID, KeyboardEvent keyData) {...};
 		 * Parameter engineID: ID of the engine receiving the event
 		 * Parameter keyData: Data on the key event 
 		 */
-		addListener(callback: (engineID: string, keyData: KeyboardEvent) => void): void;
-	}
+        addListener(callback: (engineID: string, keyData: KeyboardEvent) => void): void;
+    }
 
-	interface DeactivatedEvent extends chrome.events.Event {
+    interface DeactivatedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string engineID) {...};
 		 * Parameter engineID: ID of the engine receiving the event 
 		 */
-		addListener(callback: (engineID: string) => void): void;
-	}
+        addListener(callback: (engineID: string) => void): void;
+    }
 
-	interface InputContextUpdateEvent extends chrome.events.Event {
+    interface InputContextUpdateEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( InputContext context) {...};
 		 * Parameter context: An InputContext object describing the text field that has changed. 
 		 */
-		addListener(callback: (context: InputContext) => void): void;
-	}
+        addListener(callback: (context: InputContext) => void): void;
+    }
 
-	interface ActivateEvent extends chrome.events.Event {
+    interface ActivateEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string engineID, ScreenType screen) {...}; 
@@ -4165,26 +4165,26 @@ declare module chrome.input.ime {
 		 * Parameter The screen type under which the IME is activated. 
 		 */
 		addListener(callback: (engineID: string, screen: string) => void): void;
-	}
+    }
 
-	interface FocusEvent extends chrome.events.Event {
+    interface FocusEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( InputContext context) {...};
 		 * Parameter context: Describes the text field that has acquired focus. 
 		 */
-		addListener(callback: (context: InputContext) => void): void;
-	}
+        addListener(callback: (context: InputContext) => void): void;
+    }
 
-	interface MenuItemActivatedEvent extends chrome.events.Event {
+    interface MenuItemActivatedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string engineID, string name) {...}; 
 		 * Parameter engineID: ID of the engine receiving the event 
 		 * Parameter name: Name of the MenuItem which was activated 
 		 */
-		addListener(callback: (engineID: string, name: string) => void): void;
-	}
+        addListener(callback: (engineID: string, name: string) => void): void;
+    }
 
 	interface SurroundingTextChangedEvent extends chrome.events.Event {
 		/**
@@ -4217,21 +4217,21 @@ declare module chrome.input.ime {
 	 * If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean success) {...}; 
 	 */
-	export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
+    export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
 	/**
 	 * Sets the current candidate list. This fails if this extension doesn't own the active IME 
 	 * @param callback Called when the operation completes. 
 	 * If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean success) {...}; 
 	 */
-	export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
+    export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
 	/** 
 	 * Set the current composition. If this extension does not own the active IME, this fails. 
 	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
 	 * If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean success) {...}; 
 	 */
-	export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
+    export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
 	/**
 	 * Updates the state of the MenuItems specified 
 	 * @param callback Called when the operation completes 
@@ -4252,14 +4252,14 @@ declare module chrome.input.ime {
 	 * If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean success) {...}; 
 	 */
-	export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
+    export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
 	/**
 	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME. 
 	 * @param callback Called when the operation completes 
 	 * If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean success) {...}; 
 	 */
-	export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
+    export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
 	/**
 	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system. 
 	 * @since Chrome 33.
@@ -4287,21 +4287,21 @@ declare module chrome.input.ime {
 	export function keyEventHandled(requestId: string, response: boolean): void;
 
 	/** This event is sent when focus leaves a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-	var onBlur: BlurEvent;
+    var onBlur: BlurEvent;
 	/** This event is sent if this extension owns the active IME. */
-	var onCandidateClicked: CandidateClickedEvent;
+    var onCandidateClicked: CandidateClickedEvent;
 	/** This event is sent if this extension owns the active IME. */
-	var onKeyEvent: KeyEventEvent;
+    var onKeyEvent: KeyEventEvent;
 	/** This event is sent when an IME is deactivated. It signals that the IME will no longer be receiving onKeyPress events. */
-	var onDeactivated: DeactivatedEvent;
+    var onDeactivated: DeactivatedEvent;
 	/** This event is sent when the properties of the current InputContext change, such as the the type. It is sent to all extensions that are listening to this event, and enabled by the user. */
-	var onInputContextUpdate: InputContextUpdateEvent;
+    var onInputContextUpdate: InputContextUpdateEvent;
 	/** This event is sent when an IME is activated. It signals that the IME will be receiving onKeyPress events. */
-	var onActivate: ActivateEvent;
+    var onActivate: ActivateEvent;
 	/** This event is sent when focus enters a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-	var onFocus: FocusEvent;
+    var onFocus: FocusEvent;
 	/** Called when the user selects a menu item */
-	var onMenuItemActivated: MenuItemActivatedEvent;
+    var onMenuItemActivated: MenuItemActivatedEvent;
 	/**
 	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction. 
 	 * @since Chrome 27.
@@ -4324,77 +4324,77 @@ declare module chrome.input.ime {
  */
 declare module chrome.management {
 	/** Information about an installed extension, app, or theme. */
-	interface ExtensionInfo {
+    interface ExtensionInfo {
 		/**
 		 * Optional.
 		 * A reason the item is disabled. 
 		 * @since Chrome 17.
 		 */
-		disabledReason?: string;
+        disabledReason?: string;
 		/** Optional. The launch url (only present for apps). */
-		appLaunchUrl?: string;
+        appLaunchUrl?: string;
 		/**
 		 * The description of this extension, app, or theme. 
 		 * @since Chrome 9.
 		 */
-		description: string;
+        description: string;
 		/**
 		 * Returns a list of API based permissions. 
 		 * @since Chrome 9.
 		 */
-		permissions: string[];
+        permissions: string[];
 		/**
 		 * Optional.
 		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details. 
 		 */
-		icons?: IconInfo[];
+        icons?: IconInfo[];
 		/**
 		 * Returns a list of host based permissions. 
 		 * @since Chrome 9.
 		 */
-		hostPermissions: string[];
+        hostPermissions: string[];
 		/** Whether it is currently enabled or disabled. */
-		enabled: boolean;
+        enabled: boolean;
 		/**
 		 * Optional.
 		 * The URL of the homepage of this extension, app, or theme. 
 		 * @since Chrome 11.
 		 */
-		homepageUrl?: string;
+        homepageUrl?: string;
 		/**
 		 * Whether this extension can be disabled or uninstalled by the user. 
 		 * @since Chrome 12.
 		 */
-		mayDisable: boolean;
+        mayDisable: boolean;
 		/**
 		 * How the extension was installed. 
 		 * @since Chrome 22.
 		 */
-		installType: string;
+        installType: string;
 		/** The version of this extension, app, or theme. */
-		version: string;
+        version: string;
 		/** The extension's unique identifier. */
-		id: string;
+        id: string;
 		/**
 		 * Whether the extension, app, or theme declares that it supports offline. 
 		 * @since Chrome 15.
 		 */
-		offlineEnabled: boolean;
+        offlineEnabled: boolean;
 		/**
 		 * Optional.
 		 * The update URL of this extension, app, or theme. 
 		 * @since Chrome 16.
 		 */
-		updateUrl?: string;
+        updateUrl?: string;
 		/**
 		 * The type of this extension, app, or theme. 
 		 * @since Chrome 23.
 		 */
-		type: string;
+        type: string;
 		/** The url for the item's options page, if it has one. */
-		optionsUrl: string;
+        optionsUrl: string;
 		/** The name of this extension, app, or theme. */
-		name: string;
+        name: string;
 		/**
 		 * A short version of the name of this extension, app, or theme. 
 		 * @since Chrome 31.
@@ -4417,56 +4417,56 @@ declare module chrome.management {
 		 * @since Chrome 37.
 		 */
 		availableLaunchTypes?: string[];
-	}
+    }
 
 	/** Information about an icon belonging to an extension, app, or theme. */
-	interface IconInfo {
+    interface IconInfo {
 		/** The URL for this icon image. To display a grayscale version of the icon (to indicate that an extension is disabled, for example), append ?grayscale=true to the URL. */
-		url: string;
+        url: string;
 		/** A number representing the width and height of the icon. Likely values include (but are not limited to) 128, 48, 24, and 16. */
-		size: number;
-	}
+        size: number;
+    }
 
-	interface UninstallOptions {
+    interface UninstallOptions {
 		/**
 		 * Optional.
 		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown. 
 		 */
-		showConfirmDialog?: boolean;
-	}
+        showConfirmDialog?: boolean;
+    }
 
-	interface ManagementDisabledEvent extends chrome.events.Event {
+    interface ManagementDisabledEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( ExtensionInfo info) {...}; 
 		 */
-		addListener(callback: (info: ExtensionInfo) => void): void;
-	}
+        addListener(callback: (info: ExtensionInfo) => void): void;
+    }
 
-	interface ManagementUninstalledEvent extends chrome.events.Event {
+    interface ManagementUninstalledEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string id) {...};
 		 * Parameter id: The id of the extension, app, or theme that was uninstalled.  
 		 */
-		addListener(callback: (id: string) => void): void;
-	}
+        addListener(callback: (id: string) => void): void;
+    }
 
-	interface ManagementInstalledEvent extends chrome.events.Event {
+    interface ManagementInstalledEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( ExtensionInfo info) {...}; 
 		 */
-		addListener(callback: (info: ExtensionInfo) => void): void;
-	}
+        addListener(callback: (info: ExtensionInfo) => void): void;
+    }
 
-	interface ManagementEnabledEvent extends chrome.events.Event {
+    interface ManagementEnabledEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( ExtensionInfo info) {...}; 
 		 */
-		addListener(callback: (info: ExtensionInfo) => void): void;
-	}
+        addListener(callback: (info: ExtensionInfo) => void): void;
+    }
 
 	/**
 	 * Enables or disables an app or extension. 
@@ -4483,7 +4483,7 @@ declare module chrome.management {
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(array of string permissionWarnings) {...}; 
 	 */
-	export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
+    export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
 	/**
 	 * Returns information about the installed extension, app, or theme that has the given ID. 
 	 * @since Chrome 9.
@@ -4491,13 +4491,13 @@ declare module chrome.management {
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function( ExtensionInfo result) {...}; 
 	 */
-	export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
+    export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
 	/**
 	 * Returns a list of information about installed extensions and apps. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(array of ExtensionInfo result) {...}; 
 	 */
-	export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
+    export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
 	/**
 	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest. 
 	 * @since Chrome 15.
@@ -4505,7 +4505,7 @@ declare module chrome.management {
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(array of string permissionWarnings) {...}; 
 	 */
-	export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
+    export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
 	/**
 	 * Launches an application. 
 	 * @param id The extension id of the application. 
@@ -4579,13 +4579,13 @@ declare module chrome.management {
 	export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
 
 	/** Fired when an app or extension has been disabled. */
-	var onDisabled: ManagementDisabledEvent;
+    var onDisabled: ManagementDisabledEvent;
 	/** Fired when an app or extension has been uninstalled. */
-	var onUninstalled: ManagementUninstalledEvent;
+    var onUninstalled: ManagementUninstalledEvent;
 	/** Fired when an app or extension has been installed. */
-	var onInstalled: ManagementInstalledEvent;
+    var onInstalled: ManagementInstalledEvent;
 	/** Fired when an app or extension has been enabled. */
-	var onEnabled: ManagementEnabledEvent;
+    var onEnabled: ManagementEnabledEvent;
 }
 
 ////////////////////
@@ -4658,41 +4658,41 @@ declare module chrome.networking.config {
  * @since Chrome 28.
  */
 declare module chrome.notifications {
-	interface ButtonOptions {
-		title: string;
-		iconUrl?: string;
-	}
+    interface ButtonOptions {
+        title: string;
+        iconUrl?: string;
+    }
 
-	interface ItemOptions {
+    interface ItemOptions {
 		/** Title of one item of a list notification. */
-		title: string;
+        title: string;
 		/** Additional details about this item. */
-		message: string;
-	}
+        message: string;
+    }
 
-	interface NotificationOptions {
+    interface NotificationOptions {
 		/** Optional. Which type of notification to display. Required for notifications.create method. */
-		type?: string;
+        type?: string;
 		/** 
 		 * Optional.
 		 * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
 		 * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
 		 */
-		iconUrl?: string;
+        iconUrl?: string;
 		/** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-		title?: string;
+        title?: string;
 		/** Optional. Main notification content. Required for notifications.create method. */
-		message?: string;
+        message?: string;
 		/**
 		 * Optional.
 		 * Alternate notification content with a lower-weight font. 
 		 * @since Chrome 31.
 		 */
-		contextMessage?: string;
+        contextMessage?: string;
 		/** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-		priority?: number;
+        priority?: number;
 		/** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-		eventTime?: number;
+        eventTime?: number;
 		/** Optional. Text and icons for up to two notification action buttons. */
 		buttons?: ButtonOptions[];
 		/** Optional. Items for multi-item notifications. */
@@ -4702,13 +4702,13 @@ declare module chrome.notifications {
 		 * Current progress ranges from 0 to 100. 
 		 * @since Chrome 30.
 		 */
-		progress?: number;
+        progress?: number;
 		/**
 		 * Optional.
 		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification. 
 		 * @since Chrome 32.
 		 */
-		isClickable?: boolean;
+        isClickable?: boolean;
 		/**
 		 * Optional.
 		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered. 
@@ -4717,39 +4717,39 @@ declare module chrome.notifications {
 		appIconMaskUrl?: string;
 		/** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
 		imageUrl?: string;
-	}
+    }
 
 	interface NotificationClosedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string notificationId, boolean byUser) {...}; 
 		 */
-		addListener(callback: (notificationId: string, byUser: boolean) => void): void;
-	}
+        addListener(callback: (notificationId: string, byUser: boolean) => void): void;
+    }
 
 	interface NotificationClickedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string notificationId) {...}; 
 		 */
-		addListener(callback: (notificationId: string) => void): void;
-	}
+        addListener(callback: (notificationId: string) => void): void;
+    }
 
 	interface NotificationButtonClickedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function(string notificationId, integer buttonIndex) {...}; 
 		 */
-		addListener(callback: (notificationId: string, buttonIndex: number) => void): void;
-	}
+        addListener(callback: (notificationId: string, buttonIndex: number) => void): void;
+    }
 
 	interface NotificationPermissionLevelChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( PermissionLevel level) {...}; 
 		 */
-		addListener(callback: (level: string) => void): void;
-	}
+        addListener(callback: (level: string) => void): void;
+    }
 
 	interface NotificationShowSettingsEvent extends chrome.events.Event {
 		/**
@@ -4757,7 +4757,7 @@ declare module chrome.notifications {
 		 * function() {...}; 
 		 */
 		addListener(callback: () => void): void;
-	}
+    }
 
 	/** The notification closed, either by the system or by user action. */
 	export var onClosed: NotificationClosedEvent;
@@ -4832,7 +4832,7 @@ declare module chrome.notifications {
 	 * The callback parameter should be a function that looks like this:
 	 * function( PermissionLevel level) {...}; 
 	 */
-	export function getPermissionLevel(callback: (level: string) => void): void;
+    export function getPermissionLevel(callback: (level: string) => void): void;
 }
 
 ////////////////////
@@ -4845,27 +4845,27 @@ declare module chrome.notifications {
  */
 declare module chrome.omnibox {
 	/** A suggest result. */
-	interface SuggestResult {
+    interface SuggestResult {
 		/** The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry. */
-		content: string;
+        content: string;
 		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. You must escape the five predefined entities to display them as text: stackoverflow.com/a/1091953/89484 */
-		description: string;
-	}
+        description: string;
+    }
 
-	interface Suggestion {
+    interface Suggestion {
 		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. */
-		description: string;
-	}
+        description: string;
+    }
 
-	interface OmniboxInputEnteredEvent extends chrome.events.Event {
+    interface OmniboxInputEnteredEvent extends chrome.events.Event {
 		/**
 		 * The callback parameter should be a function that looks like this: 
 		 * function(string text, OnInputEnteredDisposition disposition) {...}; 
 		 */
-		addListener(callback: (text: string) => void): void;
-	}
+        addListener(callback: (text: string) => void): void;
+    }
 
-	interface OmniboxInputChangedEvent extends chrome.events.Event {
+    interface OmniboxInputChangedEvent extends chrome.events.Event {
 		/**
 		 * The callback parameter should be a function that looks like this: 
 		 * function(string text, function suggest) {...};
@@ -4873,39 +4873,39 @@ declare module chrome.omnibox {
 		 * The suggest parameter should be a function that looks like this:
 		 * function(array of SuggestResult suggestResults) {...}; 
 		 */
-		addListener(callback: (text: string, suggest: (suggestResults: SuggestResult[]) => void) => void): void;
-	}
+        addListener(callback: (text: string, suggest: (suggestResults: SuggestResult[]) => void) => void): void;
+    }
 
-	interface OmniboxInputStartedEvent extends chrome.events.Event {
+    interface OmniboxInputStartedEvent extends chrome.events.Event {
 		/** 
 		 * The callback parameter should be a function that looks like this: 
 		 * function() {...}; 
 		 */
 		addListener(callback: () => void): void;
-	}
+    }
 
-	interface OmniboxInputCancelledEvent extends chrome.events.Event {
+    interface OmniboxInputCancelledEvent extends chrome.events.Event {
 		/**
 		 * The callback parameter should be a function that looks like this: 
 		 * function() {...}; 
 		 */
 		addListener(callback: () => void): void;
-	}
+    }
 
 	/**
 	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar. 
 	 * @param suggestion A partial SuggestResult object, without the 'content' parameter. 
 	 */
-	export function setDefaultSuggestion(suggestion: Suggestion): void;
+    export function setDefaultSuggestion(suggestion: Suggestion): void;
 
 	/** User has accepted what is typed into the omnibox. */
-	var onInputEntered: OmniboxInputEnteredEvent;
+    var onInputEntered: OmniboxInputEnteredEvent;
 	/** User has changed what is typed into the omnibox. */
-	var onInputChanged: OmniboxInputChangedEvent;
+    var onInputChanged: OmniboxInputChangedEvent;
 	/** User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events. */
-	var onInputStarted: OmniboxInputStartedEvent;
+    var onInputStarted: OmniboxInputStartedEvent;
 	/** User has ended the keyword input session without accepting the input. */
-	var onInputCancelled: OmniboxInputCancelledEvent;
+    var onInputCancelled: OmniboxInputCancelledEvent;
 }
 
 ////////////////////
@@ -4917,81 +4917,81 @@ declare module chrome.omnibox {
  * @since Chrome 5.
  */
 declare module chrome.pageAction {
-	interface PageActionClickedEvent extends chrome.events.Event {
+    interface PageActionClickedEvent extends chrome.events.Event {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( tabs.Tab tab) {...}; 
 		 */
-		addListener(callback: (tab: chrome.tabs.Tab) => void): void;
-	}
+        addListener(callback: (tab: chrome.tabs.Tab) => void): void;
+    }
 
-	interface TitleDetails {
+    interface TitleDetails {
 		/** The id of the tab for which you want to modify the page action. */
-		tabId: number;
+        tabId: number;
 		/** The tooltip string. */
-		title: string;
-	}
+        title: string;
+    }
 
-	interface GetDetails {
+    interface GetDetails {
 		/** Specify the tab to get the title from. */
-		tabId: number;
-	}
+        tabId: number;
+    }
 
-	interface PopupDetails {
+    interface PopupDetails {
 		/** The id of the tab for which you want to modify the page action. */
-		tabId: number;
+        tabId: number;
 		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
-		popup: string;
-	}
+        popup: string;
+    }
 
-	interface IconDetails {
+    interface IconDetails {
 		/** The id of the tab for which you want to modify the page action. */
-		tabId: number;
+        tabId: number;
 		/**
 		 * Optional.
 		 * @deprecated This argument is ignored. 
 		 */
-		iconIndex?: number;
+        iconIndex?: number;
 		/**
 		 * Optional.
 		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}' 
 		 */
-		imageData?: ImageData;
+        imageData?: ImageData;
 		/**
 		 * Optional.
 		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}' 
 		 */
-		path?: any;
-	}
+        path?: any;
+    }
 
 	/**
 	 * Shows the page action. The page action is shown whenever the tab is selected. 
 	 * @param tabId The id of the tab for which you want to modify the page action. 
 	 */
-	export function hide(tabId: number): void;
+    export function hide(tabId: number): void;
 	/**
 	 * Shows the page action. The page action is shown whenever the tab is selected. 
 	 * @param tabId The id of the tab for which you want to modify the page action. 
 	 */
-	export function show(tabId: number): void;
+    export function show(tabId: number): void;
 	/** Sets the title of the page action. This is displayed in a tooltip over the page action. */
-	export function setTitle(details: TitleDetails): void;
+    export function setTitle(details: TitleDetails): void;
 	/** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
-	export function setPopup(details: PopupDetails): void;
+    export function setPopup(details: PopupDetails): void;
 	/**
 	 * Gets the title of the page action. 
 	 * @since Chrome 19.
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(string result) {...};
 	 */
-	export function getTitle(details: GetDetails, callback: (result: string) => void): void;
+    export function getTitle(details: GetDetails, callback: (result: string) => void): void;
 	/**
 	 * Gets the html document set as the popup for this page action. 
 	 * @since Chrome 19.
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function(string result) {...}; 
 	 */
-	export function getPopup(details: GetDetails, callback: (result: string) => void): void;
+    export function getPopup(details: GetDetails, callback: (result: string) => void): void;
 	/**
 	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
@@ -5000,7 +5000,7 @@ declare module chrome.pageAction {
 	export function setIcon(details: IconDetails, callback?: () => void): void;
 
 	/** Fired when a page action icon is clicked. This event will not fire if the page action has a popup. */
-	var onClicked: PageActionClickedEvent;
+    var onClicked: PageActionClickedEvent;
 }
 
 ////////////////////
@@ -5012,10 +5012,10 @@ declare module chrome.pageAction {
  * @since Chrome 18.
  */
 declare module chrome.pageCapture {
-	interface SaveDetails {
+    interface SaveDetails {
 		/** The id of the tab to save as MHTML. */
-		tabId: number;
-	}
+        tabId: number;
+    }
 
 	/**
 	 * Saves the content of the tab with given id as MHTML. 
@@ -5024,7 +5024,7 @@ declare module chrome.pageCapture {
 	 * function(binary mhtmlData) {...};
 	 * Parameter mhtmlData: The MHTML data as a Blob.  
 	 */
-	export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
+    export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
 }
 
 ////////////////////
@@ -5035,36 +5035,36 @@ declare module chrome.pageCapture {
  * @since Chrome 16.
  */
 declare module chrome.permissions {
-	interface Permissions {
+    interface Permissions {
 		/**
 		 * Optional.
 		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest. 
 		 */
-		origins?: string[];
+        origins?: string[];
 		/**
 		 * Optional.
 		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored. 
 		 */
-		permissions?: string[];
-	}
+        permissions?: string[];
+    }
 
-	interface PermissionsRemovedEvent {
+    interface PermissionsRemovedEvent {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( Permissions permissions) {...};
 		 * Parameter permissions: The permissions that have been removed.  
 		 */
-		addListener(callback: (permissions: Permissions) => void): void;
-	}
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
 
-	interface PermissionsAddedEvent {
+    interface PermissionsAddedEvent {
 		/**
 		 * @param callback The callback parameter should be a function that looks like this: 
 		 * function( Permissions permissions) {...};
 		 * Parameter permissions: The newly acquired permissions.  
 		 */
-		addListener(callback: (permissions: Permissions) => void): void;
-	}
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
 
 	/**
 	 * Checks if the extension has the specified permissions. 
@@ -5072,33 +5072,33 @@ declare module chrome.permissions {
 	 * function(boolean result) {...};
 	 * Parameter result: True if the extension has the specified permissions.  
 	 */
-	export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
 	/**
 	 * Gets the extension's current set of permissions. 
 	 * @param callback The callback parameter should be a function that looks like this: 
 	 * function( Permissions permissions) {...};
 	 * Parameter permissions: The extension's active permissions.  
 	 */
-	export function getAll(callback: (permissions: Permissions) => void): void;
+    export function getAll(callback: (permissions: Permissions) => void): void;
 	/**
 	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(boolean granted) {...};
 	 * Parameter granted: True if the user granted the specified permissions.  
 	 */
-	export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
 	/**
 	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set. 
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
 	 * function(boolean removed) {...};
 	 * Parameter removed: True if the permissions were removed.  
 	 */
-	export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
 	/** Fired when access to permissions has been removed from the extension. */
-	var onRemoved: PermissionsRemovedEvent;
+    var onRemoved: PermissionsRemovedEvent;
 	/** Fired when the extension acquires new permissions. */
-	var onAdded: PermissionsAddedEvent;
+    var onAdded: PermissionsAddedEvent;
 }
 
 ////////////////////
@@ -5296,45 +5296,45 @@ declare module chrome.printerProvider {
  * @since Chrome 18.
  */
 declare module chrome.privacy {
-	interface Services {
+    interface Services {
 		/** since Chrome 20. */
-		spellingServiceEnabled: chrome.types.ChromeSetting;
-		searchSuggestEnabled: chrome.types.ChromeSetting;
-		instantEnabled: chrome.types.ChromeSetting;
-		alternateErrorPagesEnabled: chrome.types.ChromeSetting;
-		safeBrowsingEnabled: chrome.types.ChromeSetting;
-		autofillEnabled: chrome.types.ChromeSetting;
-		translationServiceEnabled: chrome.types.ChromeSetting;
+        spellingServiceEnabled: chrome.types.ChromeSetting;
+        searchSuggestEnabled: chrome.types.ChromeSetting;
+        instantEnabled: chrome.types.ChromeSetting;
+        alternateErrorPagesEnabled: chrome.types.ChromeSetting;
+        safeBrowsingEnabled: chrome.types.ChromeSetting;
+        autofillEnabled: chrome.types.ChromeSetting;
+        translationServiceEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 38. */
 		passwordSavingEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 42. */
 		hotwordSearchEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 42. */
 		safeBrowsingExtendedReportingEnabled: chrome.types.ChromeSetting;
-	}
+    }
 
-	interface Network {
-		networkPredictionEnabled: chrome.types.ChromeSetting;
+    interface Network {
+        networkPredictionEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 42. */
 		webRTCMultipleRoutesEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 47. Warning: this is the current Dev channel. */
 		webRTCNonProxiedUdpEnabled: chrome.types.ChromeSetting;
-	}
+    }
 
-	interface Websites {
-		thirdPartyCookiesAllowed: chrome.types.ChromeSetting;
-		referrersEnabled: chrome.types.ChromeSetting;
-		hyperlinkAuditingEnabled: chrome.types.ChromeSetting;
+    interface Websites {
+        thirdPartyCookiesAllowed: chrome.types.ChromeSetting;
+        referrersEnabled: chrome.types.ChromeSetting;
+        hyperlinkAuditingEnabled: chrome.types.ChromeSetting;
 		/** @since Chrome 21. */
-		protectedContentEnabled: chrome.types.ChromeSetting;
-	}
+        protectedContentEnabled: chrome.types.ChromeSetting;
+    }
 
 	/** Settings that enable or disable features that require third-party network services provided by Google and your default search provider. */
-	var services: Services;
+    var services: Services;
 	/** Settings that influence Chrome's handling of network connections in general. */
-	var network: Network;
+    var network: Network;
 	/** Settings that determine what information Chrome makes available to websites. */
-	var websites: Websites;
+    var websites: Websites;
 }
 
 ////////////////////
@@ -5347,21 +5347,21 @@ declare module chrome.privacy {
  */
 declare module chrome.proxy {
     /** An object holding proxy auto-config information. Exactly one of the fields should be non-empty. */
-	interface PacScript {
+    interface PacScript {
         /** Optional. URL of the PAC file to be used. */
-		url?: string;
+        url?: string;
         /** Optional. If true, an invalid PAC script will prevent the network stack from falling back to direct connections. Defaults to false. */
-		mandatory?: boolean;
+        mandatory?: boolean;
         /** Optional. A PAC script. */
-		data?: string;
-	}
+        data?: string;
+    }
 
     /** An object encapsulating a complete proxy configuration. */
-	interface ProxyConfig {
+    interface ProxyConfig {
         /** Optional. The proxy rules describing this configuration. Use this for 'fixed_servers' mode. */
-		rules?: ProxyRules;
+        rules?: ProxyRules;
         /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
-		pacScript?: PacScript;
+        pacScript?: PacScript;
         /** 
          * 'direct' = Never use a proxy
          * 'auto_detect' = Auto detect proxy settings
@@ -5369,55 +5369,55 @@ declare module chrome.proxy {
          * 'fixed_servers' = Manually specify proxy servers
          * 'system' = Use system proxy settings 
          */
-		mode: string;
-	}
+        mode: string;
+    }
 
     /** An object encapsulating a single proxy server's specification. */
-	interface ProxyServer {
+    interface ProxyServer {
         /** The URI of the proxy server. This must be an ASCII hostname (in Punycode format). IDNA is not supported, yet. */
-		host: string;
+        host: string;
         /** Optional. The scheme (protocol) of the proxy server itself. Defaults to 'http'. */
-		scheme?: string;
+        scheme?: string;
         /** Optional. The port of the proxy server. Defaults to a port that depends on the scheme. */
-		port?: number;
-	}
+        port?: number;
+    }
 
     /** An object encapsulating the set of proxy rules for all protocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHttps', 'proxyForFtp' and 'fallbackProxy'. */
-	interface ProxyRules {
+    interface ProxyRules {
         /** Optional. The proxy server to be used for FTP requests. */
-		proxyForFtp?: ProxyServer;
+        proxyForFtp?: ProxyServer;
         /** Optional. The proxy server to be used for HTTP requests. */
-		proxyForHttp?: ProxyServer;
+        proxyForHttp?: ProxyServer;
         /** Optional. The proxy server to be used for everthing else or if any of the specific proxyFor... is not specified. */
 		fallbackProxy?: ProxyServer;
         /** Optional. The proxy server to be used for all per-URL requests (that is http, https, and ftp). */
-		singleProxy?: ProxyServer;
+        singleProxy?: ProxyServer;
         /** Optional. The proxy server to be used for HTTPS requests. */
-		proxyForHttps?: ProxyServer;
+        proxyForHttps?: ProxyServer;
         /** Optional. List of servers to connect to without a proxy server. */
-		bypassList?: string[];
-	}
+        bypassList?: string[];
+    }
 
-	interface ErrorDetails {
+    interface ErrorDetails {
         /** Additional details about the error such as a JavaScript runtime error. */
-		details: string;
+        details: string;
         /** The error description. */
-		error: string;
+        error: string;
         /** If true, the error was fatal and the network transaction was aborted. Otherwise, a direct connection is used instead. */
-		fatal: boolean;
-	}
+        fatal: boolean;
+    }
 
-	interface ProxyErrorEvent extends chrome.events.Event {
+    interface ProxyErrorEvent extends chrome.events.Event {
         /**
          * @param callback The callback parameter should be a function that looks like this: 
          * function(object details) {...}; 
          */
-		addListener(callback: (details: ErrorDetails) => void): void;
-	}
+        addListener(callback: (details: ErrorDetails) => void): void;
+    }
 
-	var settings: chrome.types.ChromeSetting;
+    var settings: chrome.types.ChromeSetting;
     /** Notifies about proxy errors. */
-	var onProxyError: ProxyErrorEvent;
+    var onProxyError: ProxyErrorEvent;
 }
 
 ////////////////////
@@ -5429,186 +5429,186 @@ declare module chrome.proxy {
  */
 declare module chrome.runtime {
     /** This will be defined during an API method callback if there was an error */
-	var lastError: LastError;
+    var lastError: LastError;
     /** The ID of the extension/app. */
-	var id: string;
+    var id: string;
 
-	interface LastError {
+    interface LastError {
         /** Optional. Details about the error which occurred.  */
-		message?: string;
-	}
+        message?: string;
+    }
 
-	interface ConnectInfo {
-		name?: string;
-	}
+    interface ConnectInfo {
+        name?: string;
+    }
 
-	interface InstalledDetails {
+    interface InstalledDetails {
 		/**
 		 * The reason that this event is being dispatched. 
 		 * One of: "install", "update", "chrome_update", or "shared_module_update" 
 		 */
-		reason: string;
+        reason: string;
 		/**
 		 * Optional.
 		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'. 
 		 */
-		previousVersion?: string;
+        previousVersion?: string;
 		/**
 		 * Optional.
 		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'. 
 		 * @since Chrome 29.
 		 */
 		id?: string;
-	}
+    }
 
-	interface MessageOptions {
+    interface MessageOptions {
         /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-		includeTlsChannelId?: boolean;
-	}
+        includeTlsChannelId?: boolean;
+    }
 
     /**
      * An object containing information about the script context that sent a message or request.
      * @since Chrome 26.
      */
-	interface MessageSender {
+    interface MessageSender {
         /** The ID of the extension or app that opened the connection, if any. */
-		id?: string;
+        id?: string;
         /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
-		tab?: chrome.tabs.Tab;
+        tab?: chrome.tabs.Tab;
         /**
          * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set. 
          * @since Chrome 41.
          */
-		frameId?: number;
+        frameId?: number;
         /**
          * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it. 
          * @since Chrome 28.
          */
-		url?: string;
+        url?: string;
         /**
          * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available. 
          * @since Chrome 32.
          */
-		tlsChannelId?: string;
-	}
+        tlsChannelId?: string;
+    }
 
     /**
      * An object containing information about the current platform.
      * @since Chrome 36.
      */
-	interface PlatformInfo {
+    interface PlatformInfo {
         /** 
          * The operating system chrome is running on.
          * One of: "mac", "win", "android", "cros", "linux", or "openbsd" 
          */
-		os: string;
+        os: string;
         /**
          * The machine's processor architecture. 
          * One of: "arm", "x86-32", or "x86-64" 
          */
-		arch: string;
+        arch: string;
         /**
          * The native client architecture. This may be different from arch on some platforms. 
          * One of: "arm", "x86-32", or "x86-64" 
          */
-		nacl_arch: string;
-	}
+        nacl_arch: string;
+    }
 
     /**
      * An object which allows two way communication with other pages.
      * @since Chrome 26.
      */
-	interface Port {
-		postMessage: (message: Object) => void;
-		disconnect: () => void;
+    interface Port {
+        postMessage: (message: Object) => void;
+        disconnect: () => void;
         /**
          * Optional.
          * This property will only be present on ports passed to onConnect/onConnectExternal listeners. 
          */
-		sender?: MessageSender;
+        sender?: MessageSender;
         /** An object which allows the addition and removal of listeners for a Chrome event. */
-		onDisconnect: chrome.events.Event;
+        onDisconnect: chrome.events.Event;
         /** An object which allows the addition and removal of listeners for a Chrome event. */
-		onMessage: PortMessageEvent;
-		name: string;
-	}
+        onMessage: PortMessageEvent;
+        name: string;
+    }
 
-	interface UpdateAvailableDetails {
+    interface UpdateAvailableDetails {
 		/** The version number of the available update. */
-		version: string;
-	}
+        version: string;
+    }
 
-	interface UpdateCheckDetails {
+    interface UpdateCheckDetails {
         /** The version of the available update. */
-		version: string;
-	}
+        version: string;
+    }
 
-	interface PortMessageEvent extends chrome.events.Event {
-		addListener(callback: (message: Object, port: Port) => void): void;
-	}
+    interface PortMessageEvent extends chrome.events.Event {
+        addListener(callback: (message: Object, port: Port) => void): void;
+    }
 
-	interface ExtensionMessageEvent extends chrome.events.Event {
+    interface ExtensionMessageEvent extends chrome.events.Event {
 		/**
 		 * @param callback
 		 * Optional parameter message: The message sent by the calling script. 
 		 * Parameter sendResponse: Function to call (at most once) when you have a response. The argument should be any JSON-ifiable object. If you have more than one onMessage listener in the same document, then only one may send a response. This function becomes invalid when the event listener returns, unless you return true from the event listener to indicate you wish to send a response asynchronously (this will keep the message channel open to the other end until sendResponse is called). 
 		 */
-		addListener(callback: (message: any, sender: MessageSender, sendResponse: Function) => void): void;
-	}
+        addListener(callback: (message: any, sender: MessageSender, sendResponse: Function) => void): void;
+    }
 
-	interface ExtensionConnectEvent extends chrome.events.Event {
-		addListener(callback: (port: Port) => void): void;
-	}
+    interface ExtensionConnectEvent extends chrome.events.Event {
+        addListener(callback: (port: Port) => void): void;
+    }
 
-	interface RuntimeInstalledEvent extends chrome.events.Event {
-		addListener(callback: (details: InstalledDetails) => void): void;
-	}
+    interface RuntimeInstalledEvent extends chrome.events.Event {
+        addListener(callback: (details: InstalledDetails) => void): void;
+    }
 
 	interface RuntimeEvent extends chrome.events.Event {
 		addListener(callback: () => void): void;
-	}
+    }
 
-	interface RuntimeRestartRequiredEvent extends chrome.events.Event {
+    interface RuntimeRestartRequiredEvent extends chrome.events.Event {
 		/**
 		 * @param callback
 		 * Parameter reason: The reason that the event is being dispatched. One of: "app_update", "os_update", or "periodic" 
 		 */
-		addListener(callback: (reason: string) => void): void;
-	}
+        addListener(callback: (reason: string) => void): void;
+    }
 
-	interface RuntimeUpdateAvailableEvent extends chrome.events.Event {
+    interface RuntimeUpdateAvailableEvent extends chrome.events.Event {
 		/**
 		 * @param callback 
 		 * Parameter details: The manifest details of the available update. 
 		 */
-		addListener(callback: (details: UpdateAvailableDetails) => void): void;
-	}
+        addListener(callback: (details: UpdateAvailableDetails) => void): void;
+    }
 
     /**
      * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
      * @since Chrome 26.
      */
-	export function connect(connectInfo?: ConnectInfo): Port;
+    export function connect(connectInfo?: ConnectInfo): Port;
 	/**
      * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
      * @since Chrome 26.
      * @param extensionId Optional.
      * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging. 
      */
-	export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
     /**
      * Connects to a native application in the host machine. 
      * @since Chrome 28.
      * @param application The name of the registered application to connect to. 
      */
-	export function connectNative(application: string): Port;
+    export function connectNative(application: string): Port;
     /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
-	export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
     /**
      * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file. 
      * @returns The manifest details.
      */
-	export function getManifest(): Object;
+    export function getManifest(): Object;
     /**
      * Returns a DirectoryEntry for the package directory. 
      * @since Chrome 29.
@@ -5619,17 +5619,17 @@ declare module chrome.runtime {
      * @since Chrome 29.
      * @param callback Called with results  
      */
-	export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
     /**
      * Converts a relative path within an app/extension install directory to a fully-qualified URL. 
      * @param path A path to a resource within an app/extension expressed relative to its install directory. 
      */
-	export function getURL(path: string): string;
+    export function getURL(path: string): string;
     /**
      * Reloads the app or extension. 
      * @since Chrome 25.
      */
-	export function reload(): void;
+    export function reload(): void;
     /**
      * Requests an update check for this app/extension. 
      * @since Chrome 25.
@@ -5637,26 +5637,26 @@ declare module chrome.runtime {
      * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available" 
      * Optional parameter details: If an update is available, this contains more information about the available update. 
      */
-	export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
     /**
      * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op. 
      * @since Chrome 32.
      */
-	export function restart(): void;
+    export function restart(): void;
 	/**
      * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
      * @since Chrome 26.
      * @param responseCallback Optional
      * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
      */
-	export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
 	/**
      * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
      * @since Chrome 32.
      * @param responseCallback Optional
      * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
      */
-	export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
 	/**
      * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
      * @since Chrome 26.
@@ -5664,7 +5664,7 @@ declare module chrome.runtime {
      * @param responseCallback Optional
      * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
      */
-	export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
+    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
     /**
      * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
      * @since Chrome 32.
@@ -5672,7 +5672,7 @@ declare module chrome.runtime {
      * @param responseCallback Optional
      * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
      */
-	export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
     /**
      * Send a single message to a native application. 
      * @since Chrome 28.
@@ -5702,7 +5702,7 @@ declare module chrome.runtime {
 	 * Fired when a connection is made from either an extension process or a content script. 
 	 * @since Chrome 26.
 	 */
-	var onConnect: ExtensionConnectEvent;
+    var onConnect: ExtensionConnectEvent;
 	/**
 	 * Fired when a connection is made from another extension. 
 	 * @since Chrome 26.
@@ -5716,14 +5716,14 @@ declare module chrome.runtime {
 	 */
 	var onStartup: RuntimeEvent;
 	/** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-	var onInstalled: RuntimeInstalledEvent;
+    var onInstalled: RuntimeInstalledEvent;
 	/** Sent after onSuspend to indicate that the app won't be unloaded after all. */
 	var onSuspendCanceled: RuntimeEvent;
 	/**
 	 * Fired when a message is sent from either an extension process or a content script. 
 	 * @since Chrome 26.
 	 */
-	var onMessage: ExtensionMessageEvent;
+    var onMessage: ExtensionMessageEvent;
 	/**
 	 * Fired when a message is sent from another extension/app. Cannot be used in a content script. 
 	 * @since Chrome 26.
@@ -5733,12 +5733,12 @@ declare module chrome.runtime {
 	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps. 
 	 * @since Chrome 29.
 	 */
-	var onRestartRequired: RuntimeRestartRequiredEvent;
+    var onRestartRequired: RuntimeRestartRequiredEvent;
 	/**
 	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event. 
 	 * @since Chrome 25.
 	 */
-	var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+    var onUpdateAvailable: RuntimeUpdateAvailableEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
 	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required. 
@@ -5750,28 +5750,28 @@ declare module chrome.runtime {
 // Script Badge
 ////////////////////
 declare module chrome.scriptBadge {
-	interface GetPopupDetails {
-		tabId: number;
-	}
+    interface GetPopupDetails {
+        tabId: number;
+    }
 
-	interface AttentionDetails {
-		tabId: number;
-	}
+    interface AttentionDetails {
+        tabId: number;
+    }
 
-	interface SetPopupDetails {
-		tabId: number;
-		popup: string;
-	}
+    interface SetPopupDetails {
+        tabId: number;
+        popup: string;
+    }
 
-	interface ScriptBadgeClickedEvent extends chrome.events.Event {
-		addListener(callback: (tab: chrome.tabs.Tab) => void): void;
-	}
+    interface ScriptBadgeClickedEvent extends chrome.events.Event {
+        addListener(callback: (tab: chrome.tabs.Tab) => void): void;
+    }
 
-	export function getPopup(details: GetPopupDetails, callback: Function): void;
-	export function getAttention(details: AttentionDetails): void;
-	export function setPopup(details: SetPopupDetails): void;
+    export function getPopup(details: GetPopupDetails, callback: Function): void;
+    export function getAttention(details: AttentionDetails): void;
+    export function setPopup(details: SetPopupDetails): void;
 
-	var onClicked: ScriptBadgeClickedEvent;
+    var onClicked: ScriptBadgeClickedEvent;
 }
 
 ////////////////////
@@ -5866,13 +5866,13 @@ declare module chrome.sessions {
  * @since Chrome 20.
  */
 declare module chrome.storage {
-	interface StorageArea {
+    interface StorageArea {
 		/**
 		 * Gets the amount of space (in bytes) being used by one or more items. 
 		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
 		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
 		 */
-		getBytesInUse(callback: (bytesInUse: number) => void): void;
+        getBytesInUse(callback: (bytesInUse: number) => void): void;
 		/**
 		 * Gets the amount of space (in bytes) being used by one or more items. 
 		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage. 
@@ -5886,7 +5886,7 @@ declare module chrome.storage {
 		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
 		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
 		 */
-		getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
+        getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
 		/**
 		 * Removes all items from storage. 
 		 * @param callback Optional.
@@ -5920,7 +5920,7 @@ declare module chrome.storage {
 		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
 		 * Parameter items: Object with items in their key-value mappings. 
 		 */
-		get(callback: (items: Object) => void): void;
+        get(callback: (items: Object) => void): void;
 		/**
 		 * Gets one or more items from storage. 
 		 * @param key A single key to get. Pass in null to get the entire contents of storage. 
@@ -5934,58 +5934,58 @@ declare module chrome.storage {
 		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
 		 * Parameter items: Object with items in their key-value mappings. 
 		 */
-		get(keys: string[], callback: (items: Object) => void): void;
+        get(keys: string[], callback: (items: Object) => void): void;
 		/**
 		 * Gets one or more items from storage. 
 		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage. 
 		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
 		 * Parameter items: Object with items in their key-value mappings. 
 		 */
-		get(keys: Object, callback: (items: Object) => void): void;
-	}
+        get(keys: Object, callback: (items: Object) => void): void;
+    }
 
-	interface StorageChange {
+    interface StorageChange {
 		/** Optional. The new value of the item, if there is a new value. */
-		newValue?: any;
+        newValue?: any;
 		/** Optional. The old value of the item, if there was an old value. */
-		oldValue?: any;
-	}
+        oldValue?: any;
+    }
 
 	interface LocalStorageArea extends StorageArea {
 		/** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-		QUOTA_BYTES: number;
-	}
+        QUOTA_BYTES: number;
+    }
 
 	interface SyncStorageArea extends StorageArea {
 		/** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-		MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+        MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
 		/** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-		QUOTA_BYTES: number;
+        QUOTA_BYTES: number;
 		/** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-		QUOTA_BYTES_PER_ITEM: number;
+        QUOTA_BYTES_PER_ITEM: number;
 		/** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-		MAX_ITEMS: number;
+        MAX_ITEMS: number;
 		/**
 		 * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
 		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
 		 */
-		MAX_WRITE_OPERATIONS_PER_HOUR: number;
+        MAX_WRITE_OPERATIONS_PER_HOUR: number;
 		/**
 		 * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
 		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
 		 * @since Chrome 40.
 		 */
 		MAX_WRITE_OPERATIONS_PER_MINUTE: number;
-	}
+    }
 
-	interface StorageChangedEvent extends chrome.events.Event {
+    interface StorageChangedEvent extends chrome.events.Event {
 		/**
 		 * @param callback
 		 * Parameter changes: Object mapping each key that changed to its corresponding storage.StorageChange for that item. 
 		 * Parameter areaName: Since Chrome 22. The name of the storage area ("sync", "local" or "managed") the changes are for.
 		 */
-		addListener(callback: (changes: Object, areaName: string) => void): void;
-	}
+        addListener(callback: (changes: Object, areaName: string) => void): void;
+    }
 
 	/** Items in the local storage area are local to each machine. */
 	var local: LocalStorageArea;
@@ -5998,67 +5998,67 @@ declare module chrome.storage {
 	var managed: StorageArea;
 
 	/** Fired when one or more items change. */
-	var onChanged: StorageChangedEvent;
+    var onChanged: StorageChangedEvent;
 }
 
 ////////////////////
 // Socket
 ////////////////////
 declare module chrome.socket {
-	interface CreateInfo {
-		socketId: number;
-	}
+    interface CreateInfo {
+        socketId: number;
+    }
 
-	interface AcceptInfo {
-		resultCode: number;
-		socketId?: number;
-	}
+    interface AcceptInfo {
+        resultCode: number;
+        socketId?: number;
+    }
 
-	interface ReadInfo {
-		resultCode: number;
-		data: ArrayBuffer;
-	}
+    interface ReadInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+    }
 
-	interface WriteInfo {
-		bytesWritten: number;
-	}
+    interface WriteInfo {
+        bytesWritten: number;
+    }
 
-	interface RecvFromInfo {
-		resultCode: number;
-		data: ArrayBuffer;
-		port: number;
-		address: string;
-	}
+    interface RecvFromInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+        port: number;
+        address: string;
+    }
 
-	interface SocketInfo {
-		socketType: string;
-		localPort?: number;
-		peerAddress?: string;
-		peerPort?: number;
-		localAddress?: string;
-		connected: boolean;
-	}
+    interface SocketInfo {
+        socketType: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+        localAddress?: string;
+        connected: boolean;
+    }
 
-	interface NetworkInterface {
-		name: string;
-		address: string;
-	}
+    interface NetworkInterface {
+        name: string;
+        address: string;
+    }
 
-	export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-	export function destroy(socketId: number): void;
-	export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-	export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-	export function disconnect(socketId: number): void;
-	export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-	export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-	export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-	export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-	export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-	export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-	export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-	export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-	export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-	export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+    export function destroy(socketId: number): void;
+    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    export function disconnect(socketId: number): void;
+    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
 }
 
 ////////////////////
@@ -6195,23 +6195,23 @@ declare module chrome.system.storage {
  * @since Chrome 31.
  */
 declare module chrome.tabCapture {
-	interface CaptureInfo {
+    interface CaptureInfo {
 		/** The id of the tab whose status changed. */
-		tabId: number;
+        tabId: number;
 		/**
 		 * The new capture status of the tab. 
 		 * One of: "pending", "active", "stopped", or "error"
 		 */
-		status: string;
+        status: string;
 		/** Whether an element in the tab being captured is in fullscreen mode. */
-		fullscreen: boolean;
-	}
+        fullscreen: boolean;
+    }
 
-	interface CaptureOptions {
+    interface CaptureOptions {
 		/** Optional. */
-		audio?: boolean;
+        audio?: boolean;
 		/** Optional. */
-		video?: boolean;
+        video?: boolean;
 		/** Optional. */
 		audioConstraints?: MediaStreamConstraints;
 		/** Optional. */
@@ -6224,19 +6224,19 @@ declare module chrome.tabCapture {
 		 * Parameter info: CaptureInfo with new capture status for the tab. 
 		 */
 		addListener(callback: (info: CaptureInfo) => void): void;
-	}
+    }
 
 	/**
 	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension. 
 	 * @param options Configures the returned media stream.  
 	 * @param callback Callback with either the tab capture stream or null. 
 	 */
-	export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
+    export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
 	/**
 	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab). 
 	 * @param callback Callback invoked with CaptureInfo[] for captured tabs. 
 	 */
-	export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
+    export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
 	
 	/** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
 	var onStatusChanged: CaptureStatusChangedEvent;
@@ -6273,59 +6273,59 @@ declare module chrome.tabs {
 		extensionId?: string;
 	}
 
-	interface Tab {
+    interface Tab {
 		/**
 		 * Optional.
 		 * Either loading or complete. 
 		 */
-		status?: string;
+        status?: string;
 		/** The zero-based index of the tab within its window. */
-		index: number;
+        index: number;
 		/**
 		 * Optional.
 		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists. 
 		 * @since Chrome 18.
 		 */
-		openerTabId?: number;
+        openerTabId?: number;
 		/**
 		 * Optional.
 		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission. 
 		 */
-		title?: string;
+        title?: string;
 		/**
 		 * Optional.
 		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission. 
 		 */
-		url?: string;
+        url?: string;
 		/**
 		 * Whether the tab is pinned. 
 		 * @since Chrome 9.
 		 */
-		pinned: boolean;
+        pinned: boolean;
 		/**
 		 * Whether the tab is highlighted. 
 		 * @since Chrome 16.
 		 */
-		highlighted: boolean;
+        highlighted: boolean;
 		/** The ID of the window the tab is contained within. */
-		windowId: number;
+        windowId: number;
 		/**
 		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.) 
 		 * @since Chrome 16.
 		 */
-		active: boolean;
+        active: boolean;
 		/**
 		 * Optional.
 		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading. 
 		 */
-		favIconUrl?: string;
+        favIconUrl?: string;
 		/**
 		 * Optional.
 		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows. 
 		 */
 		id?: number;
 		/** Whether the tab is in an incognito window. */
-		incognito: boolean;
+        incognito: boolean;
 		/**
 		 * Whether the tab is selected. 
 		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted. 
@@ -6358,8 +6358,8 @@ declare module chrome.tabs {
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
-	}
-	
+    }
+
 	/**
 	 * Defines how zoom changes in a tab are handled and at what scope.
 	 * @since Chrome 38.
@@ -6388,97 +6388,97 @@ declare module chrome.tabs {
 		defaultZoomFactor?: number;
 	}
 
-	interface InjectDetails {
+    interface InjectDetails {
 		/**
 		 * Optional.
 		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. 
 		 */
-		allFrames?: boolean;
+        allFrames?: boolean;
 		/**
 		 * Optional. JavaScript or CSS code to inject.
 		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks. 
 		 */
-		code?: string;
+        code?: string;
 		/**
 		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab. 
 		 * One of: "document_start", "document_end", or "document_idle"
 		 * @since Chrome 20.
 		 */
-		runAt?: string;
+        runAt?: string;
 		/** Optional. JavaScript or CSS file to inject. */
-		file?: string;
+        file?: string;
 		/**
 		 * Optional.
 		 * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
 		 * @since Chrome 39. 
 		 */
 		matchAboutBlank?: boolean;
-	}
+    }
 
-	interface CreateProperties {
+    interface CreateProperties {
 		/** Optional. The position the tab should take in the window. The provided value will be clamped to between zero and the number of tabs in the window. */
-		index?: number;
+        index?: number;
 		/**
 		 * Optional.
 		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab. 
 		 * @since Chrome 18.
 		 */
-		openerTabId?: number;
+        openerTabId?: number;
 		/**
 		 * Optional.
 		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
 		 */
-		url?: string;
+        url?: string;
 		/**
 		 * Optional. Whether the tab should be pinned. Defaults to false 
 		 * @since Chrome 9.
 		 */
-		pinned?: boolean;
+        pinned?: boolean;
 		/** Optional. The window to create the new tab in. Defaults to the current window. */
-		windowId?: number;
+        windowId?: number;
 		/**
 		 * Optional.
 		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true. 
 		 * @since Chrome 16.
 		 */
-		active?: boolean;
+        active?: boolean;
 		/**
 		 * Optional. Whether the tab should become the selected tab in the window. Defaults to true
 		 * @deprecated since Chrome 33. Please use active.  
 		 */
 		selected?: boolean;
-	}
+    }
 
-	interface MoveProperties {
+    interface MoveProperties {
 		/** The position to move the window to. -1 will place the tab at the end of the window. */
-		index: number;
+        index: number;
 		/** Optional. Defaults to the window the tab is currently in. */
-		windowId?: number;
-	}
+        windowId?: number;
+    }
 
-	interface UpdateProperties {
+    interface UpdateProperties {
 		/** 
 		 * Optional. Whether the tab should be pinned. 
 		 * @since Chrome 9.
 		 */
-		pinned?: boolean;
+        pinned?: boolean;
 		/**
 		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab. 
 		 * @since Chrome 18.
 		 */
-		openerTabId?: number;
+        openerTabId?: number;
 		/** Optional. A URL to navigate the tab to. */
-		url?: string;
+        url?: string;
 		/**
 		 * Optional. Adds or removes the tab from the current selection. 
 		 * @since Chrome 16.
 		 */
-		highlighted?: boolean;
+        highlighted?: boolean;
 		/**
 		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update). 
 		 * @since Chrome 16.
 		 */
-		active?: boolean;
+        active?: boolean;
 		/**
 		 * Optional. Whether the tab should be selected. 
 		 * @deprecated since Chrome 33. Please use highlighted. 
@@ -6489,86 +6489,86 @@ declare module chrome.tabs {
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
-	}
+    }
 
-	interface CaptureVisibleTabOptions {
+    interface CaptureVisibleTabOptions {
 		/**
 		 * Optional.
 		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease. 
 		 */
-		quality?: number;
+        quality?: number;
 		/**
 		 * Optional. The format of an image. 
 		 * One of: "jpeg", or "png"
 		 */
-		format?: string;
-	}
+        format?: string;
+    }
 
-	interface ReloadProperties {
+    interface ReloadProperties {
 		/** Optional. Whether using any local cache. Default is false. */
-		bypassCache?: boolean;
-	}
+        bypassCache?: boolean;
+    }
 
-	interface ConnectInfo {
+    interface ConnectInfo {
 		/** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
-		name?: string;
+        name?: string;
 		/**
 		 * Open a port to a specific frame identified by frameId instead of all frames in the tab. 
 		 * @since Chrome 41.
 		 */
 		frameId?: number;
-	}
+    }
 
 	interface MessageSendOptions {
 		/** Optional. Send a message to a specific frame identified by frameId instead of all frames in the tab. */
 		frameId?: number;
 	}
 
-	interface HighlightInfo {
+    interface HighlightInfo {
 		/** One or more tab indices to highlight. */
 		tabs: number | number[];
 		/** Optional. The window that contains the tabs. */
-		windowId?: number;
-	}
+        windowId?: number;
+    }
 
-	interface QueryInfo {
+    interface QueryInfo {
 		/**
 		 * Optional. Whether the tabs have completed loading.
 		 * One of: "loading", or "complete"  
 		 */
-		status?: string;
+        status?: string;
 		/**
 		 * Optional. Whether the tabs are in the last focused window. 
 		 * @since Chrome 19.
 		 */
-		lastFocusedWindow?: boolean;
+        lastFocusedWindow?: boolean;
 		/** Optional. The ID of the parent window, or windows.WINDOW_ID_CURRENT for the current window. */
-		windowId?: number;
+        windowId?: number;
 		/**
 		 * Optional. The type of window the tabs are in. 
 		 * One of: "normal", "popup", "panel", "app", or "devtools" 
 		 */
-		windowType?: string;
+        windowType?: string;
 		/** Optional. Whether the tabs are active in their windows. */
-		active?: boolean;
+        active?: boolean;
 		/**
 		 * Optional. The position of the tabs within their windows. 
 		 * @since Chrome 18.
 		 */
-		index?: number;
+        index?: number;
 		/** Optional. Match page titles against a pattern. */
-		title?: string;
+        title?: string;
 		/** Optional. Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
-		url?: string | string[];
+        url?: string | string[];
 		/**
 		 * Optional. Whether the tabs are in the current window. 
 		 * @since Chrome 19.
 		 */
-		currentWindow?: boolean;
+        currentWindow?: boolean;
 		/** Optional. Whether the tabs are highlighted. */
-		highlighted?: boolean;
+        highlighted?: boolean;
 		/** Optional. Whether the tabs are pinned. */
-		pinned?: boolean;
+        pinned?: boolean;
 		/**
 		 * Optional. Whether the tabs are audible. 
 		 * @since Chrome 45.
@@ -6579,38 +6579,38 @@ declare module chrome.tabs {
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
-	}
+    }
 
-	interface TabHighlightInfo {
-		windowId: number;
-		tabIds: number[];
-	}
+    interface TabHighlightInfo {
+        windowId: number;
+        tabIds: number[];
+    }
 
-	interface TabRemoveInfo {
+    interface TabRemoveInfo {
 		/**
 		 * The window whose tab is closed. 
 		 * @since Chrome 25.
 		 */
-		windowId: number;
+        windowId: number;
 		/** True when the tab is being closed because its window is being closed. */
-		isWindowClosing: boolean;
-	}
+        isWindowClosing: boolean;
+    }
 
-	interface TabAttachInfo {
-		newPosition: number;
-		newWindowId: number;
-	}
+    interface TabAttachInfo {
+        newPosition: number;
+        newWindowId: number;
+    }
 
-	interface TabChangeInfo {
+    interface TabChangeInfo {
 		/** Optional. The status of the tab. Can be either loading or complete. */
-		status?: string;
+        status?: string;
 		/**
 		 * The tab's new pinned state. 
 		 * @since Chrome 9.
 		 */
-		pinned?: boolean;
+        pinned?: boolean;
 		/** Optional. The tab's URL if it has changed. */
-		url?: string;
+        url?: string;
 		/**
 		 * The tab's new audible state. 
 		 * @since Chrome 45.
@@ -6626,25 +6626,25 @@ declare module chrome.tabs {
 		 * @since Chrome 27.
 		 */
 		faviconUrl?: string;
-	}
+    }
 
-	interface TabMoveInfo {
-		toIndex: number;
-		windowId: number;
-		fromIndex: number;
-	}
+    interface TabMoveInfo {
+        toIndex: number;
+        windowId: number;
+        fromIndex: number;
+    }
 
-	interface TabDetachInfo {
-		oldWindowId: number;
-		oldPosition: number;
-	}
+    interface TabDetachInfo {
+        oldWindowId: number;
+        oldPosition: number;
+    }
 
-	interface TabActiveInfo {
+    interface TabActiveInfo {
 		/** The ID of the tab that has become active. */
-		tabId: number;
+        tabId: number;
 		/** The ID of the window the active tab changed inside of. */
-		windowId: number;
-	}
+        windowId: number;
+    }
 
 	interface TabWindowInfo {
 		/** The ID of the window of where the tab is located. */
@@ -6658,50 +6658,50 @@ declare module chrome.tabs {
 		zoomSettings: ZoomSettings;
 	}
 
-	interface TabHighlightedEvent extends chrome.events.Event {
-		addListener(callback: (highlightInfo: HighlightInfo) => void): void;
-	}
+    interface TabHighlightedEvent extends chrome.events.Event {
+        addListener(callback: (highlightInfo: HighlightInfo) => void): void;
+    }
 
-	interface TabRemovedEvent extends chrome.events.Event {
-		addListener(callback: (tabId: number, removeInfo: TabRemoveInfo) => void): void;
-	}
+    interface TabRemovedEvent extends chrome.events.Event {
+        addListener(callback: (tabId: number, removeInfo: TabRemoveInfo) => void): void;
+    }
 
-	interface TabUpdatedEvent extends chrome.events.Event {
+    interface TabUpdatedEvent extends chrome.events.Event {
 		/**
 		 * @param callback
 		 * Parameter changeInfo: Lists the changes to the state of the tab that was updated. 
 		 * Parameter tab: Gives the state of the tab that was updated. 
 		 */
-		addListener(callback: (tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void): void;
-	}
+        addListener(callback: (tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void): void;
+    }
 
-	interface TabAttachedEvent extends chrome.events.Event {
-		addListener(callback: (tabId: number, attachInfo: TabAttachInfo) => void): void;
-	}
+    interface TabAttachedEvent extends chrome.events.Event {
+        addListener(callback: (tabId: number, attachInfo: TabAttachInfo) => void): void;
+    }
 
-	interface TabMovedEvent extends chrome.events.Event {
-		addListener(callback: (tabId: number, moveInfo: TabMoveInfo) => void): void;
-	}
+    interface TabMovedEvent extends chrome.events.Event {
+        addListener(callback: (tabId: number, moveInfo: TabMoveInfo) => void): void;
+    }
 
-	interface TabDetachedEvent extends chrome.events.Event {
-		addListener(callback: (tabId: number, detachInfo: TabDetachInfo) => void): void;
-	}
+    interface TabDetachedEvent extends chrome.events.Event {
+        addListener(callback: (tabId: number, detachInfo: TabDetachInfo) => void): void;
+    }
 
-	interface TabCreatedEvent extends chrome.events.Event {
+    interface TabCreatedEvent extends chrome.events.Event {
 		/**
 		 * @param callback 
 		 * Parameter tab: Details of the tab that was created. 
 		 */
-		addListener(callback: (tab: Tab) => void): void;
-	}
+        addListener(callback: (tab: Tab) => void): void;
+    }
 
-	interface TabActivatedEvent extends chrome.events.Event {
-		addListener(callback: (activeInfo: TabActiveInfo) => void): void;
-	}
+    interface TabActivatedEvent extends chrome.events.Event {
+        addListener(callback: (activeInfo: TabActiveInfo) => void): void;
+    }
 
-	interface TabReplacedEvent extends chrome.events.Event {
-		addListener(callback: (addedTabId: number, removedTabId: number) => void): void;
-	}
+    interface TabReplacedEvent extends chrome.events.Event {
+        addListener(callback: (addedTabId: number, removedTabId: number) => void): void;
+    }
 
 	interface TabSelectedEvent extends chrome.events.Event {
 		addListener(callback: (tabId: number, selectInfo: TabWindowInfo) => void): void;
@@ -6717,7 +6717,7 @@ declare module chrome.tabs {
 	 * @param callback Optional. Called after all the JavaScript has been executed.
 	 * Parameter result: The result of the script in every injected frame.  
 	 */
-	export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
+    export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
 	/**
 	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc. 
 	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window. 
@@ -6725,9 +6725,9 @@ declare module chrome.tabs {
 	 * @param callback Optional. Called after all the JavaScript has been executed.
 	 * Parameter result: The result of the script in every injected frame.  
 	 */
-	export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
+    export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
 	/** Retrieves details about the specified tab. */
-	export function get(tabId: number, callback: (tab: Tab) => void): void;
+    export function get(tabId: number, callback: (tab: Tab) => void): void;
 	/**
 	 * Gets details about all tabs in the specified window. 
 	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
@@ -6740,7 +6740,7 @@ declare module chrome.tabs {
 	 */
 	export function getAllInWindow(windowId: number, callback: (tab: Tab) => void): void;
 	/** Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for example: a background page or popup view). */
-	export function getCurrent(callback: (tab?: Tab) => void): void;
+    export function getCurrent(callback: (tab?: Tab) => void): void;
 	/**
 	 * Gets the tab that is selected in the specified window. 
 	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
@@ -6757,64 +6757,64 @@ declare module chrome.tabs {
 	 * @param callback Optional.
 	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab. 
 	 */
-	export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
+    export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
 	/**
 	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
 	 * @param tabId The tab to move.
 	 * @param callback Optional.
 	 * Parameter tab: Details about the moved tab.
 	 */
-	export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
+    export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
 	/**
 	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
 	 * @param tabIds The tabs to move.
 	 * @param callback Optional.
 	 * Parameter tabs: Details about the moved tabs.
 	 */
-	export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
+    export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
 	/**
 	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
 	 * @param callback Optional.
 	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
 	 */
-	export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
+    export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
 	 * @param tabId Defaults to the selected tab of the current window. 
 	 * @param callback Optional.
 	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
 	 */
-	export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
+    export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Closes a tab.
 	 * @param tabId The tab to close. 
 	 */
-	export function remove(tabId: number, callback?: Function): void;
+    export function remove(tabId: number, callback?: Function): void;
 	/**
 	 * Closes several tabs.
 	 * @param tabIds The list of tabs to close. 
 	 */
-	export function remove(tabIds: number[], callback?: Function): void;
+    export function remove(tabIds: number[], callback?: Function): void;
 	/**
 	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
 	 * @param callback 
 	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
 	 */
-	export function captureVisibleTab(callback: (dataUrl: string) => void): void;
+    export function captureVisibleTab(callback: (dataUrl: string) => void): void;
 	/**
 	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
 	 * @param windowId Optional. The target window. Defaults to the current window.
 	 * @param callback 
 	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
 	 */
-	export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
+    export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
 	/**
 	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
 	 * @param options Optional. Details about the format and quality of an image. 
 	 * @param callback 
 	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
 	 */
-	export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
+    export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
 	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
 	 * @param windowId Optional. The target window. Defaults to the current window.
@@ -6822,7 +6822,7 @@ declare module chrome.tabs {
 	 * @param callback 
 	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
 	 */
-	export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
+    export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
 	 * Reload a tab.
 	 * @since Chrome 16.
@@ -6846,12 +6846,12 @@ declare module chrome.tabs {
 	 * @param callback Optional.
 	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
 	 */
-	export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
+    export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
 	 * @since Chrome 20. 
 	 */
-	export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
+    export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
 	 * @since Chrome 41. 
@@ -6867,7 +6867,7 @@ declare module chrome.tabs {
 	 */
 	export function sendRequest(tabId: number, request: any, responseCallback?: (response: any) => void): void;
 	/** Connects to the content script(s) in the specified tab. The runtime.onConnect event is fired in each content script running in the specified tab for the current extension. */
-	export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
+    export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
 	/**
 	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
 	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
@@ -6880,32 +6880,32 @@ declare module chrome.tabs {
 	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
 	 * @param callback Optional. Called when all the CSS has been inserted.  
 	 */
-	export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
+    export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
 	/**
 	 * Highlights the given tabs. 
 	 * @since Chrome 16.
 	 * @param callback Optional.
 	 * Parameter window: Contains details about the window whose tabs were highlighted. 
 	 */
-	export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
+    export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
 	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified. 
 	 * @since Chrome 16.
 	 */
-	export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
+    export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
 	/**
 	 * Detects the primary language of the content in a tab. 
 	 * @param callback 
 	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
 	 */
-	export function detectLanguage(callback: (language: string) => void): void;
+    export function detectLanguage(callback: (language: string) => void): void;
 	/**
 	 * Detects the primary language of the content in a tab.
 	 * @param tabId Optional. Defaults to the active tab of the current window.  
 	 * @param callback 
 	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
 	 */
-	export function detectLanguage(tabId: number, callback: (language: string) => void): void;
+    export function detectLanguage(tabId: number, callback: (language: string) => void): void;
 	/**
 	 * Zooms a specified tab.
 	 * @since Chrome 42.
@@ -6971,31 +6971,31 @@ declare module chrome.tabs {
 	 * Fired when the highlighted or selected tabs in a window changes. 
 	 * @since Chrome 18.
 	 */
-	var onHighlighted: TabHighlightedEvent;
+    var onHighlighted: TabHighlightedEvent;
 	/** Fired when a tab is closed. */
-	var onRemoved: TabRemovedEvent;
+    var onRemoved: TabRemovedEvent;
 	/** Fired when a tab is updated. */
-	var onUpdated: TabUpdatedEvent;
+    var onUpdated: TabUpdatedEvent;
 	/** Fired when a tab is attached to a window, for example because it was moved between windows. */
-	var onAttached: TabAttachedEvent;
+    var onAttached: TabAttachedEvent;
 	/**
 	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached. 
 	 */
-	var onMoved: TabMovedEvent;
+    var onMoved: TabMovedEvent;
 	/** Fired when a tab is detached from a window, for example because it is being moved between windows. */
-	var onDetached: TabDetachedEvent;
+    var onDetached: TabDetachedEvent;
 	/** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
-	var onCreated: TabCreatedEvent;
+    var onCreated: TabCreatedEvent;
 	/**
 	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. 
 	 * @since Chrome 18.
 	 */
-	var onActivated: TabActivatedEvent;
+    var onActivated: TabActivatedEvent;
 	/**
 	 * Fired when a tab is replaced with another tab due to prerendering or instant. 
 	 * @since Chrome 26.
 	 */
-	var onReplaced: TabReplacedEvent;
+    var onReplaced: TabReplacedEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use tabs.onActivated.
 	 * Fires when the selected tab in a window changes.  
@@ -7028,12 +7028,12 @@ declare module chrome.tabs {
  */
 declare module chrome.topSites {
 	/** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
-	interface MostVisitedURL {
+    interface MostVisitedURL {
 		/** The most visited URL. */
-		url: string;
+        url: string;
 		/** The title of the page */
-		title: string;
-	}
+        title: string;
+    }
 
 	/** Gets a list of top sites. */
 	export function get(callback: (data: MostVisitedURL[]) => void): void;
@@ -7049,86 +7049,86 @@ declare module chrome.topSites {
  */
 declare module chrome.tts {
 	/** An event from the TTS engine to communicate the status of an utterance. */
-	interface TtsEvent {
+    interface TtsEvent {
 		/** Optional. The index of the current character in the utterance. */
-		charIndex?: number;
+        charIndex?: number;
 		/** Optional. The error description, if the event type is 'error'. */
-		errorMessage?: string;
+        errorMessage?: string;
 		/**
 		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances. 
 		 * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
 		 */
-		type: string;
-	}
+        type: string;
+    }
 
 	/** A description of a voice available for speech synthesis. */
-	interface TtsVoice {
+    interface TtsVoice {
 		/** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-		lang?: string;
+        lang?: string;
 		/** 
 		 * Optional. This voice's gender.
 		 * One of: "male", or "female" 
 		 */
-		gender?: string;
+        gender?: string;
 		/** Optional. The name of the voice. */
-		voiceName?: string;
+        voiceName?: string;
 		/** The ID of the extension providing this voice. */
-		extensionsId?: string;
+        extensionsId?: string;
 		/** All of the callback event types that this voice is capable of sending. */
-		eventTypes?: string[];
+        eventTypes?: string[];
 		/**
 		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs. 
 		 * @since Chrome 33.
 		 */
 		remote?: boolean;
-	}
+    }
 
-	interface SpeakOptions {
+    interface SpeakOptions {
 		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-		volume?: number;
+        volume?: number;
 		/**
 		 * Optional.
 		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance. 
 		 */
-		enqueue?: boolean;
+        enqueue?: boolean;
 		/**
 		 * Optional.
 		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0. 
 		 */
-		rate?: number;
+        rate?: number;
 		/** 
 		 * Optional. This function is called with events that occur in the process of speaking the utterance.
 		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.  
 		 */
-		onEvent?: (event: TtsEvent) => void;
+        onEvent?: (event: TtsEvent) => void;
 		/**
 		 * Optional.
 		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch. 
 		 */
-		pitch?: number;
+        pitch?: number;
 		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-		lang?: string;
+        lang?: string;
 		/** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-		voiceName?: string;
+        voiceName?: string;
 		/** Optional. The extension ID of the speech engine to use, if known. */
-		extensionId?: string;
+        extensionId?: string;
 		/**
 		 * Optional. Gender of voice for synthesized speech. 
 		 * One of: "male", or "female" 
 		 */
-		gender?: string;
+        gender?: string;
 		/** Optional. The TTS event types the voice must support. */
-		requiredEventTypes?: string[];
+        requiredEventTypes?: string[];
 		/** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-		desiredEventTypes?: string[];
-	}
+        desiredEventTypes?: string[];
+    }
 
 	/** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-	export function isSpeaking(callback?: (speaking: boolean) => void): void;
+    export function isSpeaking(callback?: (speaking: boolean) => void): void;
 	/** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-	export function stop(): void;
+    export function stop(): void;
 	/** Gets an array of all available voices. */
-	export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
 	/**
 	 * Speaks text using a text-to-speech engine. 
 	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters. 
@@ -7163,39 +7163,39 @@ declare module chrome.tts {
  * @since Chrome 14.
  */
 declare module chrome.ttsEngine {
-	interface SpeakOptions {
+    interface SpeakOptions {
 		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-		lang?: string;
+        lang?: string;
 		/** Optional. The name of the voice to use for synthesis. */
-		voiceName?: string;
+        voiceName?: string;
 		/**
 		 * Optional. Gender of voice for synthesized speech. 
 		 * One of: "male", or "female"
 		 */
-		gender?: string;
+        gender?: string;
 		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-		volume?: number;
+        volume?: number;
 		/**
 		 * Optional.
 		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports. 
 		 */
-		rate?: number;
+        rate?: number;
 		/** Optional. Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to this voice's default pitch. */
-		pitch?: number;
-	}
+        pitch?: number;
+    }
 
-	interface TtsEngineSpeakEvent extends chrome.events.Event {
+    interface TtsEngineSpeakEvent extends chrome.events.Event {
 		/**
 		 * @param callback
 		 * Parameter utterance: The text to speak, specified as either plain text or an SSML document. If your engine does not support SSML, you should strip out all XML markup and synthesize only the underlying text content. The value of this parameter is guaranteed to be no more than 32,768 characters. If this engine does not support speaking that many characters at a time, the utterance should be split into smaller chunks and queued internally without returning an error. 
 		 * Parameter options: Options specified to the tts.speak() method. 
 		 * Parameter sendTtsEvent: Call this function with events that occur in the process of speaking the utterance. 
 		 */
-		addListener(callback: (utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void): void;
-	}
+        addListener(callback: (utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void): void;
+    }
 
 	/** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
-	var onSpeak: TtsEngineSpeakEvent;
+    var onSpeak: TtsEngineSpeakEvent;
 	/** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
 	var onStop: chrome.events.Event;
 	/**
@@ -7218,7 +7218,7 @@ declare module chrome.ttsEngine {
  * @since Chrome 13.
  */
 declare module chrome.types {
-	interface ChromeSettingClearDetails {
+    interface ChromeSettingClearDetails {
 		/**
 		 * Optional.
 		 * The scope of the ChromeSetting. One of
@@ -7227,15 +7227,15 @@ declare module chrome.types {
 		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
 		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
 		 */
-		scope?: string;
-	}
+        scope?: string;
+    }
 
-	interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
 		/**
 		 * The value of the setting. 
 		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type. 
 		 */
-		value: any;
+        value: any;
 		/**
 		 * Optional.
 		 * The scope of the ChromeSetting. One of
@@ -7245,19 +7245,19 @@ declare module chrome.types {
 		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
 		 */
 		scope?: string;
-	}
+    }
 
-	interface ChromeSettingGetDetails {
+    interface ChromeSettingGetDetails {
 		/** Optional. Whether to return the value that applies to the incognito session (default false). */
-		incognito?: boolean;
-	}
+        incognito?: boolean;
+    }
 
 	/**
 	 * @param details Details of the currently effective value. 
 	 */
-	type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+    type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
-	interface ChromeSettingGetResultDetails {
+    interface ChromeSettingGetResultDetails {
 		/**
 		 * One of
 		 * • not_controllable: cannot be controlled by any extension
@@ -7265,43 +7265,43 @@ declare module chrome.types {
 		 * • controllable_by_this_extension: can be controlled by this extension
 		 * • controlled_by_this_extension: controlled by this extension
 		 */
-		levelOfControl: string;
+        levelOfControl: string;
 		/** The value of the setting. */
-		value: any;
+        value: any;
 		/**
 		 * Optional.
 		 * Whether the effective value is specific to the incognito session.
 		 * This property will only be present if the incognito property in the details parameter of get() was true. 
 		 */
-		incognitoSpecific?: boolean;
-	}
+        incognitoSpecific?: boolean;
+    }
 
-	interface ChromeSettingChangedEvent extends chrome.events.Event {
-		addListener(callback: DetailsCallback): void;
-	}
+    interface ChromeSettingChangedEvent extends chrome.events.Event {
+        addListener(callback: DetailsCallback): void;
+    }
 
 	/** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-	interface ChromeSetting {
+    interface ChromeSetting {
 		/**
 		 * Sets the value of a setting. 
 		 * @param details Which setting to change. 
 		 * @param callback Optional. Called at the completion of the set operation. 
 		 */
-		set(details: ChromeSettingSetDetails, callback?: Function): void;
+        set(details: ChromeSettingSetDetails, callback?: Function): void;
 		/**
 		 * Gets the value of a setting. 
 		 * @param details Which setting to consider. 
 		 */
-		get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
 		/**
 		 * Clears the setting, restoring any default value. 
 		 * @param details Which setting to clear.
 		 * @param callback Optional. Called at the completion of the clear operation. 
 		 */
-		clear(details: ChromeSettingClearDetails, callback?: Function): void;
+        clear(details: ChromeSettingClearDetails, callback?: Function): void;
 		/** Fired after the setting changes. */
-		onChange: ChromeSettingChangedEvent;
-	}
+        onChange: ChromeSettingChangedEvent;
+    }
 }
 
 ////////////////////
@@ -7474,54 +7474,54 @@ declare module chrome.wallpaper {
  * @since Chrome 16.
  */
 declare module chrome.webNavigation {
-	interface GetFrameDetails {
+    interface GetFrameDetails {
 		/**
 		 * The ID of the process runs the renderer for this tab. 
 		 * @since Chrome 22.
 		 */
-		processId: number;
+        processId: number;
 		/** The ID of the tab in which the frame is. */
-		tabId: number;
+        tabId: number;
 		/** The ID of the frame in the given tab. */
-		frameId: number;
-	}
+        frameId: number;
+    }
 
-	interface GetFrameResultDetails {
+    interface GetFrameResultDetails {
 		/** The URL currently associated with this frame, if the frame identified by the frameId existed at one point in the given tab. The fact that an URL is associated with a given frameId does not imply that the corresponding frame still exists. */
-		url: string;
+        url: string;
 		/** True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired. */
-		errorOccurred: boolean;
+        errorOccurred: boolean;
 		/** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
-		parentFrameId: number;
-	}
+        parentFrameId: number;
+    }
 
-	interface GetAllFrameDetails {
+    interface GetAllFrameDetails {
 		/** The ID of the tab. */
-		tabId: number;
-	}
+        tabId: number;
+    }
 
-	interface GetAllFrameResultDetails extends GetFrameResultDetails {
+    interface GetAllFrameResultDetails extends GetFrameResultDetails {
 		/** The ID of the process runs the renderer for this tab. */
-		processId: number;
+        processId: number;
 		/** The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a subframe. */
-		frameId: number;
-	}
+        frameId: number;
+    }
 
 	interface WebNavigationCallbackDetails {
 		/** The ID of the tab in which the navigation is about to occur. */
-		tabId: number;
+        tabId: number;
 		/** The time when the browser was about to start the navigation, in milliseconds since the epoch. */
-		timeStamp: number;
-	}
+        timeStamp: number;
+    }
 
 	interface WebNavigationUrlCallbackDetails extends WebNavigationCallbackDetails {
-		url: string;
-	}
+        url: string;
+    }
 
 	interface WebNavigationReplacementCallbackDetails extends WebNavigationCallbackDetails {
 		/** The ID of the tab that was replaced. */
 		replacedTabId: number;
-	}
+    }
 
 	interface WebNavigationFramedCallbackDetails extends WebNavigationUrlCallbackDetails {
 		/** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
@@ -7531,32 +7531,32 @@ declare module chrome.webNavigation {
 		 * @since Chrome 22.
 		 */
 		processId: number;
-	}
+    }
 
 	interface WebNavigationFramedErrorCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/** The error description. */
 		error: string;
-	}
+    }
 
 	interface WebNavigationSourceCallbackDetails extends WebNavigationUrlCallbackDetails {
 		/** The ID of the tab in which the navigation is triggered. */
-		sourceTabId: number;
+        sourceTabId: number;
 		/**
 		 * The ID of the process runs the renderer for the source tab. 
 		 * @since Chrome 22.
 		 */
-		sourceProcessId: number;
+        sourceProcessId: number;
 		/** The ID of the frame with sourceTabId in which the navigation is triggered. 0 indicates the main frame. */
-		sourceFrameId: number;
-	}
+        sourceFrameId: number;
+    }
 
 	interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
 		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists. 
 		 * @since Chrome 24.
 		 */
-		parentFrameId: number;
-	}
+        parentFrameId: number;
+    }
 
 	interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
@@ -7569,40 +7569,40 @@ declare module chrome.webNavigation {
 		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar" 
 		 */
 		transitionQualifiers: string[];
-	}
+    }
 
 	interface WebNavigationEventFilter {
 		/** Conditions that the URL being navigated to must satisfy. The 'schemes' and 'ports' fields of UrlFilter are ignored for this event. */
-		url: chrome.events.UrlFilter[];
-	}
+        url: chrome.events.UrlFilter[];
+    }
 
 	interface WebNavigationEvent extends chrome.events.Event {
 		addListener(callback: (details: WebNavigationCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationFramedEvent extends WebNavigationEvent {
 		addListener(callback: (details: WebNavigationFramedCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationFramedErrorEvent extends WebNavigationFramedEvent {
 		addListener(callback: (details: WebNavigationFramedErrorCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationSourceEvent extends WebNavigationEvent {
 		addListener(callback: (details: WebNavigationSourceCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationParentedEvent extends WebNavigationEvent {
 		addListener(callback: (details: WebNavigationParentedCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationTransitionalEvent extends WebNavigationEvent {
 		addListener(callback: (details: WebNavigationTransitionCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	interface WebNavigationReplacementEvent extends WebNavigationEvent {
 		addListener(callback: (details: WebNavigationReplacementCallbackDetails, filters?: WebNavigationEventFilter) => void): void;
-	}
+    }
 
 	/**
 	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID. 
@@ -7610,14 +7610,14 @@ declare module chrome.webNavigation {
 	 * @param callback
 	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid. 
 	 */
-	export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
+    export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
 	/**
 	 * Retrieves information about all frames of a given tab. 
 	 * @param details Information about the tab to retrieve all frames from.
 	 * @param callback
 	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.  
 	 */
-	export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
+    export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
 
 	/** Fired when the reference fragment of a frame was updated. All future events for that frame will use the updated URL. */
 	var onReferenceFragmentUpdated: WebNavigationTransitionalEvent;
@@ -7654,66 +7654,66 @@ declare module chrome.webNavigation {
  * @since Chrome 17.   
  */
 declare module chrome.webRequest {
-	interface AuthCredentials {
-		username: string;
-		password: string;
-	}
+    interface AuthCredentials {
+        username: string;
+        password: string;
+    }
 
 	/** An HTTP Header, represented as an object containing a key and either a value or a binaryValue. */
-	interface HttpHeader {
-		name: string;
-		value?: string;
-		binaryValue?: ArrayBuffer;
-	}
+    interface HttpHeader {
+        name: string;
+        value?: string;
+        binaryValue?: ArrayBuffer;
+    }
 
 	/** Returns value for event handlers that have the 'blocking' extraInfoSpec applied. Allows the event handler to modify network requests. */
-	interface BlockingResponse {
+    interface BlockingResponse {
 		/** Optional. If true, the request is cancelled. Used in onBeforeRequest, this prevents the request from being sent. */
-		cancel?: boolean;
+        cancel?: boolean;
 		/**
 		 * Optional.
 		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method. 
 		 */
-		redirectUrl?: string;
+        redirectUrl?: string;
 		/**
 		 * Optional.
 		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request). 
 		 */
-		responseHeaders?: HttpHeader[];
+        responseHeaders?: HttpHeader[];
 		/** Optional. Only used as a response to the onAuthRequired event. If set, the request is made using the supplied credentials. */
-		authCredentials?: AuthCredentials;
+        authCredentials?: AuthCredentials;
 		/**
 		 * Optional.
 		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead. 
 		 */
-		requestHeaders?: HttpHeader[];
-	}
+        requestHeaders?: HttpHeader[];
+    }
 
 	/** An object describing filters to apply to webRequest events. */
-	interface RequestFilter {
+    interface RequestFilter {
 		/** Optional. */
-		tabId?: number;
+        tabId?: number;
 		/**
 		 * A list of request types. Requests that cannot match any of the types will be filtered out. 
 		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
 		 */
-		types?: string[];
+        types?: string[];
 		/** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
-		urls: string[];
+        urls: string[];
 		/** Optional. */
-		windowId?: number;
-	}
+        windowId?: number;
+    }
 
 	/**
 	 * Contains data uploaded in a URL request.
 	 * @since Chrome 23.
 	 */
-	interface UploadData {
+    interface UploadData {
 		/** Optional. An ArrayBuffer with a copy of the data. */
-		bytes?: ArrayBuffer;
+        bytes?: ArrayBuffer;
 		/** Optional. A string with the file's path and name. */
-		file?: string;
-	}
+        file?: string;
+    }
 
 	interface WebRequestBody {
 		/** Optional. Errors when obtaining request body data. */
@@ -7737,32 +7737,32 @@ declare module chrome.webRequest {
 
 	interface ResourceRequest {
 		/** The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request. */
-		requestId: string;
+        requestId: string;
 		/** The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a subframe in which the request happens. If the document of a (sub-)frame is loaded (type is main_frame or sub_frame), frameId indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique within a tab. */
-		frameId: number;
+        frameId: number;
 		/** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
-		parentFrameId: number;
+        parentFrameId: number;
 		/** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
 		tabId: number;
 		/**
 		 * How the requested resource will be used. 
 		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
 		 */
-		type: string;
+        type: string;
 		/** The time when this signal is triggered, in milliseconds since the epoch. */
 		timeStamp: number;
-	}
+    }
 
 	interface WebRequestDetails extends ResourceRequest {
 		url: string;
 		/** Standard HTTP method. */
 		method: string;
-	}
+    }
 
 	interface WebRequestHeadersDetails extends WebRequestDetails {
 		/** Optional. The HTTP request headers that are going to be sent out with this request. */
 		requestHeaders?: HttpHeader[];
-	}
+    }
 
 	interface WebRequestBodyDetails extends WebRequestDetails {
 		/**
@@ -7770,40 +7770,40 @@ declare module chrome.webRequest {
 		 * @since Chrome 23.
 		 */
 		requestBody: WebRequestBody;
-	}
+    }
 
 	interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
-	}
+    }
 
 	interface WebResponseDetails extends ResourceRequest {
 		/** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
-		statusLine: string;
+        statusLine: string;
 		/**
 		 * Standard HTTP status code returned by the server. 
 		 * @since Chrome 43.
 		 */
 		statusCode: number;
-	}
+    }
 
 	interface WebResponseHeadersDetails extends WebResponseDetails {
 		/** Optional. The HTTP response headers that have been received with this response. */
 		responseHeaders?: HttpHeader[];
-	}
+    }
 
 	interface WebResponseCacheDetails extends WebResponseHeadersDetails {
 		/**
 		 * Optional.
 		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address. 
 		 */
-		ip?: string;
+        ip?: string;
 		/** Indicates if this response was fetched from disk cache. */
-		fromCache: boolean;
-	}
+        fromCache: boolean;
+    }
 
 	interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
 		/** The new URL. */
 		redirectUrl: string;
-	}
+    }
 
 	interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
 		/** The authentication scheme, e.g. Basic or Digest. */
@@ -7814,50 +7814,50 @@ declare module chrome.webRequest {
 		challenger: WebAuthChallenger;
 		/** True for Proxy-Authenticate, false for WWW-Authenticate. */
 		isProxy: boolean;
-	}
+    }
 
 	interface WebResponseErrorDetails extends WebResponseCacheDetails {
 		/** The error description. This string is not guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. */
 		error: string;
-	}
+    }
 
 	interface WebRequestBodyEvent extends chrome.events.Event {
 		addListener(callback: (details: WebRequestBodyDetails) => void): void;
-	}
+    }
 
 	interface WebRequestHeadersEvent extends chrome.events.Event {
 		addListener(callback: (details: WebRequestHeadersDetails) => void): void;
-	}
+    }
 
 	interface WebResponseHeadersEvent extends chrome.events.Event {
 		addListener(callback: (details: WebResponseHeadersDetails) => void): void;
-	}
+    }
 
 	interface WebResponseCacheEvent extends WebResponseHeadersEvent {
 		addListener(callback: (details: WebResponseCacheDetails) => void): void;
-	}
+    }
 
 	interface WebRedirectionResponseEvent extends WebResponseCacheEvent {
 		addListener(callback: (details: WebRedirectionResponseDetails) => void): void;
-	}
+    }
 
 	interface WebAuthenticationChallengeEvent extends WebResponseHeadersEvent {
 		addListener(callback: (details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void): void;
-	}
+    }
 
 	interface WebResponseErrorEvent extends WebResponseCacheEvent {
 		addListener(callback: (details: WebResponseErrorDetails) => void): void;
-	}
-	
+    }
+
 	/**
 	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often. 
 	 * @since Chrome 23.
 	 */
-	var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
+    var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
 
 	/** Needs to be called when the behavior of the webRequest handlers has changed to prevent incorrect handling due to caching. This function call is expensive. Don't call it often. */
-	export function handlerBehaviorChanged(callback?: Function): void;
-	
+    export function handlerBehaviorChanged(callback?: Function): void;
+
 	/** Fired when a request is about to occur. */
 	var onBeforeRequest: WebRequestBodyEvent;
 	/** Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP connection is made to the server, but before any HTTP data is sent. */
@@ -8000,9 +8000,9 @@ declare module chrome.webstore {
  * @since Chrome 5.
  */
 declare module chrome.windows {
-	interface Window {
+    interface Window {
 		/** Array of tabs.Tab objects representing the current tabs in the window. */
-		tabs?: chrome.tabs.Tab[];
+        tabs?: chrome.tabs.Tab[];
 		/** Optional. The offset of the window from the top edge of the screen in pixels. Under some circumstances a Window may not be assigned top property, for example when querying closed windows from the sessions API. */
 		top?: number;
 		/** Optional. The height of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned height property, for example when querying closed windows from the sessions API. */
@@ -8014,23 +8014,23 @@ declare module chrome.windows {
 		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
 		 * @since Chrome 17.
 		 */
-		state: string;
+        state: string;
 		/** Whether the window is currently the focused window. */
-		focused: boolean;
+        focused: boolean;
 		/**
 		 * Whether the window is set to be always on top. 
 		 * @since Chrome 19.
 		 */
-		alwaysOnTop: boolean;
+        alwaysOnTop: boolean;
 		/** Whether the window is incognito. */
-		incognito: boolean;
+        incognito: boolean;
 		/**
 		 * The type of browser window this is. 
 		 * One of: "normal", "popup", "panel", "app", or "devtools" 
 		 */
-		type: string;
+        type: string;
 		/** Optional. The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may not be assigned an ID, for example when querying windows using the sessions API, in which case a session ID may be present. */
-		id: number;
+        id: number;
 		/** Optional. The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may not be assigned left property, for example when querying closed windows from the sessions API. */
 		left?: number;
 		/**
@@ -8038,28 +8038,28 @@ declare module chrome.windows {
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
-	}
+    }
 
-	interface GetInfo {
+    interface GetInfo {
 		/**
 		 * Optional.
 		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission. 
 		 */
-		populate?: boolean;
+        populate?: boolean;
 		/**
 		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows. 
 		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		windowTypes?: string[];
-	}
+    }
 
-	interface CreateData {
+    interface CreateData {
 		/**
 		 * Optional. The id of the tab for which you want to adopt to the new window. 
 		 * @since Chrome 10.
 		 */
-		tabId?: number;
+        tabId?: number;
 		/**
 		 * Optional.
 		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
@@ -8069,68 +8069,68 @@ declare module chrome.windows {
 		 * Optional.
 		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
 		 */
-		top?: number;
+        top?: number;
 		/**
 		 * Optional.
 		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height. 
 		 */
-		height?: number;
+        height?: number;
 		/**
 		 * Optional.
 		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width. 
 		 */
-		width?: number;
+        width?: number;
 		/**
 		 * Optional. If true, opens an active window. If false, opens an inactive window. 
 		 * @since Chrome 12.
 		 */
-		focused?: boolean;
+        focused?: boolean;
 		/** Optional. Whether the new window should be an incognito window. */
-		incognito?: boolean;
+        incognito?: boolean;
 		/**
 		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set. 
 		 * One of: "normal", "popup", "panel", or "detached_panel" 
 		 */
-		type?: string;
+        type?: string;
 		/**
 		 * Optional.
 		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
 		 */
-		left?: number;
+        left?: number;
 		/**
 		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
 		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
 		 * @since Chrome 44.
 		 */
 		state?: string;
-	}
+    }
 
-	interface UpdateInfo {
+    interface UpdateInfo {
 		/** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
-		top?: number;
+        top?: number;
 		/**
 		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request. 
 		 * @since Chrome 14.
 		 */
-		drawAttention?: boolean;
+        drawAttention?: boolean;
 		/** Optional. The height to resize the window to in pixels. This value is ignored for panels. */
-		height?: number;
+        height?: number;
 		/** Optional. The width to resize the window to in pixels. This value is ignored for panels. */
-		width?: number;
+        width?: number;
 		/**
 		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
 		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
 		 * @since Chrome 17.
 		 */
-		state?: string;
+        state?: string;
 		/**
 		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front. 
 		 * @since Chrome 8.
 		 */
-		focused?: boolean;
+        focused?: boolean;
 		/** Optional. The offset from the left edge of the screen to move the window to in pixels. This value is ignored for panels. */
-		left?: number;
-	}
+        left?: number;
+    }
 
 	interface WindowEventFilter {
 		/**
@@ -8138,7 +8138,7 @@ declare module chrome.windows {
 		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
 		 */
 		windowTypes: string[];
-	}
+    }
 
 	interface WindowIdEvent extends chrome.events.Event {
 		/**
@@ -8146,7 +8146,7 @@ declare module chrome.windows {
 		 * Parameter windowId: The id of the window associated with this event.
 		 */
 		addListener(callback: (windowId: number, filters?: WindowEventFilter) => void): void;
-	}
+    }
 
 	interface WindowReferenceEvent extends chrome.events.Event {
 		/**
@@ -8154,35 +8154,35 @@ declare module chrome.windows {
 		 * Parameter window: The window object associated with this event.
 		 */
 		addListener(callback: (window: Window, filters?: WindowEventFilter) => void): void;
-	}	
+    }
 
 	/**
 	 * The windowId value that represents the current window. 
 	 * @since Chrome 18.
 	 */
-	var WINDOW_ID_CURRENT: number;
+    var WINDOW_ID_CURRENT: number;
 	/**
 	 * The windowId value that represents the absence of a chrome browser window. 
 	 * @since Chrome 6.
 	 */
-	var WINDOW_ID_NONE: number;
-	
+    var WINDOW_ID_NONE: number;
+
 	/** Gets details about a window. */
-	export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
+    export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
 	/** 
 	 * Gets details about a window. 
 	 * @since Chrome 18.
 	 */
-	export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+    export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
 	 * Gets the current window. 
 	 */
-	export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
+    export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
 	/**
 	 * Gets the current window. 
 	 * @since Chrome 18.
 	 */
-	export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+    export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
 	 * Creates (opens) a new browser with any optional sizing, position or default URL provided. 
 	 * @param callback
@@ -8198,25 +8198,25 @@ declare module chrome.windows {
 	/**
 	 * Gets all windows.
 	 */
-	export function getAll(callback: (windows: chrome.windows.Window[]) => void): void;
+    export function getAll(callback: (windows: chrome.windows.Window[]) => void): void;
 	/**
 	 * Gets all windows.
 	 * @since Chrome 18.
 	 */
-	export function getAll(getInfo: GetInfo, callback: (windows: chrome.windows.Window[]) => void): void;
+    export function getAll(getInfo: GetInfo, callback: (windows: chrome.windows.Window[]) => void): void;
 	/** Updates the properties of a window. Specify only the properties that you want to change; unspecified properties will be left unchanged. */
-	export function update(windowId: number, updateInfo: UpdateInfo, callback?: (window: chrome.windows.Window) => void): void;
+    export function update(windowId: number, updateInfo: UpdateInfo, callback?: (window: chrome.windows.Window) => void): void;
 	/** Removes (closes) a window, and all the tabs inside it. */
-	export function remove(windowId: number, callback?: Function): void;
+    export function remove(windowId: number, callback?: Function): void;
 	/**
 	 * Gets the window that was most recently focused — typically the window 'on top'. 
 	 */
-	export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
+    export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
 	/**
 	 * Gets the window that was most recently focused — typically the window 'on top'. 
 	 * @since Chrome 18.
 	 */
-	export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+    export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 
 	/** Fired when a window is removed (closed). */
 	var onRemoved: WindowIdEvent;
diff --git a/chui/chui-tests.ts b/chui/chui-tests.ts
index 98070b433..d4f7be5f3 100644
--- a/chui/chui-tests.ts
+++ b/chui/chui-tests.ts
@@ -37,6 +37,7 @@ $(function() {
    $.UIGoToArticle("#main");
    $.UIGoBack();
    $.UIGoBackToArticle("#main");
+   $.UIEnableBrowserHashModification();
    $.UIBlock();
    $.UIBlock(.5);
    $.UIUnblock();
diff --git a/chui/chui.d.ts b/chui/chui.d.ts
index 2f68ae454..5a7d41a5b 100644
--- a/chui/chui.d.ts
+++ b/chui/chui.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for chui v3.9.0
+// Type definitions for chui v3.9.1
 // Project: https://github.com/chocolatechipui/chocolatechip-ui
 // Definitions by: Robert Biggs <http://chocolatechip-ui.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// ChocolateChip-UI 3.9.0
+// ChocolateChip-UI 3.9.1
 /**
  These TypeScript delcarations for ChocolateChip-UI contain interfaces for both ChocolateChipJS and jQuery. Depending on which library you are using, you will get the type interfaces appropriate for it.
 */
@@ -89,6 +89,17 @@ interface ChocolateChipStatic {
    */
   isNavigating: boolean;
 
+  /**
+   * Tell ChocolateChip-UI to not modify window hash during navigation.
+   * The default value is false.
+   */
+  UIBrowserHashModification: boolean;
+
+  /**
+   * Method to tell ChocolateChip-UI to register navigation history on Window hash.
+   */
+  UIEnableBrowserHashModification(): void;
+
   /**
    * Navigate to the article indicated by the provided destination ID. This enters the destination into the navigation history array.
    *
@@ -784,6 +795,17 @@ interface JQueryStatic {
    */
   isNavigating: boolean;
 
+  /**
+   * Tell ChocolateChip-UI to not modify window hash during navigation.
+   * The default value is false.
+   */
+  UIBrowserHashModification: boolean;
+
+  /**
+   * Method to tell ChocolateChip-UI to register navigation history on Window hash.
+   */
+  UIEnableBrowserHashModification(): void;
+
   /**
    * Navigate to the article indicated by the provided destination ID. This enters the destination into the navigation history array.
    *
@@ -1014,6 +1036,54 @@ interface JQueryStatic {
    */
   UIUnBindData(controller?: string): void;
 
+  /**
+   * Object used to store string templates and parsed templates.
+   *
+   * @param string A string defining the template.
+   * @param string A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
+   * @return void
+   */
+  templates: Object;
+
+  /**
+   * This method returns a parsed template.
+   *
+   */
+  template: {
+
+    /**
+     * This method parses a string and an optoinal variable name and returns a parsed template in the form of a function. You can then pass this function data to get rendered nodes.
+     *
+     * @param template A string of markup to use as a template.
+     * @param variable An option name to use in the template. If it were "myData": [[= myData.name]]. Otherwise it defaults to "data": [[= data.name]].
+     * @return A function.
+     */
+    (template: string, variable?: string): Function;
+
+    /**
+     * A method to repeated output a template.
+     *
+     * @param element The target container into which the content will be inserted.
+     * @param template A string of markup.
+     * @param data The iterable data the template will consume.
+     * @return void.
+     */
+    repeater: (element: JQuery, template: string, data: any) => void;
+
+    /**
+     * A object that holds the reference to the controller for a repeater.
+     * This is used to cache the data that a repeater uses. After the repeater is rendered, the reference is deleted from this object.
+     *
+     */
+    data: {
+        repeaterName?: any;
+    };
+  
+    /**
+     * Use this value to output an index value in a template repeater.
+     */
+    index: number;
+  };
 }
 
 /**
diff --git a/ckeditor/ckeditor-tests.ts b/ckeditor/ckeditor-tests.ts
index aa052b8ee..f7deb6706 100644
--- a/ckeditor/ckeditor-tests.ts
+++ b/ckeditor/ckeditor-tests.ts
@@ -282,7 +282,6 @@ function test_adding_dialog_by_definition() {
 
 function test_adding_plugin() {
     CKEDITOR.plugins.add( 'abbr', {
-        icons: 'abbr',
         init: function( editor: CKEDITOR.editor ) {
             // empty logic
         }
diff --git a/ckeditor/ckeditor.d.ts b/ckeditor/ckeditor.d.ts
index 315f9bdf1..a8f268074 100644
--- a/ckeditor/ckeditor.d.ts
+++ b/ckeditor/ckeditor.d.ts
@@ -572,6 +572,10 @@ declare module CKEDITOR {
         colorButton_colors?: string;
         startupFocus?: boolean;
         on?: any;
+        extraPlugins?: string;
+        height?: string | number;
+        toolbarLocation?: string;
+        readOnly?: boolean;
     }
 
 
@@ -628,7 +632,7 @@ declare module CKEDITOR {
                 data: Function;
                 defaults: Object;
                 dialog: String;
-                downcast: any; // should be string | Function
+                downcast: string | Function;
                 downcasts: Object;
                 draggable: boolean;
                 editables: Object;
@@ -643,16 +647,16 @@ declare module CKEDITOR {
                 styleToAllowedContentRules: Function;
                 styleableElements: string;
                 template: string;
-                upcast: any; // should be string | Function
+                upcast: string | Function;
                 upcasts: Object;
 
                 addClass(className: string): void;
                 applyStyle(style: any): void; // any should be CKEDITOR.style
                 capture(): void;
                 checkStyleActive(style: any): boolean; // any should be CKEDITOR.style
-                define(name: string, meta: {errorProof?: boolean}): void;
+                define(name: string, meta: { errorProof?: boolean }): void;
                 destroy(offline?: boolean): void;
-                destroyEditable(editableName:string, offline?: boolean): void;
+                destroyEditable(editableName: string, offline?: boolean): void;
                 edit(): boolean;
                 fire(eventName: string, data?: Object, editor?: editor): any; // should be boolean | Object
                 fireOnce(eventName: string, data?: Object, editor?: editor): any; // should be boolean | Object
@@ -670,7 +674,7 @@ declare module CKEDITOR {
                 removeClass(className: string): void;
                 removeListener(evnetName: string, listenerFunction: Function): void;
                 removeStyle(style: any): void; // any should be CKEDITOR.style
-                setData(keyOrData: any, value?: Object): IWidget; // any should be string | Object
+                setData(keyOrData: string | {}, value?: Object): IWidget;
                 setFocused(selected: boolean): IWidget;
                 setSelected(selected: boolean): IWidget;
                 toFeature(): any; // should be CKEDITOR.feature
@@ -685,7 +689,7 @@ declare module CKEDITOR {
                 data?: Function;
                 defaults?: Object;
                 dialog?: String;
-                downcast?: any; // should be string | Function
+                downcast?: string | Function;
                 downcasts?: Object;
                 draggable?: boolean;
                 edit?: Function;
@@ -701,7 +705,7 @@ declare module CKEDITOR {
                 styleToAllowedContentRules?: Function;
                 styleableElements?: string;
                 template?: string;
-                upcast?: any; // should be string | Function
+                upcast?: string | Function;
                 upcasts?: Object;
                 toFeature?(): any; // should be CKEDITOR.feature
             }
@@ -732,8 +736,8 @@ declare module CKEDITOR {
 
         interface IPluginDefinition {
             hidpi?: boolean;
-            lang?: any; // should be string | string[]
-            requires?: any; // should be string | string[]a
+            lang?: string | string[];
+            requires?: string | string[];
             afterInit?(editor: editor): any;
             beforeInit?(editor: editor): any;
             init?(editor: editor): any;
diff --git a/classnames/classnames-tests.ts b/classnames/classnames-tests.ts
index 7b085c4fb..3c3086c51 100644
--- a/classnames/classnames-tests.ts
+++ b/classnames/classnames-tests.ts
@@ -8,9 +8,16 @@ classNames('foo', 'bar'); // => 'foo bar'
 classNames('foo', { bar: true }); // => 'foo bar'
 classNames({ foo: true }, { bar: true }); // => 'foo bar'
 classNames({ foo: true, bar: true }); // => 'foo bar'
+classNames(10, 11); // => '10 11';
 
 // lots of arguments of various types
-classNames('foo', { bar: true, duck: false }, 'baz', { quux: true }) // => 'foo bar baz quux'
+classNames('foo', { bar: true, duck: false }, 'baz', { quux: true }); // => 'foo bar baz quux'
+
+classNames(['foo', 'bar', 'baz']); // => 'foo bar baz'
+classNames([1, 2, 3]); // => '1 2 3'
+classNames([{ foo: true, bar: false }, { baz: true }]); // => 'foo baz'
+
+classNames(["foo", ["bar", {baz: true}]]); // => 'foo bar baz'
 
 // other falsy values are just ignored
 // NOTE: We don't really want to allow this kind of thing with Typescript (otherwise what's the point!)
diff --git a/classnames/classnames.d.ts b/classnames/classnames.d.ts
index 820043686..58a3e096f 100644
--- a/classnames/classnames.d.ts
+++ b/classnames/classnames.d.ts
@@ -1,13 +1,22 @@
 // Type definitions for classnames
 // Project: https://github.com/JedWatson/classnames
-// Definitions by: Dave Keen <http://www.keendevelopment.ch>
+// Definitions by: Dave Keen <http://www.keendevelopment.ch>, Adi Dahiya <https://github.com/adidahiya>, Jason Killian <https://github.com/JKillian>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+declare type ClassValue = string | number | ClassDictionary | ClassArray;
+
 interface ClassDictionary {
 	[id: string]: boolean;
 }
 
+interface ClassArray extends Array<ClassValue> { }
+
+interface ClassNamesFn {
+	(...classes: ClassValue[]): string;
+}
+
+declare var classNames: ClassNamesFn;
+
 declare module "classnames" {
-	function classNames(...classes: (string|ClassDictionary)[]): string;
 	export = classNames
-}
\ No newline at end of file
+}
diff --git a/clone/clone-tests.ts b/clone/clone-tests.ts
index 6a25fb7c3..8cb0681fd 100644
--- a/clone/clone-tests.ts
+++ b/clone/clone-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./clone.d.ts" />
+
 import clone = require("clone");
 
 var original = {
diff --git a/codemirror/codemirror-matchbrackets-tests.ts b/codemirror/codemirror-matchbrackets-tests.ts
new file mode 100644
index 000000000..2189612c0
--- /dev/null
+++ b/codemirror/codemirror-matchbrackets-tests.ts
@@ -0,0 +1,4 @@
+/// <reference path="codemirror.d.ts" />
+/// <reference path="codemirror-matchbrackets.d.ts" />
+
+var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { matchBrackets: true });
diff --git a/codemirror/codemirror-matchbrackets.d.ts b/codemirror/codemirror-matchbrackets.d.ts
new file mode 100644
index 000000000..13241a5a3
--- /dev/null
+++ b/codemirror/codemirror-matchbrackets.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for CodeMirror
+// Project: https://github.com/marijnh/CodeMirror
+// Definitions by: Sixin Li <https://github.com/sixinli>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// See docs https://codemirror.net/doc/manual.html#addon_matchbrackets
+
+declare module CodeMirror {
+    interface EditorConfiguration {
+        //  when set to true, causes matching brackets to be highlighted whenever the cursor is next to them
+        matchBrackets?: boolean;
+    }
+}
diff --git a/codemirror/codemirror-showhint-tests.ts b/codemirror/codemirror-showhint-tests.ts
new file mode 100644
index 000000000..b00333b29
--- /dev/null
+++ b/codemirror/codemirror-showhint-tests.ts
@@ -0,0 +1,33 @@
+/// <reference path="codemirror.d.ts" />
+/// <reference path="codemirror-showhint.d.ts" />
+var doc = new CodeMirror.Doc('text');
+var pos = new CodeMirror.Pos(2, 3);
+CodeMirror.showHint(doc);
+CodeMirror.showHint(doc, function (cm) {
+    return {
+        from: pos,
+        list: ["one", "two"],
+        to: pos
+    };
+});
+CodeMirror.showHint(doc, function (cm) {
+    return {
+        from: pos,
+        list: [
+            {
+                text: "disp1",
+                render: function (el, self, data) {
+                    ;
+                }
+            },
+            {
+                className: "class2",
+                displayText: "disp2",
+                from: pos,
+                to: pos,
+                text: "sometext"
+            }
+        ],
+        to: pos
+    };
+});
diff --git a/codemirror/codemirror-showhint.d.ts b/codemirror/codemirror-showhint.d.ts
new file mode 100644
index 000000000..48a904a3b
--- /dev/null
+++ b/codemirror/codemirror-showhint.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for CodeMirror
+// Project: https://github.com/marijnh/CodeMirror
+// Definitions by: jacqt <https://github.com/jacqt>, basarat <https://github.com/basarat>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// See docs https://codemirror.net/doc/manual.html#addon_show-hint
+
+declare module CodeMirror {
+    var commands: any;
+
+    /** Provides a framework for showing autocompletion hints. Defines editor.showHint, which takes an optional
+    options object, and pops up a widget that allows the user to select a completion. Finding hints is done with
+    a hinting functions (the hint option), which is a function that take an editor instance and options object,
+    and return a {list, from, to} object, where list is an array of strings or objects (the completions), and
+    from and to give the start and end of the token that is being completed as {line, ch} objects. An optional
+    selectedHint property (an integer) can be added to the completion object to control the initially selected hint. */
+    function showHint(cm: CodeMirror.Doc, hinter?: (doc: CodeMirror.Doc) => Hints, options?: ShowHintOptions): void;
+
+    interface Hints {
+        from: Position;
+        to: Position;
+        list: (Hint | string)[];
+    }
+
+    /** Interface used by showHint.js Codemirror add-on
+    When completions aren't simple strings, they should be objects with the following properties: */
+    interface Hint {
+        text: string;
+        className?: string;
+        displayText?: string;
+        from?: Position;
+        /** Called if a completion is picked. If provided *you* are responsible for applying the completion */
+        hint?: (cm: any, data: Hints, cur: Hint) => void;
+        render?: (element: HTMLLIElement, data: Hints, cur: Hint) => void;
+        to?: Position;
+    }
+
+    interface Editor {
+        /** An extension of the existing CodeMirror typings for the Editor.on("keyup", func) syntax */
+        on(eventName: string, handler: (doc: CodeMirror.Doc, event: any) => void): void;
+        off(eventName: string, handler: (doc: CodeMirror.Doc, event: any) => void): void;
+    }
+
+    /** Extend CodeMirror.Doc with a state object, so that the Doc.state.completionActive property is reachable*/
+    interface Doc {
+        state: any;
+        showHint: (options: ShowHintOptions) => void;
+    }
+
+    interface ShowHintOptions {
+        completeSingle: boolean;
+        hint: (doc: CodeMirror.Doc) => Hints;
+    }
+
+    /** The Handle used to interact with the autocomplete dialog box.*/
+    interface Handle {
+        moveFocus(n: number, avoidWrap: boolean): void;
+        setFocus(n: number): void;
+        menuSize(): number;
+        length: number;
+        close(): void;
+        pick(): void;
+        data: any;
+    }
+
+    interface EditorConfiguration {
+        showHint?: boolean;
+        hintOptions?: ShowHintOptions;
+    }
+}
+
+declare module "codemirror/addon/hint/show-hint" {
+    export = CodeMirror;
+}
diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
index 86c01141e..2ca58c702 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -228,6 +228,14 @@ declare module CodeMirror {
         The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
         scrollIntoView(pos: { left: number; top: number; right: number; bottom: number; }, margin: number): void;
 
+        /** Scrolls the given element into view. pos is a { line, ch } object, in editor-local coordinates.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: { line: number, ch: number }, margin?: number): void;
+
+        /** Scrolls the given element into view. pos is a { from, to } object, in editor-local coordinates.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: { from: CodeMirror.Position, to: CodeMirror.Position }, margin: number): void;
+
         /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
         If mode is "local" , they will be relative to the top-left corner of the editable document.
         If it is "page" or not given, they are relative to the top-left corner of the page.
@@ -787,7 +795,10 @@ declare module CodeMirror {
         viewportMargin?: number;
 
         /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
-        lint?: LintOptions;
+        lint?: boolean | LintOptions;
+
+	/** Optional value to be used in conduction with CodeMirror’s placeholder add-on. */
+	placeholder?: string;
     }
 
     interface TextMarkerOptions {
@@ -1090,3 +1101,7 @@ declare module CodeMirror {
         to?: Position;
     }
 }
+
+declare module "codemirror" {
+    export = CodeMirror;
+}
diff --git a/codemirror/searchcursor-tests.ts b/codemirror/searchcursor-tests.ts
new file mode 100644
index 000000000..2e87a8b59
--- /dev/null
+++ b/codemirror/searchcursor-tests.ts
@@ -0,0 +1,16 @@
+/// <reference path="codemirror.d.ts" />
+/// <reference path="searchcursor.d.ts" />
+
+var doc = new CodeMirror.Doc('text some string and another text match');
+var cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0), false);
+cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0));
+cursor = doc.getSearchCursor('text');
+
+
+cursor.find(false);
+cursor.findNext();
+cursor.findPrevious();
+cursor.from();
+cursor.to();
+cursor.replace("blah");
+cursor.replace("text", "origin");
diff --git a/codemirror/searchcursor.d.ts b/codemirror/searchcursor.d.ts
new file mode 100644
index 000000000..ed7af7a25
--- /dev/null
+++ b/codemirror/searchcursor.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for CodeMirror
+// Project: https://github.com/marijnh/CodeMirror
+// Definitions by: jacqt <https://github.com/jacqt>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module CodeMirror {
+    interface Doc {
+        /** This method can be used to implement search/replace functionality.
+         *  `query`: This can be a regular * expression or a string (only strings will match across lines -
+         *          if they contain newlines).
+         *  `start`: This provides the starting position of the search. It can be a `{line, ch} object,
+         *          or can be left off to default to the start of the document
+         *  `caseFold`: This is only relevant when matching a string. IT will cause the search to be case-insenstive */
+        getSearchCursor(query: string | RegExp, start?: Position, caseFold?: boolean): SearchCursor;
+    }
+
+    interface SearchCursor {
+        /** Searches forward or backward from the current position. The return value indicates whether a match was
+         * found. If matching a regular expression, the return value will be the array returned by the match method, in case
+         * you want to extract matched groups */
+        find(reverse: boolean): boolean | any[];
+
+        /** Searches forward from the current position. The return value indicates whether a match was
+         * found. If matching a regular expression, the return value will be the array returned by the match method, in case
+         * you want to extract matched groups */
+        findNext(): boolean | any[];
+
+        /** Searches backward from the current position. The return value indicates whether a match was
+         * found. If matching a regular expression, the return value will be the array returned by the match method, in case
+         * you want to extract matched groups */
+        findPrevious(): boolean | any[];
+
+        /** Only valid when the last call to find, findNext, or findPrevious did not return false. Returns {line, ch}
+         * objects pointing the start of the match. */
+        from(): Position;
+
+        /** Only valid when the last call to find, findNext, or findPrevious did not return false. Returns {line, ch}
+         * objects pointing the end of the match. */
+        to(): Position;
+
+
+        /** Replaces the currently found match with the given text and adjusts the cursor position to reflect the deplacement. */
+        replace(text: string, origin?: string): void;
+    }
+}
diff --git a/coffeeify/coffeeify-tests.ts b/coffeeify/coffeeify-tests.ts
new file mode 100644
index 000000000..753f68e79
--- /dev/null
+++ b/coffeeify/coffeeify-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="coffeeify.d.ts" />
+
+import coffeeify = require('coffeeify');
+
+coffeeify.sourceMap = false;
+
+var isCoffee = coffeeify.isCoffee('foo.coffee');
+var isLiterate = coffeeify.isLiterate('bar.coffee');
+coffeeify.compile('out.js', 'console.log 42', (err, compiled) => {
+    console.log(err);
+    console.log(compiled);
+});
+
+coffeeify('test.coffee').end();
+
diff --git a/coffeeify/coffeeify.d.ts b/coffeeify/coffeeify.d.ts
new file mode 100644
index 000000000..9651cdb15
--- /dev/null
+++ b/coffeeify/coffeeify.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for coffeeify
+// Project: https://github.com/jnordberg/coffeeify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../through/through.d.ts" />
+
+declare module "coffeeify" {
+    import through = require('through');
+
+    namespace coffeeify {
+        interface Coffeeify {
+            isCoffee(file: string): boolean;
+            isLiterate(file: string): boolean;
+            sourceMap: boolean;
+            compile(file: string, data: string, callback: Callback): void;
+            (file: string): through.ThroughStream;
+        }
+
+        interface Callback {
+            (error: ParseError, compiled: string): void;
+        }
+
+        interface ParseError extends SyntaxError {
+            new(error: any, src: string, file: string): ParseError;
+            message: string;
+            line: number;
+            column: number;
+            annotated: string;
+        }
+    }
+
+    var coffeeify: coffeeify.Coffeeify;
+
+    export = coffeeify;
+}
+
diff --git a/cometd/cometd.d.ts b/cometd/cometd.d.ts
index 592c6c963..d6f0f6e2a 100644
--- a/cometd/cometd.d.ts
+++ b/cometd/cometd.d.ts
@@ -5,15 +5,6 @@
 
 declare module CometD {
 
-    var onListenerException: (exception: any, subscriptionHandle: any, isListener: boolean, message: string) => void;
-
-    function init(options: ConfigurationOptions): void;
-
-    function addListener(channel: string, listener: (message: any) => void): void;
-    function removeListener(listener: (message: any) => void): void;
-
-    function publish(channel: string, message: any): void;
-
     interface ConfigurationOptions {
         url: string;
         logLevel?: string;
@@ -26,4 +17,35 @@ declare module CometD {
         appendMessageTypeToURL?: boolean;
         autoBatch?: boolean;
     }
+
+}
+
+interface CometD {
+
+    onListenerException: (exception: any, subscriptionHandle: any, isListener: boolean, message: string) => void;
+
+    init(options: CometD.ConfigurationOptions): void;
+
+    configure(config: CometD.ConfigurationOptions): void;
+
+    addListener(channel: string, listener: (message: any) => void): void;
+    removeListener(listener: (message: any) => void): void;
+
+    clearListeners(): void;
+
+    clearSubscriptions(): void;
+
+    handshake(handshake_params: any): void;
+
+    publish(channel: string, message: any): void;
+
+
+    disconnect(): void;
+    
+}
+
+
+
+interface JQueryStatic {
+    cometd: CometD;
 }
diff --git a/commander/commander-tests.ts b/commander/commander-tests.ts
index f2457901d..135ad8bf0 100644
--- a/commander/commander-tests.ts
+++ b/commander/commander-tests.ts
@@ -95,6 +95,13 @@ program.on('--help', () => {
     console.log('');
 });
 
+program
+    .command('allow-unknown-option')
+    .allowUnknownOption()
+    .action(() => {
+        console.log('unknown option is allowed');
+    });
+
 program.parse(process.argv);
 
 console.log('stuff');
diff --git a/commander/commander.d.ts b/commander/commander.d.ts
index 09d796659..278a491a6 100644
--- a/commander/commander.d.ts
+++ b/commander/commander.d.ts
@@ -158,6 +158,15 @@ declare module commander {
         option(flags:string, description?:string, fn?:(arg1:any, arg2:any)=>void, defaultValue?:any):ICommand;
         option(flags:string, description?:string, defaultValue?:any):ICommand;
 
+        /**
+         * Allow unknown options on the command line.
+         *
+         * @param {Boolean} arg if `true` or omitted, no error will be thrown
+         * for unknown options.
+         * @api public
+         */
+        allowUnknownOption(arg?: boolean):ICommand;
+
         /**
          * Parse `argv`, settings options and invoking commands when defined.
          *
diff --git a/config/config-tests.ts b/config/config-tests.ts
new file mode 100644
index 000000000..2f53b76d6
--- /dev/null
+++ b/config/config-tests.ts
@@ -0,0 +1,30 @@
+/// <reference path="config.d.ts" />
+
+import config = require('config');
+
+var value1: string = config.get<string>("");
+var value2: any = config.get("");
+
+var has: boolean = config.has("");
+
+// util tests:
+var extended1: any = config.util.extendDeep({}, {});
+var extended2: any = config.util.extendDeep({}, {}, 20);
+
+var clone1: any = config.util.cloneDeep({});
+var clone2: any = config.util.cloneDeep({}, 20);
+
+var equals1: boolean = config.util.equalsDeep({}, {});
+var equals2: boolean = config.util.equalsDeep({}, {}, 20);
+
+var diff1: any = config.util.diffDeep({}, {});
+var diff2: any = config.util.diffDeep({}, {}, 20);
+
+var immutable1: any = config.util.makeImmutable({});
+var immutable2: any = config.util.makeImmutable({}, "");
+var immutable3: any = config.util.makeImmutable({}, "", "");
+
+var hidden1: any = config.util.makeHidden({}, "");
+var hidden2: any = config.util.makeHidden({}, "", "");
+
+var env: string = config.util.getEnv("");
diff --git a/config/config.d.ts b/config/config.d.ts
new file mode 100644
index 000000000..c37eddae9
--- /dev/null
+++ b/config/config.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for node-config
+// Project: https://github.com/lorenwest/node-config
+// Definitions by: Roman Korneev <https://github.com/RWander>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "config" {
+	// see https://github.com/lorenwest/node-config/wiki/Using-Config-Utilities
+	interface IUtil {
+		// Extend an object (and any object it contains) with one or more objects (and objects contained in them).
+		extendDeep(mergeInto: any, mergeFrom: any, depth?: number): any;
+
+		// Return a deep copy of the specified object.
+		cloneDeep(copyFrom: any, depth?: number): any;
+
+		// Return true if two objects have equal contents.
+		equalsDeep(object1: any, object2: any, dept?: number): boolean;
+
+		// Returns an object containing all elements that differ between two objects.
+		diffDeep(object1: any, object2: any, depth?: number): any;
+
+		// Make a javascript object property immutable (assuring it cannot be changed from the current value).
+		makeImmutable(object: any, propertyName?: string, propertyValue?: string): any;
+
+		// Make an object property hidden so it doesn't appear when enumerating elements of the object.
+		makeHidden(object: any, propertyName: string, propertyValue?: string): any;
+
+		// Get the current value of a config environment variable
+		getEnv(varName: string): string;
+	}
+
+	export function get<T>(setting: string): T;
+	export function has(setting: string): boolean;
+	export var util: IUtil;
+}
diff --git a/connect-mongo/connect-mongo-tests.ts b/connect-mongo/connect-mongo-tests.ts
new file mode 100644
index 000000000..018aeea2f
--- /dev/null
+++ b/connect-mongo/connect-mongo-tests.ts
@@ -0,0 +1,46 @@
+/// <reference path="connect-mongo.d.ts" />
+
+import * as express from 'express';
+import * as mongoose from 'mongoose';
+import * as session from 'express-session';
+import * as connectMongo from 'connect-mongo';
+import * as mongodb from 'mongodb';
+
+var app = express();
+
+/// Create MongoStore
+var MongoStore = connectMongo(session);
+
+/// Use MongoStore
+
+// MongoUrlOptions
+app.use(session({
+    secret: 'secret',
+    store: new MongoStore({url: 'mongodb://localhost/test'})
+}));
+
+
+app.use(session({
+    secret: 'secret',
+    store: new MongoStore({
+        url: 'mongodb://localhost/test',
+        collection: "test-sessions",
+        ttl: 30 * 24 * 60 * 60 // = 30 days
+    })
+}));
+
+// MongooseConnectionOptions
+mongoose.connect('mongodb://localhost/test')
+app.use(session({
+    secret: 'secret',
+    store: new MongoStore({mongooseConnection: mongoose.connection})
+}));
+
+// NativeMongoOptions
+var Db = mongodb.Db
+var Server = mongodb.Server
+var mongoDb = new Db('test', new Server('localhost', 27017));
+app.use(session({
+    secret: 'secret',
+    store: new MongoStore({db: mongoDb})
+}));
diff --git a/connect-mongo/connect-mongo.d.ts b/connect-mongo/connect-mongo.d.ts
new file mode 100644
index 000000000..ece75973a
--- /dev/null
+++ b/connect-mongo/connect-mongo.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for connect-mongo
+// Project: https://github.com/kcbanner/connect-mongo
+// Definitions by: Mizuki Yamamoto <https://github.com/Syati>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../mongoose/mongoose.d.ts" />
+/// <reference path="../mongodb/mongodb.d.ts" />
+/// <reference path="../express-session/express-session.d.ts" />
+
+declare module "connect-mongo" {
+    import * as express from 'express';
+    import * as mongoose from 'mongoose';
+    import * as mongodb from 'mongodb';
+    import * as session from 'express-session';
+
+    function connectMongo(connect: (options?: session.SessionOptions) => express.RequestHandler): connectMongo.MongoStoreFactory;
+
+    module connectMongo {
+
+        export interface DefaultOptions{
+            /**
+             * The hostname of the database you are connecting to.
+             * (Default: '127.0.0.1')
+             */
+            host?: string;
+
+            /**
+             * The port number to connect to.
+             * (Default: 27017)
+             */
+            port?: string;
+
+            /**
+             * (Default: false)
+             */
+            autoReconnect?: boolean;
+
+            /**
+             * (Default: true)
+             */
+            ssl?: boolean;
+
+            /**
+             * (Default: 1)
+             */
+            w?: number;
+
+            /**
+             * The colletion of the database you are connecting to.
+             * (Default: sessions)
+             */
+            collection?: string;
+
+            /**
+             * Serialize sessions using JSON.stringify and deserialize them with JSON.parse.
+             * (Default: true)
+             */
+            stringify?: boolean;
+
+            /**
+             * Default: false
+             */
+            hash?: boolean;
+
+            /**
+             * Default: 14 days (60 * 60 * 24 * 14)
+             */
+            ttl?: number;
+
+            /**
+             * Automatically remove expired sessions.
+             * (Default: 'native')
+             */
+            autoRemove?: string;
+
+            /**
+             * (Default: 10)
+             */
+            autoRemoveInterval?: number;
+        }
+
+        export interface MongoUrlOptions extends DefaultOptions {
+            url: string;
+            mongoOptions?: mongoose.ConnectionOptions;
+        }
+
+        export interface MogooseConnectionOptions extends DefaultOptions {
+            mongooseConnection: mongoose.Connection;
+        }
+
+        export interface NaitiveMongoOptions extends DefaultOptions {
+            db: mongodb.Db;
+        }
+
+        export interface MongoStoreFactory {
+            new (options: MongoUrlOptions): MongoStore;
+            new (options: MogooseConnectionOptions): MongoStore;
+            new (options: NaitiveMongoOptions): MongoStore;
+        }
+
+        export class MongoStore implements session.Store {
+            get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+            set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+            destroy: (sid: string, callback: (err: any) => void) => void;
+            length: (callback: (err: any, length: number) => void) => void;
+            clear: (callback: (err: any) => void) => void;
+            touch: (sid: string, session: Express.Session, callback:(err: any) => void) => void;
+        }
+    }
+
+    export = connectMongo;
+}
diff --git a/connect-slashes/connect-slashes-tests.ts b/connect-slashes/connect-slashes-tests.ts
index 6fc66bbc0..f4c8ac965 100644
--- a/connect-slashes/connect-slashes-tests.ts
+++ b/connect-slashes/connect-slashes-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../express/express.d.ts"/>
+/// <reference path="./connect-slashes.d.ts"/>
 
 import express = require('express');
 import slashes = require('connect-slashes');
diff --git a/contextjs/contextjs-tests.ts b/contextjs/contextjs-tests.ts
index 0b0d55d09..abfc643ef 100644
--- a/contextjs/contextjs-tests.ts
+++ b/contextjs/contextjs-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./contextjs.d.ts" />
+
 import context = require("contextjs");
 
 context.init();
diff --git a/convert-source-map/convert-source-map-tests.ts b/convert-source-map/convert-source-map-tests.ts
index a89cfb712..1701e0065 100644
--- a/convert-source-map/convert-source-map-tests.ts
+++ b/convert-source-map/convert-source-map-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./convert-source-map.d.ts" />
+
 import convert = require("convert-source-map");
 
 var json = convert
@@ -10,4 +12,4 @@ var modified = convert
 	.toJSON();
 
 console.log(json);
-console.log(modified);
\ No newline at end of file
+console.log(modified);
diff --git a/cookie-parser/cookie-parser.d.ts b/cookie-parser/cookie-parser.d.ts
index a4897c5e7..dd18bdc23 100644
--- a/cookie-parser/cookie-parser.d.ts
+++ b/cookie-parser/cookie-parser.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cookie-parser
+// Type definitions for cookie-parser v1.3.4
 // Project: https://github.com/expressjs/cookie-parser
 // Definitions by: Santi Albo <https://github.com/santialbo/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -8,5 +8,6 @@
 declare module "cookie-parser" {
     import express = require('express');
     function e(secret?: string, options?: any): express.RequestHandler;
+    namespace e{}
     export = e;
 }
\ No newline at end of file
diff --git a/cordova-ionic/cordova-ionic-tests.ts b/cordova-ionic/cordova-ionic-tests.ts
index 69d1a3d82..a88c9c580 100644
--- a/cordova-ionic/cordova-ionic-tests.ts
+++ b/cordova-ionic/cordova-ionic-tests.ts
@@ -7,4 +7,6 @@ cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false);
 cordova.plugins.Keyboard.close();
 cordova.plugins.Keyboard.disableScroll(true);
 cordova.plugins.Keyboard.disableScroll(false);
+cordova.plugins.Keyboard.show();
+cordova.plugins.Keyboard.close();
 console.log(cordova.plugins.Keyboard.isVisible);
diff --git a/cordova-ionic/plugins/keyboard.d.ts b/cordova-ionic/plugins/keyboard.d.ts
index 4ff9e293d..7a1cd38e1 100644
--- a/cordova-ionic/plugins/keyboard.d.ts
+++ b/cordova-ionic/plugins/keyboard.d.ts
@@ -17,6 +17,14 @@ declare module Ionic {
      * Close the keyboard if it is open.
      */
     close(): void;
+    
+    /**
+     * Force keyboard to be shown on Android.
+     * This typically helps if autofocus on a text element does not pop up the keyboard automatically
+     * 
+     * Supported Platforms: Android, Blackberry 10
+     */
+    show(): void;
 
     /**
      * Disable native scrolling, useful if you are using JavaScript to scroll
diff --git a/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts
new file mode 100644
index 000000000..3b27435bd
--- /dev/null
+++ b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="../cordova/cordova.d.ts" />
+/// <reference path="./cordova-plugin-app-version.d.ts" />
+
+cordova.getAppVersion.getAppName()
+	.then(appName=> {
+		console.log(appName)
+	});
+cordova.getAppVersion.getPackageName()
+	.then(packageName=> {
+		console.log(packageName);
+	});
+cordova.getAppVersion.getVersionCode()
+	.then(versionCode=> {
+		console.log(versionCode);
+	});
+cordova.getAppVersion.getVersionNumber()
+	.then(versionNumber=> {
+		console.log(versionNumber);
+	});
\ No newline at end of file
diff --git a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
new file mode 100644
index 000000000..a754368e3
--- /dev/null
+++ b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for cordova-plugin-app-version v0.1.7
+// Project: https://github.com/whiteoctober/cordova-plugin-app-version
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../q/Q.d.ts" />
+
+interface Cordova {
+    getAppVersion: {
+		getAppName: () => Q.IPromise<string>;
+		getPackageName: () => Q.IPromise<string>;
+		getVersionCode: () => Q.IPromise<string>;
+		getVersionNumber: () => Q.IPromise<string>;
+	};
+}
\ No newline at end of file
diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts
new file mode 100644
index 000000000..7520c39d5
--- /dev/null
+++ b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="../cordova/cordova.d.ts" />
+/// <reference path="./cordova-plugin-ibeacon.d.ts" />
+
+function registerDelegates() {
+	cordova.plugins.locationManager.enableDebugLogs();
+
+	cordova.plugins.locationManager.delegate.didRangeBeaconsInRegion = (pluginResult) => didRangeBeaconsInRegion(pluginResult);
+	cordova.plugins.locationManager.delegate.didEnterRegion = (pluginResult) => didEnterRegion(pluginResult);
+	cordova.plugins.locationManager.delegate.didExitRegion = (pluginResult) => didExitRegion(pluginResult);
+	cordova.plugins.locationManager.delegate.didDetermineStateForRegion = (pluginResult) => didDetermineStateForRegion(pluginResult);
+	cordova.plugins.locationManager.delegate.didChangeAuthorizationStatus = (authorizationStatus) => didChangeAuthorizationStatus(authorizationStatus);
+	cordova.plugins.locationManager.delegate.didStartMonitoringForRegion = (pluginResult) => didStartMonitoringForRegion(pluginResult);
+	cordova.plugins.locationManager.delegate.monitoringDidFailForRegionWithError = (pluginResult) => monitoringDidFailForRegionWithError(pluginResult);
+
+	cordova.plugins.locationManager.onDomDelegateReady();
+}
+
+function didRangeBeaconsInRegion(pluginResult: BeaconPlugin.PluginResult): void {
+	for (var beacon of pluginResult.beacons) {
+		console.log(beacon.uuid, beacon.major, beacon.minor, beacon.accuracy, beacon.proximity, beacon.rssi, beacon.tx);
+	}
+}
+
+function didEnterRegion(pluginResult: BeaconPlugin.PluginResult): void {
+	var region: BeaconPlugin.Region = new cordova.plugins.locationManager.BeaconRegion("identifier", "uuid", 1, 2);;
+	cordova.plugins.locationManager.startRangingBeaconsInRegion(this.createBeaconRegionFromPluginResult(pluginResult))
+		.then(() => {
+			console.log("startRangingBeaconsInRegion succeeded");
+		})
+		.catch((reason: any) => {
+			console.error("startRangingBeaconsInRegion failed: " + reason);
+		});
+}
+
+function didExitRegion(pluginResult: BeaconPlugin.PluginResult): void {
+	var region: BeaconPlugin.Region;
+	cordova.plugins.locationManager.stopRangingBeaconsInRegion(region)
+		.then(() => {
+			console.log("stopRangingBeaconsInRegion succeeded");
+		})
+		.catch((reason: any) => {
+			console.error("stopRangingBeaconsInRegion failed: " + reason);
+		});
+}
+
+function didDetermineStateForRegion(pluginResult: BeaconPlugin.PluginResult): void {
+	if (pluginResult.state === "CLRegionStateInside") {
+		console.log(pluginResult.region.identifier);
+	}
+}
+
+function didChangeAuthorizationStatus(authorizationStatus: string): void {
+	console.log(authorizationStatus);
+}
+
+function didStartMonitoringForRegion(pluginResult: BeaconPlugin.PluginResult): void {
+	console.log(pluginResult.region.identifier);
+}
+
+function monitoringDidFailForRegionWithError(pluginResult: BeaconPlugin.PluginResult): void {
+	console.log(pluginResult.region.identifier);
+}
\ No newline at end of file
diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts
new file mode 100644
index 000000000..8f1f6af1a
--- /dev/null
+++ b/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts
@@ -0,0 +1,95 @@
+// Type definitions for cordova-plugin-ibeacon v3.3.0
+// Project: https://github.com/petermetz/cordova-plugin-ibeacon
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../q/Q.d.ts" />
+
+interface CordovaPlugins {
+    locationManager: BeaconPlugin.LocationManager;
+}
+
+declare module BeaconPlugin {
+	/**
+	 * Beacon Plugin.
+	 */
+	export interface LocationManager {
+		delegate: Delegate;
+		BeaconRegion: BeaconRegion;
+		onDomDelegateReady(): void;
+		startMonitoringForRegion(region: Region): Q.Promise<void>;
+		stopMonitoringForRegion(region: Region): Q.Promise<void>;
+		requestStateForRegion(region: Region): Q.Promise<void>;
+		startRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+		stopRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+		getAuthorizationStatus(): Q.Promise<PluginResult>;
+		requestWhenInUseAuthorization(): Q.Promise<void>;
+		requestAlwaysAuthorization(): Q.Promise<void>;
+		getMonitoredRegions(): Q.Promise<Region[]>;
+		getRangedRegions(): Q.Promise<Region[]>;
+		isRangingAvailable(): Q.Promise<boolean>;
+		isMonitoringAvailableForClass(region: Region): Q.Promise<boolean>;
+		startAdvertising(region: Region, measuredPower: boolean): Q.Promise<void>;
+		stopAdvertising(): Q.Promise<void>;
+		isAdvertisingAvailable(): Q.Promise<boolean>;
+		isAdvertising(): Q.Promise<boolean>;
+		disableDebugLogs(): Q.Promise<void>;
+		enableDebugNotifications(): Q.Promise<void>;
+		disableDebugNotifications(): Q.Promise<void>;
+		enableDebugLogs(): Q.Promise<void>;
+		isBluetoothEnabled(): Q.Promise<boolean>;
+		enableBluetooth(): Q.Promise<void>;
+		disableBluetooth(): Q.Promise<void>;
+		appendToDeviceLog(message: string): Q.Promise<string>;
+	}
+
+	export interface PluginResult {
+		eventType: string;
+		region: Region;
+		beacons: Beacon[];
+		authorizationStatus: string;
+		state: string;
+	}
+
+	export interface Delegate {
+		didDetermineStateForRegion(pluginResult: PluginResult): void;
+		didStartMonitoringForRegion(pluginResult: PluginResult): void;
+		didExitRegion(pluginResult: PluginResult): void;
+		didEnterRegion(pluginResult: PluginResult): void;
+		didRangeBeaconsInRegion(pluginResult: PluginResult): void;
+		peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void;
+		peripheralManagerDidUpdateState(pluginResult: PluginResult): void;
+		didChangeAuthorizationStatus(authorizationStatus: string): void;
+		monitoringDidFailForRegionWithError(pluginResult: PluginResult): void;
+	}
+
+	export interface Region {
+		identifier: string;
+		new (identifier: string): Region;
+	}
+
+	export interface BeaconRegion extends Region {
+		uuid: string;
+		major: string;
+		minor: string;
+		notifyEntryStateOnDisplay: boolean;
+		new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion;
+	}
+
+	export interface CircularRegion extends Region {
+		latitude: number;
+		longitude: number;
+		radius: number;
+		new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion;
+	}
+
+	export interface Beacon {
+		uuid: string;
+		major: string;
+		minor: string;
+		proximity: string;
+		tx: number;
+		rssi: number;
+		accuracy: number;
+	}
+}
diff --git a/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts b/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts
new file mode 100644
index 000000000..eed76253c
--- /dev/null
+++ b/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts
@@ -0,0 +1,96 @@
+/// <reference path="cordova-plugin-ouralabs.d.ts" />
+
+var traceLevel: number = OuralabsPlugin.LogLevel.TRACE;
+var debugLevel: number = OuralabsPlugin.LogLevel.DEBUG;
+var infoLevel: number = OuralabsPlugin.LogLevel.INFO;
+var warnLevel: number = OuralabsPlugin.LogLevel.WARN;
+var errorLevel: number = OuralabsPlugin.LogLevel.ERROR;
+var fatalLevel: number = OuralabsPlugin.LogLevel.FATAL;
+
+OuralabsPlugin.init("a");
+OuralabsPlugin.init("a", () => {});
+OuralabsPlugin.init("a", () => {}, (error: string) => {});
+
+OuralabsPlugin.setAttributes("a");
+OuralabsPlugin.setAttributes("a", "b");
+OuralabsPlugin.setAttributes("a", "b", "c");
+OuralabsPlugin.setAttributes("a", null, "c");
+OuralabsPlugin.setAttributes("a", "b", "c");
+OuralabsPlugin.setAttributes("a", "b", "c", () => {});
+OuralabsPlugin.setAttributes("a", "b", "c", () => {}, (error: string) => {});
+
+OuralabsPlugin.setLogToBrowserConsole(true);
+
+OuralabsPlugin.setHookBrowserConsole(true);
+
+OuralabsPlugin.logTrace("a", "b");
+OuralabsPlugin.logTrace("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logTrace("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logTrace("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logTrace("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.logDebug("a", "b");
+OuralabsPlugin.logDebug("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logDebug("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logDebug("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logDebug("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.logInfo("a", "b");
+OuralabsPlugin.logInfo("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logInfo("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logInfo("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logInfo("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.logWarn("a", "b");
+OuralabsPlugin.logWarn("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logWarn("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logWarn("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logWarn("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.logError("a", "b");
+OuralabsPlugin.logError("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logError("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logError("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logError("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.logFatal("a", "b");
+OuralabsPlugin.logFatal("a", "b", { "whoa": "yep" });
+OuralabsPlugin.logFatal("a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.logFatal("a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.logFatal("a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.TRACE, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.TRACE, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.TRACE, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.TRACE, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.TRACE, "a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.DEBUG, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.DEBUG, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.DEBUG, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.DEBUG, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.DEBUG, "a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.INFO, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.INFO, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.INFO, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.INFO, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.INFO, "a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.WARN, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.WARN, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.WARN, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.WARN, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.WARN, "a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.ERROR, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.ERROR, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.ERROR, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.ERROR, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.ERROR, "a", "b", null, () => {}, (error: string) => {});
+
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.FATAL, "a", "b");
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.FATAL, "a", "b", { "whoa": "yep" });
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.FATAL, "a", "b", { "whoa": "yep" }, () => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.FATAL, "a", "b", { "whoa": "yep" }, () => {}, (error: string) => {});
+OuralabsPlugin.log(OuralabsPlugin.LogLevel.FATAL, "a", "b", null, () => {}, (error: string) => {});
\ No newline at end of file
diff --git a/cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts b/cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts
new file mode 100644
index 000000000..6596c7f0c
--- /dev/null
+++ b/cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts
@@ -0,0 +1,139 @@
+// Type definitions for cordova-plugin-ouralabs 1.1.0
+// Project: https://github.com/Justin-Credible/cordova-plugin-ouralabs
+// Definitions by: Justin Unterreiner <https://github.com/Justin-Credible>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module OuralabsPlugin {
+
+    interface OuralabsStatic {
+
+        /**
+         * Log levels designate the severity of the log; used with the log() function.
+         * Log levels are ordered from least severe to most severe.
+         */
+        LogLevel: {
+            TRACE: number,
+            DEBUG: number,
+            INFO: number,
+            WARN: number,
+            ERROR: number,
+            FATAL: number
+        }
+
+        /**
+         * Initialize the Ourlabs plugin with the given channel ID string value.
+         * You can obtain your channel ID from the Ouralabs dashboard.
+         * 
+         * @param channelId The ID of the channel that logs will be written to.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        init(channelId: string, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Used to ensure values logged via the plugin are also displayed in the browser's console.
+         * 
+         * @param enable True to enable logs to show up in the browser's console, false  to disable.
+         */
+        setLogToBrowserConsole(enable: boolean): void;
+
+        /**
+         * Used to enable hooking of the browser's console logging functions (eg console.log,
+         * console.error, etc) to ensure that these logs get logged via Ouralabs.
+         * 
+         * @param enable True to enable hooking of the console log functions, false to disable.
+         */
+        setHookBrowserConsole(enable: boolean): void;
+
+        /**
+         * Allows setting of the three arbitrary attribute values that are stored with the device information.
+         * 
+         * @param [string] attribute1 - The (optional) attribute value to set for the first attribute.
+         * @param [string] attribute2 - The (optional) attribute value to set for the first attribute.
+         * @param [string] attribute3 - The (optional) attribute value to set for the first attribute.
+         * @param [function] successCallback - The success callback for this asynchronous function.
+         * @param [function] failureCallback - The failure callback for this asynchronous function; receives an error string.
+         */
+        setAttributes(attribute1?: string, attribute2?: string, attribute3?: string, successCallback?: () => void, errorCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level TRACE with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logTrace(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level DEBUG with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logDebug(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level INFO with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logInfo(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level WARN with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logWarn(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level ERROR with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logError(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a log message of level FATAL with the given information.
+         * 
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        logFatal(tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+
+        /**
+         * Logs a message with the given information.
+         * 
+         * @param logLevel The level of the log; see OuralabsPlugin.LogLevels for possible values.
+         * @param tag The tag for the log entry.
+         * @param message The body of the log message.
+         * @param metadata An optional object to be appended to the log message in JSON format. If the object cannot be serialized into JSON it will be flattened into key/value pairs.
+         * @param successCallback The success callback for this asynchronous function.
+         * @param failureCallback The failure callback for this asynchronous function; receives an error string.
+         */
+        log(logLevel: number, tag: string, message: string, metadata?: any, successCallback?: () => void, failureCallback?: (error: string) => void): void;
+    }
+}
+
+declare var OuralabsPlugin: OuralabsPlugin.OuralabsStatic;
diff --git a/cordova/cordova-tests.ts b/cordova/cordova-tests.ts
index d162b1ab6..491b49773 100644
--- a/cordova/cordova-tests.ts
+++ b/cordova/cordova-tests.ts
@@ -176,8 +176,12 @@ file.download('http://some.server.com/download.php',
             console.error('Failed with exception ' + err.exception);
         }
     },
-    { headers: null },
-    true);
+    true,
+    {
+      headers: {
+        "Authorization": "Basic dGVzdHVzZXJuYW1lOnRlc3RwYXNzd29yZA=="
+      }
+    });
 
 file.upload('cdvfile://localhost/persistent/path/to/downloads/',
     'http://some.server.com/download.php',
diff --git a/cordova/plugins/Device.d.ts b/cordova/plugins/Device.d.ts
index 283406cb9..a25c1aadc 100644
--- a/cordova/plugins/Device.d.ts
+++ b/cordova/plugins/Device.d.ts
@@ -24,6 +24,8 @@ interface Device {
     uuid: string;
     /** Get the operating system version. */
     version: string;
+	/** Get the device's manufacturer. */
+	manufacturer: string;
 }
 
 declare var device: Device;
\ No newline at end of file
diff --git a/cordova/plugins/FileTransfer.d.ts b/cordova/plugins/FileTransfer.d.ts
index d0c023ae8..7cbde5322 100644
--- a/cordova/plugins/FileTransfer.d.ts
+++ b/cordova/plugins/FileTransfer.d.ts
@@ -53,8 +53,8 @@ interface FileTransfer {
         target: string,
         successCallback: (fileEntry: FileEntry) => void,
         errorCallback: (error: FileTransferError) => void,
-        options?: FileDownloadOptions,
-        trustAllHosts?: boolean): void;
+        trustAllHosts?: boolean,
+        options?: FileDownloadOptions): void;
     /**
      * Aborts an in-progress transfer. The onerror callback is passed a FileTransferError object
      * which has an error code of FileTransferError.ABORT_ERR.
@@ -98,8 +98,8 @@ interface FileUploadOptions {
 
 /** Optional parameters for download method. */
 interface FileDownloadOptions {
-    /** A map of header name/header values. Use an array to specify more than one value. */
-    headers?: Object[];
+    /** A map of header name/header values. */
+    headers?: {};
 }
 
 /** A FileTransferError object is passed to an error callback when an error occurs. */
diff --git a/cordova/plugins/Globalization.d.ts b/cordova/plugins/Globalization.d.ts
index bb9cd2f4a..e6a36af90 100644
--- a/cordova/plugins/Globalization.d.ts
+++ b/cordova/plugins/Globalization.d.ts
@@ -41,12 +41,17 @@ interface Globalization {
      * @param onError   Called on error with a GlobalizationError object.
      *                  The error's expected code is GlobalizationError.FORMATTING_ERROR.
      * @param options   Optional format parameters. Default {formatLength:'short', selector:'date and time'}
+     *                      - 'formatLength' can be "short", "medium", "long", or "full".
+     *                      - 'selector' can be "date", "time", or "date and time".
      */
     dateToString(
         date: Date,
         onSuccess: (date: { value: string; }) => void,
         onError: (error: GlobalizationError) => void,
-        options?: { type?: string; item?: string; }): void;
+        options?: {
+            formatLength?: string; // "short" | "medium" | "long" | "full"
+            selector?: string; // "date" | "time" | "date and time"
+        }): void;
     /**
      * Parses a date formatted as a string, according to the client's user preferences
      * and calendar using the time zone of the client, and returns the corresponding date object.
diff --git a/cordova/plugins/Vibration.d.ts b/cordova/plugins/Vibration.d.ts
index 715f6625f..65952f8e9 100644
--- a/cordova/plugins/Vibration.d.ts
+++ b/cordova/plugins/Vibration.d.ts
@@ -1,17 +1,32 @@
 // Type definitions for Apache Cordova Vibration plugin.
 // Project: https://github.com/apache/cordova-plugin-vibration
-// Definitions by: Microsoft Open Technologies, Inc. <http://msopentech.com>
+// Definitions by: Microsoft Open Technologies, Inc. <http://msopentech.com>, Louis Lagrange <https://github.com/Minishlink/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// 
+//
 // Copyright (c) Microsoft Open Technologies, Inc.
 // Licensed under the MIT license.
 
+interface Navigator {
+	/**
+	 * Vibrates the device for the specified amount of time.
+	 * @param time Milliseconds to vibrate the device. 0 cancels the vibration. Ignored on iOS.
+	 */
+    vibrate(time: number): void;
+
+    /**
+	 * Vibrates the device with a given pattern.
+	 * @param time Sequence of durations (in milliseconds) for which to turn on or off the vibrator. Ignored on iOS.
+	 */
+    vibrate(time: number[]): void;
+}
+
 interface Notification {
 	/**
 	 * Vibrates the device for the specified amount of time.
 	 * @param time Milliseconds to vibrate the device. Ignored on iOS.
+     * @deprecated
 	 */
-    vibrate(time: number): void
+    vibrate(time: number): void;
     /**
      * Vibrates the device with a given pattern.
      * @param number[] pattern Pattern with which to vibrate the device.
@@ -19,10 +34,12 @@ interface Notification {
      *                         The next value - the number of milliseconds for which to keep the vibrator on before turning it off.
      * @param number  repeat   Optional index into the pattern array at which to start repeating (will repeat until canceled),
      *                         or -1 for no repetition (default).
+     * @deprecated
      */
     vibrateWithPattern(pattern: number[], repeat: number): void;
     /**
      * Immediately cancels any currently running vibration.
+     * @deprecated
      */
     cancelVibration(): void;
-}
\ No newline at end of file
+}
diff --git a/core-decorators/core-decorators-tests.ts b/core-decorators/core-decorators-tests.ts
new file mode 100644
index 000000000..e4a31432b
--- /dev/null
+++ b/core-decorators/core-decorators-tests.ts
@@ -0,0 +1,169 @@
+/// <reference path="core-decorators.d.ts" />
+
+//
+// @autobind
+//
+
+import { autobind } from 'core-decorators';
+
+class Person {
+    @autobind
+    getPerson() {
+        return this;
+    }
+}
+
+let person = new Person();
+let getPerson = person.getPerson;
+
+getPerson() === person;
+
+//
+// @readonly
+//
+
+import { readonly } from 'core-decorators';
+
+class Meal {
+    @readonly
+    entree: string = 'steak';
+}
+
+var dinner = new Meal();
+dinner.entree = 'salmon';
+
+//
+// @override
+//
+
+import { override } from 'core-decorators';
+
+class Parent {
+    speak(first: string, second: string) {}
+}
+
+class Child extends Parent {
+    @override
+    speak() {}
+    // SyntaxError: Child#speak() does not properly override Parent#speak(first, second)
+}
+
+// or
+
+class Child2 extends Parent {
+    @override
+    speaks() {}
+    // SyntaxError: No descriptor matching Child#speaks() was found on the prototype chain.
+    //
+    //   Did you mean "speak"?
+}
+
+//
+// @deprecate (alias: @deprecated)
+//
+
+import { deprecate, deprecated } from 'core-decorators';
+
+class Person2 {
+    @deprecate
+    facepalm() {}
+
+    @deprecate('We stopped facepalming')
+    facepalmHard() {}
+
+    @deprecate('We stopped facepalming', { url: 'http://knowyourmeme.com/memes/facepalm' })
+    facepalmHarder() {}
+}
+
+let person2 = new Person2();
+
+person2.facepalm();
+// DEPRECATION Person#facepalm: This function will be removed in future versions.
+
+person2.facepalmHard();
+// DEPRECATION Person#facepalmHard: We stopped facepalming
+
+person2.facepalmHarder();
+// DEPRECATION Person#facepalmHarder: We stopped facepalming
+//
+//     See http://knowyourmeme.com/memes/facepalm for more details.
+//
+
+//
+// @debounce
+//
+
+import { debounce } from 'core-decorators';
+
+class Editor {
+
+    content = '';
+
+    @debounce(500)
+    updateContent(content: string) {
+        this.content = content;
+    }
+}
+
+//
+// @suppressWarnings
+//
+
+import { suppressWarnings } from 'core-decorators';
+
+class Person3 {
+    @deprecated
+    facepalm() {}
+
+    @suppressWarnings
+    facepalmWithoutWarning() {
+        this.facepalm();
+    }
+}
+
+let person3 = new Person3();
+
+person3.facepalmWithoutWarning();
+// no warning is logged
+
+//
+// @nonenumerable
+//
+
+import { nonenumerable } from 'core-decorators';
+
+class Meal2 {
+    entree = 'steak';
+
+    @nonenumerable
+    cost: number = 4.44;
+}
+
+var dinner2 = new Meal2();
+for (var key in dinner2) {
+    key;
+    // "entree" only, not "cost"
+}
+
+Object.keys(dinner2);
+// ["entree"]
+
+//
+// @nonconfigurable
+//
+
+import { nonconfigurable } from 'core-decorators';
+
+class Meal3 {
+    @nonconfigurable
+    entree: string = 'steak';
+}
+
+var dinner3 = new Meal3();
+
+Object.defineProperty(dinner3, 'entree', {
+    enumerable: false
+});
+// Cannot redefine property: entree
+
+
diff --git a/core-decorators/core-decorators-tests.ts.tscparams b/core-decorators/core-decorators-tests.ts.tscparams
new file mode 100644
index 000000000..3f0863ac6
--- /dev/null
+++ b/core-decorators/core-decorators-tests.ts.tscparams
@@ -0,0 +1 @@
+--experimentalDecorators --noImplicitAny --target ES5
diff --git a/core-decorators/core-decorators.d.ts b/core-decorators/core-decorators.d.ts
new file mode 100644
index 000000000..160802fc1
--- /dev/null
+++ b/core-decorators/core-decorators.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for core-decorators.js v0.1.5
+// Project: https://github.com/jayphelps/core-decorators.js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "core-decorators" {
+    export interface ClassDecorator {
+      <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+
+    export interface ParameterDecorator {
+      (target: Object, propertyKey: string|symbol, parameterIndex: number): void;
+    }
+
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string|symbol): void;
+    }
+
+    export interface MethodDecorator {
+      <T>(target: Object, propertyKey: string|symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>|void;
+    }
+
+    export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
+        (target: Object, propertyKey: string|symbol): void;
+    }
+
+    export interface Deprecate extends MethodDecorator {
+        (message?: string, option?: DeprecateOption): MethodDecorator;
+    }
+
+    export interface DeprecateOption {
+        url: string;
+    }
+
+    /**
+     * Forces invocations of this function to always have this refer to the class instance,
+     * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
+     */
+    var autobind: MethodDecorator;
+    /**
+     * Marks a property or method as not being writable.
+     */
+    var readonly: PropertyOrMethodDecorator;
+    /**
+     * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
+     */
+    var override: MethodDecorator;
+    /**
+     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+     */
+    var deprecate: Deprecate;
+    /**
+     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+     */
+    var deprecated: Deprecate;
+    /**
+     * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
+     */
+    var debounce: (wait: number) => MethodDecorator;
+    /**
+     * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
+     */
+    var suppressWarnings: MethodDecorator;
+    /**
+     * Marks a property or method as not being enumerable.
+     */
+    var nonenumerable: PropertyOrMethodDecorator;
+    /**
+     * Marks a property or method as not being writable.
+     */
+    var nonconfigurable: PropertyOrMethodDecorator;
+    /**
+     * Initial implementation included, likely slow. WIP.
+     */
+    var memoize: MethodDecorator;
+
+    export {
+        autobind,
+        readonly,
+        override,
+        deprecate,
+        deprecated,
+        debounce,
+        suppressWarnings,
+        nonenumerable,
+        nonconfigurable,
+        memoize // WIP
+    };
+}
diff --git a/core-js/core-js.d.ts b/core-js/core-js.d.ts
index 476ab9916..9c492e433 100644
--- a/core-js/core-js.d.ts
+++ b/core-js/core-js.d.ts
@@ -22,13 +22,13 @@ declare type PropertyKey = string | number | symbol;
 
 // #############################################################################################
 // ECMAScript 6: Object & Function
-// Modules: es6.object.assign, es6.object.is, es6.object.set-prototype-of, 
+// Modules: es6.object.assign, es6.object.is, es6.object.set-prototype-of,
 //          es6.object.to-string, es6.function.name and es6.function.has-instance.
 // #############################################################################################
- 
+
 interface ObjectConstructor {
     /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
       * target object. Returns the target object.
       * @param target The target object to copy to.
       * @param sources One or more source objects to copy properties from.
@@ -57,10 +57,10 @@ interface Function {
       */
     name: string;
 
-    /** 
-      * Determines if a constructor object recognizes an object as one of the 
+    /**
+      * Determines if a constructor object recognizes an object as one of the
       * constructor’s instances.
-      * @param value The object to test. 
+      * @param value The object to test.
       */
     [Symbol.hasInstance](value: any): boolean;
 }
@@ -71,30 +71,25 @@ interface Function {
 //          and es6.array.find-index
 // #############################################################################################
 
-interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
-}
-
 interface Array<T> {
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the value of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
 
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the index of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
@@ -102,21 +97,21 @@ interface Array<T> {
     /**
       * Returns the this object after filling the section identified by start and end with value
       * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * @param start index to start filling the array at. If start is negative, it is treated as
+      * length+start where length is the length of the array.
+      * @param end index to stop filling the array at. If end is negative, it is treated as
       * length+end.
       */
     fill(value: T, start?: number, end?: number): T[];
 
-    /** 
+    /**
       * Returns the this object after copying a section of the array identified by start and end
       * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * @param target If target is negative, it is treated as length+target where length is the
+      * length of the array.
+      * @param start If start is negative, it is treated as length+start. If end is negative, it
       * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
+      * @param end If not specified, length of the this object is used as its default value.
       */
     copyWithin(target: number, start: number, end?: number): T[];
 
@@ -161,47 +156,47 @@ interface ArrayConstructor {
 
 // #############################################################################################
 // ECMAScript 6: String & RegExp
-// Modules: es6.string.from-code-point, es6.string.raw, es6.string.code-point-at, 
-//          es6.string.ends-with, es6.string.includes, es6.string.repeat, 
+// Modules: es6.string.from-code-point, es6.string.raw, es6.string.code-point-at,
+//          es6.string.ends-with, es6.string.includes, es6.string.repeat,
 //          es6.string.starts-with, and es6.regexp
 // #############################################################################################
 
 interface String {
     /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point
+      * value of the UTF-16 encoded code point starting at the string element at position pos in
+      * the String resulting from converting this object to a String.
+      * If there is no element at that position, the result is undefined.
       * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
       */
     codePointAt(pos: number): number;
 
     /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
+      * Returns true if searchString appears as a substring of the result of converting this
+      * object to a String, at one or more positions that are
       * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
+      * @param searchString search string
       * @param position If position is undefined, 0 is assumed, so as to search all of the String.
       */
     includes(searchString: string, position?: number): boolean;
 
     /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
       * endPosition – length(this). Otherwise returns false.
       */
     endsWith(searchString: string, endPosition?: number): boolean;
 
     /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * Returns a String value that is made from count copies appended together. If count is 0,
       * T is the empty String is returned.
       * @param count number of copies to append
       */
     repeat(count: number): string;
 
     /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
       * position. Otherwise returns false.
       */
     startsWith(searchString: string, position?: number): boolean;
@@ -216,7 +211,7 @@ interface StringConstructor {
 
     /**
       * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
+      * as such the first argument will be a well formed template call site object and the rest
       * parameter will contain the substitution values.
       * @param template A well-formed template string call site representation.
       * @param substitutions A set of substitution values.
@@ -248,14 +243,14 @@ interface RegExp {
 interface NumberConstructor {
     /**
       * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
+      * that is representable as a Number value, which is approximately:
       * 2.2204460492503130808472633361816 x 10‍−‍16.
       */
     EPSILON: number;
 
     /**
       * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
@@ -268,7 +263,7 @@ interface NumberConstructor {
     isInteger(number: number): boolean;
 
     /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
       * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
@@ -281,30 +276,30 @@ interface NumberConstructor {
       */
     isSafeInteger(number: number): boolean;
 
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
+    /**
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as
+      * a Number value.
       * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
       */
     MAX_SAFE_INTEGER: number;
 
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
+    /**
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as
+      * a Number value.
       * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
       */
     MIN_SAFE_INTEGER: number;
 
     /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
+      * Converts a string to a floating-point number.
+      * @param string A string that contains a floating-point number.
       */
     parseFloat(string: string): number;
 
     /**
       * Converts A string to an integer.
       * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString.
       * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
       * All other strings are considered decimal.
       */
@@ -350,7 +345,7 @@ interface Math {
     log1p(x: number): number;
 
     /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of
       * the natural logarithms).
       * @param x A numeric expression.
       */
@@ -436,8 +431,8 @@ interface Symbol {
 }
 
 interface SymbolConstructor {
-    /** 
-      * A reference to the prototype. 
+    /**
+      * A reference to the prototype.
       */
     prototype: Symbol;
 
@@ -448,14 +443,14 @@ interface SymbolConstructor {
     (description?: string|number): symbol;
 
     /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+      * Returns a Symbol object from the global symbol registry matching the given key if found.
       * Otherwise, returns a new symbol with this key.
       * @param key key to search for.
       */
     for(key: string): symbol;
 
     /**
-      * Returns a key from the global symbol registry matching the given Symbol if found. 
+      * Returns a key from the global symbol registry matching the given Symbol if found.
       * Otherwise, returns a undefined.
       * @param sym Symbol to find the key for.
       */
@@ -463,72 +458,72 @@ interface SymbolConstructor {
 
     // Well-known Symbols
 
-    /** 
-      * A method that determines if a constructor object recognizes an object as one of the 
-      * constructor’s instances. Called by the semantics of the instanceof operator. 
+    /**
+      * A method that determines if a constructor object recognizes an object as one of the
+      * constructor’s instances. Called by the semantics of the instanceof operator.
       */
     hasInstance: symbol;
 
-    /** 
+    /**
       * A Boolean value that if true indicates that an object should flatten to its array elements
       * by Array.prototype.concat.
       */
     isConcatSpreadable: symbol;
 
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
+    /**
+      * A method that returns the default iterator for an object. Called by the semantics of the
       * for-of statement.
       */
     iterator: symbol;
 
     /**
-      * A regular expression method that matches the regular expression against a string. Called 
-      * by the String.prototype.match method. 
+      * A regular expression method that matches the regular expression against a string. Called
+      * by the String.prototype.match method.
       */
     match: symbol;
 
-    /** 
-      * A regular expression method that replaces matched substrings of a string. Called by the 
+    /**
+      * A regular expression method that replaces matched substrings of a string. Called by the
       * String.prototype.replace method.
       */
     replace: symbol;
 
     /**
-      * A regular expression method that returns the index within a string that matches the 
+      * A regular expression method that returns the index within a string that matches the
       * regular expression. Called by the String.prototype.search method.
       */
     search: symbol;
 
-    /** 
-      * A function valued property that is the constructor function that is used to create 
+    /**
+      * A function valued property that is the constructor function that is used to create
       * derived objects.
       */
     species: symbol;
 
     /**
-      * A regular expression method that splits a string at the indices that match the regular 
+      * A regular expression method that splits a string at the indices that match the regular
       * expression. Called by the String.prototype.split method.
       */
     split: symbol;
 
-    /** 
+    /**
       * A method that converts an object to a corresponding primitive value.Called by the ToPrimitive
       * abstract operation.
       */
     toPrimitive: symbol;
 
-    /** 
+    /**
       * A String value that is used in the creation of the default string description of an object.
       * Called by the built-in method Object.prototype.toString.
       */
     toStringTag: symbol;
 
-    /** 
-      * An Object whose own property names are property names that are excluded from the with 
+    /**
+      * An Object whose own property names are property names that are excluded from the with
       * environment bindings of the associated objects.
       */
     unscopables: symbol;
-    
+
     /**
       * Non-standard. Use simple mode for core-js symbols. See https://github.com/zloirock/core-js/#caveats-when-using-symbol-polyfill
       */
@@ -544,12 +539,12 @@ declare var Symbol: SymbolConstructor;
 
 interface Object {
     /**
-      * Determines whether an object has a property with the specified name. 
+      * Determines whether an object has a property with the specified name.
       * @param v A property name.
       */
     hasOwnProperty(v: PropertyKey): boolean;
 
-    /** 
+    /**
       * Determines whether a specified property is enumerable.
       * @param v A property name.
       */
@@ -564,17 +559,17 @@ interface ObjectConstructor {
     getOwnPropertySymbols(o: any): symbol[];
 
     /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not 
-      * inherited from the object's prototype. 
+      * Gets the own property descriptor of the specified object.
+      * An own property descriptor is one that is defined directly on the object and is not
+      * inherited from the object's prototype.
       * @param o Object that contains the property.
       * @param p Name of the property.
     */
     getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
 
     /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript 
+      * Adds a property to an object, or modifies attributes of an existing property.
+      * @param o Object on which to add or modify the property. This can be a native JavaScript
       * object (that is, a user-defined object or a built in object) or a DOM object.
       * @param p The property name.
       * @param attributes Descriptor for the property. It can be for a data property or an accessor
@@ -693,17 +688,17 @@ interface Array<T> {
     /** Iterator */
     [Symbol.iterator](): IterableIterator<T>;
 
-    /** 
+    /**
       * Returns an array of key, value pairs for every entry in the array
       */
     entries(): IterableIterator<[number, T]>;
 
-    /** 
+    /**
       * Returns an list of keys in the array
       */
     keys(): IterableIterator<number>;
 
-    /** 
+    /**
       * Returns an list of values in the array
       */
     values(): IterableIterator<T>;
@@ -776,21 +771,21 @@ interface Promise<T> {
 }
 
 interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
+    /**
+      * A reference to the prototype.
       */
     prototype: Promise<any>;
 
     /**
      * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments:
+     * a resolve callback used resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
     new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
 
     /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
      * resolve, or rejected when any Promise is rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
@@ -798,7 +793,7 @@ interface PromiseConstructor {
     all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;
 
     /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
      * or rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
@@ -859,7 +854,7 @@ declare module Reflect {
 
 // #############################################################################################
 // ECMAScript 7
-// Modules: es7.array.includes, es7.string.at, es7.string.lpad, es7.string.rpad, 
+// Modules: es7.array.includes, es7.string.at, es7.string.lpad, es7.string.rpad,
 //          es7.object.to-array, es7.object.get-own-property-descriptors, es7.regexp.escape,
 //          es7.map.to-json, and es7.set.to-json
 // #############################################################################################
@@ -918,14 +913,14 @@ interface ArrayConstructor {
       */
     join<T>(array: ArrayLike<T>, separator?: string): string;
     /**
-      * Reverses the elements in an Array. 
+      * Reverses the elements in an Array.
       */
     reverse<T>(array: ArrayLike<T>): T[];
     /**
       * Removes the first element from an array and returns it.
       */
     shift<T>(array: ArrayLike<T>): T;
-    /** 
+    /**
       * Returns a section of an array.
       * @param start The beginning of the specified portion of the array.
       * @param end The end of the specified portion of the array.
@@ -988,21 +983,21 @@ interface ArrayConstructor {
 
     /**
       * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. 
+      * @param callbackfn  A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array.
       * @param thisArg  An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     forEach<T>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array. 
+      * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     map<T, U>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
 
     /**
-      * Returns the elements of an array that meet the condition specified in a callback function. 
-      * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. 
+      * Returns the elements of an array that meet the condition specified in a callback function.
+      * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
     filter<T>(array: ArrayLike<T>, callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
@@ -1021,53 +1016,53 @@ interface ArrayConstructor {
       */
     reduce<T>(array: ArrayLike<T>, callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 
-    /** 
+    /**
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight<T, U>(array: ArrayLike<T>, callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 
-    /** 
+    /**
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight<T>(array: ArrayLike<T>, callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 
-    /** 
+    /**
       * Returns an array of key, value pairs for every entry in the array
       */
     entries<T>(array: ArrayLike<T>): IterableIterator<[number, T]>;
 
-    /** 
+    /**
       * Returns an list of keys in the array
       */
     keys<T>(array: ArrayLike<T>): IterableIterator<number>;
 
-    /** 
+    /**
       * Returns an list of values in the array
       */
     values<T>(array: ArrayLike<T>): IterableIterator<T>;
 
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the value of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     find<T>(array: ArrayLike<T>, predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
 
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the index of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     findIndex<T>(array: ArrayLike<T>, predicate: (value: T) => boolean, thisArg?: any): number;
@@ -1075,21 +1070,21 @@ interface ArrayConstructor {
     /**
       * Returns the this object after filling the section identified by start and end with value
       * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * @param start index to start filling the array at. If start is negative, it is treated as
+      * length+start where length is the length of the array.
+      * @param end index to stop filling the array at. If end is negative, it is treated as
       * length+end.
       */
     fill<T>(array: ArrayLike<T>, value: T, start?: number, end?: number): T[];
 
-    /** 
+    /**
       * Returns the this object after copying a section of the array identified by start and end
       * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * @param target If target is negative, it is treated as length+target where length is the
+      * length of the array.
+      * @param start If start is negative, it is treated as length+start. If end is negative, it
       * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
+      * @param end If not specified, length of the this object is used as its default value.
       */
     copyWithin<T>(array: ArrayLike<T>, target: number, start: number, end?: number): T[];
 
@@ -1113,7 +1108,7 @@ interface ObjectConstructor {
       * Non-standard.
       */
     classof(value: any): string;
-    
+
     /**
       * Non-standard.
       */
@@ -1477,13 +1472,13 @@ declare module core {
 }
 
 declare module "core-js" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/shim" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/core" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/core/$for" {
     import $for = core.$for;
@@ -2149,10 +2144,10 @@ declare module "core-js/fn/symbol/unscopables" {
     export = unscopables;
 }
 declare module "core-js/es5" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/es6" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/es6/array" {
     var Array: typeof core.Array;
@@ -2211,7 +2206,7 @@ declare module "core-js/es6/weak-set" {
     export = WeakSet;
 }
 declare module "core-js/es7" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/es7/array" {
     var Array: typeof core.Array;
@@ -2238,32 +2233,32 @@ declare module "core-js/es7/string" {
     export = String;
 }
 declare module "core-js/js" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/js/array" {
     var Array: typeof core.Array;
     export = Array;
 }
 declare module "core-js/web" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/web/dom" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/web/immediate" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/web/timers" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/shim" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/core" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/core/$for" {
     import $for = core.$for;
@@ -2928,10 +2923,10 @@ declare module "core-js/libary/fn/symbol/unscopables" {
     export = unscopables;
 }
 declare module "core-js/libary/es5" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/es6" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/es6/array" {
     var Array: typeof core.Array;
@@ -2990,7 +2985,7 @@ declare module "core-js/libary/es6/weak-set" {
     export = WeakSet;
 }
 declare module "core-js/libary/es7" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/es7/array" {
     var Array: typeof core.Array;
@@ -3017,21 +3012,21 @@ declare module "core-js/libary/es7/string" {
     export = String;
 }
 declare module "core-js/libary/js" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/js/array" {
     var Array: typeof core.Array;
     export = Array;
 }
 declare module "core-js/libary/web" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/web/dom" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/web/immediate" {
-    export = core; 
+    export = core;
 }
 declare module "core-js/libary/web/timers" {
-    export = core; 
+    export = core;
 }
diff --git a/cryptojs/cryptojs.d.ts b/cryptojs/cryptojs.d.ts
index d9c77dbe9..997306e4a 100644
--- a/cryptojs/cryptojs.d.ts
+++ b/cryptojs/cryptojs.d.ts
@@ -52,11 +52,11 @@ declare module CryptoJS{
             init(cfg?: C): void
             create(cfg?: C): IHasher<C>
 
-            update(messageUpdate: WordArray): Hasher
             update(messageUpdate: string): Hasher
+            update(messageUpdate: WordArray): Hasher
 
-            finalize(messageUpdate?: WordArray): WordArray
             finalize(messageUpdate?: string): WordArray
+            finalize(messageUpdate?: WordArray): WordArray
 
             blockSize: number
 
@@ -69,16 +69,16 @@ declare module CryptoJS{
 
         //tparam C - Configuration type
         interface IHasherHelper<C>{
-            (message: WordArray, cfg?: C): WordArray
             (message: string, cfg?: C): WordArray
+            (message: WordArray, cfg?: C): WordArray
         }
         interface HasherHelper extends IHasherHelper<Object>{}
 
         interface IHasherHmacHelper{
-            (message: WordArray,  key: WordArray): WordArray
+            (message: string,     key: string): WordArray
             (message: string,     key: WordArray): WordArray
             (message: WordArray,  key: string): WordArray
-            (message: string,     key: string): WordArray
+            (message: WordArray,  key: WordArray): WordArray
         }
 
         //tparam C - Configuration type
@@ -90,11 +90,11 @@ declare module CryptoJS{
             create(xformMode?: number, key?: WordArray, cfg?: C): ICipher<C>
             init(xformMode?: number, key?: WordArray, cfg?: C): void
 
-            process(dataUpdate: WordArray): WordArray
             process(dataUpdate: string): WordArray
+            process(dataUpdate: WordArray): WordArray
 
-            finalize(dataUpdate?: WordArray): WordArray
             finalize(dataUpdate?: string): WordArray
+            finalize(dataUpdate?: WordArray): WordArray
 
             keySize: number
             ivSize: number
@@ -127,12 +127,13 @@ declare module CryptoJS{
         //BlockCipher has interface same as IStreamCipher
         interface BlockCipher extends IStreamCipher<IBlockCipherCfg>{}
 
-        interface IBlockCipherCfg{
+        interface IBlockCipherCfg {
+            iv?: WordArray;
             mode?: mode.IBlockCipherModeImpl //default CBC
             padding?: pad.IPaddingImpl //default Pkcs7
         }
 
-        interface CipherParamsData{
+        interface CipherParamsData {
             ciphertext?: lib.WordArray
             key?: lib.WordArray
             iv?: lib.WordArray
@@ -163,6 +164,9 @@ declare module CryptoJS{
         interface SerializableCipher extends ISerializableCipher<ISerializableCipherCfg>{}
         interface ISerializableCipherCfg{
             format?: format.IFormatter //default OpenSSLFormatter
+            iv?: WordArray;
+            mode?: mode.IBlockCipherModeImpl;
+            padding?: pad.IPaddingImpl;
         }
 
         interface IPasswordBasedCipher<C extends IPasswordBasedCipherCfg> extends Base{
@@ -177,19 +181,21 @@ declare module CryptoJS{
         interface PasswordBasedCipher extends IPasswordBasedCipher<IPasswordBasedCipherCfg>{}
         interface IPasswordBasedCipherCfg extends ISerializableCipherCfg{
             kdf?: kdf.IKdfImpl //default OpenSSLKdf
+            mode?: mode.IBlockCipherModeImpl;
+            padding?: pad.IPaddingImpl;
         }
 
         /** see Cipher._createHelper */
         interface ICipherHelper<C>{
-            encrypt(message: WordArray, key: WordArray, cfg?: C): CipherParams
+            encrypt(message: string,    password: string, cfg?: C): CipherParams
             encrypt(message: string,    key: WordArray, cfg?: C): CipherParams
             encrypt(message: WordArray, password: string, cfg?: C): CipherParams
-            encrypt(message: string,    password: string, cfg?: C): CipherParams
+            encrypt(message: WordArray, key: WordArray, cfg?: C): CipherParams
 
-            decrypt(ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
+            decrypt(ciphertext: string,       password: string, cfg?: C): WordArray
             decrypt(ciphertext: string,       key: WordArray, cfg?: C): WordArray
             decrypt(ciphertext: CipherParamsData, password: string, cfg?: C): WordArray
-            decrypt(ciphertext: string,       password: string, cfg?: C): WordArray
+            decrypt(ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
         }
 
         interface CipherHelper extends ICipherHelper<Object>{}
@@ -228,8 +234,8 @@ declare module CryptoJS{
         }
 
         interface IKdfImpl{
-            execute(password: string, keySize: number, ivSize: number, salt?: lib.WordArray): lib.CipherParams
             execute(password: string, keySize: number, ivSize: number, salt?: string): lib.CipherParams
+            execute(password: string, keySize: number, ivSize: number, salt?: lib.WordArray): lib.CipherParams
         }
     }
 
@@ -277,8 +283,8 @@ declare module CryptoJS{
             encryptBlock(M: number[], offset: number): void
             decryptBlock(M: number[], offset: number): void
 
-            createEncryptor(key: lib.WordArray, cfg?: lib.IBlockCipherCfg): IBlockCipherImpl
-            createDecryptor(key: lib.WordArray, cfg?: lib.IBlockCipherCfg): IBlockCipherImpl
+            createEncryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
+            createDecryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
 
             create(xformMode?: number, key?: lib.WordArray, cfg?: lib.IBlockCipherCfg): IBlockCipherImpl
         }
@@ -305,26 +311,26 @@ declare module CryptoJS{
         }
 
         interface HMAC extends lib.Base{
-            init(hasher?: lib.Hasher, key?: lib.WordArray): void
             init(hasher?: lib.Hasher, key?: string): void
-            create(hasher?: lib.Hasher, key?: lib.WordArray): HMAC
+            init(hasher?: lib.Hasher, key?: lib.WordArray): void
             create(hasher?: lib.Hasher, key?: string): HMAC
+            create(hasher?: lib.Hasher, key?: lib.WordArray): HMAC
 
-            update(messageUpdate: lib.WordArray): HMAC
             update(messageUpdate: string): HMAC
+            update(messageUpdate: lib.WordArray): HMAC
 
-            finalize(messageUpdate?: lib.WordArray): lib.WordArray
             finalize(messageUpdate?: string): lib.WordArray
+            finalize(messageUpdate?: lib.WordArray): lib.WordArray
         }
 
         interface EvpKDF extends lib.Base{
             cfg: IEvpKDFCfg
             init(cfg?: IEvpKDFCfg): void
             create(cfg?: IEvpKDFCfg): EvpKDF
-            compute(password: lib.WordArray,  salt: lib.WordArray): lib.WordArray
+            compute(password: string,         salt: string): lib.WordArray
             compute(password: string,         salt: lib.WordArray): lib.WordArray
             compute(password: lib.WordArray,  salt: string): lib.WordArray
-            compute(password: string,         salt: string): lib.WordArray
+            compute(password: lib.WordArray,  salt: lib.WordArray): lib.WordArray
         }
         interface IEvpKDFCfg{
             keySize?: number //default 128/32
@@ -332,10 +338,10 @@ declare module CryptoJS{
             iterations?: number //default 1
         }
         interface IEvpKDFHelper{
-            (password: lib.WordArray,  salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
+            (password: string,         salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
             (password: string,         salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
             (password: lib.WordArray,  salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
-            (password: string,         salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
+            (password: lib.WordArray,  salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
         }
 
         interface PBKDF2 extends EvpKDF{} //PBKDF2 is same as EvpKDF
diff --git a/cryptojs/test/aes-tests.ts b/cryptojs/test/aes-tests.ts
index d4f0d9537..81e83e594 100644
--- a/cryptojs/test/aes-tests.ts
+++ b/cryptojs/test/aes-tests.ts
@@ -50,7 +50,7 @@ YUI.add('algo-aes-test', function (Y) {
             var expectedKey = key.toString();
             var expectedIv = iv.toString();
 
-            C.AES.encrypt(message, key, { iv: iv });
+            C.AES.encrypt(message, key, { iv });
 
             Y.Assert.areEqual(expectedMessage, message.toString());
             Y.Assert.areEqual(expectedKey, key.toString());
diff --git a/cryptojs/test/des-tests.ts b/cryptojs/test/des-tests.ts
index d889abab1..72ae365f9 100644
--- a/cryptojs/test/des-tests.ts
+++ b/cryptojs/test/des-tests.ts
@@ -74,7 +74,7 @@ YUI.add('algo-des-test', function (Y) {
             var expectedKey = key.toString();
             var expectedIv = iv.toString();
 
-            C.DES.encrypt(message, key, { iv: iv });
+            C.DES.encrypt(message, key, { iv });
 
             Y.Assert.areEqual(expectedMessage, message.toString());
             Y.Assert.areEqual(expectedKey, key.toString());
diff --git a/cryptojs/test/tripledes-tests.ts b/cryptojs/test/tripledes-tests.ts
index cbc123ea3..c0a795c9d 100644
--- a/cryptojs/test/tripledes-tests.ts
+++ b/cryptojs/test/tripledes-tests.ts
@@ -58,7 +58,7 @@ YUI.add('algo-tripledes-test', function (Y) {
             var expectedKey = key.toString();
             var expectedIv = iv.toString();
 
-            C.TripleDES.encrypt(message, key, { iv: iv });
+            C.TripleDES.encrypt(message, key, { iv });
 
             Y.Assert.areEqual(expectedMessage, message.toString());
             Y.Assert.areEqual(expectedKey, key.toString());
diff --git a/d3/d3-tests.ts b/d3/d3-tests.ts
index d087c7876..98888dde7 100644
--- a/d3/d3-tests.ts
+++ b/d3/d3-tests.ts
@@ -139,7 +139,7 @@ function groupedBarChart() {
             .style("text-anchor", "end")
             .text("Population");
 
-        var state = svg.selectAll(".state") 
+        var state = svg.selectAll(".state")
             .data(data)
           .enter().append("g")
             .attr("class", "g")
@@ -672,8 +672,8 @@ function dragMultiples() {
 
     function dragmove(d: { x: number; y: number }) {
         d3.select(this)
-            .attr("cx", d.x = Math.max(radius, Math.min(width - radius, (<any> d3.event).x)))
-            .attr("cy", d.y = Math.max(radius, Math.min(height - radius, (<any> d3.event).y)));
+            .attr("cx", d.x = Math.max(radius, Math.min(width - radius, (<d3.DragEvent> d3.event).x)))
+            .attr("cy", d.y = Math.max(radius, Math.min(height - radius, (<d3.DragEvent> d3.event).y)));
     }
 }
 
@@ -873,7 +873,7 @@ function populationPyramid() {
         // Allow the arrow keys to change the displayed year.
         window.focus();
         d3.select(window).on("keydown", function () {
-            switch (d3.event.keyCode) {
+            switch ((<KeyboardEvent> d3.event).keyCode) {
                 case 37: year = Math.max(year0, year - 10); break;
                 case 39: year = Math.min(year1, year + 10); break;
             }
@@ -922,7 +922,7 @@ module forcedBasedLabelPlacemant {
 
     var nodes: Node[] = [];
     var labelAnchors: LabelAnchor[] = [];
-    var labelAnchorLinks: { source: number; target: number }[] = [];
+    var labelAnchorLinks: { source: number; target: number; weight: number }[] = [];
     var links: typeof labelAnchorLinks = [];
 
     for (var i = 0; i < 30; i++) {
@@ -1167,7 +1167,7 @@ function azimuthalEquidistant() {
         .translate([width / 2, height / 2])
         .clipAngle(180 - 1e-3)
         .precision(.1);
-    
+
     var path = d3.geo.path()
         .projection(projection);
 
@@ -1209,7 +1209,7 @@ function azimuthalEquidistant() {
 
     d3.select(self.frameElement).style("height", height + "px");
 }
- 
+
 //Example from http://bl.ocks.org/mbostock/4060366
 function voronoiTesselation() {
     var width = 960,
@@ -1237,7 +1237,7 @@ function voronoiTesselation() {
         .attr("r", 2);
 
     redraw();
-    
+
     function redraw() {
         path = path.data(voronoi(vertices).map(function (d) { return "M" + d.join("L") + "Z"; } ), String);
         path.exit().remove();
@@ -1254,7 +1254,7 @@ function forceDirectedVoronoi() {
         simulate = true,
         zoomToAdd = true,
         color = d3.scale.quantize<string>().domain([10000, 7250]).range(["#dadaeb","#bcbddc","#9e9ac8","#807dba","#6a51a3","#54278f","#3f007d"])
- 
+
     var numVertices = (w*h) / 3000;
     var vertices = d3.range(numVertices).map(function(i) {
         var angle = radius * (i+10);
@@ -1266,15 +1266,15 @@ function forceDirectedVoronoi() {
     var prevEventScale = 1;
     var zoom = d3.behavior.zoom().on("zoom", function(d,i) {
         if (zoomToAdd){
-          if ((<any> d3.event).scale > prevEventScale) {
-                var angle = radius * vertices.length;
-                vertices.push({x: angle*Math.cos(angle)+(w/2), y: angle*Math.sin(angle)+(h/2)})
-            } else if (vertices.length > 2 && (<any> d3.event).scale != prevEventScale) {
-                vertices.pop();
-            }
-            force.nodes(vertices).start()
+          if ((<d3.ZoomEvent> d3.event).scale > prevEventScale) {
+            var angle = radius * vertices.length;
+            vertices.push({x: angle*Math.cos(angle)+(w/2), y: angle*Math.sin(angle)+(h/2)})
+          } else if (vertices.length > 2 && (<d3.ZoomEvent> d3.event).scale != prevEventScale) {
+            vertices.pop();
+          }
+        force.nodes(vertices).start()
         } else {
-            if ((<any> d3.event).scale > prevEventScale) {
+            if ((<d3.ZoomEvent> d3.event).scale > prevEventScale) {
                 radius+= .01
             } else {
                 radius -= .01
@@ -1285,18 +1285,18 @@ function forceDirectedVoronoi() {
             });
             force.nodes(vertices).start()
         }
-        prevEventScale = (<any> d3.event).scale;
+        prevEventScale = (<d3.ZoomEvent> d3.event).scale;
     });
- 
+
     d3.select(window)
         .on("keydown", function() {
             // shift
-            if(d3.event.keyCode == 16) {
+            if((<KeyboardEvent> d3.event).keyCode == 16) {
                 zoomToAdd = false
             }
-     
+
             // s
-            if(d3.event.keyCode == 83) {
+            if((<KeyboardEvent> d3.event).keyCode == 83) {
                 simulate = !simulate
                 if(simulate) {
                     force.start()
@@ -1308,38 +1308,38 @@ function forceDirectedVoronoi() {
         .on("keyup", function() {
             zoomToAdd = true
         })
- 
+
     var svg = d3.select("#chart")
         .append("svg")
         .attr("width", w)
         .attr("height", h)
         .call(zoom)
- 
+
     var force = d3.layout.force()
         .charge(-300)
         .size([w, h])
         .on("tick", update);
- 
+
     force.nodes(vertices).start();
- 
+
     var circle = <d3.selection.Update<any>> svg.selectAll("circle");
     var path = <d3.selection.Update<any>> svg.selectAll("path");
     var link = <d3.selection.Update<any>> svg.selectAll("line");
- 
+
     function update() {
         path = path.data(d3_geom_voronoi(vertices));
         path.enter().append("path")
             // drag node by dragging cell
             .call(d3.behavior.drag()
               .on("drag", function(d, i) {
-                vertices[i] = {x: vertices[i].x + (<any> d3.event).dx, y: vertices[i].y + (<any> d3.event).dy}
+                vertices[i] = {x: vertices[i].x + (<d3.DragEvent> d3.event).dx, y: vertices[i].y + (<d3.DragEvent> d3.event).dy}
               })
             )
             .style("fill", function(d, i) { return color(0) })
         path.attr("d", function(d) { return "M" + d.join("L") + "Z"; })
             .transition().duration(150).style("fill", function(d, i) { return color(d3.geom.polygon(d).area()) })
         path.exit().remove();
- 
+
         circle = circle.data(vertices)
         circle.enter().append("circle")
               .attr("r", 0)
@@ -1347,16 +1347,16 @@ function forceDirectedVoronoi() {
         circle.attr("cx", function(d) { return d.x; })
               .attr("cy", function(d) { return d.y; });
         circle.exit().transition().attr("r", 0).remove();
- 
+
         link = link.data(d3_geom_voronoi.links(vertices))
         link.enter().append("line")
         link.attr("x1", function(d) { return d.source.x; })
             .attr("y1", function(d) { return d.source.y; })
             .attr("x2", function(d) { return d.target.x; })
             .attr("y2", function(d) { return d.target.y; })
- 
+
         link.exit().remove()
- 
+
         if(!simulate) force.stop()
     }
 }
@@ -1521,7 +1521,7 @@ module hierarchicalEdgeBundling {
         .value(function (d) { return d.size; } );
 
     var bundle = d3.layout.bundle<Result>();
-    
+
     var line = d3.svg.line.radial<Result>()
         .interpolate("bundle")
         .tension(.85)
@@ -1851,7 +1851,7 @@ function chordDiagram() {
         [8010, 16145, 8090, 8045],
         [1013, 990, 940, 6907]
     ];
-    
+
     var chord = d3.layout.chord()
         .padding(.05)
         .sortSubgroups(d3.descending)
@@ -2031,7 +2031,7 @@ function irisParallel() {
         }
 
         function drag(d: string) {
-            x.range()[i] = (<any> d3.event).x;
+            x.range()[i] = (<d3.DragEvent> d3.event).x;
             traits.sort(function (a, b) { return x(a) - x(b); } );
             g.attr("transform", function (d) { return "translate(" + x(d) + ")"; } );
             foreground.attr("d", path);
@@ -2085,14 +2085,14 @@ function healthAndWealth() {
     // The x & y axes.
     var xAxis = d3.svg.axis().orient("bottom").scale(xScale).ticks(12, d3.format(",d")),
         yAxis = d3.svg.axis().scale(yScale).orient("left");
-    
+
     // Create the SVG container and set the origin.
     var svg = d3.select("#chart").append("svg")
         .attr("width", width + margin.left + margin.right)
         .attr("height", height + margin.top + margin.bottom)
         .append("g")
         .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-    
+
     // Add the x-axis.
     svg.append("g")
         .attr("class", "x axis")
@@ -2152,7 +2152,7 @@ function healthAndWealth() {
 
         // Add an overlay for the year label.
         var box = (<SVGTextElement>label.node()).getBBox();
-        
+
         var overlay = svg.append("rect")
             .attr("class", "overlay")
             .attr("x", box.x)
@@ -2669,12 +2669,14 @@ function multiTest() {
 function testD3Events () {
     d3.select('svg')
         .on('click', () => {
-            var coords = [d3.event.pageX, d3.event.pageY];
-            console.log("clicked", d3.event.target, "at " + coords);
+            let e = <MouseEvent>d3.event;
+            var coords = [e.pageX, e.pageY];
+            console.log("clicked", e.target, "at " + coords);
         })
         .on('keypress', () => {
-            if (d3.event.shiftKey) {
-                console.log('shift + ' + d3.event.which);
+            let e = <KeyboardEvent>d3.event;
+            if (e.shiftKey) {
+                console.log('shift + ' + e.which);
             }
         });
 }
@@ -2690,4 +2692,17 @@ function testD3MutlieTimeFormat() {
         ["%B", function(d) { return d.getMonth(); }],
         ["%Y", function() { return true; }]
     ]);
+}
+
+function testMultiUtcFormat() {
+    var format = d3.time.format.utc.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 ef3909e9f..fbeca365e 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -807,7 +807,7 @@ declare module d3 {
     interface Transition<Datum> {
 
         transition(): Transition<Datum>;
-        
+
         delay(): number;
         delay(delay: number): Transition<Datum>;
         delay(delay: (datum: Datum, index: number, outerIndex: number) => number): Transition<Datum>;
@@ -920,16 +920,33 @@ declare module d3 {
         export function flush(): void;
     }
 
-    /**
-     * Interface for any and all d3 events.
-     */
-    interface Event extends KeyboardEvent, MouseEvent {
-    }
+	 interface BaseEvent {
+		 type: string;
+		 sourceEvent?: Event;
+	 }
+
+	 /**
+	  * Define a D3-specific ZoomEvent per https://github.com/mbostock/d3/wiki/Zoom-Behavior#event
+	  */
+	 interface ZoomEvent extends BaseEvent {
+		 scale: number;
+		 translate: [number, number];
+	 }
+
+	 /**
+	  * Define a D3-specific DragEvent per https://github.com/mbostock/d3/wiki/Drag-Behavior#on
+	  */
+	 interface DragEvent extends BaseEvent {
+		 x: number;
+		 y: number;
+		 dx: number;
+		 dy: number;
+	 }
 
     /**
      * The current event's value. Use this variable in a handler registered with `selection.on`.
      */
-    export var event: Event;
+    export var event: Event | BaseEvent;
 
     /**
      * Returns the x and y coordinates of the mouse relative to the provided container element, using d3.event for the mouse's position on the page.
@@ -1785,6 +1802,10 @@ declare module d3 {
         export module format {
             export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
             export function utc(specifier: string): Format;
+            module utc {
+                export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
+            }
+
             export var iso: Format;
         }
 
diff --git a/devextreme/dx.devextreme-15.1.5.d.ts b/devextreme/dx.devextreme-15.1.5.d.ts
new file mode 100644
index 000000000..aff710888
--- /dev/null
+++ b/devextreme/dx.devextreme-15.1.5.d.ts
@@ -0,0 +1,6497 @@
+// Type definitions for DevExtreme 15.1.5
+// Project: http://js.devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module DevExpress {
+    /** A mixin that provides a capability to fire and subscribe to events. */
+    export interface EventsMixin<T> {
+        /** Subscribes to a specified event. */
+        on(eventName: string, eventHandler: Function): T;
+        /** Subscribes to the specified events. */
+        on(events: { [eventName: string]: Function; }): T;
+        /** Detaches all event handlers from the specified event. */
+        off(eventName: string): Object;
+        /** Detaches a particular event handler from the specified event. */
+        off(eventName: string, eventHandler: Function): T;
+    }
+    /** An object that serves as a namespace for the methods required to perform validation. */
+    export module validationEngine {
+        export interface IValidator {
+            validate(): ValidatorValidationResult;
+            reset(): void;
+        }
+        export interface ValidatorValidationResult {
+            isValid: boolean;
+            name?: string;
+            value: any;
+            brokenRule: any;
+            validationRules: any[];
+        }
+        export interface ValidationGroupValidationResult {
+            isValid: boolean;
+            brokenRules: any[];
+            validators: IValidator[];
+        }
+        export interface GroupConfig extends EventsMixin<GroupConfig>  {
+            group: any;
+            validators: IValidator[];
+            validate(): ValidationGroupValidationResult;
+            reset(): void;
+        }
+        /** Provides access to the object that represents the specified validation group. */
+        export function getGroupConfig(group: any): GroupConfig
+        /** Provides access to the object that represents the default validation group. */
+        export function getGroupConfig(): GroupConfig
+        /** Validates rules of the validators that belong to the specified validation group. */
+        export function validateGroup(group: any): ValidationGroupValidationResult;
+        /** Validates rules of the validators that belong to the default validation group. */
+        export function validateGroup(): ValidationGroupValidationResult;
+        /** Resets the values and validation result of the editors that belong to the specified validation group. */
+        export function resetGroup(group: any): void;
+        /** Resets the values and validation result of the editors that belong to the default validation group. */
+        export function resetGroup(): void;
+        /** Validates the rules that are defined within the dxValidator objects that are registered for the specified ViewModel. */
+        export function validateModel(model: Object): ValidationGroupValidationResult;
+        /** Registers all the dxValidator objects by which the fields of the specified ViewModel are extended. */
+        export function registerModelForValidation(model: Object) : void;
+    }
+    export var hardwareBackButton: JQueryCallback;
+    /** Processes the hardware back button click. */
+    export function processHardwareBackButton(): void;
+    /** Specifies whether or not the entire application/site supports right-to-left representation. */
+    export var rtlEnabled: boolean;
+    /** Registers a new component in the DevExpress.ui namespace, and a jQuery plugin and Knockout binding for the required component. */
+    export function registerComponent(name: string, componentClass: Object): void;
+    /** Registers a new component in the specified namespace as a jQuery plugin, Angular directive and Knockout binding. */
+    export function registerComponent(name: string, namespace: Object, componentClass: Object): void;
+    /** Requests that the browser call a specified function to update animation before the next repaint. */
+    export function requestAnimationFrame(callback: Function): number;
+    /** Cancels an animation frame request scheduled with the requestAnimationFrame method. */
+    export function cancelAnimationFrame(requestID: number): void;
+    /** Custom Knockout binding that links an HTML element with a specific action. */
+    export class Action { }
+    /** Used to get URLs that vary in a locally running application and the application running on production. */
+    export class EndpointSelector {
+        constructor(options: {
+            [key: string]: {
+                local?: string;
+                production?: string;
+            }
+        });
+        /** Returns a local or a productional URL depending on how the application is currently running. */
+        urlFor(key: string): string;
+    }
+    /** An object that serves as a namespace for the methods that are used to animate UI elements. */
+    export module fx {
+        /** Defines animation options. */
+        export interface AnimationOptions {
+            /** A function called after animation is completed. */
+            complete?: (element: JQuery, config: AnimationOptions) => void;
+            /** A number specifying wait time before animation execution. */
+            delay?: number;
+            /** A number specifying the time period to wait before the animation of the next stagger item starts. */
+            staggerDelay?: number;
+            /** A number specifying the time in milliseconds spent on animation. */
+            duration?: number;
+            /** A string specifying the type of an easing function used for animation. */
+            easing?: string;
+            /** Specifies the initial animation state. */
+            from?: any;
+            /** A function called before animation is started. */
+            start?: (element: JQuery, config: AnimationOptions) => void;
+            /** Specifies a final animation state. */
+            to?: any;
+            /** A string value specifying the animation type. */
+            type?: string;
+            /** Specifies the animation direction for the "slideIn" and "slideOut" animation types. */
+            direction?: string;
+        }
+        /** Animates the specified element. */
+        export function animate(element: HTMLElement, config: AnimationOptions): Object;
+        /** Returns a value indicating whether the specified element is being animated. */
+        export function isAnimating(element: HTMLElement): boolean;
+        /** Stops the animation. */
+        export function stop(element: HTMLElement, jumpToEnd: boolean): void;
+    }
+    /** The manager that performs several specified animations at a time. */
+    export class TransitionExecutor {
+        /** Deletes all the animations registered in the Transition Executor by using the enter(elements, animation) and leave(elements, animation) methods. */
+        reset(): void;
+        /** Registers a set of elements that should be animated as "entering" using the specified animation configuration. */
+        enter(elements: JQuery, animation: any): void;
+        /** Registers a set of elements that should be animated as "leaving" using the specified animation configuration. */
+        leave(elements: JQuery, animation: any): void;
+        /** Starts all the animations registered using the enter(elements, animation) and leave(elements, animation) methods beforehand. */
+        start(config: Object): JQueryPromise<void>;
+    }
+    export class AnimationPresetCollection {
+        /** Resets all the changes made in the animation repository. */
+        resetToDefaults(): void;
+        /** Deletes the specified animation or clears all the animation repository, if an animation name is not passed. */
+        clear(name: string): void;
+        /** Adds the specified animation preset to the animation repository by the specified name. */
+        registerPreset(name: string, config: any): void;
+        /** Applies the changes made in the animation repository. */
+        applyChanges(): void;
+        /** Returns the configuration of the animation found in the animation repository by the specified name for the current device. */
+        getPreset(name: string): void;
+        /** Registers predefined animations in the animation repository. */
+        registerDefaultPresets(): void;
+    }
+    /** A repository of animations. */
+    export var animationPresets: AnimationPresetCollection;
+    /** The device object defines the device on which the application is running. */
+    export interface Device {
+        /** Indicates whether or not the device platform is Android. */
+        android?: boolean;
+        /** Specifies the type of the device on which the application is running. */
+        deviceType?: string;
+        /** Indicates whether or not the device platform is generic, which means that the application will look and behave according to a generic "light" or "dark" theme. */
+        generic?: boolean;
+        /** Indicates whether or not the device platform is iOS. */
+        ios?: boolean;
+        /** Indicates whether or not the device type is 'phone'. */
+        phone?: boolean;
+        /** Specifies the platform of the device on which the application is running. */
+        platform?: string;
+        /** Indicates whether or not the device type is 'tablet'. */
+        tablet?: boolean;
+        /** Specifies an array with the major and minor versions of the device platform. */
+        version?: Array<number>;
+        /** Indicates whether or not the device platform is Windows8. */
+        win8?: boolean;
+        /** Specifies a performance grade of the current device. */
+        grade?: string;
+    }
+    export class Devices implements EventsMixin<Devices> {
+        constructor(options: { window: Window });
+        /** Overrides actual device information to force the application to operate as if it was running on the specified device. */
+        current(deviceName: any): void;
+        /** Returns information about the current device. */
+        current(): Device;
+        orientationChanged: JQueryCallback;
+        /** Returns the current device orientation. */
+        orientation(): string;
+        /** Returns real information about the current device regardless of the value passed to the devices.current(deviceName) method. */
+        real(): Device;
+        on(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        on(eventName: string, eventHandler: Function): Devices;
+        on(events: { [eventName: string]: Function; }): Devices;
+        off(eventName: "orientationChanged"): Devices;
+        off(eventName: string): Devices;
+        off(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        off(eventName: string, eventHandler: Function): Devices;
+    }
+    /** An object that serves as a namespace for the methods and events specifying information on the current device. */
+    export var devices: Devices;
+    /** The position object specifies the widget positioning options. */
+    export interface PositionOptions {
+        /** The target element position that the widget is positioned against. */
+        at?: string;
+        /** The element within which the widget is positioned. */
+        boundary?: Element;
+        /** A string value holding horizontal and vertical offset from the window's boundaries. */
+        boundaryOffset?: string;
+        /** Specifies how to move the widget if it overflows the screen. */
+        collision?: any;
+        /** The position of the widget to align against the target element. */
+        my?: string;
+        /** The target element that the widget is positioned against. */
+        of?: HTMLElement;
+        /** A string value holding horizontal and vertical offset in pixels, separated by a space (e.g., "5 -10"). */
+        offset?: string;
+    }
+    export interface ComponentOptions {
+        /** A handler for the initialized event. */
+        onInitialized?: Function;
+        /** A handler for the optionChanged event. */
+        onOptionChanged?: Function;
+        /** A handler for the disposing event. */
+        onDisposing?: Function;
+    }
+    /** A base class for all components and widgets. */
+    export class Component {
+        constructor(options?: ComponentOptions)
+        /** Prevents the component from refreshing until the endUpdate method is called. */
+        beginUpdate(): void;
+        /** Enables the component to refresh after the beginUpdate method call. */
+        endUpdate(): void;
+        /** Returns an instance of this component class. */
+        instance(): Component;
+        /** Sets one or more options of this component. */
+        option(options: Object): void;
+        /** Returns the configuration options of this component. */
+        option(): Object;
+        /** Gets the value of the specified configuration option of this component. */
+        option(optionName: string): any;
+        /** Sets a value to the specified configuration option of this component. */
+        option(optionName: string, optionValue: any): void;
+    }
+    export interface DOMComponentOptions extends ComponentOptions {
+        /** Specifies whether or not the current component supports a right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A base class for all components. */
+    export class DOMComponent extends Component {
+        constructor(element: JQuery, options?: DOMComponentOptions);
+        constructor(element: HTMLElement, options?: DOMComponentOptions);
+        /** Returns the root HTML element of the widget. */
+        element(): JQuery;
+        /** Specifies the device-dependent default configuration options for this component. */
+        static defaultOptions(rule: {
+            device?: any;
+            options?: any;
+        }): void;
+    }
+    export module data {
+        export interface ODataError extends Error {
+            httpStatus?: number;
+            errorDetails?: any;
+        }
+        export interface StoreOptions {
+            inserted?: (values: Object, key: any) => void;
+            inserting?: (values: Object) => void;
+            loaded?: (result: Array<any>) => void;
+            loading?: (loadOptions: LoadOptions) => void;
+            modified?: () => void;
+            modifying?: () => void;
+            removed?: (key: any) => void;
+            removing?: (key: any) => void;
+            updated?: (key: any, values: Object) => void;
+            updating?: (key: any, values: Object) => void;
+            /** A handler for the modified event. */
+            onModified?: () => void;
+            /** A handler for the modifying event. */
+            onModifying?: () => void;
+            /** A handler for the removed event. */
+            onRemoved?: (key: any) => void;
+            /** A handler for the removing event. */
+            onRemoving?: (key: any) => void;
+            /** A handler for the updated event. */
+            onUpdated?: (key: any, values: Object) => void;
+            /** A handler for the updating event. */
+            onUpdating?: (key: any, values: Object) => void;
+            /** A handler for the loaded event. */
+            onLoaded?: (result: Array<any>) => void;
+            /** A handler for the loading event. */
+            onLoading?: (loadOptions: LoadOptions) => void;
+            /** A handler for the inserted event. */
+            onInserted?: (values: Object, key: any) => void;
+            /** A handler for the inserting event. */
+            onInserting?: (values: Object) => void;
+            /** Specifies the function called when the Store causes an error. */
+            errorHandler?: (e: Error) => void;
+            /** Specifies the key properties within the data associated with the Store. */
+            key?: any;
+        }
+        export interface LoadOptions {
+            filter?: Object;
+            sort?: Object;
+            select?: Object;
+            expand?: Object;
+            group?: Object;
+            skip?: number;
+            take?: number;
+            userData?: Object;
+            requireTotalCount?: boolean;
+        }
+        /** The base class for all Stores. */
+        export class Store implements EventsMixin<Store> {
+            inserted: JQueryCallback;
+            inserting: JQueryCallback;
+            loaded: JQueryCallback;
+            loading: JQueryCallback;
+            modified: JQueryCallback;
+            modifying: JQueryCallback;
+            removed: JQueryCallback;
+            removing: JQueryCallback;
+            updated: JQueryCallback;
+            updating: JQueryCallback;
+            constructor(options?: StoreOptions);
+            /** Returns the data item specified by the key. */
+            byKey(key: any): JQueryPromise<any>;
+            /** Adds an item to the data associated with this Store. */
+            insert(values: Object): JQueryPromise<any>;
+            /** Returns the key expression specified via the key configuration option. */
+            key(): any;
+            /** Returns the key of the Store item that matches the specified object. */
+            keyOf(obj: Object): any;
+            /** Starts loading the data. */
+            load(obj?: LoadOptions): JQueryPromise<any[]>;
+            /** Removes the data item specified by the key. */
+            remove(key: any): JQueryPromise<any>;
+            /** Obtains the total count of items that will be returned by the load() function. */
+            totalCount(obj?: {
+                filter?: Object;
+                select?: Object;
+                group?: Object;
+                sort?: Object;
+            }): JQueryPromise<any>;
+            /** Updates the data item specified by the key. */
+            update(key: any, values: Object): JQueryPromise<any>;
+            on(eventName: "removing", eventHandler: (key: any) => void): Store;
+            on(eventName: "removed", eventHandler: (key: any) => void): Store;
+            on(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            on(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            on(eventName: "modifying", eventHandler: () => void): Store;
+            on(eventName: "modified", eventHandler: () => void): Store;
+            on(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            on(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            on(eventName: string, eventHandler: Function): Store;
+            on(events: { [eventName: string]: Function; }): Store;
+            off(eventName: "removing"): Store;
+            off(eventName: "removed"): Store;
+            off(eventName: "updating"): Store;
+            off(eventName: "updated"): Store;
+            off(eventName: "inserting"): Store;
+            off(eventName: "inserted"): Store;
+            off(eventName: "modifying"): Store;
+            off(eventName: "modified"): Store;
+            off(eventName: "loading"): Store;
+            off(eventName: "loaded"): Store;
+            off(eventName: string): Store;
+            off(eventName: "removing", eventHandler: (key: any) => void): Store;
+            off(eventName: "removed", eventHandler: (key: any) => void): Store;
+            off(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            off(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            off(eventName: "modifying", eventHandler: () => void): Store;
+            off(eventName: "modified", eventHandler: () => void): Store;
+            off(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            off(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            off(eventName: string, eventHandler: Function): Store;
+        }
+        export interface ArrayStoreOptions extends StoreOptions {
+            /** Specifies the array associated with this Store. */
+            data?: Array<any>;
+        }
+        /** A Store accessing an in-memory array. */
+        export class ArrayStore extends Store {
+            constructor(options?: ArrayStoreOptions);
+            /** Clears all data associated with the current ArrayStore. */
+            clear(): void;
+            /** Creates the Query object for the underlying array. */
+            createQuery(): Query;
+        }
+        interface Promise {
+            then(doneFn?: Function, failFn?: Function, progressFn?: Function): Promise;
+        }
+        export interface CustomStoreOptions extends StoreOptions {
+            /** The user implementation of the byKey(key, extraOptions) method. */
+            byKey?: (key: any) => Promise;
+            /** The user implementation of the insert(values) method. */
+            insert?: (values: Object) => Promise;
+            /** The user implementation of the load(options) method. */
+            load?: (options?: LoadOptions) => Promise;
+            /** The user implementation of the remove(key) method. */
+            remove?: (key: any) => Promise;
+            /** The user implementation of the totalCount(options) method. */
+            totalCount?: () => Promise;
+            /** The user implementation of the update(key, values) method. */
+            update?: (key: any, values: Object) => Promise;
+        }
+        /** A Store object that enables you to implement your own data access logic. */
+        export class CustomStore extends Store {
+            constructor(options: CustomStoreOptions);
+        }
+        export interface DataSourceOptions {
+            /** Specifies data filtering conditions. */
+            filter?: Object;
+            /** Specifies data grouping conditions. */
+            group?: Object;
+            /** The item mapping function. */
+            map?: (record: any) => any;
+            /** Specifies the maximum number of items the page can contain. */
+            pageSize?: number;
+            /** Specifies whether a DataSource loads data by pages, or all items at once. */
+            paginate?: boolean;
+            /** The data post processing function. */
+            postProcess?: (data: any[]) => any[];
+            /** Specifies a value by which the required items are searched. */
+            searchExpr?: Object;
+            /** Specifies the comparison operation used to search for the required items. */
+            searchOperation?: string;
+            /** Specifies the value to which the search expression is compared. */
+            searchValue?: Object;
+            /** Specifies the initial select option value. */
+            select?: Object;
+            /** An array of the strings that represent the names of the navigation properties to be loaded simultaneously with the OData store's entity. */
+            expand?: Object;
+            /** Specifies the initial sort option value. */
+            sort?: Object;
+            /** Specifies the underlying Store instance used to access data. */
+            store?: any;
+            /** A handler for the changed event. */
+            onChanged?: () => void;
+            /** A handler for the loadingChanged event. */
+            onLoadingChanged?: (isLoading: boolean) => void;
+            /** A handler for the loadError event. */
+            onLoadError?: (e?: Error) => void;
+        }
+        /** An object that provides access to a data web service or local data storage for collection container widgets. */
+        export class DataSource implements EventsMixin<DataSource> {
+            constructor(options?: DataSourceOptions);
+            changed: JQueryCallback;
+            loadError: JQueryCallback;
+            loadingChanged: JQueryCallback;
+            /** Disposes all resources associated with this DataSource. */
+            dispose(): void;
+            /** Returns the current filter option value. */
+            filter(): Object;
+            /** Sets the filter option value. */
+            filter(filterExpr: Object): void;
+            /** Returns the current group option value. */
+            group(): Object;
+            /** Sets the group option value. */
+            group(groupExpr: Object): void;
+            /** Indicates whether or not the current page contains fewer items than the number of items specified by the pageSize configuration option. */
+            isLastPage(): boolean;
+            /** Indicates whether or not at least one load() method execution has successfully finished. */
+            isLoaded(): boolean;
+            /** Indicates whether or not the DataSource is currently being loaded. */
+            isLoading(): boolean;
+            /** Returns the array of items currently operated by the DataSource. */
+            items(): Array<any>;
+            /** Returns the key expression. */
+            key(): any;
+            /** Starts loading data. */
+            load(): JQueryPromise<Array<any>>;
+            /** Returns an object that would be passed to the load() method of the underlying Store according to the current data shaping option values of the current DataSource instance. */
+            loadOptions(): Object;
+            /** Returns the current pageSize option value. */
+            pageSize(): number;
+            /** Sets the pageSize option value. */
+            pageSize(value: number): void;
+            /** Specifies the index of the currently loaded page. */
+            pageIndex(): number;
+            /** Specifies the index of the page to be loaded during the next load() method execution. */
+            pageIndex(newIndex: number): void;
+            /** Returns the current paginate option value. */
+            paginate(): boolean;
+            /** Sets the paginate option value. */
+            paginate(value: boolean): void;
+            /** Returns the searchExpr option value. */
+            searchExpr(): Object;
+            /** Sets the searchExpr option value. */
+            searchExpr(expr: Object): void;
+            /** Returns the currently specified search operation. */
+            searchOperation(): string;
+            /** Sets the current search operation. */
+            searchOperation(op: string): void;
+            /** Returns the searchValue option value. */
+            searchValue(): Object;
+            /** Sets the searchValue option value. */
+            searchValue(value: Object): void;
+            /** Returns the current select option value. */
+            select(): Object;
+            /** Sets the select option value. */
+            select(expr: Object): void;
+            /** Returns the current sort option value. */
+            sort(): Object;
+            /** Sets the sort option value. */
+            sort(sortExpr: Object): void;
+            /** Returns the underlying Store instance. */
+            store(): Store;
+            /** Returns the number of data items available in an underlying Store after the last load() operation without paging. */
+            totalCount(): number;
+            on(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            on(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            on(eventName: "changed", eventHandler: () => void): DataSource;
+            on(eventName: string, eventHandler: Function): DataSource;
+            on(events: { [eventName: string]: Function; }): DataSource;
+            off(eventName: "loadingChanged"): DataSource;
+            off(eventName: "loadError"): DataSource;
+            off(eventName: "changed"): DataSource;
+            off(eventName: string): DataSource;
+            off(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            off(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            off(eventName: "changed", eventHandler: () => void): DataSource;
+            off(eventName: string, eventHandler: Function): DataSource;
+        }
+        /** An object used to work with primitive data types not supported by JavaScript when accessing an OData web service. */
+        export class EdmLiteral {
+            /** Creates an EdmLiteral instance and assigns the specified value to it. */
+            constructor(value: string);
+            /** Returns a string representation of the value associated with this EdmLiteral object. */
+            valueOf(): string;
+        }
+        /** An object used to generate and hold the GUID. */
+        export class Guid {
+            /** Creates a new Guid instance that holds the specified GUID. */
+            constructor(value: string);
+            /** Creates a new Guid instance holding the generated GUID. */
+            constructor();
+            /** Returns a string representation of the Guid instance. */
+            toString(): string;
+            /** Returns a string representation of the Guid instance. */
+            valueOf(): string;
+        }
+        export interface LocalStoreOptions extends ArrayStoreOptions {
+            /** Specifies the time (in miliseconds) after the change operation, before the data is flushed. */
+            flushInterval?: number;
+            /** Specifies whether the data is flushed immediatelly after each change operation, or after the delay specified via the flushInterval option. */
+            immediate?: boolean;
+            /** The unique identifier used to distinguish the data within the HTML5 Web Storage. */
+            name?: string;
+        }
+        /** A Store providing access to the HTML5 Web Storage. */
+        export class LocalStore extends ArrayStore {
+            constructor(options?: LocalStoreOptions);
+            /** Removes all data associated with this Store. */
+            clear(): void;
+        }
+        export interface ODataContextOptions extends ODataStoreOptions {
+            /** Specifies the list of entities to be accessed via the ODataContext. */
+            entities?: Object;
+            /** Specifies the function called if the ODataContext causes an error. */
+            errorHandler?: (e: Error) => void;
+        }
+        /** Provides access to the entire OData service. */
+        export class ODataContext {
+            constructor(options?: ODataContextOptions);
+            /** Initiates the specified WebGet service operation that returns a value. For the information on service operations, refer to the OData documentation. */
+            get(operationName: string, params: Object): JQueryPromise<any>;
+            /** Initiates the specified WebGet service operation that returns nothing. For the information on service operations, refer to the OData documentation. */
+            invoke(operationName: string, params: Object, httpMethod: Object): JQueryPromise<any>;
+            /** Return a special proxy object to describe the entity link. */
+            objectLink(entityAlias: string, key: any): Object;
+        }
+        export interface ODataStoreOptions extends StoreOptions {
+            /** A function used to customize a web request before it is sent. */
+            beforeSend?: (request: {
+                url: string;
+                method: string;
+                timeout: number;
+                params: Object;
+                payload: Object;
+                headers: Object;
+            }) => void;
+            /** Specifies whether the ODataStore uses the JSONP approach to access non-CORS-compatible remote services. */
+            jsonp?: boolean;
+            /** Specifies the type of the ODataStore key property. The following key types are supported out of the box: String, Int32, Int64, and Guid. */
+            keyType?: any;
+            /** Specifies the URL of the data service being accessed via the current ODataContext. */
+            url?: string;
+            /** Specifies the version of the OData protocol used to interact with the data service. */
+            version?: number;
+            /** Specifies the value of the withCredentials field of the underlying jqXHR object. */
+            withCredentials?: boolean;
+        }
+        /** A Store providing access to a separate OData web service entity. */
+        export class ODataStore extends Store {
+            constructor(options?: ODataStoreOptions);
+            /** Creates the Query object for the OData endpoint. */
+            createQuery(loadOptions: Object): Object;
+            /** Returns the data item specified by the key. */
+            byKey(key: any, extraOptions?: { expand?: Object }): JQueryPromise<any>;
+        }
+        /** An universal chainable data query interface object. */
+        export interface Query {
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(step: (accumulator: any, value: any) => any): JQueryPromise<any>;
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(seed: any, step: (accumulator: any, value: any) => any, finalize: (result: any) => any): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query. */
+            avg(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum getter value. */
+            max(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum value in the Query. */
+            max(): JQueryPromise<any>;
+            /** Finds the item with the minimum value in the Query. */
+            min(): JQueryPromise<any>;
+            /** Finds the item with the minimum getter value. */
+            min(getter: Object): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query, if each Query item has a numeric type. */
+            avg(): JQueryPromise<any>;
+            /** Returns the total count of items in the current Query. */
+            count(): JQueryPromise<any>;
+            /** Executes the Query. */
+            enumerate(): JQueryPromise<any>;
+            /** Filters the current Query data. */
+            filter(criteria: Array<any>): Query;
+            /** Groups the current Query data. */
+            groupBy(getter: Object): Query;
+            /** Applies the specified transformation to each item. */
+            select(getter: Object): Query;
+            /** Limits the data item count. */
+            slice(skip: number, take?: number): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object, desc: boolean): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object): Query;
+            /** Calculates the sum of item getter values in the current Query. */
+            sum(getter: Object): JQueryPromise<any>;
+            /** Calculates the sum of item values in the current Query. */
+            sum(): JQueryPromise<any>;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object): Query;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object, desc: boolean): Query;
+            /** Returns the array of current Query items. */
+            toArray(): Array<any>;
+        }
+        /** The global data layer error handler. */
+        export var errorHandler: (e: Error) => void;
+        /** Encodes the specified string or array of bytes to base64 encoding. */
+        export function base64_encode(input: any): string;
+        /** Creates a Query instance. */
+        export function query(array: Array<any>): Query;
+        /** Creates a Query instance for accessing the remote service specified by a URL. */
+        export function query(url: string, queryOptions: Object): Query;
+        /** This section describes the utility objects provided by the DevExtreme data layer. */
+        export var utils: {
+            /** Compiles a getter function from the getter expression. */
+            compileGetter(expr: any): Function;
+            /** Compiles a setter function from the setter expression. */
+            compileSetter(expr: any): Function;
+            odata: {
+                /** Holds key value converters for OData. */
+                keyConverters: {
+                    String(value: any): string;
+                    Int32(value: any): number;
+                    Int64(value: any): EdmLiteral;
+                    Guid(value: any): Guid;
+                    Boolean(value: any): boolean;
+                    Single(value: any): EdmLiteral;
+                    Decimal(value: any): EdmLiteral;
+                };
+            }
+        }
+    }
+    /** An object that serves as a namespace for DevExtreme UI widgets as well as for methods implementing UI logic in DevExtreme sites/applications. */
+    export module ui {
+        export interface WidgetOptions extends DOMComponentOptions {
+            /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+            activeStateEnabled?: boolean;
+            /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+            disabled?: boolean;
+            /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+            hoverStateEnabled?: boolean;
+            /** Specifies whether or not the widget can be focused. */
+            focusStateEnabled?: boolean;
+            /** Specifies a shortcut key that sets focus on the widget element. */
+            accessKey?: string;
+            /** A Boolean value specifying whether or not the widget is visible. */
+            visible?: boolean;
+            /** Specifies the widget tab index. */
+            tabIndex?: number;
+            /** Specifies the text of the hint displayed for the widget. */
+            hint?: string;
+        }
+        /** The base class for widgets. */
+        export class Widget extends DOMComponent {
+            constructor(options?: WidgetOptions);
+            /** Redraws the widget. */
+            repaint(): void;
+            /** Sets focus on the widget. */
+            focus(): void;
+            /** Registers a handler for pressing of the specified key. */
+            registerKeyHandler(key: string, handler: Function): void;
+        }
+        export interface CollectionWidgetOptions extends WidgetOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            itemClickAction?: any;
+            itemHoldAction?: Function;
+            /** The time period in milliseconds before the onItemHold event is raised. */
+            itemHoldTimeout?: number;
+            itemRender?: any;
+            itemRenderedAction?: Function;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /**
+             * A function performed when a widget item is selected.
+             * @deprecated onSelectionChanged.md
+             */
+            itemSelectAction?: Function;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            loopItemFocus?: boolean;
+            /** The text or HTML markup displayed by the widget if the item collection is empty. */
+            noDataText?: string;
+            onContentReady?: any;
+            contentReadyAction?: any;
+            /** A handler for the itemClick event. */
+            onItemClick?: any;
+            /** A handler for the itemContextMenu event. */
+            onItemContextMenu?: Function;
+            /** A handler for the itemHold event. */
+            onItemHold?: Function;
+            /** A handler for the itemRendered event. */
+            onItemRendered?: Function;
+            /** A handler for the selectionChanged event. */
+            onSelectionChanged?: Function;
+            /** The index of the currently selected widget item. */
+            selectedIndex?: number;
+            /** The selected item object. */
+            selectedItem?: Object;
+            /** An array of currently selected item objects. */
+            selectedItems?: Array<any>;
+            /** A handler for the itemDeleting event. */
+            onItemDeleting?: Function;
+            /** A handler for the itemDeleted event. */
+            onItemDeleted?: Function;
+            /** A handler for the itemReordered event. */
+            onItemReordered?: Function;
+        }
+        /** The base class for widgets containing an item collection. */
+        export class CollectionWidget extends Widget {
+            constructor(element: JQuery, options?: CollectionWidgetOptions);
+            constructor(element: HTMLElement, options?: CollectionWidgetOptions);
+            selectItem(itemElement: any): void;
+            unselectItem(itemElement: any): void;
+            deleteItem(itemElement: any): JQueryPromise<void>;
+            isItemSelected(itemElement: any): boolean;
+            reorderItem(itemElement: any, toItemElement: any): JQueryPromise<void>;
+        }
+        export interface DataExpressionMixinOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            /** Specifies the name of the data source item field whose value is displayed by the widget. */
+            displayExpr?: any;
+            /** Specifies the name of a data source item field whose value is held in the value configuration option. */
+            valueExpr?: any;
+            itemRender?: any;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            /** The currently selected value in the widget. */
+            value?: Object;
+        }
+        export interface EditorOptions extends WidgetOptions {
+            /** The currently specified value. */
+            value?: Object;
+            /** A handler for the valueChanged event. */
+            onValueChanged?: Function;
+            valueChangeAction?: Function;
+            /** A Boolean value specifying whether or not the widget is read-only. */
+            readOnly?: boolean;
+            /** Holds the object that defines the error that occurred during validation. */
+            validationError?: Object;
+            /** Specifies whether the editor's value is valid. */
+            isValid?: boolean;
+            /** Specifies how the message about the validation rules that are not satisfied by this editor's value is displayed. */
+            validationMessageMode?: string;
+        }
+        /** A base class for editors. */
+        export class Editor extends Widget {
+            /** Resets the editor's value to undefined. */
+            reset(): void;
+        }
+        /** An object that serves as a namespace for methods displaying a message in an application/site. */
+        export var dialog: {
+            /** Creates an alert dialog message containing a single "OK" button. */
+            alert(message: string, title: string): JQueryPromise<void>;
+            /** Creates a confirm dialog that contains "Yes" and "No" buttons. */
+            confirm(message: string, title: string): JQueryPromise<boolean>;
+            /** Creates a custom dialog using the options specified by the passed configuration object. */
+            custom(options: { title?: string; message?: string; buttons?: Array<Object>; }): {
+                show(): JQueryPromise<any>;
+                hide(): void;
+                hide(value: any): void;
+            };
+        };
+        /** Creates a toast message. */
+        export function notify(message: any, type: string, displayTime: number): void;
+        /** Creates a toast message. */
+        export function notify(options: Object): void;
+        /** An object that serves as a namespace for the methods that work with DevExtreme CSS Themes. */
+        export var themes: {
+            /** Returns the name of the currently applied theme. */
+            current(): string;
+            /** Changes the current theme to the specified one. */
+            current(themeName: string): void;
+        };
+        /** Sets a specified template engine. */
+        export function setTemplateEngine(name: string): void;
+        /** Sets a custom template engine defined via custom compile and render functions. */
+        export function setTemplateEngine(options: Object): void;
+        /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
+        export var utils: {
+            /** Sets parameters for the viewport meta tag. */
+            initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
+        };
+    }
+}
+declare module DevExpress.ui {
+    export interface dxValidatorOptions extends DOMComponentOptions {
+        /** An array of validation rules to be checked for the editor with which the dxValidator object is associated. */
+        validationRules?: Array<any>;
+        /** Specifies the editor name to be used in the validation default messages. */
+        name?: string;
+        /** An object that specifies what and when to validate and how to apply the validation result. */
+        adapter?: Object;
+        /** Specifies the validation group the editor will be related to. */
+        validationGroup?: string;
+        /** A handler for the validated event. */
+        onValidated?: (params: validationEngine.ValidatorValidationResult) => void;
+    }
+    /** A widget that is used to validate the associated DevExtreme editors against the defined validation rules. */
+    export class dxValidator extends DOMComponent implements validationEngine.IValidator {
+        constructor(element: JQuery, options?: dxValidatorOptions);
+        constructor(element: Element, options?: dxValidatorOptions);
+        /** Validates the value of the editor that is controlled by the current dxValidator object against the list of the specified validation rules. */
+        validate(): validationEngine.ValidatorValidationResult;
+        /** Resets the value and validation result of the editor associated with the current dxValidator object. */
+        reset(): void;
+    }
+    /** The widget that is used in the Knockout and Angular approaches to combine the editors to be validated. */
+    export class dxValidationGroup extends DOMComponent {
+        constructor(element: JQuery);
+        constructor(element: Element);
+        /** Validates rules of the validators that belong to the current validation group. */
+        validate(): validationEngine.ValidationGroupValidationResult;
+        /** Resets the value and validation result of the editors that are included to the current validation group. */
+        reset(): void;
+    }
+    export interface dxValidationSummaryOptions extends CollectionWidgetOptions {
+        /** Specifies the validation group for which summary should be generated. */
+        validationGroup?: string;
+    }
+    /** A widget for displaying the result of checking validation rules for editors. */
+    export class dxValidationSummary extends CollectionWidget {
+        constructor(element: JQuery, options?: dxValidationSummaryOptions);
+        constructor(element: Element, options?: dxValidationSummaryOptions);
+    }
+    export interface dxResizableOptions extends DOMComponentOptions {
+        /** Specifies which borders of the widget element are used as a handle. */
+        handles?: string;
+        /** Specifies the lower width boundary for resizing. */
+        minWidth?: number;
+        /** Specifies the upper width boundary for resizing. */
+        maxWidth?: number;
+        /** Specifies the lower height boundary for resizing. */
+        minHeight?: number;
+        /** Specifies the upper height boundary for resizing. */
+        maxHeight?: number;
+        /** A handler for the resizeStart event. */
+        onResizeStart?: Function;
+        /** A handler for the resize event. */
+        onResize?: Function;
+        /** A handler for the resizeEnd event. */
+        onResizeEnd?: Function;
+    }
+    /** A widget that displays required content in a resizable element. */
+    export class dxResizable extends DOMComponent {
+        constructor(element: JQuery, options?: dxResizableOptions);
+        constructor(element: Element, options?: dxResizableOptions);
+    }
+    export interface dxTooltipOptions extends dxPopoverOptions {
+    }
+    /** A tooltip widget. */
+    export class dxTooltip extends dxPopover {
+        constructor(element: JQuery, options?: dxTooltipOptions);
+        constructor(element: Element, options?: dxTooltipOptions);
+    }
+    export interface dxDropDownListOptions extends dxDropDownEditorOptions {
+        /** Returns the value currently displayed by the widget. */
+        displayValue?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies the name of a data source item field or an expression whose value is compared to the search criterion. */
+        searchExpr?: Object;
+        /** Specifies the binary operation used to filter data. */
+        searchMode?: string;
+        /** Specifies the time delay, in milliseconds, after the last character has been typed in, before a search is executed. */
+        searchTimeout?: number;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget supports searching. */
+        searchEnabled?: boolean;
+        /**
+         * Specifies whether or not the widget displays items by pages.
+         * @deprecated dataSource.paginate.md
+         */
+        pagingEnabled?: boolean;
+        /** The text or HTML markup displayed by the widget if the item collection is empty. */
+        noDataText?: string;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: Function;
+        onContentReady?: Function;
+    }
+    /** A base class for drop-down list widgets. */
+    export class dxDropDownList extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDropDownListOptions);
+        constructor(element: Element, options?: dxDropDownListOptions);
+    }
+    export interface dxToolbarOptions extends CollectionWidgetOptions {
+        menuItemRender?: any;
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** Informs the widget about its location in a view HTML markup. */
+        renderAs?: string;
+    }
+    /** A toolbar widget. */
+    export class dxToolbar extends CollectionWidget {
+        constructor(element: JQuery, options?: dxToolbarOptions);
+        constructor(element: Element, options?: dxToolbarOptions);
+    }
+    export interface dxToastOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** The time span in milliseconds during which the dxToast widget is visible. */
+        displayTime?: number;
+        height?: any;
+        /** The dxToast message text. */
+        message?: string;
+        position?: PositionOptions;
+        shading?: boolean;
+        /** Specifies the dxToast widget type. */
+        type?: string;
+        width?: any;
+        closeOnBackButton?: boolean;
+    }
+    /** The toast message widget. */
+    export class dxToast extends dxOverlay {
+        constructor(element: JQuery, options?: dxToastOptions);
+        constructor(element: Element, options?: dxToastOptions);
+    }
+    export interface dxTextEditorOptions extends EditorOptions {
+        /** A handler for the change event. */
+        onChange?: Function;
+        changeAction?: Function;
+        /** A handler for the copy event. */
+        onCopy?: Function;
+        copyAction?: Function;
+        /** A handler for the cut event. */
+        onCut?: Function;
+        cutAction?: Function;
+        /** A handler for the enterKey event. */
+        onEnterKey?: Function;
+        enterKeyAction?: Function;
+        /** A handler for the focusIn event. */
+        onFocusIn?: Function;
+        focusInAction?: Function;
+        /** A handler for the focusOut event. */
+        onFocusOut?: Function;
+        focusOutAction?: Function;
+        /** A handler for the input event. */
+        onInput?: Function;
+        inputAction?: Function;
+        /** A handler for the keyDown event. */
+        onKeyDown?: Function;
+        keyDownAction?: Function;
+        /** A handler for the keyPress event. */
+        onKeyPress?: Function;
+        keyPressAction?: Function;
+        /** A handler for the keyUp event. */
+        onKeyUp?: Function;
+        keyUpAction?: Function;
+        /** A handler for the paste event. */
+        onPaste?: Function;
+        pasteAction?: Function;
+        /** The text displayed by the widget when the widget value is empty. */
+        placeholder?: string;
+        /** Specifies whether to display the Clear button in the widget. */
+        showClearButton?: boolean;
+        /** Specifies the current value displayed by the widget. */
+        value?: any;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+        /** Specifies HTML attributes applied to the inner input element of the widget. */
+        attr?: Object;
+        /** The read-only option that holds the text displayed by the widget input element. */
+        text?: string;
+        /** Specifies whether or not the widget supports the focused state and keyboard navigation. */
+        focusStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+        hoverStateEnabled?: boolean;
+        /** The editor mask, which specifies the format of the entered string. */
+        mask?: string;
+        /** Specifies a mask placeholder character. */
+        maskChar?: string;
+        /** Specifies custom mask rules. */
+        maskRules?: Object;
+        /** A message displayed when the entered text does not match the specified pattern. */
+        maskInvalidMessage?: string;
+    }
+    /** A base class for text editing widgets. */
+    export class dxTextEditor extends Editor {
+        constructor(element: JQuery, options?: dxTextEditorOptions);
+        constructor(element: Element, options?: dxTextEditorOptions);
+        /** Removes focus from the input element. */
+        blur(): void;
+        /** Sets focus to the input element representing the widget. */
+        focus(): void;
+    }
+    export interface dxTextBoxOptions extends dxTextEditorOptions {
+        /** Specifies the maximum number of characters you can enter into the textbox. */
+        maxLength?: any;
+        /** The "mode" attribute value of the actual HTML input element representing the text box. */
+        mode?: string;
+    }
+    /** A single-line text box widget. */
+    export class dxTextBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxTextBoxOptions);
+        constructor(element: Element, options?: dxTextBoxOptions);
+    }
+    export interface dxTextAreaOptions extends dxTextBoxOptions {
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+    }
+    /** A widget used to display and edit multi-line text. */
+    export class dxTextArea extends dxTextBox {
+        constructor(element: JQuery, options?: dxTextAreaOptions);
+        constructor(element: Element, options?: dxTextAreaOptions);
+    }
+    export interface dxTabsOptions extends CollectionWidgetOptions {
+        /** Specifies whether the widget enables an end-user to select only a single item or multiple items. */
+        selectionMode?: string;
+        /** Specifies whether or not an end-user can scroll tabs by swiping. */
+        scrollByContent?: boolean;
+        /** Specifies whether or not an end-user can scroll tabs. */
+        scrollingEnabled?: boolean;
+        /** A Boolean value that specifies the availability of navigation buttons. */
+        showNavButtons?: boolean;
+    }
+    /** A tab strip used to switch between pages. */
+    export class dxTabs extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTabsOptions);
+        constructor(element: Element, options?: dxTabsOptions);
+    }
+    export interface dxTabPanelOptions extends dxMultiViewOptions {
+        /** A handler for the titleClick event. */
+        onTitleClick?: any;
+        /** A handler for the titleHold event. */
+        onTitleHold?: Function;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        titleTemplate?: any;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+    }
+    /** A widget used to display a view and to switch between several views by clicking the appropriate tabs. */
+    export class dxTabPanel extends dxMultiView {
+        constructor(element: JQuery, options?: dxTabPanelOptions);
+        constructor(element: Element, options?: dxTabPanelOptions);
+    }
+    export interface dxSelectBoxOptions extends dxDropDownListOptions {
+        /** The template to be used for rendering the widget text field. */
+        fieldTemplate?: any;
+        /** The text that is provided as a hint in the select box editor. */
+        placeholder?: string;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+    }
+    /** A widget that allows you to select an item in a dropdown list. */
+    export class dxSelectBox extends dxDropDownList {
+        constructor(element: JQuery, options?: dxSelectBoxOptions);
+        constructor(element: Element, options?: dxSelectBoxOptions);
+    }
+    export interface dxTagBoxOptions extends dxSelectBoxOptions {
+        /** Holds the list of selected values. */
+        values?: Array<any>;
+    }
+    /** A widget that allows you to select multiple items from a dropdown list. */
+    export class dxTagBox extends dxSelectBox {
+        constructor(element: JQuery, options?: dxTagBoxOptions);
+        constructor(element: Element, options?: dxTagBoxOptions);
+    }
+    export interface dxScrollViewOptions extends dxScrollableOptions {
+        /** A handler for the pullDown event. */
+        onPullDown?: Function;
+        pullDownAction?: Function;
+        /** Specifies the text shown in the pullDown panel when pulling the content down lowers the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while pulling the content down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the reachBottom event. */
+        onReachBottom?: Function;
+        reachBottomAction?: Function;
+        /** Specifies the text shown in the pullDown panel displayed when content is scrolled to the bottom. */
+        reachBottomText?: string;
+        /** Specifies the text shown in the pullDown panel displayed when the content is being refreshed. */
+        refreshingText?: string;
+        /** Returns a value indicating if the scrollView content is larger then the widget container. */
+        isFull(): boolean;
+        /** Locks the widget until the release(preventScrollBottom) method is called and executes the function passed to the onPullDown option and the handler assigned to the pullDown event. */
+        refresh(): void;
+        /** Notifies the scroll view that data loading is finished. */
+        release(preventScrollBottom: boolean): JQueryPromise<void>;
+        /** Toggles the loading state of the widget. */
+        toggleLoading(showOrHide: boolean): void;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollView extends dxScrollable {
+        constructor(element: JQuery, options?: dxScrollViewOptions);
+        constructor(element: Element, options?: dxScrollViewOptions);
+    }
+    export interface dxScrollableLocation {
+        top?: number;
+        left?: number;
+    }
+    export interface dxScrollableOptions extends DOMComponentOptions {
+        /** A string value specifying the available scrolling directions. */
+        direction?: string;
+        /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+        disabled?: boolean;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        scrollAction?: Function;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** A handler for the update event. */
+        onUpdated?: Function;
+        updateAction?: Function;
+        /** Indicates whether to use native or simulated scrolling. */
+        useNative?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content swiping it up or down. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content using the scrollbar. */
+        scrollByThumb?: boolean;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollable extends DOMComponent {
+        constructor(element: JQuery, options?: dxScrollableOptions);
+        constructor(element: Element, options?: dxScrollableOptions);
+        /** Returns the height of the scrollable widget in pixels. */
+        clientHeight(): number;
+        /** Returns the width of the scrollable widget in pixels. */
+        clientWidth(): number;
+        /** Returns an HTML element of the widget. */
+        content(): JQuery;
+        /** Scrolls the widget content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Scrolls widget content by the specified number of pixels in horizontal and vertical directions. */
+        scrollBy(distanceObject: dxScrollableLocation): void;
+        /** Returns the height of the scrollable content in pixels. */
+        scrollHeight(): number;
+        /** Returns the current scroll position against the leftmost position. */
+        scrollLeft(): number;
+        /** Returns how far the scrollable content is scrolled from the top and from the left. */
+        scrollOffset(): dxScrollableLocation;
+        /** Scrolls widget content to the specified position. */
+        scrollTo(targetLocation: number): void;
+        /** Scrolls widget content to a specified position. */
+        scrollTo(targetLocation: dxScrollableLocation): void;
+        /** Scrolls widget content to the specified element. */
+        scrollToElement(element: Element): void;
+        /** Returns the current scroll position against the topmost position. */
+        scrollTop(): number;
+        /** Returns the width of the scrollable content in pixels. */
+        scrollWidth(): number;
+        /** Updates the dimensions of the scrollable contents. */
+        update(): void;
+    }
+    export interface dxRadioGroupOptions extends CollectionWidgetOptions {
+        /** Specifies the radio group layout. */
+        layout?: string;
+    }
+    /** A widget that enables a user to select one item within a list of items represented by radio buttons. */
+    export class dxRadioGroup extends CollectionWidget {
+        constructor(element: JQuery, options?: dxRadioGroupOptions);
+        constructor(element: Element, options?: dxRadioGroupOptions);
+    }
+    export interface dxPopupOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** Specifies whether or not to allow a user to drag the popup window. */
+        dragEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display the widget in full-screen mode. */
+        fullScreen?: boolean;
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showTitle?: boolean;
+        /** The title in the overlay window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        width?: any;
+        /** Specifies items displayed on the top or bottom toolbar of the popup window. */
+        buttons?: Array<any>;
+        /** Specifies whether or not the widget displays the Close button. */
+        showCloseButton?: boolean;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+    }
+    /** A widget that displays required content in a popup window. */
+    export class dxPopup extends dxOverlay {
+        constructor(element: JQuery, options?: dxPopupOptions);
+        constructor(element: Element, options?: dxPopupOptions);
+    }
+    export interface dxPopoverOptions extends dxPopupOptions {
+        /** An object defining animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        shading?: boolean;
+        /** A Boolean value specifying whether or not to display the title in the overlay window. */
+        showTitle?: boolean;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A widget that displays the required content in a popup window. */
+    export class dxPopover extends dxPopup {
+        constructor(element: JQuery, options?: dxPopoverOptions);
+        constructor(element: Element, options?: dxPopoverOptions);
+        /** Displays the widget for the specified target element. */
+        show(target?: any): JQueryPromise<void>;
+    }
+    export interface dxOverlayOptions extends WidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget is closed if a user presses the Back hardware button. */
+        closeOnBackButton?: boolean;
+        /** A Boolean value specifying whether or not the widget is closed if a user clicks outside of the overlapping window. */
+        closeOnOutsideClick?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+        /** Specifies whether or not an end-user can drag the widget. */
+        dragEnabled?: boolean;
+        /** Specifies whether or not an end user can resize the widget. */
+        resizeEnabled?: boolean;
+        /** The height of the widget in pixels. */
+        height?: any;
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        hiddenAction?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        hidingAction?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not the main screen is inactive while the widget is active. */
+        shading?: boolean;
+        /** Specifies the shading color. */
+        shadingColor?: string;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        showingAction?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        shownAction?: Function;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+        /** The widget width in pixels. */
+        width?: any;
+    }
+    /** A widget displaying the required content in an overlay window. */
+    export class dxOverlay extends Widget {
+        constructor(element: JQuery, options?: dxOverlayOptions);
+        constructor(element: Element, options?: dxOverlayOptions);
+        /** An HTML element of the widget. */
+        content(): JQuery;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+        /** Recalculates the overlay's size and position. */
+        repaint(): void;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** A static method that specifies the base z-index for all overlay widgets. */
+        static baseZIndex(zIndex: number): void;
+    }
+    export interface dxNumberBoxOptions extends dxTextEditorOptions {
+        /** The maximum value accepted by the number box. */
+        max?: number;
+        /** The minimum value accepted by the number box. */
+        min?: number;
+        /** Specifies whether or not to show spin buttons. */
+        showSpinButtons?: boolean;
+        useTouchSpinButtons?: boolean;
+        /** Specifies by which value the widget value changes when a spin button is clicked. */
+        step?: number;
+        /** The current number box value. */
+        value?: number;
+    }
+    /** A textbox widget that enables a user to enter numeric values. */
+    export class dxNumberBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxNumberBoxOptions);
+        constructor(element: Element, options?: dxNumberBoxOptions);
+    }
+    export interface dxNavBarOptions extends dxTabsOptions {
+        scrollingEnabled?: boolean;
+    }
+    /** A widget that contains items used to navigate through application views. */
+    export class dxNavBar extends dxTabs {
+        constructor(element: JQuery, options?: dxNavBarOptions);
+        constructor(element: Element, options?: dxNavBarOptions);
+    }
+    export interface dxMultiViewOptions extends CollectionWidgetOptions {
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently displayed item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to change the selected index by swiping. */
+        swipeEnabled?: boolean;
+    }
+    /** A widget used to display a view and to switch between several views. */
+    export class dxMultiView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxMultiViewOptions);
+        constructor(element: Element, options?: dxMultiViewOptions);
+    }
+    export interface dxMapOptions extends WidgetOptions {
+        /** Specifies whether or not the widget automatically adjusts center and zoom option values when adding a new marker or route. */
+        autoAdjust?: boolean;
+        bounds?: {
+            northEast?: {
+                lat?: number;
+                lng?: number;
+            };
+            southWest?: {
+                lat?: number;
+                lng?: number;
+            };
+            /** An object, a string, or an array specifying the location displayed at the center of the widget. */
+            center?: {
+                /** The latitude location displayed in the center of the widget. */
+                lat?: number;
+                /** The longitude location displayed in the center of the widget. */
+                lng?: number;
+            };
+            /** A handler for the click event. */
+            onClick?: any;
+            clickAction?: any;
+            /** Specifies whether or not map widget controls are available. */
+            controls?: boolean;
+            /** Specifies the height of the widget. */
+            height?: number;
+            /** A key used to authenticate the application within the required map provider. */
+            key?: {
+                /** A key used to authenticate the application within the "Bing" map provider. */
+                bing?: string;
+                /** A key used to authenticate the application within the "Google" map provider. */
+                google?: string;
+                /** A key used to authenticate the application within the "Google Static" map provider. */
+                googleStatic?: string;
+            }
+            /** A handler for the markerAdded event. */
+            onMarkerAdded?: Function;
+            markerAddedAction?: Function;
+            /** A URL pointing to the custom icon to be used for map markers. */
+            markerIconSrc?: string;
+            /** A handler for the markerRemoved event. */
+            onMarkerRemoved?: Function;
+            markerRemovedAction?: Function;
+            /** An array of markers displayed on a map. */
+            markers?: Array<any>;
+            /** The name of the current map data provider. */
+            provider?: string;
+            /** A handler for the ready event. */
+            onReady?: Function;
+            readyAction?: Function;
+            /** A handler for the routeAdded event. */
+            onRouteAdded?: Function;
+            routeAddedAction?: Function;
+            /** A handler for the routeRemoved event. */
+            onRouteRemoved?: Function;
+            routeRemovedAction?: Function;
+            /** An array of routes shown on the map. */
+            routes?: Array<any>;
+            /** The type of a map to display. */
+            type?: string;
+            /** Specifies the width of the widget. */
+            width?: number;
+            /** The zoom level of the map. */
+            zoom?: number;
+            /** Adds a marker to the map. */
+            addMarker(markerOptions: Object): JQueryPromise<Object>;
+            /** Adds a route to the map. */
+            addRoute(options: Object): JQueryPromise<Object>;
+            /** Removes a marker from the map. */
+            removeMarker(marker: Object): JQueryPromise<void>;
+            /** Removes a route from the map. */
+            removeRoute(route: any): JQueryPromise<void>;
+        };
+    }
+    /** An interactive map widget. */
+    export class dxMap extends Widget {
+        constructor(element: JQuery, options?: dxMapOptions);
+        constructor(element: Element, options?: dxMapOptions);
+    }
+    export interface dxLookupOptions extends dxDropDownListOptions {
+        /** An object defining widget animation options. */
+        animation?: fx.AnimationOptions;
+        /** The text displayed on the Cancel button. */
+        cancelButtonText?: string;
+        /** The text displayed on the Clear button. */
+        clearButtonText?: string;
+        /** Specifies whether or not the widget cleans the search box when the popup window is displayed. */
+        cleanSearchOnOpening?: boolean;
+        /** A Boolean value specifying whether or not the widget is closed if a user clicks outside of the overlaying window. */
+        closeOnOutsideClick?: any;
+        /** The text displayed on the Apply button. */
+        applyButtonText?: string;
+        /** A Boolean value specifying whether or not to display the lookup in full-screen mode. */
+        fullScreen?: boolean;
+        focusStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to group widget items. */
+        grouped?: boolean;
+        groupRender?: any;
+        /** The name of the template used to display a group header. */
+        groupTemplate?: any;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        pageLoadingAction?: Function;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the widget is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** The text displayed by the widget when nothing is selected. */
+        placeholder?: string;
+        /** The height of the widget popup element. */
+        popupHeight?: any;
+        /** The width of the widget popup element. */
+        popupWidth?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the text displayed in the pullDown panel when the widget is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        pullRefreshAction?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the widget is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        scrollAction?: Function;
+        /** A Boolean value specifying whether or not the search bar is visible. */
+        searchEnabled?: boolean;
+        /** The text that is provided as a hint in the lookup's search bar. */
+        searchPlaceholder?: string;
+        /** A Boolean value specifying whether or not the main screen is inactive while the lookup is active. */
+        shading?: boolean;
+        /** Specifies whether to display the Cancel button in the lookup window. */
+        showCancelButton?: boolean;
+        /**
+         * A Boolean value specifying whether the widget loads the next page automatically when you reach the bottom of the list or when a button is clicked.
+         * @deprecated pageLoadMode.md
+         */
+        showNextButton?: boolean;
+        /** The title of the lookup window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** Specifies whether or not to show lookup contents in a dxPopover widget. */
+        usePopover?: boolean;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        contentReadyAction?: Function;
+        titleRender?: any;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showPopupTitle?: boolean;
+    }
+    /** A widget that allows a user to select predefined values from a lookup window. */
+    export class dxLookup extends dxDropDownList {
+        constructor(element: JQuery, options?: dxLookupOptions);
+        constructor(element: Element, options?: dxLookupOptions);
+        /** This section lists the data source fields that are used in a default template for lookup drop-down items. */
+    }
+    export interface dxLoadPanelOptions extends dxOverlayOptions {
+        /** An object defining the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** The delay in milliseconds after which the load panel is displayed. */
+        delay?: number;
+        /** The height of the widget. */
+        height?: number;
+        /** A URL pointing to an image to be used as a load indicator. */
+        indicatorSrc?: string;
+        /** The text displayed in the load panel. */
+        message?: string;
+        /** A Boolean value specifying whether or not to show a load indicator. */
+        showIndicator?: boolean;
+        /** A Boolean value specifying whether or not to show the pane behind the load indicator. */
+        showPane?: boolean;
+        /** The width of the widget. */
+        width?: number;
+    }
+    /** A widget used to indicate whether or not an element is loading. */
+    export class dxLoadPanel extends dxOverlay {
+        constructor(element: JQuery, options?: dxLoadPanelOptions);
+        constructor(element: Element, options?: dxLoadPanelOptions);
+    }
+    export interface dxLoadIndicatorOptions extends WidgetOptions {
+        /** Specifies the path to an image used as the indicator. */
+        indicatorSrc?: string;
+    }
+    /** The widget used to indicate the loading process. */
+    export class dxLoadIndicator extends Widget {
+        constructor(element: JQuery, options?: dxLoadIndicatorOptions);
+        constructor(element: Element, options?: dxLoadIndicatorOptions);
+    }
+    export interface dxListOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not to display a grouped list. */
+        grouped?: boolean;
+        groupRender?: any;
+        /** The template to be used for rendering item groups. */
+        groupTemplate?: any;
+        onItemDeleting?: Function;
+        /** A handler for the itemDeleted event. */
+        onItemDeleted?: Function;
+        /** A handler for the groupRendered event. */
+        onGroupRendered?: Function;
+        itemDeleteAction?: Function;
+        /** A handler for the itemReordered event. */
+        onItemReordered?: Function;
+        itemReorderAction?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        /** A handler for the itemSwipe event. */
+        onItemSwipe?: Function;
+        itemSwipeAction?: Function;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        pageLoadingAction?: Function;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the list is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** Specifies the text displayed in the pullDown panel when the list is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        pullRefreshAction?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the list is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        scrollAction?: Function;
+        /** A Boolean value specifying whether to enable or disable list scrolling. */
+        scrollingEnabled?: boolean;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying if the list is scrolled by content. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying if the list is scrolled using the scrollbar. */
+        scrollByThumb?: boolean;
+        itemUnselectAction?: Function;
+        onItemContextMenu?: Function;
+        onItemHold?: Function;
+        /** Specifies whether or not an end-user can collapse groups. */
+        collapsibleGroups?: boolean;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        /** Specifies whether or not to display controls used to select list items. */
+        showSelectionControls?: boolean;
+        /** Specifies whether the list supports single item selection or multi-selection. */
+        selectionMode?: string;
+        selectAllText?: string;
+        /** Specifies the array of items for a context menu called for a list item. */
+        menuItems?: Array<any>;
+        /** Specifies whether an item context menu is shown when a user holds or swipes an item. */
+        menuMode?: string;
+        /** Specifies whether or not an end user can delete list items. */
+        allowItemDeleting?: boolean;
+        /** Specifies the way a user can delete items from the list. */
+        itemDeleteMode?: string;
+        /** Specifies whether or not an end user can reorder list items. */
+        allowItemReordering?: boolean;
+        /** Specifies whether or not to show the loading panel when the DataSource bound to the widget is loading data. */
+        indicateLoading?: boolean;
+    }
+    /** A list widget. */
+    export class dxList extends CollectionWidget {
+        constructor(element: JQuery, options?: dxListOptions);
+        constructor(element: Element, options?: dxListOptions);
+        /** Returns the height of the widget in pixels. */
+        clientHeight(): number;
+        /** Removes the specified item from the list. */
+        deleteItem(itemIndex: any): JQueryPromise<void>;
+        /** Removes the specified item from the list. */
+        deleteItem(itemElement: Element): JQueryPromise<void>;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemIndex: any): boolean;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemElement: Element): boolean;
+        /** Reloads list data. */
+        reload(): void;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemElement: Element, toItemElement: Element): JQueryPromise<void>;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemIndex: any, toItemIndex: any): JQueryPromise<void>;
+        /** Scrolls the list content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Returns the height of the list content in pixels. */
+        scrollHeight(): number;
+        /** Scrolls list content to the specified position. */
+        scrollTo(location: number): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemElement: Element): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemIndex: any): void;
+        /** Returns how far the list content is scrolled from the top. */
+        scrollTop(): number;
+        /** Selects the specified item from the list. */
+        selectItem(itemElement: Element): void;
+        /** Selects the specified item from the list. */
+        selectItem(itemIndex: any): void;
+        /** Deselects the specified item from the list. */
+        unselectItem(itemElement: Element): void;
+        /** Unselects the specified item from the list. */
+        unselectItem(itemIndex: any): void;
+        /** Updates the widget scrollbar according to widget content size. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Expands the specified group. */
+        expandGroup(groupIndex: number): JQueryPromise<void>;
+        /** Collapses the specified group. */
+        collapseGroup(groupIndex: number): JQueryPromise<void>;
+    }
+    export interface dxGalleryOptions extends CollectionWidgetOptions {
+        /** The time, in milliseconds, spent on slide animation. */
+        animationDuration?: number;
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to allow users to switch between items by clicking an indicator. */
+        indicatorEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently active gallery item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to display an indicator that points to the selected gallery item. */
+        showIndicator?: boolean;
+        /** A Boolean value that specifies the availability of the "Forward" and "Back" navigation buttons. */
+        showNavButtons?: boolean;
+        /** The time interval in milliseconds, after which the gallery switches to the next item. */
+        slideshowDelay?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** Specifies whether or not to display parts of previous and next images along the sides of the current image. */
+        wrapAround?: boolean;
+        /** Specifies if the widget stretches images to fit the total gallery width. */
+        stretchImages?: boolean;
+        /** Specifies the width of an area used to display a single image. */
+        initialItemWidth?: number;
+    }
+    /** An image gallery widget. */
+    export class dxGallery extends CollectionWidget {
+        constructor(element: JQuery, options?: dxGalleryOptions);
+        constructor(element: Element, options?: dxGalleryOptions);
+        /** Shows the specified gallery item. */
+        goToItem(itemIndex: number, animation: boolean): JQueryPromise<any>;
+        /** Shows the next gallery item. */
+        nextItem(animation: boolean): JQueryPromise<any>;
+        /** Shows the previous gallery item. */
+        prevItem(animation: boolean): JQueryPromise<any>;
+    }
+    export interface dxDropDownEditorOptions extends dxTextBoxOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: Object;
+        /** A handler for the closed event. */
+        onClosed?: Function;
+        /** A handler for the opened event. */
+        onOpened?: Function;
+        /** Specifies whether or not the drop-down editor is displayed. */
+        opened?: boolean;
+        closeAction?: Function;
+        openAction?: Function;
+        shownAction?: Function;
+        hiddenAction?: Function;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+        editEnabled?: boolean;
+        /** Specifies the way an end-user applies the selected value. */
+        applyValueMode?: string;
+    }
+    /** A drop-down editor widget. */
+    export class dxDropDownEditor extends dxTextBox {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** Closes the drop-down editor. */
+        close(): void;
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Resets the widget's value to null. */
+        reset(): void;
+        /** Returns an &lt;input&gt; element of the widget. */
+        field(): JQuery;
+        /** Returns an HTML element of the popup window content. */
+        content(): JQuery;
+    }
+    export interface dxDateBoxOptions extends dxTextEditorOptions {
+        /** A format used to display date/time information. */
+        format?: string;
+        /** A Globalize format string specifying the date display format. */
+        formatString?: string;
+        /** The last date that can be selected within the widget. */
+        max?: Date;
+        /** The minimum date that can be selected within the widget. */
+        min?: Date;
+        /** The text displayed by the widget when the widget value is not yet specified. This text is also used as a title of the date picker. */
+        placeholder?: string;
+        /**
+         * Specifies whether or not a user can pick out a date using the drop-down calendar.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useCalendar?: boolean;
+        /** A Date object specifying the date and time currently selected using the date box. */
+        value?: Date;
+        /**
+         * Specifies whether or not the widget uses the native HTML input element.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useNative?: boolean;
+        /** Specifies the interval between neighboring values in the popup list in minutes. */
+        interval?: number;
+        /** Specifies the maximum zoom level of a calendar, which is used to pick the date. */
+        maxZoomLevel?: string;
+	/** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
+        minZoomLevel?: string;
+        /** Specifies the type of date/time picker. */
+        pickerType?: string;
+    }
+    /** A date box widget. */
+    export class dxDateBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDateBoxOptions);
+        constructor(element: Element, options?: dxDateBoxOptions);
+    }
+    export interface dxCheckBoxOptions extends EditorOptions {
+        /** Specifies the widget state. */
+        value?: boolean;
+        /** Specifies the text displayed by the check box. */
+        text?: string;
+    }
+    /** A check box widget. */
+    export class dxCheckBox extends Editor {
+        constructor(element: JQuery, options?: dxCheckBoxOptions);
+        constructor(element: Element, options?: dxCheckBoxOptions);
+    }
+    export interface dxCalendarOptions extends EditorOptions {
+        /** Specifies a date displayed on the current calendar page. */
+        currentDate?: Date;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The latest date the widget allows to select. */
+        max?: Date;
+        /** The earliest date the widget allows to select. */
+        min?: Date;
+        /** Specifies whether or not the widget displays a button that selects the current date. */
+        showTodayButton?: boolean;
+        /** Specifies the current calendar zoom level. */
+        zoomLevel?: string;
+        /** Specifies the maximum zoom level of the calendar. */
+        maxZoomLevel?: string;
+        /** Specifies the minimum zoom level of the calendar. */
+        minZoomLevel?: string;
+		/** The template to be used for rendering calendar cells. */
+		cellTemplate?: any;
+    }
+    /** A calendar widget. */
+    export class dxCalendar extends Editor {
+        constructor(element: JQuery, options?: dxCalendarOptions);
+        constructor(element: Element, options?: dxCalendarOptions);
+    }
+    export interface dxButtonOptions extends WidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A handler for the click event. */
+        onClick?: any;
+        clickAction?: any;
+        /** Specifies the icon to be displayed on the button. */
+        icon?: string;
+        iconSrc?: string;
+        /** A template to be used for rendering the dxButton widget. */
+        template?: any;
+        /** The text displayed on the button. */
+        text?: string;
+        /** Specifies the button type. */
+        type?: string;
+        /** Specifies the name of the validation group to be accessed in the click event handler. */
+        validationGroup?: string;
+    }
+    /** A button widget. */
+    export class dxButton extends Widget {
+        constructor(element: JQuery, options?: dxButtonOptions);
+        constructor(element: Element, options?: dxButtonOptions);
+    }
+    export interface dxBoxOptions extends CollectionWidget {
+        /** Specifies how widget items are aligned along the main direction. */
+        align?: string;
+        /** Specifies the direction of item positioning in the widget. */
+        direction?: string;
+        /** Specifies how widget items are aligned cross-wise. */
+        crossAlign?: string;
+    }
+    /** A container widget used to arrange inner elements. */
+    export class dxBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);    
+    }
+    export interface dxResponsiveBoxOptions extends CollectionWidgetOptions {
+        /** Specifies the collection of rows for the grid used to position layout elements. */
+        rows?: Array<Object>;
+        /** Specifies the collection of columns for the grid used to position layout elements. */
+        cols?: Array<Object>;
+        /** Specifies the function returning the screen factor depending on the screen width. */
+        screenByWidth?: (width: number) => string;
+        /** Specifies the screen factor with which all elements are located in a single column. */
+        singleColumnScreen?: string;
+    }
+    /** A widget used to build an adaptive markup that is dependent on screen resolution. */
+    export class dxResponsiveBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);
+    }
+    export interface dxAutocompleteOptions extends dxDropDownListOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies the maximum count of items displayed by the widget. */
+        maxItemCount?: number;
+        /** Gets the currently selected item. */
+        selectedItem?: Object;
+    }
+    /** A textbox widget that supports autocompletion. */
+    export class dxAutocomplete extends dxDropDownList {
+        constructor(element: JQuery, options?: dxAutocompleteOptions);
+        constructor(element: Element, options?: dxAutocompleteOptions);
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Closes the drop-down editor. */
+        close(): void;
+    }
+    export interface dxAccordionOptions extends CollectionWidgetOptions {
+        /** A number specifying the time in milliseconds spent on the animation of the expanding or collapsing of a panel. */
+        animationDuration?: number;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies whether all items can be collapsed or whether at least one item must always be expanded. */
+        collapsible?: boolean;
+        /** Specifies whether the widget can expand several items or only a single item at once. */
+        multiple?: boolean;
+        /** The template to be used for rendering dxAccordion items. */
+        itemTemplate?: any;
+        /** A handler for the itemTitleClick event. */
+        onItemTitleClick?: any;
+        /** A handler for the itemTitleHold event. */
+        onItemTitleHold?: Function;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+        /** The index number of the currently selected item. */
+        selectedIndex?: number;
+    }
+    /** A widget that displays data source items on collapsible panels. */
+    export class dxAccordion extends CollectionWidget {
+        constructor(element: JQuery, options?: dxAccordionOptions);
+        constructor(element: Element, options?: dxAccordionOptions);
+        /** Collapses the specified item. */
+        collapseItem(index: number): JQueryPromise<dxAccordion>;
+        /** Expands the specified item. */
+        expandItem(index: number): JQueryPromise<dxAccordion>;
+    }
+    export interface dxFileUploaderOptions extends EditorOptions {
+        /** A read-only option that holds a File instance representing the selected file. */
+        value?: File;
+        /** Holds the File instances representing files selected in the widget. */
+        values?: Array<File>;
+        buttonText?: string;
+        /** The text displayed on the button that opens the file browser. */
+        selectButtonText?: string;
+        /** The text displayed on the button that starts uploading. */
+        uploadButtonText?: string;
+        /** Specifies the text displayed on the area to which an end-user can drop a file. */
+        labelText?: string;
+        /** Specifies the value passed to the name attribute of the underlying input element. */
+        name?: string;
+        /** Specifies whether the widget enables an end-user to select a single file or multiple files. */
+        multiple?: boolean;
+        /** Specifies a file type or several types accepted by the widget. */
+        accept?: string;
+        /** Specifies a target Url for the upload request. */
+        uploadUrl?: string;
+        /** Specifies if an end user can remove a file from the selection and interrupt uploading. */
+        allowCanceling?: boolean;
+        /** Specifies whether or not the widget displays the list of selected files. */
+        showFileList?: boolean;
+        /** Gets the current progress in percentages. */
+        progress?: number;
+        /** The message displayed by the widget when it is ready to upload the specified files. */
+        readyToUploadMessage?: string;
+        /** The message displayed by the widget when uploading is finished. */
+        uploadedMessage?: string;
+        /** The message displayed by the widget on uploading failure. */
+        uploadFailedMessage?: string;
+        /** Specifies how the widget uploads files. */
+        uploadMode?: string;
+    }
+    /** A widget used to select and upload a file or multiple files. */
+    export class dxFileUploader extends Editor {
+        constructor(element: JQuery, options?: dxFileUploaderOptions);
+        constructor(element: Element, options?: dxFileUploaderOptions);
+    }
+    export interface dxTrackBarOptions extends EditorOptions {
+        /** The minimum value the widget can accept. */
+        min?: number;
+        /** The maximum value the widget can accept. */
+        max?: number;
+        /** The current widget value. */
+        value?: number;
+    }
+    /** A base class for track bar widgets. */
+    export class dxTrackBar extends Editor {
+        constructor(element: JQuery, options?: dxTrackBarOptions);
+        constructor(element: Element, options?: dxTrackBarOptions);
+    }
+    export interface dxProgressBarOptions extends dxTrackBarOptions {
+        /** Specifies a format for the progress status. */
+        statusFormat?: any;
+        /** Specifies whether or not the widget displays a progress status. */
+        showStatus?: boolean;
+        /** A handler for the complete event. */
+        onComplete?: Function;
+    }
+    /** A widget used to indicate progress. */
+    export class dxProgressBar extends dxTrackBar {
+        constructor(element: JQuery, options?: dxProgressBarOptions);
+        constructor(element: Element, options?: dxProgressBarOptions);
+    }
+    export interface dxSliderOptions extends dxTrackBarOptions {
+        /** The slider step size. */
+        step?: number;
+        /** The current slider value. */
+        value?: number;
+        /** Specifies whether or not to highlight a range selected within the widget. */
+        showRange?: boolean;
+        /** Specifies the size of a step by which a slider handle is moved when a user uses the Page up or Page down keyboard shortcuts. */
+        keyStep?: number;
+        /** Specifies options for the slider tooltip. */
+        tooltip?: {
+            /** Specifies whether or not the tooltip is enabled. */
+            enabled?: boolean;
+            /** Specifies format for the tooltip. */
+            format?: any;
+            /** Specifies whether the tooltip is located over or under the slider. */
+            position?: string;
+            /** Specifies whether the widget always shows a tooltip or only when a pointer is over the slider. */
+            showMode?: string;
+        };
+        /** Specifies options for labels displayed at the min and max values. */
+        label?: {
+            /** Specifies whether or not slider labels are visible. */
+            visible?: boolean;
+            /** Specifies whether labels are located over or under the scale. */
+            position?: string;
+            /** Specifies a format for labels. */
+            format?: any;
+        };
+    }
+    /** A widget that allows a user to select a numeric value within a given range. */
+    export class dxSlider extends dxTrackBar {
+        constructor(element: JQuery, options?: dxSliderOptions);
+        constructor(element: Element, options?: dxSliderOptions);
+    }
+    export interface dxRangeSliderOptions extends dxSliderOptions {
+        /** The left edge of the interval currently selected using the range slider. */
+        start?: number;
+        /** The right edge of the interval currently selected using the range slider. */
+        end?: number;
+    }
+    /** A widget that enables a user to select a range of numeric values. */
+    export class dxRangeSlider extends dxSlider {
+        constructor(element: JQuery, options?: dxRangeSliderOptions);
+        constructor(element: Element, options?: dxRangeSliderOptions);
+    }
+}
+interface JQuery {
+    dxProgressBar(): JQuery;
+    dxProgressBar(options: "instance"): DevExpress.ui.dxProgressBar;
+    dxProgressBar(options: string): any;
+    dxProgressBar(options: string, ...params: any[]): any;
+    dxProgressBar(options: DevExpress.ui.dxProgressBarOptions): JQuery;
+    dxSlider(): JQuery;
+    dxSlider(options: "instance"): DevExpress.ui.dxSlider;
+    dxSlider(options: string): any;
+    dxSlider(options: string, ...params: any[]): any;
+    dxSlider(options: DevExpress.ui.dxSliderOptions): JQuery;
+    dxRangeSlider(): JQuery;
+    dxRangeSlider(options: "instance"): DevExpress.ui.dxRangeSlider;
+    dxRangeSlider(options: string): any;
+    dxRangeSlider(options: string, ...params: any[]): any;
+    dxRangeSlider(options: DevExpress.ui.dxRangeSliderOptions): JQuery;
+    dxFileUploader(): JQuery;
+    dxFileUploader(options: "instance"): DevExpress.ui.dxFileUploader;
+    dxFileUploader(options: string): any;
+    dxFileUploader(options: string, ...params: any[]): any;
+    dxFileUploader(options: DevExpress.ui.dxFileUploaderOptions): JQuery;
+    dxValidator(): JQuery;
+    dxValidator(options: "instance"): DevExpress.ui.dxValidator;
+    dxValidator(options: string): any;
+    dxValidator(options: string, ...params: any[]): any;
+    dxValidationGroup(): JQuery;
+    dxValidationGroup(options: "instance"): DevExpress.ui.dxValidationGroup;
+    dxValidationGroup(options: string): any;
+    dxValidationGroup(options: string, ...params: any[]): any;
+    dxValidationSummary(): JQuery;
+    dxValidationSummary(options: "instance"): DevExpress.ui.dxValidationSummary;
+    dxValidationSummary(options: string): any;
+    dxValidationSummary(options: string, ...params: any[]): any;
+    dxTooltip(): JQuery;
+    dxTooltip(options: "instance"): DevExpress.ui.dxTooltip;
+    dxTooltip(options: string): any;
+    dxTooltip(options: string, ...params: any[]): any;
+    dxTooltip(options: DevExpress.ui.dxTooltipOptions): JQuery;
+    dxResizable(): JQuery;
+    dxResizable(options: "instance"): DevExpress.ui.dxResizable;
+    dxResizable(options: string): any;
+    dxResizable(options: string, ...params: any[]): any;
+    dxResizable(options: DevExpress.ui.dxResizableOptions): JQuery;
+    dxDropDownList(): JQuery;
+    dxDropDownList(options: "instance"): DevExpress.ui.dxDropDownList;
+    dxDropDownList(options: string): any;
+    dxDropDownList(options: string, ...params: any[]): any;
+    dxDropDownList(options: DevExpress.ui.dxDropDownListOptions): JQuery;
+    dxToolbar(): JQuery;
+    dxToolbar(options: "instance"): DevExpress.ui.dxToolbar;
+    dxToolbar(options: string): any;
+    dxToolbar(options: string, ...params: any[]): any;
+    dxToolbar(options: DevExpress.ui.dxToolbarOptions): JQuery;
+    dxToast(): JQuery;
+    dxToast(options: "instance"): DevExpress.ui.dxToast;
+    dxToast(options: string): any;
+    dxToast(options: string, ...params: any[]): any;
+    dxToast(options: DevExpress.ui.dxToastOptions): JQuery;
+    dxTextEditor(): JQuery;
+    dxTextEditor(options: "instance"): DevExpress.ui.dxTextEditor;
+    dxTextEditor(options: string): any;
+    dxTextEditor(options: string, ...params: any[]): any;
+    dxTextEditor(options: DevExpress.ui.dxTextEditorOptions): JQuery;
+    dxTextBox(): JQuery;
+    dxTextBox(options: "instance"): DevExpress.ui.dxTextBox;
+    dxTextBox(options: string): any;
+    dxTextBox(options: string, ...params: any[]): any;
+    dxTextBox(options: DevExpress.ui.dxTextBoxOptions): JQuery;
+    dxTextArea(): JQuery;
+    dxTextArea(options: "instance"): DevExpress.ui.dxTextArea;
+    dxTextArea(options: string): any;
+    dxTextArea(options: string, ...params: any[]): any;
+    dxTextArea(options: DevExpress.ui.dxTextAreaOptions): JQuery;
+    dxTabs(): JQuery;
+    dxTabs(options: "instance"): DevExpress.ui.dxTabs;
+    dxTabs(options: string): any;
+    dxTabs(options: string, ...params: any[]): any;
+    dxTabs(options: DevExpress.ui.dxTabsOptions): JQuery;
+    dxTabPanel(): JQuery;
+    dxTabPanel(options: "instance"): DevExpress.ui.dxTabPanel;
+    dxTabPanel(options: string): any;
+    dxTabPanel(options: string, ...params: any[]): any;
+    dxTabPanel(options: DevExpress.ui.dxTabPanelOptions): JQuery;
+    dxSelectBox(): JQuery;
+    dxSelectBox(options: "instance"): DevExpress.ui.dxSelectBox;
+    dxSelectBox(options: string): any;
+    dxSelectBox(options: string, ...params: any[]): any;
+    dxSelectBox(options: DevExpress.ui.dxSelectBoxOptions): JQuery;
+    dxScrollView(): JQuery;
+    dxScrollView(options: "instance"): DevExpress.ui.dxScrollView;
+    dxScrollView(options: string): any;
+    dxScrollView(options: string, ...params: any[]): any;
+    dxScrollView(options: DevExpress.ui.dxScrollViewOptions): JQuery;
+    dxScrollable(): JQuery;
+    dxScrollable(options: "instance"): DevExpress.ui.dxScrollable;
+    dxScrollable(options: string): any;
+    dxScrollable(options: string, ...params: any[]): any;
+    dxScrollable(options: DevExpress.ui.dxScrollableOptions): JQuery;
+    dxRadioGroup(): JQuery;
+    dxRadioGroup(options: "instance"): DevExpress.ui.dxRadioGroup;
+    dxRadioGroup(options: string): any;
+    dxRadioGroup(options: string, ...params: any[]): any;
+    dxRadioGroup(options: DevExpress.ui.dxRadioGroupOptions): JQuery;
+    dxPopup(): JQuery;
+    dxPopup(options: "instance"): DevExpress.ui.dxPopup;
+    dxPopup(options: string): any;
+    dxPopup(options: string, ...params: any[]): any;
+    dxPopup(options: DevExpress.ui.dxPopupOptions): JQuery;
+    dxPopover(): JQuery;
+    dxPopover(options: "instance"): DevExpress.ui.dxPopover;
+    dxPopover(options: string): any;
+    dxPopover(options: string, ...params: any[]): any;
+    dxPopover(options: DevExpress.ui.dxPopoverOptions): JQuery;
+    dxOverlay(): JQuery;
+    dxOverlay(options: "instance"): DevExpress.ui.dxOverlay;
+    dxOverlay(options: string): any;
+    dxOverlay(options: string, ...params: any[]): any;
+    dxOverlay(options: DevExpress.ui.dxOverlayOptions): JQuery;
+    dxNumberBox(): JQuery;
+    dxNumberBox(options: "instance"): DevExpress.ui.dxNumberBox;
+    dxNumberBox(options: string): any;
+    dxNumberBox(options: string, ...params: any[]): any;
+    dxNumberBox(options: DevExpress.ui.dxNumberBoxOptions): JQuery;
+    dxNavBar(): JQuery;
+    dxNavBar(options: "instance"): DevExpress.ui.dxNavBar;
+    dxNavBar(options: string): any;
+    dxNavBar(options: string, ...params: any[]): any;
+    dxNavBar(options: DevExpress.ui.dxNavBarOptions): JQuery;
+    dxMultiView(): JQuery;
+    dxMultiView(options: "instance"): DevExpress.ui.dxMultiView;
+    dxMultiView(options: string): any;
+    dxMultiView(options: string, ...params: any[]): any;
+    dxMultiView(options: DevExpress.ui.dxMultiViewOptions): JQuery;
+    dxMap(): JQuery;
+    dxMap(options: "instance"): DevExpress.ui.dxMap;
+    dxMap(options: string): any;
+    dxMap(options: string, ...params: any[]): any;
+    dxMap(options: DevExpress.ui.dxMapOptions): JQuery;
+    dxLookup(): JQuery;
+    dxLookup(options: "instance"): DevExpress.ui.dxLookup;
+    dxLookup(options: string): any;
+    dxLookup(options: string, ...params: any[]): any;
+    dxLookup(options: DevExpress.ui.dxLookupOptions): JQuery;
+    dxLoadPanel(): JQuery;
+    dxLoadPanel(options: "instance"): DevExpress.ui.dxLoadPanel;
+    dxLoadPanel(options: string): any;
+    dxLoadPanel(options: string, ...params: any[]): any;
+    dxLoadPanel(options: DevExpress.ui.dxLoadPanelOptions): JQuery;
+    dxLoadIndicator(): JQuery;
+    dxLoadIndicator(options: "instance"): DevExpress.ui.dxLoadIndicator;
+    dxLoadIndicator(options: string): any;
+    dxLoadIndicator(options: string, ...params: any[]): any;
+    dxLoadIndicator(options: DevExpress.ui.dxLoadIndicatorOptions): JQuery;
+    dxList(): JQuery;
+    dxList(options: "instance"): DevExpress.ui.dxList;
+    dxList(options: string): any;
+    dxList(options: string, ...params: any[]): any;
+    dxList(options: DevExpress.ui.dxListOptions): JQuery;
+    dxGallery(): JQuery;
+    dxGallery(options: "instance"): DevExpress.ui.dxGallery;
+    dxGallery(options: string): any;
+    dxGallery(options: string, ...params: any[]): any;
+    dxGallery(options: DevExpress.ui.dxGalleryOptions): JQuery;
+    dxDropDownEditor(): JQuery;
+    dxDropDownEditor(options: "instance"): DevExpress.ui.dxDropDownEditor;
+    dxDropDownEditor(options: string): any;
+    dxDropDownEditor(options: string, ...params: any[]): any;
+    dxDropDownEditor(options: DevExpress.ui.dxDropDownEditorOptions): JQuery;
+    dxDateBox(): JQuery;
+    dxDateBox(options: "instance"): DevExpress.ui.dxDateBox;
+    dxDateBox(options: string): any;
+    dxDateBox(options: string, ...params: any[]): any;
+    dxDateBox(options: DevExpress.ui.dxDateBoxOptions): JQuery;
+    dxCheckBox(): JQuery;
+    dxCheckBox(options: "instance"): DevExpress.ui.dxCheckBox;
+    dxCheckBox(options: string): any;
+    dxCheckBox(options: string, ...params: any[]): any;
+    dxCheckBox(options: DevExpress.ui.dxCheckBoxOptions): JQuery;
+    dxBox(): JQuery;
+    dxBox(options: "instance"): DevExpress.ui.dxBox;
+    dxBox(options: string): any;
+    dxBox(options: string, ...params: any[]): any;
+    dxBox(options: DevExpress.ui.dxBoxOptions): JQuery;
+    dxButton(): JQuery;
+    dxButton(options: "instance"): DevExpress.ui.dxButton;
+    dxButton(options: string): any;
+    dxButton(options: string, ...params: any[]): any;
+    dxButton(options: DevExpress.ui.dxButtonOptions): JQuery;
+    dxCalendar(): JQuery;
+    dxCalendar(options: "instance"): DevExpress.ui.dxCalendar;
+    dxCalendar(options: string): any;
+    dxCalendar(options: string, ...params: any[]): any;
+    dxCalendar(options: DevExpress.ui.dxCalendarOptions): JQuery;
+    dxAccordion(): JQuery;
+    dxAccordion(options: "instance"): DevExpress.ui.dxAccordion;
+    dxAccordion(options: string): any;
+    dxAccordion(options: string, ...params: any[]): any;
+    dxAccordion(options: DevExpress.ui.dxAccordionOptions): JQuery;
+    dxAutocomplete(): JQuery;
+    dxAutocomplete(options: "instance"): DevExpress.ui.dxAutocomplete;
+    dxAutocomplete(options: string): any;
+    dxAutocomplete(options: string, ...params: any[]): any;
+    dxAutocomplete(options: DevExpress.ui.dxAutocompleteOptions): JQuery;
+}
+
+declare module DevExpress.ui {
+    export interface dxTileViewOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the height of the base tile view item. */
+        baseItemHeight?: number;
+        /** Specifies the width of the base tile view item. */
+        baseItemWidth?: number;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the distance in pixels between adjacent tiles. */
+        itemMargin?: number;
+        /** A Boolean value specifying whether or not to display a scrollbar. */
+        showScrollbar?: boolean;
+    }
+    /** A widget displaying several blocks of data as tiles. */
+    export class dxTileView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTileViewOptions);
+        constructor(element: Element, options?: dxTileViewOptions);
+        /** Returns the current scroll position of the widget content. */
+        scrollPosition(): number;
+    }
+    export interface dxSwitchOptions extends EditorOptions {
+        /** Text displayed when the widget is in a disabled state. */
+        offText?: string;
+        /** Text displayed when the widget is in an enabled state. */
+        onText?: string;
+        /** A Boolean value specifying whether the current switch state is "On" or "Off". */
+        value?: boolean;
+    }
+    /** A switch widget. */
+    export class dxSwitch extends Editor {
+        constructor(element: JQuery, options?: dxSwitchOptions);
+        constructor(element: Element, options?: dxSwitchOptions);
+    }
+    export interface dxSlideOutViewOptions extends WidgetOptions {
+        /** Specifies whether or not the menu panel is visible. */
+        menuVisible?: boolean;
+        /** Specifies whether or not the menu is shown when a user swipes the widget content. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering menu panel content. */
+        menuTemplate?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal a custom menu. */
+    export class dxSlideOutView extends Widget {
+        constructor(element: JQuery, options?: dxSlideOutViewOptions);
+        constructor(element: Element, options?: dxSlideOutViewOptions);
+        /** Returns an HTML element of the widget menu block. */
+        menuContent(): JQuery;
+        /** Returns an HTML element of the widget content block. */
+        content(): JQuery;
+        /** Displays the widget's menu block. */
+        showMenu(): JQueryPromise<void>;
+        /** Hides the widget's menu block. */
+        hideMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's menu block. */
+        toggleMenuVisibility(): JQueryPromise<void>;
+    }
+    export interface dxSlideOutOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display a grouped menu. */
+        menuGrouped?: boolean;
+        menuGroupRender?: any;
+        /** The name of the template used to display a group header. */
+        menuGroupTemplate?: any;
+        menuItemRender?: any;
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** A handler for the menuGroupRendered event. */
+        onMenuGroupRendered?: Function;
+        /** A handler for the menuItemRendered event. */
+        onMenuItemRendered?: Function;
+        /** Specifies whether or not the slide-out menu is displayed. */
+        menuVisible?: boolean;
+        /** Indicates whether the menu can be shown/hidden by swiping the widget's main panel. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal an item list. */
+    export class dxSlideOut extends CollectionWidget {
+        constructor(element: JQuery, options?: dxSlideOutOptions);
+        constructor(element: Element, options?: dxSlideOutOptions);
+        /** Hides the widget's slide-out menu. */
+        hideMenu(): JQueryPromise<void>;
+        /** Displays the widget's slide-out menu. */
+        showMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's slide-out menu. */
+        toggleMenuVisibility(showing: boolean): JQueryPromise<void>;
+    }
+    export interface dxPivotOptions extends CollectionWidgetOptions {
+        /** The index of the currently active pivot item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** A widget that is similar to a traditional tab control, but optimized for the phone with simplified end-user interaction. */
+    export class dxPivot extends CollectionWidget {
+        constructor(element: JQuery, options?: dxPivotOptions);
+        constructor(element: Element, options?: dxPivotOptions);
+    }
+    export interface dxPanoramaOptions extends CollectionWidgetOptions {
+        /** An object exposing options for setting a background image for the panorama. */
+        backgroundImage?: {
+            /** Specifies the height of the panorama's background image. */
+            height?: number;
+            /** Specifies the URL of the image that is used as the panorama's background image. */
+            url?: string;
+            /** Specifies the width of the panorama's background image. */
+            width?: number;
+        };
+        /** The index of the currently active panorama item. */
+        selectedIndex?: number;
+        /** Specifies the widget content title. */
+        title?: string;
+    }
+    /** A widget displaying the required content in a long horizontal canvas that extends beyond the frames of the screen. */
+    export class dxPanorama extends CollectionWidget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+    }
+    export interface dxDropDownMenuOptions extends WidgetOptions {
+        /** A handler for the buttonClick event. */
+        onButtonClick?: any;
+        buttonClickAction?: any;
+        /** The name of the icon to be displayed by the DropDownMenu button. */
+        buttonIcon?: string;
+        buttonIconSrc?: string;
+        /** The text displayed in the DropDownMenu button. */
+        buttonText?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        itemClickAction?: any;
+        itemRender?: any;
+        /** An array of items displayed by the widget. */
+        items?: Array<any>;
+        /** The template to be used for rendering items. */
+        itemTemplate?: any;
+        /** Specifies whether or not to show the drop down menu within a dxPopover widget. */
+        usePopover?: boolean;
+        /** The width of the menu popup in pixels. */
+        popupWidth?: any;
+        /** The height of the menu popup in pixels. */
+        popupHeight?: any;
+        /** Specifies whether or not the drop-down menu is displayed. */
+        opened?: boolean;
+        /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+        hoverStateEnabled?: boolean;
+    }
+    /** A drop-down menu widget. */
+    export class dxDropDownMenu extends Widget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** This section lists the data source fields that are used in a default template for drop-down menu items. */
+        /** Opens the drop-down menu. */
+        open(): void;
+        /** Closes the drop-down menu. */
+        close(): void;
+    }
+    export interface dxActionSheetOptions extends CollectionWidgetOptions {
+        cancelClickAction?: any;
+        /** A handler for the cancelClick event. */
+        onCancelClick?: any;
+        /** The text displayed in the button that closes the action sheet. */
+        cancelText?: string;
+        /** Specifies whether or not to display the Cancel button in action sheet. */
+        showCancelButton?: boolean;
+        /** A Boolean value specifying whether or not the title of the action sheet is visible. */
+        showTitle?: boolean;
+        /** Specifies the element the action sheet popover points at. */
+        target?: any;
+        /** The title of the action sheet. */
+        title?: string;
+        /** Specifies whether or not to show the action sheet within a dxPopover widget. */
+        usePopover?: boolean;
+        /** A Boolean value specifying whether or not the dxActionSheet widget is visible. */
+        visible?: boolean;
+    }
+    /** A widget consisting of a set of choices related to a certain task. */
+    export class dxActionSheet extends CollectionWidget {
+        constructor(element: JQuery, options?: dxActionSheetOptions);
+        constructor(element: Element, options?: dxActionSheetOptions);
+        /** Hides the widget. */
+        hide(): JQueryPromise<dxActionSheet>;
+        /** Shows the widget. */
+        show(): JQueryPromise<dxActionSheet>;
+        /** Shows or hides the widget depending on the Boolean value passed as the parameter. */
+        toggle(showing: boolean): JQueryPromise<dxActionSheet>;
+    }
+}
+interface JQuery {
+    dxTileView(): JQuery;
+    dxTileView(options: "instance"): DevExpress.ui.dxTileView;
+    dxTileView(options: string): any;
+    dxTileView(options: string, ...params: any[]): any;
+    dxTileView(options: DevExpress.ui.dxTileViewOptions): JQuery;
+    dxSwitch(): JQuery;
+    dxSwitch(options: "instance"): DevExpress.ui.dxSwitch;
+    dxSwitch(options: string): any;
+    dxSwitch(options: string, ...params: any[]): any;
+    dxSwitch(options: DevExpress.ui.dxSwitchOptions): JQuery;
+    dxSlideOut(): JQuery;
+    dxSlideOut(options: "instance"): DevExpress.ui.dxSlideOut;
+    dxSlideOut(options: string): any;
+    dxSlideOut(options: string, ...params: any[]): any;
+    dxSlideOut(options: DevExpress.ui.dxSlideOutOptions): JQuery;
+    dxPivot(): JQuery;
+    dxPivot(options: "instance"): DevExpress.ui.dxPivot;
+    dxPivot(options: string): any;
+    dxPivot(options: string, ...params: any[]): any;
+    dxPivot(options: DevExpress.ui.dxPivotOptions): JQuery;
+    dxPanorama(): JQuery;
+    dxPanorama(options: "instance"): DevExpress.ui.dxPanorama;
+    dxPanorama(options: string): any;
+    dxPanorama(options: string, ...params: any[]): any;
+    dxPanorama(options: DevExpress.ui.dxPanoramaOptions): JQuery;
+    dxActionSheet(): JQuery;
+    dxActionSheet(options: "instance"): DevExpress.ui.dxActionSheet;
+    dxActionSheet(options: string): any;
+    dxActionSheet(options: string, ...params: any[]): any;
+    dxActionSheet(options: DevExpress.ui.dxActionSheetOptions): JQuery;
+    dxDropDownMenu(): JQuery;
+    dxDropDownMenu(options: "instance"): DevExpress.ui.dxDropDownMenu;
+    dxDropDownMenu(options: string): any;
+    dxDropDownMenu(options: string, ...params: any[]): any;
+    dxDropDownMenu(options: DevExpress.ui.dxDropDownMenuOptions): JQuery;
+}
+declare module DevExpress.data {
+    export interface XmlaStoreOptions {
+        /** The HTTP address to an XMLA OLAP server. */
+        url?: string;
+        /** The name of the database associated with the Store. */
+        catalog?: string;
+        /** The cube name. */
+        cube?: string;
+        beforeSend?: (request: Object) => void;
+    }
+    /** A Store that provides access to an OLAP cube using the XMLA standard. */
+    export class XmlaStore {
+        constructor(options: XmlaStoreOptions);
+    }
+    export interface PivotGridField {
+        index?: number;
+        /** A boolean value specifying whether or not the field is visible in the pivot grid and the Field Chooser. */
+        visible?: boolean;
+        /** Name of the data source field containing data for the pivot grid field. */
+        dataField?: string;
+        /** A caption that will be displayed in the pivot grid's field chooser to identify the field. */
+        caption?: string;
+        /** Specifies a type of field values. */
+        dataType?: string;
+        /** Specifies how the values of the current field are combined into groups. Cannot be used for the XmlaStore store type. */
+        groupInterval?: any;
+        /** Specifies how to aggregate field data. Cannot be used for th XmlaStore store type. */
+        summaryType?: string;
+        /** Allows you to use a custom aggregate function to calculate the summary values. Cannot be used for the XmlaStore store type. */
+        calculateCustomSummary?: (options: {
+            summaryProcess?: string;
+            value?: any;
+            totalValue?: any;
+        }) => void;
+        /** Specifies the function that determines how to split data from the data source into ranges for header items. Cannot be used for the XmlaStore store type. */
+        selector?: (data: Object) => any;
+        /** Type of the area where the field is located. */
+        area?: string;
+        /** Index among the other fields displayed within the same area. */
+        areaIndex?: number;
+        /** The name of the folder in which the field is located. */
+        displayFolder?: string;
+        /** The name of the group to which the field belongs. */
+        groupName?: string;
+        /** The index of the field within a group. */
+        groupIndex?: number;
+        /** Specifies the initial sort order of field values. */
+        sortOrder?: string;
+        /** Specifies how field data should be sorted. Can be used for the XmlaStore store type only. */
+        sortBy?: string;
+        /** Specifies the data field against which the header items of this field should be sorted. */
+        sortBySummaryField?: string;
+        /** The array of field names that specify a path to column/row whose summary field is used for sorting of this field's header items. */
+        sortBySummaryPath?: Array<any>;
+        /** The filter values for the current field. */
+        filterValues?: Array<any>;
+        /** The filter type for the current field. */
+        filterType?: string;
+        /** Indicates whether all header items of the field's header level are expanded. */
+        expanded?: boolean;
+        /** Specifies whether the field should be treated as a Data Field. */
+        isMeasure?: boolean;
+        /** Specifies a display format for field values. */
+        format?: string;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a field. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies a precision for formatted field values. */
+        precision?: number;
+        /** Specifies how to sort the header items. */
+        sortingMethod?: (a: Object, b: Object) => number;
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies the absolute width of the field in the pivot grid. */
+        width?: number;
+    }
+    export interface PivotGridDataSourceOptions {
+        /** Specifies the underlying Store instance used to access data. */
+        store?: any;
+        /** Indicates whether or not the automatic field generation from data in the Store is enabled. */
+        retrieveFields?: boolean;
+        /** Specifies data filtering conditions. */
+        filter?: Object;
+        /** An array of pivot grid fields. */
+        fields?: Array<PivotGridField>;
+        /** Indicates whether or not the local sorting of the XMLA data should be performed. */
+        localSorting?: boolean;
+        /** A handler for the changed event. */
+        onChanged?: () => void;
+        /** A handler for the loadingChanged event. */
+        onLoadingChanged?: (isLoading: boolean) => void;
+        /** A handler for the loadError event. */
+        onLoadError?: (e?: Object) => void;
+        /** A handler for the fieldsPrepared event. */
+        onFieldsPrepared?: (e?: Array<PivotGridField>) => void;
+    }
+    /** An object that provides access to data for the dxPivotGrid widget. */
+    export class PivotGridDataSource implements EventsMixin<PivotGridDataSource> {
+        constructor(options?: PivotGridDataSource);
+        /** Starts loading data. */
+        load(): JQueryPromise<any>;
+        /** Indicates whether or not the PivotGridDataSource is currently being loaded. */
+        isLoading(): boolean;
+        /** Gets data displayed in a PivotGrid. */
+        getData(): Object;
+        /** Gets all fields within a specified area. */
+        getAreaFields(area: string, collectGroups: boolean): Array<PivotGridField>;
+        /** Gets all fields from the data source. */
+        fields(): Array<PivotGridField>;
+        /** Sets the fields option. */
+        fields(fields: Array<PivotGridField>): void;
+        /** Gets current options of a specified field. */
+        field(id: number): PivotGridField;
+        /** Sets one or more options of a specified field. */
+        field(id: number, field: PivotGridField): void;
+        /** Collapses a specified header item. */
+        collapseHeaderItem(area: string, path: Array<any>): void;
+        /** Expands a specified header item. */
+        expandHeaderItem(area: string, path: Array<any>): void;
+        /** Disposes of all resources associated with this PivotGridDataSource. */
+        dispose(): void;
+        on(eventName: string, eventHandler: Function): PivotGridDataSource;
+        on(events: { [eventName: string]: Function; }): PivotGridDataSource;
+        off(eventName: string): PivotGridDataSource;
+        off(eventName: string, eventHandler: Function): PivotGridDataSource;
+    }
+}
+declare module DevExpress.ui {
+    export interface dxSchedulerOptions extends WidgetOptions {
+        /** Specifies a date displayed on the current scheduler view by default. */
+        currentDate?: Date;
+        /** Specifies the view used in the scheduler by default. */
+        currentView?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The template to be used for rendering appointments. */
+        appointmentTemplate?: any;
+        /** Lists the views to be available within the scheduler's View Selector. */
+        views?: Array<string>;
+        /** Specifies the resource kinds by which the scheduler's appointments are grouped in a timetable. */
+        groups?: Array<string>;
+        /** Specifies a start hour in the scheduler view's time interval. */
+        startDayHour?: number;
+        /** Specifies an end hour in the scheduler view's time interval. */
+        endDayHour?: number;
+        /** Specifies whether the scheduler data can be edited at runtime. */
+        editing?: boolean;
+        /** Specifies an array of resources available in the scheduler. */
+        resources?: Array<{
+            /** Indicates whether or not several resources of this kind can be assigned to an appointment. */
+            allowMultiple?: boolean;
+            /** Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned. */
+            mainColor?: boolean;
+            /** A data source used to fetch resources to be available in the scheduler. */
+            dataSource?: any;
+            /** Specifies the resource object field whose value is displayed by the Resource editor in the Appointment popup window. */
+            displayExpr?: any;
+            /** Specifies the resource object field that is used as a value of the Resource editor in the Appointment popup window. */
+            valueExpr?: any;
+            /** The name of the appointment object field that specifies a resource of this kind. */
+            field?: string;
+            /** Specifies the label of the Appointment popup window field that allows end users to assign a resource of this kind. */
+            label?: string;
+        }>;
+        /** A handler for the AppoinmentAdding event. */
+        onAppointmentAdding?: Function;
+        /** A handler for the appointmentAdded event. */
+        onAppointmentAdded?: Function;
+        /** A handler for the AppoinmentUpdating event. */
+        onAppointmentUpdating?: Function;
+        /** A handler for the appointmentUpdated event. */
+        onAppointmentUpdated?: Function;
+        /** A handler for the AppoinmentDeleting event. */
+        onAppointmentDeleting?: Function;
+        /** A handler for the appointmentDeleted event. */
+        onAppointmentDeleted?: Function;
+        /** A handler for the appointmentRendered event. */
+        onAppointmentRendered?: Function;
+    }
+    /** A widget that displays scheduled data using different views and provides the capability to load, add and edit appointments. */
+    export class dxScheduler extends Widget {
+        constructor(element: JQuery, options?: dxSchedulerOptions);
+        constructor(element: Element, options?: dxSchedulerOptions);
+        /** Add the appointment defined by the object passed as a parameter to the data associated with the widget. */
+        addAppointment(appointment: Object): void;
+        /** Updates the appointment specified by the first method parameter by the appointment object specified by the second method parameter in the the data associated with the widget. */
+        updateAppointment(target: Object, appointment: Object): void;
+        /** Deletes the appointment defined by the parameter from the the data associated with the widget. */
+        deleteAppointment(appointment: Object): void;
+    }
+    export interface dxColorBoxOptions extends dxDropDownEditorOptions {
+        /** Specifies the text displayed on the button that applies changes and closes the drop-down editor. */
+        applyButtonText?: string;
+        applyValueMode?: string;
+        /** Specifies the text displayed on the button that cancels changes and closes the drop-down editor. */
+        cancelButtonText?: string;
+        /** Specifies whether or not the widget value includes the alpha channel component. */
+        editAlphaChannel?: boolean;
+        /** Specifies the size of a step by which a handle is moved using a keyboard shortcut. */
+        keyStep?: number;
+    }
+    /** A widget used to specify a color value. */
+    export class dxColorBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxColorBoxOptions);
+        constructor(element: Element, options?: dxColorBoxOptions);
+    }
+    export interface dxColorPickerOptions extends dxColorBoxOptions { }
+    /**
+     * A widget used to specify a color value.
+     * @deprecated Use the dxColorBox widget instead
+     */
+    export class dxColorPicker extends dxColorBox {
+        constructor(element: JQuery, options?: dxColorPickerOptions);
+        constructor(element: Element, options?: dxColorPickerOptions);
+    }
+    export interface dxTreeViewOptions extends CollectionWidgetOptions {
+        /** Specifies whether or not to animate item collapsing and expanding. */
+        animationEnabled?: boolean;
+        /** Specifies whether a nested or plain array is used as a data source. */
+        dataStructure?: string;
+        /** Specifies whether or not a user can expand all tree view items by the "*" hot key. */
+        expandAllEnabled?: boolean;
+        /**
+         * An array of currently expanded item objects.
+         * @deprecated Use item.expanded field instead
+         */
+        expandedItems?: Array<any>;
+        /** Specifies whether or not a check box is displayed at each tree view item. */
+        showCheckBoxes?: boolean;
+        /** Specifies whether or not to select nodes recursively. */
+        selectNodesRecursive?: boolean;
+        /** Specifies whether the "Select All" check box is displayed over the tree view. */
+        selectAllEnabled?: boolean;
+        /** Specifies the text displayed at the "Select All" check box. */
+        selectAllText?: string;
+        /** Specifies the name of the data source item field used as a key. */
+        keyExpr?: any;
+        /** Specifies the name of the data source item field whose value is displayed by the widget. */
+        displayExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node is selected. */
+        selectedExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node is expanded. */
+        expandedExpr?: any;
+        /** Specifies the name of the data source item field that contains an array of nested items. */
+        itemsExpr?: any;
+        /** Specifies the name of the data source item field that holds the key of the parent item. */
+        parentIdExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node is disabled. */
+        disabledExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node includes child nodes. */
+        hasItemsExpr?: any;
+        /** Specifies if the virtual mode is enabled. */
+        virtualModeEnabled?: boolean;
+        /** Specifies the parent ID value of the root item. */
+        rootValue?: any;
+        /** A string value specifying available scrolling directions. */
+        scrollDirection?: string;
+        /** A handler for the itemSelected event. */
+        onItemSelected?: Function;
+        /** A handler for the itemExpanded event. */
+        onItemExpanded?: Function;
+        /** A handler for the itemCollapsed event. */
+        onItemCollapsed?: Function;
+        hoverStateEnabled?: boolean;
+        focusStateEnabled?: boolean;
+    }
+    /** A widget displaying specified data items as a tree. */
+    export class dxTreeView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTreeViewOptions);
+        constructor(element: Element, options?: dxTreeViewOptions);
+        /** Updates the tree view scrollbars according to the current size of the widget content. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+        /** Expands the specified item. */
+        expandItem(itemElement: any): void;
+        /** Collapses the specified item. */
+        collapseItem(itemElement: any): void;
+        /** Returns all nodes of the tree view. */
+        getNodes(): Array<Object>;
+        /** Selects all widget items. */
+        selectAll(): void;
+        /** Unselects all widget items. */
+        unselectAll(): void;
+    }
+    export interface dxMenuBaseOptions extends CollectionWidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the name of the CSS class associated with the menu. */
+        cssClass?: string;
+        /** Holds an array of menu items. */
+        items?: Array<any>;
+        /** Specifies whether or not an item becomes selected if an end-user clicks it. */
+        selectionByClick?: boolean;
+        /** Specifies the selection mode supported by the menu. */
+        selectionMode?: string;
+        /** Specifies options of submenu showing and hiding. */
+        showSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay of submenu show and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+        /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+        hoverStateEnabled?: boolean;
+    }
+    export class dxMenuBase extends CollectionWidget {
+        constructor(element: JQuery, options?: dxMenuBaseOptions);
+        constructor(element: Element, options?: dxMenuBaseOptions);
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+    }
+    export interface dxMenuOptions extends dxMenuBaseOptions {
+        /** Specifies whether or not the submenu is hidden when the mouse pointer leaves it. */
+        hideSubmenuOnMouseLeave?: boolean;
+        /** Specifies whether the menu has horizontal or vertical orientation. */
+        orientation?: string;
+        /** Specifies options for showing and hiding the first level submenu. */
+        showFirstSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay of submenu showing and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+        /** Specifies the direction at which the submenus are displayed. */
+        submenuDirection?: string;
+        /** A handler for the submenuHidden event. */
+        onSubmenuHidden?: Function;
+        submenuHiddenAction?: Function;
+        /** A handler for the submenuHiding event. */
+        onSubmenuHiding?: Function;
+        submenuHidingAction?: Function;
+        /** A handler for the submenuShowing event. */
+        onSubmenuShowing?: Function;
+        submenuShowingAction?: Function;
+        /** A handler for the submenuShown event. */
+        onSubmenuShown?: Function;
+        submenuShownAction?: Function;
+    }
+    /** A menu widget. */
+    export class dxMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxMenuOptions);
+        constructor(element: Element, options?: dxMenuOptions);
+    }
+    export interface dxContextMenuOptions extends dxMenuBaseOptions {
+        /** Holds an object that specifies options of alternative menu invocation. */
+        alternativeInvocationMode?: {
+            /** Specifies whether or not the standard context menu invocation (on a right mouse click or on a long tap) is disabled. */
+            enabled?: Boolean;
+            /** Specifies the element used to invoke the context menu. */
+            invokingElement?: any;
+        };
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        /** A handler for the positioning event. */
+        onPositioning?: Function;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the direction at which submenus are displayed. */
+        submenuDirection?: string;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+    }
+    /** A context menu widget. */
+    export class dxContextMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxContextMenuOptions);
+        constructor(element: Element, options?: dxContextMenuOptions);
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+    }
+    export interface dxRemoteOperations {
+        /** Specifies whether or not filtering must be performed on the server side. */
+        filtering?: boolean;
+        /** Specifies whether or not paging must be performed on the server side. */
+        paging?: boolean;
+        /** Specifies whether or not sorting must be performed on the server side. */
+        sorting?: boolean;
+    }
+    export interface dxDataGridColumn {
+        /** Specifies the content alignment within column cells. */
+        alignment?: string;
+        /** Specifies whether the values in a column can be edited at runtime. Setting this option makes sense only when editing is enabled for a grid. */
+        allowEditing?: boolean;
+        /** Specifies whether or not a column can be used for filtering grid records. Setting this option makes sense only when the filter row and column header filtering are visible.  */
+        allowFiltering?: boolean;
+        /** Specifies whether or not the column can be anchored to a grid edge by end users. Setting this option makes sense only when the columnFixing | enabled option is set to true. */
+        allowFixing?: boolean;
+        /** Specifies if a column can be used for searching grid records. Setting this option makes sense only when the search panel is visible.  */
+        allowSearch?: boolean;
+        /** Specifies whether a column can be used for grouping grid records at runtime. Setting this option makes sense only when the group panel is visible. */
+        allowGrouping?: boolean;
+        /** Specifies whether or not a column can be hidden by a user. Setting this option makes sense only when the column chooser is visible. */
+        allowHiding?: boolean;
+        /** Specifies whether or not a particular column can be used in column reordering. Setting this option makes sense only when the allowColumnReordering option is set to true. */
+        allowReordering?: boolean;
+        /** Specifies whether or not a particular column can be resized by a user. Setting this option makes sense only when the allowColumnResizing option is true. */
+        allowResizing?: boolean;
+        /** Specifies whether grid records can be sorted by a specific column at runtime. Setting this option makes sense only when the sorting mode differs from none. */
+        allowSorting?: boolean;
+        /** Specifies whether groups appear expanded or not when records are grouped by a specific column. Setting this option makes sense only when grouping is allowed for this column. */
+        autoExpandGroup?: boolean;
+        /** Specifies a callback function that returns a value to be displayed in a column cell. */
+        calculateCellValue?: (rowData: Object) => string;
+        /** Specifies a callback function that defines filters for customary calculated grid cells. */
+        calculateFilterExpression?: (filterValue: any, selectedFilterOperation: string) => Array<any>;
+        /** Specifies a caption for a column. */
+        caption?: string;
+        /** Specifies a custom template for grid column cells. */
+        cellTemplate?: any;
+        /** Specifies a CSS class to be applied to a column. */
+        cssClass?: string;
+        /** Specifies a callback function that determines values for column cells to be used for grouping. */
+        calculateGroupValue?: any;
+        /** Specifies a callback function that returns a value or the name of the field to be used for sorting column cells. */
+        calculateSortValue?: any;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a column. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies the field of a data source that provides data for a column. */
+        dataField?: string;
+        /** Specifies the required type of column values. */
+        dataType?: string;
+        /** Specifies a custom template for the cell of a grid column when it is in an editing state. */
+        editCellTemplate?: any;
+        /** Specifies whether HTML tags are displayed as plain text or applied to the values of the column. */
+        encodeHtml?: boolean;
+        /** In a boolean column, replaces all false items with a specified text. */
+        falseText?: string;
+        /** Specifies the set of available filter operations. */
+        filterOperations?: Array<any>;
+        /** Specifies a filter value for a column. */
+        filterValue?: any;
+        /** Specifies initial filter values for the column's header filter. */
+        filterValues?: Array<any>;
+        /** Specifies whether to include or exclude the records with the values selected in the column's header filter. */
+        filterType?: string;
+        /** Indicates whether the column takes part in horizontal grid scrolling or is anchored to a grid edge. */
+        fixed?: boolean;
+        /** Specifies the grid edge to which the column is anchored. */
+        fixedPosition?: string;
+        /** Specifies a format for the values displayed in a column. */
+        format?: string;
+        /** Specifies a custom template for the group cell of a grid column. */
+        groupCellTemplate?: any;
+        /** Specifies the index of a column when grid records are grouped by the values of this column. */
+        groupIndex?: number;
+        /** Specifies a custom template for the header of a grid column. */
+        headerCellTemplate?: any;
+        /** Specifies options of a lookup column. */
+        lookup?: {
+            /** Specifies whether or not a user can nullify values of a lookup column. */
+            allowClearing?: boolean;
+            /** 
+Specifies the data source providing data for a lookup column.
+ */
+            dataSource?: any;
+            /** Specifies the expression defining the data source field whose values must be displayed. */
+            displayExpr?: any;
+            /** Specifies the expression defining the data source field whose values must be replaced. */
+            valueExpr?: string;
+        };
+        /** Specifies a precision for formatted values displayed in a column. */
+        precision?: number;
+        /** Specifies a filter operation applied to a column. */
+        selectedFilterOperation?: string;
+        /** Specifies whether or not the column displays its values by using editors. */
+        showEditorAlways?: boolean;
+        /** Specifies whether or not to display the column when grid records are grouped by it. */
+        showWhenGrouped?: boolean;
+        /** Specifies the index of a column when grid records are sorted by the values of this column. */
+        sortIndex?: number;
+        /** Specifies the initial sort order of column values. */
+        sortOrder?: string;
+        /** In a boolean column, replaces all true items with a specified text. */
+        trueText?: string;
+        /** Specifies whether a column is visible or not. */
+        visible?: boolean;
+        /** Specifies the sequence number of the column in the grid. */
+        visibleIndex?: number;
+        /** Specifies a column width in pixels or percentages. */
+        width?: any;
+        /** Specifies an array of validation rules to be checked when updating column cell values. */
+        validationRules?: Array<Object>;
+        /** Specifies whether or not to display the header of a hidden column in the column chooser. */
+        showInColumnChooser?: boolean;
+        /** Specifies the identifier of the column. */
+        name?: string;
+    }
+    export interface dxDataGridOptions extends WidgetOptions {
+        /** Specifies whether the outer borders of the grid are visible or not. */
+        showBorders?: boolean;
+        /** Indicates whether to show the error row for the grid. */
+        errorRowEnabled?: boolean;
+        /** A handler for the rowValidating event. */
+        onRowValidating?: (e: Object) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+        initNewRow?: (e: { data: Object }) => void;
+        /** A handler for the initNewRow event. */
+        onInitNewRow?: (e: { data: Object }) => void;
+        rowInserted?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowInserted event. */
+        onRowInserted?: (e: { data: Object; key: any }) => void;
+        rowInserting?: (e: { data: Object; cancel: boolean }) => void;
+        /** A handler for the rowInserting event. */
+        onRowInserting?: (e: { data: Object; cancel: boolean }) => void;
+        rowRemoved?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowRemoved event. */
+        onRowRemoved?: (e: { data: Object; key: any }) => void;
+        rowRemoving?: (e: { data: Object; key: any; cancel: boolean }) => void;
+        /** A handler for the rowRemoving event. */
+        onRowRemoving?: (e: { data: Object; key: any; cancel: boolean }) => void;
+        rowUpdated?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowUpdated event. */
+        onRowUpdated?: (e: { data: Object; key: any }) => void;
+        rowUpdating?: (e: { oldData: Object; newData: Object; key: any; cancel: boolean }) => void;
+        /** A handler for the rowUpdating event. */
+        onRowUpdating?: (e: { oldData: Object; newData: Object; key: any; cancel: boolean }) => void;
+        /** Enables a hint that appears when a user hovers the mouse pointer over a cell with truncated content. */
+        cellHintEnabled?: boolean;
+        /** Specifies whether or not grid columns can be reordered by a user. */
+        allowColumnReordering?: boolean;
+        /** Specifies whether or not grid columns can be resized by a user. */
+        allowColumnResizing?: boolean;
+        cellClick?: any;
+        /** A handler for the cellClick event. */
+        onCellClick?: any;
+        cellHoverChanged?: (e: Object) => void;
+        /** A handler for the cellHoverChanged event. */
+        onCellHoverChanged?: (e: Object) => void;
+        cellPrepared?: (e: Object) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: Object) => void;
+        /** Specifies whether or not the width of grid columns depends on column content. */
+        columnAutoWidth?: boolean;
+        /** Specifies the options of a column chooser. */
+        columnChooser?: {
+            /** Specifies text displayed by the column chooser panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether a user can invoke the column chooser or not. */
+            enabled?: boolean;
+            /** Specifies the height of the column chooser panel. */
+            height?: number;
+            /** Specifies text displayed in the title of the column chooser panel. */
+            title?: string;
+            /** Specifies the width of the column chooser panel. */
+            width?: number;
+        };
+        /** Specifies options for column fixing.  */
+        columnFixing?: {
+            /** Indicates if column fixing is enabled. */
+            enabled?: boolean;
+            /** Contains options that specify texts for column-fixing related commands in the column header's context menu. */
+            texts?: {
+                /** Specifies text for a context menu item that fixes the column for which the context menu is invoked. */
+                fix?: string;
+                /** Specifies text for a context menu item that unfixes the column for which the context menu is invoked. */
+                unfix?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the left grid edge. */
+                leftPosition?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the right grid edge. */
+                rightPosition?: string;
+            };
+        };
+        /** Specifies options for filtering using a column header filter. */
+        headerFilter?: {
+            /** Indicates whether or not the column header filter button is visible. */
+            visible?: boolean;
+            /** Specifies the height of the dropdown menu invoked when using a column header filter. */
+            height?: number;
+            /** Specifies the width of the dropdown menu invoked when using a column header filter. */
+            width?: number;
+            /** Contains options that specify texts for the dropdown menu invoked when you use a column header filter. */
+            texts?: {
+                /** Specifies text for the item specifying an empty value in the column header filter's dropdown menu. */
+                emptyValue?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu and applies specified filtering. */
+                ok?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu without applying performed selection. */
+                cancel?: string;
+            }
+        };
+        /** 
+An array of grid columns.
+ */
+        columns?: Array<dxDataGridColumn>;
+        onContentReady?: Function;
+        contentReadyAction?: Function;
+        /** Specifies a function that customizes grid columns after they are created. */
+        customizeColumns?: (columns: Array<dxDataGridColumn>) => void;
+        dataErrorOccurred?: (errorObject: Error) => void;
+        /** Specifies a data source for the grid. */
+        dataSource?: any;
+        editingStart?: (e: {
+            data: Object;
+            key: any;
+            cancel: boolean;
+            column: dxDataGridColumn
+        }) => void;
+        /** A handler for the editingStart event. */
+        onEditingStart?: (e: {
+            data: Object;
+            key: any;
+            cancel: boolean;
+            column: dxDataGridColumn
+        }) => void;
+        editorPrepared?: (e: Object) => void;
+        /** A handler for the editorPrepared event. */
+        onEditorPrepared?: (e: Object) => void;
+        editorPreparing?: (e: Object) => void;
+        /** A handler for the editorPreparing event. */
+        onEditorPreparing?: (e: Object) => void;
+        /** Contains options that specify how grid content can be changed. */
+        editing?: {
+            /** Specifies whether or not grid records can be edited at runtime. */
+            editEnabled?: boolean;
+            /** Specifies how grid values can be edited manually. */
+            editMode?: string;
+            /** Specifies whether or not new records can be inserted into a grid. */
+            insertEnabled?: boolean;
+            /** Specifies whether or not records can be deleted from a grid. */
+            removeEnabled?: boolean;
+            /** Contains options that specify texts for editing-related grid controls. */
+            texts?: {
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Save" button. Setting this option makes sense only when the editMode option is set to batch. */
+                saveAllChanges?: string;
+                /** Specifies text for a cancel button displayed when a row is in the editing state. Setting this option makes sense only when the editEnabled option is set to true. */
+                cancelRowChanges?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Revert" button. Setting this option makes sense only when the editMode option is set to batch. */
+                cancelAllChanges?: string;
+                /** Specifies a message to be displayed by a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteMessage?: string;
+                /** Specifies text to be displayed in the title of a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteTitle?: string;
+                /** Specifies text for a button that deletes a row from a grid. Setting this option makes sense only when the removeEnabled option is set to true. */
+                deleteRow?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Add" button. Setting this option makes sense only when the insertEnabled option is true. */
+                addRow?: string;
+                /** Specifies text for a button that turns a row into the editing state. Setting this option makes sense only when the editEnabled option is set to true. */
+                editRow?: string;
+                /** Specifies text for a save button displayed when a row is in the editing state. Setting this option makes sense only when the editEnabled option is set to true. */
+                saveRowChanges?: string;
+                /** Specifies text for a button that recovers a deleted row. Setting this option makes sense only if the grid uses the batch edit mode and the removeEnabled option is set to true. */
+                undeleteRow?: string;
+            };
+        };
+        /** Specifies filter row options. */
+        filterRow?: {
+            /** Specifies when to apply a filter. */
+            applyFilter?: string;
+            /** Specifies text for the hint that pops up when a user hovers the mouse pointer over the "Apply Filter" button. */
+            applyFilterText?: string;
+            /** Specifies descriptions for filter operations. */
+            operationDescriptions?: {
+                "=": string;
+                "<>": string;
+                "<": string;
+                "<=": string;
+                ">": string;
+                ">=": string;
+                "startswith": string;
+                "contains": string;
+                "notcontains": string;
+                "endswith": string;
+            };
+            /** Specifies text for the reset operation in a filter list. */
+            resetOperationText?: string;
+            /** Specifies text for the operation of clearing the applied filter when a select box is used. */
+            showAllText?: string;
+            /** Specifies whether or not an icon that allows the user to choose a filter operation is visible. */
+            showOperationChooser?: boolean;
+            /** Specifies whether the filter row is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies the behavior of grouped grid records. */
+        grouping?: {
+            /** Specifies whether the user can collapse grouped records in a grid or not. */
+            allowCollapsing?: boolean;
+            /** Specifies whether groups appear expanded or not. */
+            autoExpandAll?: boolean;
+            /** Specifies the message displayed in a group row when the corresponding group is continued from the previous page. */
+            groupContinuedMessage?: string;
+            /** 
+Specifies the message displayed in a group row when the corresponding group continues on the next page.
+ */
+            groupContinuesMessage?: string;
+        };
+        /** Specifies options that configure the group panel. */
+        groupPanel?: {
+            /** Specifies whether columns can be dragged onto or from the group panel. */
+            allowColumnDragging?: boolean;
+            /** Specifies text displayed by the group panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether the group panel is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies options configuring the load panel. */
+        loadPanel?: {
+            /** Specifies whether to show the load panel or not. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel in pixels. */
+            height?: number;
+            /** Specifies a URL pointing to an image to be used as a loading indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not a loading indicator must be displayed on the load panel. */
+            showIndicator?: boolean;
+            /** Specifies whether or not the pane of the load panel must be displayed. */
+            showPane?: boolean;
+            /** Specifies text displayed by the load panel. */
+            text?: string;
+            /** Specifies the width of the load panel in pixels. */
+            width?: number;
+        };
+        /** Specifies text displayed when a grid does not contain any records. */
+        noDataText?: string;
+        /** Specifies the options of a grid pager. */
+        pager?: {
+            /** Specifies the page sizes that can be selected at runtime. */
+            allowedPageSizes?: any;
+            /** Specifies whether to show the page size selector or not. */
+            showPageSizeSelector?: boolean;
+            /** Specifies whether to show the pager or not. */
+            visible?: any;
+            /** Specifies the text accompanying the page navigator. */
+            infoText?: string;
+            /** Specifies whether or not to display the text accompanying the page navigator. This text is specified by the infoText option. */
+            showInfo?: boolean;
+            /** Specifies whether or not to display buttons that switch the grid to the previous or next page. */
+            showNavigationButtons?: boolean;
+        };
+        /** Specifies paging options. */
+        paging?: {
+            /** Specifies whether dxDataGrid loads data page by page or all at once.  */
+            enabled?: boolean;
+            /** Specifies the grid page that should be displayed by default. */
+            pageIndex?: number;
+            /** Specifies the size of grid pages. */
+            pageSize?: number;
+        };
+        /** Specifies whether or not grid rows must be shaded in a different way. */
+        rowAlternationEnabled?: boolean;
+        rowClick?: any;
+        /** A handler for the rowClick event. */
+        onRowClick?: any;
+        rowPrepared?: (e: Object) => void;
+        /** A handler for the rowPrepared event. */
+        onRowPrepared?: (e: Object) => void;
+        /** Specifies a custom template for grid rows. */
+        rowTemplate?: any;
+        /** A configuration object specifying scrolling options. */
+        scrolling?: {
+            /** Specifies the scrolling mode. */
+            mode?: string;
+            /** Specifies whether or not a grid must preload pages adjacent to the current page when using virtual scrolling. */
+            preloadEnabled?: boolean;
+        };
+        /** Specifies options of the search panel. */
+        searchPanel?: {
+            /** Specifies whether or not search strings in the located grid records should be highlighted. */
+            highlightSearchText?: boolean;
+            /** Specifies text displayed by the search panel when no search string was typed. */
+            placeholder?: string;
+            /** Specifies whether the search panel is visible or not. */
+            visible?: boolean;
+            /** Specifies the width of the search panel in pixels. */
+            width?: number;
+            /** Sets a search string for the search panel. */
+            text?: string;
+        };
+        /** Specifies the operations that must be performed on the server side. */
+        remoteOperations?: any;
+        /** Allows you to sort groups according to the values of group summary items. */
+        sortByGroupSummaryInfo?: Array<{
+            /** Specifies the group summary item whose values must be used to sort groups. */
+            summaryItem?: string;
+            /** Specifies the identifier of the column that must be used in grouping so that sorting by group summary item values be applied. */
+            groupColumn?: string;
+            /** Specifies the sort order of group summary item values. */
+            sortOrder?: string;
+        }>;
+        /** Allows you to build a master-detail interface in the grid. */
+        masterDetail?: {
+            /** Enables an end-user to expand/collapse detail sections. */
+            enabled?: boolean;
+            /** Specifies whether detail sections appear expanded or collapsed. */
+            autoExpandAll?: boolean;
+            /** Specifies the template for detail sections. */
+            template?: any;
+        };
+        /** Specifies options for exporting grid data. */
+        export?: {
+            /** Indicates if the export feature is enabled in the grid. */
+            enabled?: boolean;
+            /** Specifies a default name for the file to which grid data is exported. */
+            fileName?: string;
+            /** Specifies whether to enable Excel filtering for the exported data in the resulting XLSX file. */
+            excelFilterEnabled?: boolean;
+            /** Specifies whether to enable word wrapping for the exported data in the resulting XLSX file. */
+            excelWrapTextEnabled?: boolean;
+            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
+            proxyUrl?: string;
+            /** Indicates whether to allow end users to export not only the data displayed in the grid, but the selected rows only. */
+            allowExportSelectedData?: boolean;
+            /** Contains options that specify texts for the export-related commands and hints. */
+            texts?: {
+                /** Specifies text for the Export button when this button invokes a dropdown menu so you can choose the required export format. */
+                exportTo?: string;
+                /** Specifies text for the Export button when this button exports to the XSLX format. */
+                exportToExcel?: string;
+                /** Specifies text for the item in the Export dropdown menu that exports grid data to Excel. */
+                excelFormat?: string;
+                /** Specifies text for the option in the Export dropdown menu that allows you to choose whether to export all the grid data or the selected rows only. */
+                selectedRows?: string;
+            }
+        };
+        /** Specifies the keys of the records that must appear selected initially. */
+        selectedRowKeys?: Array<any>;
+        /** Specifies options of runtime selection. */
+        selection?: {
+            /** Specifies whether the user can select all grid records at once. */
+            allowSelectAll?: boolean;
+            /** Specifies the selection mode. */
+            mode?: string;
+        };
+        selectionChanged?: (e: {
+            currentSelectedRowKeys: Array<any>;
+            currentDeselectedRowKeys: Array<any>;
+            selectedRowKeys: Array<any>;
+            selectedRowsData: Array<any>;
+        }) => void;
+        /** A handler for the dataErrorOccured event. */
+        onDataErrorOccurred?: (e: { error: Error }) => void;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: (e: {
+            currentSelectedRowKeys: Array<any>;
+            currentDeselectedRowKeys: Array<any>;
+            selectedRowKeys: Array<any>;
+            selectedRowsData: Array<any>;
+        }) => void;
+        /** A handler for the exporting event. */
+        onExporting?: (e: {
+            fileName: string;
+            format: string;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the exported event. */
+        onExported?: (e: Object) => void;
+        /** A handler for the keyDown event. */
+        onKeyDown?: (e: Object) => void;
+        /** A handler for the rowExpanding event. */
+        onRowExpanding?: (e: Object) => void;
+        /** A handler for the rowExpanded event. */
+        onRowExpanded?: (e: Object) => void;
+        /** A handler for the rowCollapsing event. */
+        onRowCollapsing?: (e: Object) => void;
+        /** A handler for the rowCollapsed event. */
+        onRowCollapsed?: (e: Object) => void;
+        /** Specifies whether column headers are visible or not. */
+        showColumnHeaders?: boolean;
+        /** Specifies whether or not vertical lines separating one grid column from another are visible. */
+        showColumnLines?: boolean;
+        /** Specifies whether or not horizontal lines separating one grid row from another are visible. */
+        showRowLines?: boolean;
+        /** Specifies options of runtime sorting. */
+        sorting?: {
+            /** Specifies text for the context menu item that sets an ascending sort order in a column. */
+            ascendingText?: string;
+            /** Specifies text for the context menu item that resets sorting settings for a column. */
+            clearText?: string;
+            /** Specifies text for the context menu item that sets a descending sort order in a column. */
+            descendingText?: string;
+            /** Specifies the runtime sorting mode. */
+            mode?: string;
+        };
+        /** Specifies options of state storing. */
+        stateStoring?: {
+            /** Specifies a callback function that performs specific actions on state loading. */
+            customLoad?: () => JQueryPromise<Object>;
+            /** Specifies a callback function that performs specific actions on state saving. */
+            customSave?: (gridState: Object) => void;
+            /** Specifies whether or not a grid saves its state. */
+            enabled?: boolean;
+            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
+            savingTimeout?: number;
+            /** Specifies a unique key to be used for storing the grid state. */
+            storageKey?: string;
+            /** Specifies the type of storage to be used for state storing. */
+            type?: string;
+        };
+        /** Specifies the options of the grid summary. */
+        summary?: {
+            /** Contains options that specify text patterns for summary items. */
+            texts?: {
+                /** Specifies a pattern for the 'sum' summary items when they are displayed in the parent column. */
+                sum?: string;
+                /** Specifies a pattern for the 'sum' summary items displayed in a group row or in any other column rather than the parent one. */
+                sumOtherColumn?: string;
+                /** Specifies a pattern for the 'min' summary items when they are displayed in the parent column. */
+                min?: string;
+                /** Specifies a pattern for the 'min' summary items displayed in a group row or in any other column rather than the parent one. */
+                minOtherColumn?: string;
+                /** Specifies a pattern for the 'max' summary items when they are displayed in the parent column. */
+                max?: string;
+                /** Specifies a pattern for the 'max' summary items displayed in a group row or in any other column rather than the parent one. */
+                maxOtherColumn?: string;
+                /** Specifies a pattern for the 'avg' summary items when they are displayed in the parent column. */
+                avg?: string;
+                /** Specifies a pattern for the 'avg' summary items displayed in a group row or in any other column rather than the parent one. */
+                avgOtherColumn?: string;
+                /** Specifies a pattern for the 'count' summary items. */
+                count?: string;
+            };
+            /** Specifies items of the group summary. */
+            groupItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the column that provides data for a group summary item. */
+                column?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies whether or not a summary item must be displayed in the group footer. */
+                showInGroupFooter?: boolean;
+                /** Indicates whether to display group summary items in brackets of the group row header or to align them by the corresponding columns within the group row. */
+                alignByColumn?: boolean;
+                /** Specifies the column that must hold the summary item when this item is displayed in the group footer or aligned by a column in the group row. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+            }>;
+            /** Specifies items of the total summary. */
+            totalItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the alignment of a summary item. */
+                alignment?: string;
+                /** Specifies the column that provides data for a summary item. */
+                column?: string;
+                /** Specifies a CSS class to be applied to a summary item. */
+                cssClass?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies the column that must hold the summary item. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+            }>;
+            /** Allows you to use a custom aggregate function to calculate the value of a summary item. */
+            calculateCustomSummary?: (options: {
+                component: dxDataGrid;
+                name?: string;
+                value: any;
+                totalValue: any;
+                summaryProcess: string
+            }) => void;
+        };
+        /** Specifies whether text that does not fit into a column should be wrapped. */
+        wordWrapEnabled?: boolean;
+    }
+    /** A data grid widget. */
+    export class dxDataGrid extends Widget {
+        constructor(element: JQuery, options?: dxDataGridOptions);
+        constructor(element: Element, options?: dxDataGridOptions);
+        /** Ungroups grid records. */
+        clearGrouping(): void;
+        /** Clears sorting settings of all grid columns at once. */
+        clearSorting(): void;
+        /** Allows you to obtain a cell by its row index and the data field of its column. */
+        getCellElement(rowIndex: number, dataField: string): any;
+        /** Allows you to obtain a cell by its row index and the visible index of its column. */
+        getCellElement(rowIndex: number, visibleColumnIndex: number): any;
+        /** Returns the current state of the grid. */
+        state(): Object;
+        /** Sets the grid state. */
+        state(state: Object): void;
+        /** Allows you to obtain the row index by a data key. */
+        getRowIndexByKey(key: any): number;
+        /** Allows you to obtain the data key by a row index. */
+        getKeyByRowIndex(rowIndex: number): any;
+        /** Adds a new column to a grid. */
+        addColumn(columnOptions: dxDataGridColumn): void;
+        /** Displays the load panel.  */
+        beginCustomLoading(messageText: string): void;
+        /** Discards changes made in a grid. */
+        cancelEditData(): void;
+        /** Clears all the filters of a specific type applied to grid records. */
+        clearFilter(): void;
+        /** Deselects all grid records. */
+        clearSelection(): void;
+        /** Draws the cell being edited from the editing state. Use this method when the edit mode is batch. */
+        closeEditCell(): void;
+        /** Collapses groups or master rows in a grid. */
+        collapseAll(groupIndex?: number): void;
+        /** Returns the number of data columns in a grid. */
+        columnCount(): number;
+        /** Returns the value of a specific column option. */
+        columnOption(id: number, optionName: string): any;
+        /** Sets an option of a specific column. */
+        columnOption(id: number, optionName: string, optionValue: any): void;
+        /** Returns the options of a column by an identifier. */
+        columnOption(id: any): Object;
+        /** Sets several options of a column at once. */
+        columnOption(id: any, options: Object): void;
+        /** Sets a specific cell into the editing state. */
+        editCell(rowIndex: number, columnIndex: number): void;
+        /** Sets a specific row into the editing state. */
+        editRow(rowIndex: number): void;
+        /** Hides the load panel.  */
+        endCustomLoading(): void;
+        /** Expands groups or master rows in a grid. */
+        expandAll(groupIndex: number): void;
+        /** Allows you to find out whether a specific group or master row is expanded or collapsed. */
+        isRowExpanded(key: any): boolean;
+        /** Allows you to expand a specific group or master row by its key. */
+        expandRow(key: any): void;
+        /** Allows you to collapse a specific group or master row by its key. */
+        collapseRow(key: any): void;
+        /** Applies a filter to the grid's data source. */
+        filter(filterExpr?: any): void;
+        /** Returns a filter expression applied to the grid's data source using the filter(filterExpr) method. */
+        filter(): any;
+        /** Returns a filter expression applied to the grid using all possible scenarious. */
+        getCombinedFilter(): any;
+        /** Gets the keys of currently selected grid records.  */
+        getSelectedRowKeys(): Array<Object>;
+        /** Gets the data objects of currently selected grid records.  */
+        getSelectedRowsData(): Array<Object>;
+        /** Hides the column chooser panel. */
+        hideColumnChooser(): void;
+        /** Adds a new data row to a grid. */
+        insertRow(): void;
+        /** Returns the key corresponding to the passed data object. */
+        keyOf(obj: Object): any;
+        /** Switches a grid to a specified page. */
+        pageIndex(newIndex: number): void;
+        /** Gets the index of the current page. */
+        pageIndex(): number;
+        /** Sets the page size. */
+        pageSize(value: number): void;
+        /** Gets the current page size. */
+        pageSize(): number;
+        /** Refreshes grid data. */
+        refresh(): void;
+        /** Removes a specific row from a grid. */
+        removeRow(rowIndex: number): void;
+        /** Saves changes made in a grid. */
+        saveEditData(): void;
+        /** 
+Searches grid records by a search string.
+ */
+        searchByText(text: string): void;
+        /** Selects all grid records. */
+        selectAll(): void;
+        /** Deselects the rows that are currently selected within the applied filter. */
+        deselectAll(): void;
+        /** Selects specific grid records. */
+        selectRows(keys: Array<any>, preserve: boolean): void;
+        /** Deselects specific grid records. */
+        deselectRows(keys: Array<any>): void;
+        /** Selects grid rows by indexes. */
+        selectRowsByIndexes(indexes: Array<any>): void;
+        /** Allows you to find out whether a row is selected or not. */
+        isRowSelected(key: any): boolean;
+        /** Invokes the column chooser panel. */
+        showColumnChooser(): void;
+        startSelectionWithCheckboxes(): boolean;
+        /** Returns the number of records currently held by a grid. */
+        totalCount(): number;
+        /** Recovers a row deleted in the batch edit mode. */
+        undeleteRow(rowIndex: number): void;
+        /** Allows you to obtain a data object by its key. */
+        byKey(key: any): JQueryPromise<any>;
+        /** Gets the value of a total summary item. */
+        getTotalSummaryValue(summaryItemName: string): any;
+        /** Exports grid data to Excel. */
+        exportToExcel(selectionOnly: boolean): void;
+        /** Updates the grid to the size of its content. */
+        updateDimensions(): void;
+        /** Focuses the specified cell element in the grid. */
+        focus(element?: JQuery): void;
+    }
+    export interface dxPivotGridOptions extends WidgetOptions {
+        onContentReady?: Function;
+        /** Specifies a data source for the pivot grid. */
+        dataSource?: any;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: any;
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies whether to display the Total rows. */
+        showRowTotals?: boolean;
+        /** Specifies whether to display the Grand Total row. */
+        showRowGrandTotals?: boolean;
+        /** Specifies whether to display the Total columns. */
+        showColumnTotals?: boolean;
+        /** Specifies whether to display the Grand Total column. */
+        showColumnGrandTotals?: boolean;
+        /** The Field Chooser configuration options. */
+        fieldChooser?: {
+            /** Enables or disables the field chooser. */
+            enabled?: boolean;
+            /** Specifies the field chooser layout. */
+            layout?: number;
+            /** Specifies the text to display as a title of the field chooser popup window. */
+            title?: string;
+            /** Specifies the field chooser width. */
+            width?: number;
+            /** Specifies the field chooser height. */
+            height?: number;
+            /** Strings that can be changed or localized in the pivot grid's integrated Field Chooser. */
+            texts?: {
+                /** The string to display instead of Row Fields. */
+                rowFields?: string;
+                /** The string to display instead of Column Fields. */
+                columnFields?: string;
+                /** The string to display instead of Data Fields. */
+                dataFields?: string;
+                /** The string to display instead of Filter Fields. */
+                filterFields?: string;
+                /** The string to display instead of All Fields. */
+                allFields?: string;
+            };
+        }
+        /** Strings that can be changed or localized in the dxPivotGrid widget. */
+        texts?: {
+            /** The string to display as a header of the Grand Total row and column. */
+            grandTotal?: string;
+            /** The string to display as a header of the Total row and column. */
+            total?: string;
+            /** Specifies the text displayed when a pivot grid does not contain any fields. */
+            noData?: string;
+            /** The string to display as a Show Field Chooser context menu item. */
+            showFieldChooser?: string;
+            /** The string to display as an Expand All context menu item. */
+            expandAll?: string;
+            /** The string to display as a Collapse All context menu item. */
+            collapseAll?: string;
+            /** The string to display as a Sort Column by Summary Value context menu item. */
+            sortColumnBySummary?: string;
+            /** The string to display as a Sort Row by Summary Value context menu item. */
+            sortRowBySummary?: string;
+            /** The string to display as a Remove All Sorting context menu item. */
+            removeAllSorting?: string;
+        };
+        /** The Load panel configuration options. */
+        loadPanel?: {
+            /** Enables or disables the load panel. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel. */
+            height?: number;
+            /** Specifies the URL pointing to an image that will be used as a load indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not to show a load indicator. */
+            showIndicator?: boolean;
+            /** Specifies whether or not to show load panel background. */
+            showPane?: boolean;
+            /** Specifies the text to display inside a load panel. */
+            text?: string;
+            /** Specifies the width of the load panel. */
+            width?: number;
+        };
+        /** A handler for the cellClick event. */
+        onCellClick?: (e: any) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: any) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+    }
+    /** A data summarization widget for multi-dimensional data analysis and data mining. */
+    export class dxPivotGrid extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridOptions);
+        constructor(element: Element, options?: dxPivotGridOptions);
+        /** Gets the PivotGridDataSource instance. */
+        getDataSource(): DevExpress.data.PivotGridDataSource;
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+    }
+    export interface dxPivotGridFieldChooserOptions extends WidgetOptions {
+        /** Specifies the field chooser layout. */
+        layout?: number;
+        /** The data source of a dxPivotGrid widget. */
+        dataSource?: DevExpress.data.PivotGridDataSource;
+        onContentReady?: Function;
+        /** Strings that can be changed or localized in the dxPivotGridFieldChooser widget. */
+        texts?: {
+            /** The string to display instead of Row Fields. */
+            rowFields?: string;
+            /** The string to display instead of Column Fields. */
+            columnFields?: string;
+            /** The string to display instead of Data Fields. */
+            dataFields?: string;
+            /** The string to display instead of Filter Fields. */
+            filterFields?: string;
+            /** The string to display instead of All Fields. */
+            allFields?: string;
+        };
+    }
+    /** A complementary widget for dxPivotGrid that allows you to manage data displayed in the dxPivotGrid. */
+    export class dxPivotGridFieldChooser extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridFieldChooserOptions);
+        constructor(element: Element, options?: dxPivotGridFieldChooserOptions);
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+    }
+}
+interface JQuery {
+    dxTreeView(): JQuery;
+    dxTreeView(options: "instance"): DevExpress.ui.dxTreeView;
+    dxTreeView(options: string): any;
+    dxTreeView(options: string, ...params: any[]): any;
+    dxTreeView(options: DevExpress.ui.dxTreeViewOptions): JQuery;
+    dxMenuBase(): JQuery;
+    dxMenuBase(options: "instance"): DevExpress.ui.dxMenuBase;
+    dxMenuBase(options: string): any;
+    dxMenuBase(options: string, ...params: any[]): any;
+    dxMenuBase(options: DevExpress.ui.dxMenuBaseOptions): JQuery;
+    dxMenu(): JQuery;
+    dxMenu(options: "instance"): DevExpress.ui.dxMenu;
+    dxMenu(options: string): any;
+    dxMenu(options: string, ...params: any[]): any;
+    dxMenu(options: DevExpress.ui.dxMenuOptions): JQuery;
+    dxContextMenu(): JQuery;
+    dxContextMenu(options: "instance"): DevExpress.ui.dxContextMenu;
+    dxContextMenu(options: string): any;
+    dxContextMenu(options: string, ...params: any[]): any;
+    dxContextMenu(options: DevExpress.ui.dxContextMenuOptions): JQuery;
+    dxColorBox(): JQuery;
+    dxColorBox(options: "instance"): DevExpress.ui.dxColorBox;
+    dxColorBox(options: string): any;
+    dxColorBox(options: string, ...params: any[]): any;
+    dxColorBox(options: DevExpress.ui.dxColorBoxOptions): JQuery;
+    dxDataGrid(): JQuery;
+    dxDataGrid(options: "instance"): DevExpress.ui.dxDataGrid;
+    dxDataGrid(options: string): any;
+    dxDataGrid(options: string, ...params: any[]): any;
+    dxDataGrid(options: DevExpress.ui.dxDataGridOptions): JQuery;
+    dxPivotGrid(): JQuery;
+    dxPivotGrid(options: "instance"): DevExpress.ui.dxPivotGrid;
+    dxPivotGrid(options: string): any;
+    dxPivotGrid(options: string, ...params: any[]): any;
+    dxPivotGrid(options: DevExpress.ui.dxPivotGridOptions): JQuery;
+    dxPivotGridFieldChooser(): JQuery;
+    dxPivotGridFieldChooser(options: "instance"): DevExpress.ui.dxPivotGridFieldChooser;
+    dxPivotGridFieldChooser(options: string): any;
+    dxPivotGridFieldChooser(options: string, ...params: any[]): any;
+    dxPivotGridFieldChooser(options: DevExpress.ui.dxPivotGridFieldChooserOptions): JQuery;
+    dxScheduler(): JQuery;
+    dxScheduler(options: "instance"): DevExpress.ui.dxScheduler;
+    dxScheduler(options: string): any;
+    dxScheduler(options: string, ...params: any[]): any;
+    dxScheduler(options: DevExpress.ui.dxSchedulerOptions): JQuery;
+}
+declare module DevExpress.framework {
+    /** An object used to store information on the views displayed in an application. */
+    export class ViewCache {
+        viewRemoved: JQueryCallback;
+        /** Removes all the viewInfo objects from the cache. */
+        clear(): void;
+        /** Obtains a viewInfo object from the cache by the specified key. */
+        getView(key: string): Object;
+        /** Checks whether or not a viewInfo object is contained in the view cache under the specified key. */
+        hasView(key: string): boolean;
+        /** Removes a viewInfo object from the cache by the specified key. */
+        removeView(key: string): Object;
+        /** Adds the specified viewInfo object to the cache under the specified key. */
+        setView(key: string, viewInfo: Object): void;
+    }
+    export interface dxCommandOptions extends DOMComponentOptions {
+        action?: any;
+        /** Specifies an action performed when the execute() method of the command is called. */
+        onExecute?: any;
+        /** Indicates whether or not the widget that displays this command is disabled. */
+        disabled?: boolean;
+        /** Specifies the name of the icon shown inside the widget associated with this command. */
+        icon?: string;
+        iconSrc?: string;
+        /** The identifier of the command. */
+        id?: string;
+        /** Specifies the title of the widget associated with this command. */
+        title?: string;
+        /** Specifies the type of the button, if the command is rendered as a dxButton widget. */
+        type?: string;
+        /** A Boolean value specifying whether or not the widget associated with this command is visible. */
+        visible?: boolean;
+    }
+    /** A markup component used to define markup options for a command. */
+    export class dxCommand extends DOMComponent {
+        constructor(element: JQuery, options: dxCommandOptions);
+        constructor(options: dxCommandOptions);
+        /** Executes the action associated with this command. */
+        execute(): void;
+    }
+    /** An object responsible for routing. */
+    export class Router {
+        /** Adds a routing rule to the list of registered rules. */
+        register(pattern: string, defaults?: Object, constraints?: Object): void;
+        /** Decodes the specified URI to an object using the registered routing rules. */
+        parse(uri: string): Object;
+        /** Formats an object to a URI. */
+        format(obj: Object): string;
+    }
+    export interface StateManagerOptions {
+        /** A storage to which the state manager saves the application state.  */
+        storage?: Object;
+    }
+    /** An object used to store the current application state. */
+    export class StateManager {
+        constructor(options?: StateManagerOptions);
+        /** Adds an object that implements an interface of a state source to the state manager's collection of state sources. */
+        addStateSource(stateSource: Object): void;
+        /** Removes a specified state source from the state manager's collection of state sources. */
+        removeStateSource(stateSource: Object): void;
+        /** Saves the current application state. */
+        saveState(): void;
+        /** Restores the application state that has been saved by the saveState() method to the state storage. */
+        restoreState(): void;
+        /** Removes the application state that has been saved by the saveState() method to the state storage. */
+        clearState(): void;
+    }
+    export module html {
+        export var layoutSets: Array<string>;
+        export var animationSets: { [animationSetName: string]: AnimationSet };
+        export interface AnimationSet {
+            [animationName: string]: any
+        }
+        export interface HtmlApplicationOptions {
+            /** Specifies where the commands that are defined in the application's views must be displayed. */
+            commandMapping?: Object;
+            /** Specifies whether or not view caching is disabled. */
+            disableViewCache?: boolean;
+            /** An array of layout controllers that should be used to show application views in the current navigation context. */
+            layoutSet?: any;
+            /** Specifies the animation presets that are used to animate different UI elements in the current application. */
+            animationSet?: AnimationSet;
+            /** Specifies whether the current application must behave as a mobile or web application. */
+            mode?: string;
+            /** Specifies the object that represents a root namespace of the application. */
+            namespace?: Object;
+            /** Specifies application behavior when the user navigates to a root view. */
+            navigateToRootViewMode?: string;
+            /** An array of dxCommand configuration objects used to define commands available from the application's global navigation. */
+            navigation?: Array<any>;
+            /** A state manager to be used in the application. */
+            stateManager?: StateManager;
+            /** Specifies the storage to be used by the application's state manager to store the application state. */
+            stateStorage?: Object;
+            /** Indicates whether on not to use the title of the previously displayed view as text on the Back button. */
+            useViewTitleAsBackText?: boolean;
+            /** A custom view cache to be used in the application. */
+            viewCache?: Object;
+            /** Specifies a limit for the views that can be cached. */
+            viewCacheSize?: number;
+            /** Specifies options for the viewport meta tag of a mobile browser. */
+            viewPort?: JQuery;
+            /** A custom router to be used in the application. */
+            router?: Router;
+        }
+        /** An object used to manage views, as well as control the application life cycle. */
+        export class HtmlApplication implements EventsMixin<HtmlApplication> {
+            constructor(options: HtmlApplicationOptions);
+            afterViewSetup: JQueryCallback;
+            beforeViewSetup: JQueryCallback;
+            initialized: JQueryCallback;
+            navigating: JQueryCallback;
+            navigatingBack: JQueryCallback;
+            resolveLayoutController: JQueryCallback;
+            viewDisposed: JQueryCallback;
+            viewDisposing: JQueryCallback;
+            viewHidden: JQueryCallback;
+            viewRendered: JQueryCallback;
+            viewShowing: JQueryCallback;
+            viewShown: JQueryCallback;
+            /** Provides access to the ViewCache object. */
+            viewCache: ViewCache;
+            /** An array of dxCommand components that are created based on the application's navigation option value. */
+            navigation: Array<any>;
+            /** Provides access to the StateManager object. */
+            stateManager: StateManager;
+            /** Provides access to the Router object. */
+            router: Router;
+            /** Navigates to the URI preceding the current one in the navigation history. */
+            back(): void;
+            /** Returns a Boolean value indicating whether or not backwards navigation is currently possible. */
+            canBack(): boolean;
+            /** Calls the clearState() method of the application's StateManager object. */
+            clearState(): void;
+            /** Creates global navigation commands.  */
+            createNavigation(navigationConfig: Array<any>): void;
+            /** Returns an HTML template of the specified view. */
+            getViewTemplate(viewName: string): JQuery;
+            /** Returns a configuration object used to create a dxView component for a specified view. */
+            getViewTemplateInfo(viewName: string): Object;
+            /** Adds a specified HTML template to a collection of view or layout templates. */
+            loadTemplates(source: any): JQueryPromise<any>;
+            /** Navigates to the specified URI. */
+            navigate(uri?: any, options?: Object): void;
+            /** Renders navigation commands to the navigation command containers that are located in the layouts used in the application. */
+            renderNavigation(): void;
+            /** Calls the restoreState() method of the application's StateManager object. */
+            restoreState(): void;
+            /** Calls the saveState method of the application's StateManager object. */
+            saveState(): void;
+            /** Provides access to the object that defines the current context to be considered when choosing an appropriate template for a view. */
+            templateContext(): Object;
+            on(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            on(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            on(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            on(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: string, eventHandler: Function): HtmlApplication;
+            on(events: { [eventName: string]: Function; }): HtmlApplication;
+            off(eventName: "initialized"): HtmlApplication;
+            off(eventName: "afterViewSetup"): HtmlApplication;
+            off(eventName: "beforeViewSetup"): HtmlApplication;
+            off(eventName: "navigating"): HtmlApplication;
+            off(eventName: "navigatingBack"): HtmlApplication;
+            off(eventName: "resolveLayoutController"): HtmlApplication;
+            off(eventName: "viewDisposed"): HtmlApplication;
+            off(eventName: "viewDisposing"): HtmlApplication;
+            off(eventName: "viewHidden"): HtmlApplication;
+            off(eventName: "viewRendered"): HtmlApplication;
+            off(eventName: "viewShowing"): HtmlApplication;
+            off(eventName: "viewShown"): HtmlApplication;
+            off(eventName: string): HtmlApplication;
+            off(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            off(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            off(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            off(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: string, eventHandler: Function): HtmlApplication;
+        }
+    }
+}
+declare module DevExpress.viz.core {
+    export interface Border {
+        /** Sets a border color for a selected series. */
+        color?: string;
+        /** Sets border visibility for a selected series. */
+        visible?: boolean;
+        /** Sets a border width for a selected series. */
+        width?: number;
+    }
+    export interface DashedBorder extends Border {
+        /** Specifies a dash style for the border of a selected series point. */
+        dashStyle?: string;
+    }
+    export interface DashedBorderWithOpacity extends DashedBorder {
+        /** Specifies the opacity of the tooltip's border. */
+        opacity?: number;
+    }
+    export interface Font {
+        /** Specifies the font color for a strip label. */
+        color?: string;
+        /** Specifies the font family for a strip label. */
+        family?: string;
+        /** Specifies the font opacity for a strip label. */
+        opacity?: number;
+        /** Specifies the font size for a strip label. */
+        size?: any;
+        /** Specifies the font weight for the text displayed in strips. */
+        weight?: number;
+    }
+    export interface Hatching {
+        /** Specifies how to apply hatching to highlight a selected series. */
+        direction?: string;
+        /** Specifies the opacity of hatching lines. */
+        opacity?: number;
+        /** Specifies the distance between hatching lines in pixels. */
+        step?: number;
+        /** Specifies the width of hatching lines in pixels. */
+        width?: number;
+    }
+    export interface Margins {
+        /** Specifies the legend's bottom margin in pixels. */
+        bottom?: number;
+        /** Specifies the legend's left margin in pixels. */
+        left?: number;
+        /** Specifies the legend's right margin in pixels. */
+        right?: number;
+        /** Specifies the legend's bottom margin in pixels. */
+        top?: number;
+    }
+    export interface Size {
+        /** Specifies the width of the widget. */
+        width?: number;
+        /** Specifies the height of the widget. */
+        height?: number;
+    }
+    export interface Tooltip {
+        /** Specifies the length of the tooltip's arrow in pixels. */
+        arrowLength?: number;
+        /** Specifies the appearance of the tooltip's border. */
+        border?: viz.core.DashedBorderWithOpacity;
+        /** Specifies a color for the tooltip. */
+        color?: string;
+        /** Specifies the z-index for tooltips. */
+        zIndex?: number;
+        /** Specifies text and appearance of a set of tooltips. */
+        customizeTooltip?: (arg: Object) => { color?: string; text?: string };
+        /** Specifies whether or not the tooltip is enabled. */
+        enabled?: boolean;
+        /** Specifies font options for the text displayed by the tooltip. */
+        font?: Font;
+        /** Specifies a format for the text displayed by the tooltip. */
+        format?: string;
+        /** Specifies the opacity of a tooltip. */
+        opacity?: number;
+        /** Specifies a distance from the tooltip's left/right boundaries to the inner text in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies a distance from the tooltip's top/bottom boundaries to the inner text in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies a precision for formatted values displayed by the tooltip. */
+        precision?: number;
+        /** Specifies options of the tooltip's shadow. */
+        shadow?: {
+            /** Specifies the blur distance of the tooltip's shadow. */
+            blur?: number;
+            /** Specifies the color of the tooltip's shadow. */
+            color?: string;
+            /** Specifies the horizontal offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetX?: number;
+            /** Specifies the vertical offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetY?: number;
+            /** Specifies the opacity of the tooltip's shadow. */
+            opacity?: number;
+        };
+    }
+    export interface Animation {
+        /** Determines how long animation runs. */
+        duration?: number;
+        /** Specifies the animation easing mode. */
+        easing?: string;
+        /** Indicates whether or not animation is enabled. */
+        enabled?: boolean;
+    }
+    export interface LoadingIndicator {
+        /** Specifies a color for the loading indicator background. */
+        backgroundColor?: string;
+        /** Specifies font options for the loading indicator text. */
+        font?: viz.core.Font;
+        /** Specifies whether to show the loading indicator or not. */
+        show?: boolean;
+        /** Specifies a text to be displayed by the loading indicator. */
+        text?: string;
+    }
+    export interface LegendBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies a radius for the corners of the legend border. */
+        cornerRadius?: number;
+    }
+    export interface BaseLegend {
+        /** Specifies the color of the legend's background. */
+        backgroundColor?: string;
+        /** Specifies legend border settings. */
+        border?: viz.core.LegendBorder;
+        /** Specifies how many columns must be taken to arrange legend items. */
+        columnCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend columns in pixels. */
+        columnItemSpacing?: number;
+        /** Specifies font options for legend items. */
+        font?: viz.core.Font;
+        /** Specifies the legend's position on the map. */
+        horizontalAlignment?: string;
+        /** Specifies the alignment of legend items. */
+        itemsAlignment?: string;
+        /** Specifies the position of text relative to the item marker. */
+        itemTextPosition?: string;
+        /** Specifies the distance between the legend and the container borders in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of item markers in the legend in pixels. */
+        markerSize?: number;
+        /** Specifies whether to arrange legend items horizontally or vertically.  */
+        orientation?: string;
+        /** Specifies the spacing between the legend left/right border and legend items in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies the spacing between the legend top/bottom border and legend items in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies how many rows must be taken to arrange legend items. */
+        rowCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend rows in pixels. */
+        rowItemSpacing?: number;
+        /** Specifies the legend's position on the map. */
+        verticalAlignment?: string;
+        /** Specifies whether or not the legend is visible on the map. */
+        visible?: boolean;
+    }
+    export interface BaseWidgetOptions {
+        drawn?: (widget: Object) => void;
+        /** A handler for the drawn event. */
+        onDrawn?: (e: {
+            component: BaseWidget;
+            element: Element;
+        }) => void;
+        incidentOccured?: (incidentInfo: {
+            id: string;
+            type: string;
+            args: any;
+            text: string;
+            widget: string;
+            version: string;
+        }) => void;
+        /** A handler for the incidentOccurred event. */
+        onIncidentOccurred?: (
+            component: BaseWidget,
+            element: Element,
+            target: {
+                id: string;
+                type: string;
+                args: any;
+                text: string;
+                widget: string;
+                version: string;
+            }
+        ) => void;
+        /** Notifies a widget that it is embedded into an HTML page that uses a path modifier. */
+        pathModified?: boolean;
+        /** Specifies whether or not the widget supports right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Sets the name of the theme to be used in the widget. */
+        theme?: string;
+    }
+    /** This section describes options and methods that are common to all widgets. */
+    export class BaseWidget extends DOMComponent {
+        /** Returns the widget's SVG markup. */
+        svg(): string;
+    }
+}
+declare module DevExpress.viz.charts {
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface BaseSeries {
+        /** Provides information about the state of the series object. */
+        fullState: number;
+        /** Returns the type of the series. */
+        type: string;
+        /** Unselects all the selected points of the series. The points are displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the color of a particular series. */
+        getColor(): string;
+		/**
+         * Gets a point from the series point collection based on the specified argument.
+         * @deprecated getPointsByArg(pointArg).md
+         */
+        getPointByArg(pointArg: any): Object;
+        /** Gets points from the series point collection based on the specified argument. */
+        getPointsByArg(pointArg: any): Array<BasePoint>;
+        /** Gets a point from the series point collection based on the specified point position. */
+        getPointByPos(positionIndex: number): Object;
+        /** Selects the series. The series is displayed in a 'selected' style until another series is selected or the current series is deselected programmatically. */
+        select(): void;
+        /** Selects the specified point. The point is displayed in a 'selected' style. */
+        selectPoint(point: BasePoint): void;
+        /** Deselects the specified point. The point is displayed in an initial style. */
+        deselectPoint(point: BasePoint): void;
+        /** Returns an array of all points in the series. */
+        getAllPoints(): Array<BasePoint>;
+        /** Returns visible series points. */
+        getVisiblePoints(): Array<BasePoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface BasePoint {
+        /** Provides information about the state of the point object. */
+        fullState: number;
+        /** Returns the point's argument value that was set in the data source. */
+        originalArgument: any;
+        /** Returns the point's value that was set in the data source. */
+        originalValue: any;
+        /** Returns the tag of the point. */
+        tag: string;
+        /** Deselects the point. */
+        clearSelection(): void;
+        /** Gets the color of a particular point. */
+        getColor(): string;
+        /** Hides the tooltip of the point. */
+        hideTooltip(): void;
+        /** Provides information about the hover state of a point. */
+        isHovered(): any;
+        /** Provides information about the selection state of a point. */
+        isSelected(): any;
+        /** Selects the point. The point is displayed in a 'selected' style until another point is selected or the current point is deselected programmatically. */
+        select(): void;
+        /** Shows the tooltip of the point. */
+        showTooltip(): void;
+        /** Allows you to obtain the label of a series point. */
+        getLabel(): any;
+        /** Returns the series object to which the point belongs. */
+        series: BaseSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface ChartSeries extends BaseSeries {
+        /** Returns the name of the series pane. */
+        pane: string;
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        /** Returns the name of the series. */
+        name: string;
+        /** Returns the tag of the series. */
+        tag: string;
+        /** Hides a series. */
+        hide(): void;
+        /** Provides information about the hover state of a series. */
+        isHovered(): any;
+        /** Provides information about the selection state of a series. */
+        isSelected(): any;
+        /** Provides information about the visibility state of a series. */
+        isVisible(): boolean;
+        /** Makes a particular series visible. */
+        show(): void;
+        selectPoint(point: ChartPoint): void;
+        deselectPoint(point: ChartPoint): void;
+        getAllPoints(): Array<ChartPoint>;
+        getVisiblePoints(): Array<ChartPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface ChartPoint extends BasePoint {
+        /** Contains the close value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalCloseValue: any;
+        /** Contains the high value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalHighValue: any;
+        /** Contains the low value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalLowValue: any;
+        /** Contains the first value of the point. This field is useful for points belonging to a series of the range area or range bar type only. */
+        originalMinValue: any;
+        /** Contains the open value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalOpenValue: any;
+        /** Contains the size of the bubble as it was set in the data source. This field is useful for points belonging to a series of the bubble type only. */
+        size: any;
+        /** Gets the parameters of the point's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        series: ChartSeries;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Label object. */
+    export interface Label {
+        /** Gets the parameters of the label's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        /** Hides the point label. */
+        hide(): void;
+        /** Shows the point label. */
+        show(): void;
+    }
+    export interface PieSeries extends BaseSeries {
+        selectPoint(point: PiePoint): void;
+        deselectPoint(point: PiePoint): void;
+        getAllPoints(): Array<PiePoint>;
+        getVisiblePoints(): Array<PiePoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PiePoint extends BasePoint {
+        /** Gets the percentage value of the specific point. */
+        percent: any;
+        /** Provides information about the visibility state of a point. */
+        isVisible(): boolean;
+        /** Makes a specific point visible. */
+        show(): void;
+        /** Hides a specific point. */
+        hide(): void;
+        series: PieSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface PolarSeries extends BaseSeries {
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        /** Returns the name of the series. */
+        name: string;
+        /** Returns the tag of the series. */
+        tag: string;
+        /** Hides a series. */
+        hide(): void;
+        /** Provides information about the hover state of a series. */
+        isHovered(): any;
+        /** Provides information about the selection state of a series. */
+        isSelected(): any;
+        /** Provides information about the visibility state of a series. */
+        isVisible(): boolean;
+        /** Makes a particular series visible. */
+        show(): void;
+        selectPoint(point: PolarPoint): void;
+        deselectPoint(point: PolarPoint): void;
+        getAllPoints(): Array<PolarPoint>;
+        getVisiblePoints(): Array<PolarPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PolarPoint extends BasePoint {
+        series: PolarSeries;
+    }
+    export interface Strip {
+        /** Specifies a color for a strip. */
+        color?: string;
+        /** An object that defines the label configuration options of a strip. */
+        label?: {
+            /** Specifies the text displayed in a strip. */
+            text?: string;
+        };
+        /** Specifies a start value for a strip. */
+        startValue?: any;
+        /** Specifies an end value for a strip. */
+        endValue?: any;
+    }
+    export interface BaseSeriesConfigLabel {
+        /** Specifies a format for arguments displayed by point labels. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted point arguments displayed in point labels. */
+        argumentPrecision?: number;
+        /** Specifies a background color for point labels. */
+        backgroundColor?: string;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies connector options for series point labels. */
+        connector?: {
+            /** Specifies the color of label connectors. */
+            color?: string;
+            /** Indicates whether or not label connectors are visible. */
+            visible?: boolean;
+            /** Specifies the width of label connectors. */
+            width?: number;
+        };
+        /** Specifies a callback function that returns the text to be displayed by point labels. */
+        customizeText?: (pointInfo: Object) => string;
+        /** Specifies font options for the text displayed in point labels. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed by point labels. */
+        format?: string;
+        position?: string;
+        /** Specifies a precision for formatted point values displayed in point labels. */
+        precision?: number;
+        /** Specifies the angle used to rotate point labels from their initial position. */
+        rotationAngle?: number;
+        /** Specifies the visibility of point labels. */
+        visible?: boolean;
+    }
+    export interface SeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies whether or not to show a label when the point has a zero value. */
+        showForZeroValues?: boolean;
+    }
+    export interface ChartSeriesConfigLabel extends SeriesConfigLabel {
+        /** Specifies how to align point labels relative to the corresponding data points that they represent. */
+        alignment?: string;
+        /** Specifies how to shift point labels horizontally from their initial positions. */
+        horizontalOffset?: number;
+        /** Specifies how to shift point labels vertically from their initial positions. */
+        verticalOffset?: number;
+        /** Specifies a precision for the percentage values displayed in the labels of a full-stacked-like series. */
+        percentPrecision?: number;
+    }
+	export interface BaseCommonSeriesConfig {
+		/** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        axis?: string;
+        /** An object defining the label configuration options for a series in the dxChart widget. */
+        label?: ChartSeriesConfigLabel;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the dash style of the series' line. */
+        dashStyle?: string;
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered series. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** <p>Sets a color for a series when it is hovered over.</p> */
+            color?: string;
+            /** Specifies the dash style for the line in a hovered series. */
+            dashStyle?: string;
+            /** Specifies the hatching options to be applied when a series is hovered over. */
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a hovered series. */
+            width?: number;
+        };
+        /** Specifies whether a chart ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies the minimal length of a displayed bar in pixels. */
+        minBarSize?: number;
+        /** Specifies opacity for a series. */
+        opacity?: number;
+        /** Specifies the series elements to highlight when the series is selected. */
+        selectionMode?: string;
+        /** An object defining configuration options for a selected series. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the dash style for the line in a selected series. */
+            dashStyle?: string;
+            /** Specifies the hatching options to be applied when a series is selected. */
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a selected series. */
+            width?: number;
+        };
+        /** Specifies whether or not to show the series in the chart's legend. */
+        showInLegend?: boolean;
+        /** Specifies the name of the stack where the values of the _stackedBar_ series must be located. */
+        stack?: string;
+        /** Specifies the name of the data source field that provides data about a point. */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+        /** Specifies the visibility of a series. */
+        visible?: boolean;
+        /** Specifies a line width. */
+        width?: number;
+		/** Configures error bars. */
+		valueErrorBar?: {
+			/** Specifies whether error bars must be displayed in full or partially. */
+			displayMode?: string;
+			/** Specifies the data field that provides data for low error values. */
+			lowValueField?: string;
+			/** Specifies the data field that provides data for high error values. */
+			highValueField?: string;
+			/** Specifies how error bar values must be calculated. */
+			type?: string;
+			/** Specifies the value to be used for generating error bars. */
+			value?: number;
+			/** Specifies the color of error bars. */
+			color?: string;
+			/** Specifies the opacity of error bars. */
+			opacity?: number;
+			/** Specifies the length of the lines that indicate the error bar edges. */
+            edgeLength?: number;
+			/** Specifies the width of the error bar line. */
+			lineWidth?: number;
+		};
+	}
+	export interface CommonPointOptions {
+			/** Specifies border options for points in the line and area series. */
+            border?: viz.core.Border;
+            /** Specifies the points color. */
+            color?: string;
+            /** Specifies what series points to highlight when a point is hovered over. */
+            hoverMode?: string;
+            /** An object defining configuration options for a hovered point. */
+            hoverStyle?: {
+                /** An object defining the border options for a hovered point. */
+                border?: viz.core.Border;
+                /** Sets a color for a point when it is hovered over. */
+                color?: string;
+                /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
+                size?: number;
+            };
+            /** Specifies what series points to highlight when a point is selected. */
+            selectionMode?: string;
+            /** An object defining configuration options for a selected point. */
+            selectionStyle?: {
+                /** An object defining the border options for a selected point. */
+                border?: viz.core.Border;
+                /** <p>Sets a color for a point when it is selected.</p> */
+                color?: string;
+                /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
+                size?: number;
+            };
+            /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
+            size?: number;
+            /** Specifies a symbol for presenting points of the line and area series. */
+            symbol?: string;
+            visible?: boolean;
+	}
+	export interface ChartCommonPointOptions extends CommonPointOptions {
+			/** An object specifying the parameters of an image that is used as a point marker. */
+            image?: {
+                /** Specifies the height of an image that is used as a point marker. */
+                height?: any;
+                /** Specifies a URL leading to the image to be used as a point marker. */
+                url?: any;
+                /** Specifies the width of an image that is used as a point marker. */
+                width?: any;
+            };
+	}
+	export interface PolarCommonPointOptions extends CommonPointOptions {
+			/** An object specifying the parameters of an image that is used as a point marker. */
+            image?: {
+                /** Specifies the height of an image that is used as a point marker. */
+                height?: number;
+                /** Specifies a URL leading to the image to be used as a point marker. */
+                url?: string;
+                /** Specifies the width of an image that is used as a point marker. */
+                width?: number;
+            };
+	}
+    /** An object that defines configuration options for chart series. */
+    export interface CommonSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides a 'close' value for a _candleStick_ or _stock_ series. */
+        closeValueField?: string;
+        /** Specifies a radius for bar corners. */
+        cornerRadius?: number;
+        /** Specifies the data source field that provides a 'high' value for a _candleStick_ or _stock_ series. */
+        highValueField?: string;
+        /** Specifies the color for the body (rectangle) of a _candleStick_ series. */
+        innerColor?: string;
+        /** Specifies the data source field that provides a 'low' value for a _candleStick_ or _stock_ series. */
+        lowValueField?: string;
+        /** Specifies the data source field that provides an 'open' value for a _candleStick_ or _stock_ series. */
+        openValueField?: string;
+        /** Specifies the pane that will be used to display a series. */
+        pane?: string;
+        /** An object defining configuration options for points in line-, scatter- and area-like series. */
+        point?: ChartCommonPointOptions;
+        /** Specifies the data source field that provides values for one end of a range series. To set the data source field for the other end of the range series, use the rangeValue2Field property. */
+        rangeValue1Field?: string;
+        /** Specifies the data source field that provides values for the second end of a range series. To set the data source field for the other end of the range series, use the rangeValue1Field property. */
+        rangeValue2Field?: string;
+        /** Specifies reduction options for the stock or candleStick series. */
+        reduction?: {
+            /** Specifies a color for the points whose reduction level price is lower in comparison to the value in the previous point. */
+            color?: string;
+            /** Specifies for which price level (open, high, low or close) to enable reduction options in the series. */
+            level?: string;
+        };
+        /** Specifies the data source field that defines the size of bubbles. */
+        sizeField?: string;
+    }
+    export interface CommonSeriesSettings extends CommonSeriesConfig {
+        /** <p>An object that specifies configuration options for all series of the <i>area</i> type in the chart.</p> */
+        area?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the bubble type in the chart. */
+        bubble?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _candleStick_ type in the chart. */
+        candlestick?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedArea_ type in the chart. */
+        fullstackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline Area type in the chart. */
+        fullstackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedBar_ type in the chart. */
+        fullstackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedLine_ type in the chart. */
+        fullstackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline type in the chart. */
+        fullstackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeArea_ type in the chart. */
+        rangearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeBar_ type in the chart. */
+        rangebar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _spline_ type in the chart. */
+        spline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _splineArea_ type in the chart. */
+        splinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedArea_ type in the chart. */
+        stackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline Area type in the chart. */
+        stackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedLine_ type in the chart. */
+        stackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline type in the chart. */
+        stackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepArea_ type in the chart. */
+        steparea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepLine_ type in the chart. */
+        stepline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stock_ type in the chart. */
+        stock?: CommonSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface SeriesConfig extends CommonSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+	/** An object that defines configuration options for polar chart series. */
+	export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
+		/** Specifies whether or not to close the chart by joining the end point with the first point. */
+        closed?: boolean;
+        label?: SeriesConfigLabel;
+        point?: PolarCommonPointOptions;
+	}
+	export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
+        /** An object that specifies configuration options for all series of the <i>area</i> type in the chart. */
+        area?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonPolarSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface PolarSeriesConfig extends CommonPolarSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+    export interface PieSeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies how to shift labels from their initial position in a radial direction in pixels. */
+        radialOffset?: number;
+        /** Specifies a precision for the percentage values displayed in labels. */
+        percentPrecision?: number;
+    }
+    /** An object that defines configuration options for chart series. */
+    export interface CommonPieSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        /** Specifies the required type for series arguments. */
+        argumentType?: string;
+        /** An object defining the series border configuration options. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the chart elements to highlight when a series is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered series. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for the series when it is hovered over. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is hovered over. */
+            hatching?: viz.core.Hatching;
+        };
+        /** Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type. */
+        innerRadius?: number;
+        /** An object defining the label configuration options. */
+        label?: PieSeriesConfigLabel;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies a minimal size of a displayed pie segment. */
+        minSegmentSize?: number;
+        /** Specifies the direction in which the dxPieChart's series points are located. */
+        segmentsDirection?: string;
+        /** <p>Specifies the chart elements to highlight when the series is selected.</p> */
+        selectionMode?: string;
+        /** An object defining configuration options for the series when it is selected. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is selected. */
+            hatching?: viz.core.Hatching;
+        };
+        /** Specifies chart segment grouping options. */
+        smallValuesGrouping?: {
+            /** Specifies the name of the grouped chart segment. This name represents the segment in the chart legend. */
+            groupName?: string;
+            /** Specifies the segment grouping mode. */
+            mode?: string;
+            /** Specifies a threshold for segment values. */
+            threshold?: number;
+            /** Specifies how many segments must not be grouped. */
+            topCount?: number;
+        };
+        /** Specifies a start angle for a pie chart in arc degrees. */
+        startAngle?: number;
+        /** <p>Specifies the name of the data source field that provides data about a point.</p> */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+    }
+    export interface PieSeriesConfig extends CommonPieSeriesConfig {
+        /** Sets the series type. */
+        type?: string;
+    }
+    export interface SeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => SeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+	export interface PolarSeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => PolarSeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+    export interface ChartCommonConstantLineLabel {
+        /** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+        /** Specifies the position of the constant line label relative to the chart plot. */
+        position?: string;
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+    }
+    export interface PolarCommonConstantLineLabel {
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+		/** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+	}
+	export interface ConstantLineStyle {
+		/** Specifies a color for a constant line. */
+        color?: string;
+        /** Specifies a dash style for a constant line. */
+        dashStyle?: string;
+        /** Specifies a constant line width in pixels. */
+        width?: number;
+	}
+	export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartCommonConstantLineLabel;
+        /** Specifies the space between the constant line label and the left/right side of the constant line. */
+        paddingLeftRight?: number;
+        /** Specifies the space between the constant line label and the top/bottom side of the constant line. */
+        paddingTopBottom?: number;
+    }
+	export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
+		/** An object defining constant line label options. */
+        label?: PolarCommonConstantLineLabel;
+	}
+	export interface CommonAxisLabel {
+		/** Specifies font options for axis labels. */
+        font?: viz.core.Font;
+        /** Specifies the spacing between an axis and its labels in pixels. */
+        indentFromAxis?: number;
+        /** Indicates whether or not axis labels are visible. */
+        visible?: boolean;
+	}
+    export interface ChartCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the label's position relative to the tick (grid line). */
+        alignment?: string;
+		/** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: {
+			/** Specifies how to arrange axis labels. */
+            mode?: string;
+            /** Specifies the angle used to rotate axis labels. */
+            rotationAngle?: number;
+            /** Specifies the spacing that must be set between staggered rows when the 'stagger' algorithm is applied. */
+            staggeringSpacing?: number;
+        };
+    }
+    export interface PolarCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: string;
+    }
+	export interface CommonAxisTitle {
+        /** Specifies font options for an axis title. */
+        font?: viz.core.Font;
+        /** Specifies a margin for an axis title in pixels. */
+        margin?: number;
+    }
+    export interface BaseCommonAxisSettings {
+        /** Specifies the color of the line that represents an axis. */
+        color?: string;
+		/** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
+        discreteAxisDivisionMode?: string;
+        /** An object defining the configuration options for the grid lines of an axis in the dxPolarChart widget. */
+        grid?: {
+            /** Specifies a color for grid lines. */
+            color?: string;
+            /** Specifies an opacity for grid lines. */
+            opacity?: number;
+            /** Indicates whether or not the grid lines of an axis are visible. */
+            visible?: boolean;
+            /** Specifies the width of grid lines. */
+            width?: number;
+        };
+		/** Specifies the options of the minor grid. */
+        minorGrid?: {
+            /** Specifies a color for the lines of the minor grid. */
+            color?: string;
+            /** Specifies an opacity for the lines of the minor grid. */
+            opacity?: number;
+            /** Indicates whether the minor grid is visible or not. */
+            visible?: boolean;
+            /** Specifies a width for the lines of the minor grid. */
+            width?: number;
+        };
+        /** Indicates whether or not an axis is inverted. */
+        inverted?: boolean;
+        /** Specifies the opacity of the line that represents an axis. */
+        opacity?: number;
+        /** Indicates whether or not to set ticks/grid lines of a continuous axis of the 'date-time' type at the beginning of each date-time interval. */
+        setTicksAtUnitBeginning?: boolean;
+        /** An object defining the configuration options for axis ticks. */
+        tick?: {
+            /** Specifies ticks color. */
+            color?: string;
+            /** Specifies tick opacity. */
+            opacity?: number;
+            /** Indicates whether or not ticks are visible on an axis. */
+            visible?: boolean;
+        };
+		/** Specifies the options of the minor ticks. */
+        minorTick?: {
+            /** Specifies a color for the minor ticks. */
+            color?: string;
+            /** Specifies an opacity for the minor ticks. */
+            opacity?: number;
+            /** Indicates whether or not the minor ticks are displayed on an axis. */
+            visible?: boolean;
+        };
+        /** Indicates whether or not the line that represents an axis in a chart is visible. */
+        visible?: boolean;
+        /** Specifies the width of the line that represents an axis in the chart. */
+        width?: number;
+    }
+	export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxChart widget. */
+        label?: ChartCommonAxisLabel;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+		maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+		minValueMargin?: number;
+        /** Specifies, in pixels, the space reserved for an axis. */
+        placeholderSize?: number;
+		/** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+                /** Specifies the label's position on a strip. */
+                horizontalAlignment?: string;
+                /** Specifies a label's position on a strip. */
+                verticalAlignment?: string;
+            };
+            /** Specifies the spacing, in pixels, between the left/right strip border and the strip label. */
+            paddingLeftRight?: number;
+            /** Specifies the spacing, in pixels, between the top/bottom strip borders and the strip label. */
+            paddingTopBottom?: number;
+        };
+        /** An object defining the title configuration options that are common for all axes in the dxChart widget. */
+        title?: CommonAxisTitle;
+        /** Indicates whether or not to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+    }
+	export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: PolarCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxPolarChart widget. */
+        label?: PolarCommonAxisLabel;
+        /** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+            };
+        };
+    }
+    export interface ChartConstantLineLabel extends ChartCommonConstantLineLabel {
+        /** Specifies the horizontal alignment of a constant line label. */
+        horizontalAlignment?: string;
+        /** Specifies the vertical alignment of a constant line label. */
+        verticalAlignment?: string;
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+	export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+	export interface AxisLabel {
+		  /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
+        customizeHint?: (argument: { value: any; valueText: string }) => string;
+          /** Specifies a callback function that returns the text to be displayed in value axis labels. */
+        customizeText?: (argument: { value: any; valueText: string }) => string;
+          /** Specifies a format for the text displayed by axis labels. */
+        format?: string;
+          /** Specifies a precision for the formatted value displayed in the axis labels. */
+        precision?: number;
+	}
+    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel {}
+	export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel {}
+    export interface AxisTitle extends CommonAxisTitle {
+        /** Specifies the text for the value axis title. */
+        text?: string;
+    }
+    export interface ChartConstantLineStyle extends ChartCommonConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+    }
+    export interface ChartConstantLine extends ChartConstantLineStyle {
+		/** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+	}
+	export interface PolarConstantLine extends PolarCommonConstantLineStyle {
+	/** An object defining constant line label options. */
+        label?: PolarConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+	}
+	export interface Axis {
+	    /** Specifies a coefficient for dividing the value axis. */
+        axisDivisionFactor?: number;
+        /** Specifies the order in which discrete values are arranged on the value axis. */
+        categories?: Array<any>;
+        /** Specifies the value to be raised to a power when generating ticks for a logarithmic axis. */
+        logarithmBase?: number;
+        /** Specifies an interval between axis ticks/grid lines. */
+        tickInterval?: any;
+        /** Specifies the interval between minor ticks. */
+        minorTickInterval?: any;
+        /** Specifies the number of minor ticks between two neighboring major ticks. */
+        minorTickCount?: number;
+        /** Specifies the required type of the value axis. */
+        type?: string;
+		/** Specifies the pane on which the current value axis will be displayed. */
+        pane?: string;
+        /** Specifies options for value axis strips. */
+        strips?: Array<Strip>;
+	}
+    export interface ChartAxis extends ChartCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<ChartConstantLine>;
+        /** Specifies the appearance options for the constant lines of the value axis. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** Specifies options for value axis labels. */
+        label?: ChartAxisLabel;
+        /** Specifies the maximum value on the value axis. */
+        max?: any;
+        /** Specifies the minimum value on the value axis. */
+        min?: any;
+        /** Specifies the position of the value axis on a chart. */
+        position?: string;
+        /** Specifies the title for a value axis. */
+        title?: AxisTitle;
+    }
+	export interface PolarAxis extends PolarCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<PolarConstantLine>;
+        /** Specifies options for value axis labels. */
+        label?: PolarAxisLabel;
+    }
+	export interface ArgumentAxis {
+	    /** Specifies the desired type of axis values. */
+        argumentType?: string;
+        /** Specifies the elements that will be highlighted when the argument axis is hovered over. */
+        hoverMode?: string;
+	}
+    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis {}
+	export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
+	    /** Specifies a start angle for the argument axis in degrees. */
+        startAngle?: number;
+        /** Specifies whether or not to display the first point at the angle specified by the startAngle option. */
+        firstPointOnStartAngle?: boolean;
+        /** Specifies the period of the argument values in the data source. */
+        period?: number;
+	}
+	export interface ValueAxis {
+        /** Specifies the name of the value axis. */
+        name?: string;
+        /** Specifies whether or not to indicate a zero value on the value axis. */
+        showZero?: boolean;
+        /** Specifies the desired type of axis values. */
+        valueType?: string;
+		}
+    export interface ChartValueAxis extends ChartAxis, ValueAxis {
+        /** Specifies the spacing, in pixels, between multiple value axes in a chart. */
+        multipleAxesSpacing?: number;
+        /** Specifies the value by which the chart's value axes are synchronized. */
+        synchronizedValue?: number;
+    }
+	export interface PolarValueAxis extends PolarAxis, ValueAxis {
+	    /** Indicates whether to display series with indents from axis boundaries. */
+	    valueMarginsEnabled?: boolean;
+		/** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+        maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+        minValueMargin?: number;
+		tick?: {
+			visible?: boolean;
+		}
+	}
+    export interface CommonPane {
+        /** Specifies a background color in a pane. */
+        backgroundColor?: string;
+        /** Specifies the border options of a chart's pane. */
+        border?: PaneBorder;
+    }
+    export interface Pane extends CommonPane {
+        /** Specifies the name of a pane. */
+        name?: string;
+    }
+    export interface PaneBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies the bottom border's visibility state in a pane. */
+        bottom?: boolean;
+        /** Specifies the left border's visibility state in a pane. */
+        left?: boolean;
+        /** Specifies the right border's visibility state in a pane. */
+        right?: boolean;
+        /** Specifies the top border's visibility state in a pane. */
+        top?: boolean;
+    }
+    export interface ChartAnimation extends viz.core.Animation {
+        /** Specifies the maximum series point count in the chart that the animation supports. */
+        maxPointCountSupported?: number;
+    }
+    export interface BaseChartTooltip extends viz.core.Tooltip {
+        /** Specifies a format for arguments of the chart's series points. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted arguments displayed in tooltips. */
+        argumentPrecision?: number;
+        /** Specifies a precision for a percent value displayed in tooltips for stacked series and dxPieChart series. */
+        percentPrecision?: number;
+    }
+    export interface BaseChartOptions<TPoint> extends viz.core.BaseWidgetOptions {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies the width of the widget container that is small enough for the layout to begin adapting. */
+            width?: number;
+            /** Specifies the height of the widget container that is small enough for the layout to begin adapting. */
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies animation options. */
+        animation?: ChartAnimation;
+        /** Specifies a callback function that returns an object with options for a specific point label. */
+        customizeLabel?: (labelInfo: Object) => Object;
+        /** Specifies a callback function that returns an object with options for a specific point. */
+        customizePoint?: (pointInfo: Object) => Object;
+        /** Specifies a data source for the chart. */
+        dataSource?: any;
+        done?: Function;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies options of a dxChart's (dxPieChart's) legend. */
+        legend?: core.BaseLegend;
+        /** Specifies the blank space between the chart's extreme elements and the boundaries of the area provided for the widget (see size) in pixels. */
+        margin?: viz.core.Margins;
+        /** Sets the name of the palette to be used in the chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+        palette?: any;
+        /** A handler for the done event. */
+        onDone?: (e: {
+            component: BaseChart;
+            element: Element;
+        }) => void;
+        /** A handler for the pointClick event. */
+        onPointClick?: any;
+        pointClick?: any;
+        /** A handler for the pointHoverChanged event. */
+        onPointHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        pointHoverChanged?: (point: TPoint) => void;
+        /** A handler for the pointSelectionChanged event. */
+        onPointSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        pointSelectionChanged?: (point: TPoint) => void;
+        /** Specifies whether a single point or multiple points can be selected in the chart. */
+        pointSelectionMode?: string;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options for the dxChart and dxPieChart widget series. */
+        series?: any;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /** Specifies a title for the chart. */
+        title?: {
+            /** Specifies font options for the title. */
+            font?: viz.core.Font;
+            /** Specifies the title's horizontal position in the chart. */
+            horizontalAlignment?: string;
+            /** Specifies a title's position on the chart in the vertical direction. */
+            verticalAlignment?: string;
+            /** Specifies the distance between the title and surrounding chart elements in pixels. */
+            margin?: viz.core.Margins;
+            /** Specifies the height of the space reserved for the title. */
+            placeholderSize?: number;
+            /** Specifies a text for the chart's title. */
+            text?: string;
+        };
+        /** Specifies tooltip options. */
+        tooltip?: BaseChartTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+        tooltipHidden?: (point: TPoint) => void;
+        tooltipShown?: (point: TPoint) => void;
+    }
+    /** A base class for all chart widgets included in the ChartJS library. */
+    export class BaseChart extends viz.core.BaseWidget {
+        /** Deselects the chart's selected series. The series is displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the current size of the widget. */
+        getSize(): { width: number; height: number };
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Hides all widget tooltips. */
+        hideTooltip(): void;
+        /** Redraws a widget. */
+        render(renderOptions?: {
+            force?: boolean;
+            animate?: boolean;
+            asyncSeriesRendering?: boolean;
+        }): void;
+    }
+	export interface AdvancedLegend extends core.BaseLegend {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** <p>Specifies a callback function that returns the text to be displayed by legend items.</p> */
+        customizeText?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** Specifies what series elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+    }
+    export interface AdvancedOptions<TPoint, TSeries> extends BaseChartOptions<TPoint> {
+        /** A handler for the argumentAxisClick event. */
+        onArgumentAxisClick?: any;
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** An object providing options for managing data from a data source. */
+        dataPrepareSettings?: {
+            /** Specifies whether or not to validate the values from a data source. */
+            checkTypeForAllData?: boolean;
+            /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+            convertToAxisDataType?: boolean;
+            /** Specifies how to sort the series points. */
+            sortingMethod?: any;
+        };
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        /** A handler for the seriesClick event. */
+        onSeriesClick?: any;
+        /** A handler for the seriesHoverChanged event. */
+        onSeriesHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** A handler for the seriesSelectionChanged event. */
+        onSeriesSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** Specifies whether a single series or multiple series can be selected in the chart. */
+        seriesSelectionMode?: string;
+        /** Specifies how the chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string; 
+    }
+    export interface Legend extends AdvancedLegend {
+        /** Specifies whether the legend is located outside or inside the chart's plot. */
+        position?: string;
+    }
+    export interface ChartTooltip extends BaseChartTooltip {
+        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies only to the Bar series. */
+        location?: string;
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxChartOptions extends AdvancedOptions<ChartPoint, ChartSeries> {
+        /** Specifies a value indicating whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
+        equalBarWidth?: any;
+        adaptiveLayout?: {
+            keepLabels?: boolean;
+        };
+        /** Indicates whether or not to synchronize value axes when they are displayed on a single pane. */
+        synchronizeMultiAxes?: boolean;
+        /** Specifies whether or not to filter the series points depending on their quantity. */
+        useAggregation?: boolean;
+        /** Indicates whether or not to adjust a value axis to the current minimum and maximum values of a zoomed chart. */
+        adjustOnZoom?: boolean;
+        /** Specifies argument axis options for the dxChart widget. */
+        argumentAxis?: ChartArgumentAxis;
+        argumentAxisClick?: any;
+        /** An object defining the configuration options that are common for all axes of the dxChart widget. */
+        commonAxisSettings?: ChartCommonAxisSettings;
+        /** An object defining the configuration options that are common for all panes in the dxChart widget. */
+        commonPaneSettings?: CommonPane;
+        /** An object defining the configuration options that are common for all series of the dxChart widget. */
+        commonSeriesSettings?: CommonSeriesSettings;
+        /** An object that specifies the appearance options of the chart crosshair. */
+        crosshair?: {
+            /** Specifies a color for the crosshair lines. */
+            color?: string;
+            /** Specifies a dash style for the crosshair lines. */
+            dashStyle?: string;
+            /** Specifies whether to enable the crosshair or not. */
+            enabled?: boolean;
+            /** Specifies the opacity of the crosshair lines. */
+            opacity?: number;
+            /** Specifies the width of the crosshair lines. */
+            width?: number;
+            /** Specifies the appearance of the horizontal crosshair line. */
+            horizontalLine?: CrosshaierWithLabel;
+            /** Specifies the appearance of the vertical crosshair line. */
+            verticalLine?: CrosshaierWithLabel;
+            /** Specifies the options of the crosshair labels. */
+            label?: {
+                /** Specifies a color for the background of the crosshair labels. */
+                backgroundColor?: string;
+                /** Specifies whether the crosshair labels are visible or not. */
+                visible?: boolean;
+                /** Specifies font options for the text of the crosshair labels. */
+                font?: viz.core.Font;
+            }
+        };
+        /** Specifies a default pane for the chart's series. */
+        defaultPane?: string;
+        /** Specifies a coefficient determining the diameter of the largest bubble. */
+        maxBubbleSize?: number;
+        /** Specifies the diameter of the smallest bubble measured in pixels. */
+        minBubbleSize?: number;
+        /** Defines the dxChart widget's <a href="/Documentation/Guide/Data_Visualization/Charts/Chart_Elements?version=15_1#Panes">pane(s)</a>. */
+        panes?: Array<Pane>;
+        /** Swaps the axes round so that the value axis becomes horizontal and the argument axes becomes vertical. */
+        rotated?: boolean;
+        /** Specifies the options of a chart's legend. */
+        legend?: Legend;
+        /** Specifies options for dxChart widget series. */
+        series?: Array<SeriesConfig>;
+        legendClick?: any;
+        seriesClick?: any;
+        seriesHoverChanged?: (series: ChartSeries) => void;
+        seriesSelectionChanged?: (series: ChartSeries) => void;
+        /** Defines options for the series template. */
+        seriesTemplate?: SeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: ChartTooltip;
+        /** Specifies value axis options for the dxChart widget. */
+        valueAxis?: Array<ChartValueAxis>;
+        /** Enables scrolling in your chart. */
+        scrollingMode?: string;
+        /** Enables zooming in your chart. */
+        zoomingMode?: string;
+        /** Specifies the settings of the scroll bar. */
+        scrollBar?: {
+            /** Specifies whether the scroll bar is visible or not. */
+            visible?: boolean;
+            /** Specifies the spacing between the scroll bar and the chart's plot in pixels. */
+            offset?: number;
+            /** Specifies the color of the scroll bar. */
+            color?: string;
+            /** Specifies the width of the scroll bar in pixels. */
+            width?: number;
+            /** Specifies the opacity of the scroll bar. */
+            opacity?: number;
+            /** Specifies the position of the scroll bar in the chart. */
+            position?: string;
+        };
+    }
+    /** A widget used to embed charts into HTML JS applications. */
+    export class dxChart extends BaseChart {
+        constructor(element: JQuery, options?: dxChartOptions);
+        constructor(element: Element, options?: dxChartOptions);
+        /** Returns an array of all series in the chart. */
+        getAllSeries(): Array<ChartSeries>;
+        /** Gets a series within the chart's series collection by the specified name (see the name option). */
+        getSeriesByName(seriesName: string): ChartSeries;
+        /** Gets a series within the chart's series collection by its position number. */
+        getSeriesByPos(seriesIndex: number): ChartSeries;
+        /** Sets the specified start and end values for the chart's argument axis. */
+        zoomArgument(startValue: any, endValue: any): void;
+    }
+    interface CrosshaierWithLabel extends viz.core.DashedBorderWithOpacity {
+        /** Configures the label that belongs to the horizontal crosshair line. */
+        label?: {
+            /** Specifies a color for the background of the label that belongs to the horizontal crosshair line. */
+            backgroundColor?: string;
+            /** Specifies whether the label of the horizontal crosshair line is visible or not. */
+            visible?: boolean;
+            /** Specifies font options for the text of the label that belongs to the horizontal crosshair line. */
+            font?: viz.core.Font;
+        }
+    }
+    export interface PolarChartTooltip extends BaseChartTooltip {
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxPolarChartOptions extends AdvancedOptions<PolarPoint, PolarSeries> {
+        /** Specifies a value indicating whether all bars in a series must have the same angle, or may have different angles if any points in other series are missing. */
+        equalBarWidth?: boolean;
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            width?: number;
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+	    /** Indicates whether or not to display a "spider web". */
+        useSpiderWeb?: boolean;
+        /** Specifies argument axis options for the dxPolarChart widget. */
+        argumentAxis?: PolarArgumentAxis;
+        /** An object defining the configuration options that are common for all axes of the dxPolarChart widget. */
+        commonAxisSettings?: PolarCommonAxisSettings;
+        /** An object defining the configuration options that are common for all series of the dxPolarChart widget. */
+        commonSeriesSettings?: CommonPolarSeriesSettings;
+        /** Specifies the options of a chart's legend. */
+        legend?: AdvancedLegend;
+        /** Specifies options for dxPolarChart widget series. */
+        series?: Array<PolarSeriesConfig>;
+        /** Defines options for the series template. */
+        seriesTemplate?: PolarSeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: PolarChartTooltip;
+        /** Specifies value axis options for the dxPolarChart widget. */
+        valueAxis?: PolarValueAxis;
+    }
+    /** A chart widget displaying data in a polar coordinate system. */
+    export class dxPolarChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPolarChartOptions);
+        constructor(element: Element, options?: dxPolarChartOptions);
+        /** Returns an array of all series in the chart. */
+        getAllSeries(): Array<PolarSeries>;
+        /** Gets a series within the chart's series collection by the specified name (see the name option). */
+        getSeriesByName(seriesName: string): PolarSeries;
+        /** Gets a series within the chart's series collection by its position number. */
+        getSeriesByPos(seriesIndex: number): PolarSeries;
+    }
+    export interface PieLegend extends core.BaseLegend {
+        /** Specifies what chart elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+        /** Specifies a callback function that returns the text to be displayed by a legend item. */
+        customizeText?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+    }
+    export interface dxPieChartOptions extends BaseChartOptions<PiePoint> {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies dxPieChart legend options. */
+        legend?: PieLegend;
+        /** Specifies options for the series of the dxPieChart widget. */
+        series?: Array<PieSeriesConfig>;
+        /** Specifies the diameter of the pie. */
+        diameter?: number;
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        legendClick?: any;
+        /** Specifies how the chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string; 
+    }
+    /** A circular chart widget for HTML JS applications. */
+    export class dxPieChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPieChartOptions);
+        constructor(element: Element, options?: dxPieChartOptions);
+        /** Provides access to the dxPieChart series. */
+        getSeries(): PieSeries;
+    }
+}
+interface JQuery {
+    dxChart(options?: DevExpress.viz.charts.dxChartOptions): JQuery;
+    dxChart(methodName: string, ...params: any[]): any;
+    dxChart(methodName: "instance"): DevExpress.viz.charts.dxChart;
+    dxPieChart(options?: DevExpress.viz.charts.dxPieChartOptions): JQuery;
+    dxPieChart(methodName: string, ...params: any[]): any;
+    dxPieChart(methodName: "instance"): DevExpress.viz.charts.dxPieChart;
+    dxPolarChart(options?: DevExpress.viz.charts.dxPolarChartOptions): JQuery;
+    dxPolarChart(methodName: string, ...params: any[]): any;
+    dxPolarChart(methodName: "instance"): DevExpress.viz.charts.dxPolarChart;
+}
+declare module DevExpress.viz.gauges {
+    export interface BaseRangeContainer {
+        /** Specifies a range container's background color. */
+        backgroundColor?: string;
+        /** Specifies the offset of the range container from an invisible scale line in pixels. */
+        offset?: number;
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: any;
+        /** An array of objects representing ranges contained in the range container. */
+        ranges?: Array<{ startValue: number; endValue: number; color: string }>;
+        /** Specifies a color of a range. */
+        color?: string;
+        /** Specifies an end value of a range. */
+        endValue?: number;
+        /** Specifies a start value of a range. */
+        startValue?: number;
+    }
+    export interface ScaleTick {
+        /** Specifies the color of the scale's minor ticks. */
+        color?: string;
+        /** Specifies an array of custom minor ticks. */
+        customTickValues?: Array<any>;
+        /** Specifies the length of the scale's minor ticks. */
+        length?: number;
+        /** Indicates whether automatically calculated minor ticks are visible or not. */
+        showCalculatedTicks?: boolean;
+        /** Specifies an interval between minor ticks. */
+        tickInterval?: number;
+        /** Indicates whether scale minor ticks are visible or not. */
+        visible?: boolean;
+        /** Specifies the width of the scale's minor ticks. */
+        width?: number;
+    }
+    export interface ScaleMajorTick extends ScaleTick {
+        /** Specifies whether or not to expand the current major tick interval if labels overlap each other. */
+        useTicksAutoArrangement?: boolean;
+    }
+    export interface BaseScaleLabel {
+        /** Specifies whether or not scale labels should be colored similarly to their corresponding ranges in the range container. */
+        useRangeColors?: boolean;
+        /** Specifies a callback function that returns the text to be displayed in scale labels. */
+        customizeText?: (scaleValue: { value: number; valueText: string }) => string;
+        /** Specifies font options for the text displayed in the scale labels of the gauge. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed in scale labels. */
+        format?: string;
+        /** Specifies a precision for the formatted value displayed in the scale labels. */
+        precision?: number;
+        /** Specifies whether or not scale labels are visible on the gauge. */
+        visible?: boolean;
+    }
+    export interface BaseScale {
+        /** Specifies the end value for the scale of the gauge. */
+        endValue?: number;
+        /** Specifies whether or not to hide the first scale label. */
+        hideFirstLabel?: boolean;
+        /** Specifies whether or not to hide the first major tick on the scale. */
+        hideFirstTick?: boolean;
+        /** Specifies whether or not to hide the last scale label. */
+        hideLastLabel?: boolean;
+        /** Specifies whether or not to hide the last major tick on the scale. */
+        hideLastTick?: boolean;
+        /** Specifies common options for scale labels. */
+        label?: BaseScaleLabel;
+        /** Specifies options of the gauge's major ticks. */
+        majorTick?: ScaleMajorTick;
+        /** Specifies options of the gauge's minor ticks. */
+        minorTick?: ScaleTick;
+        /** Specifies the start value for the scale of the gauge. */
+        startValue?: number;
+    }
+    export interface BaseValueIndicator {
+        /** Specifies the type of subvalue indicators. */
+        type?: string;
+        /** Specifies the background color for the indicator of the rangeBar type. */
+        backgroundColor?: string;
+        /** Specifies the base value for the indicator of the rangeBar type. */
+        baseValue?: number;
+        /** Specifies a color of the indicator. */
+        color?: string;
+        /** Specifies the range bar size for an indicator of the rangeBar type. */
+        size?: number;
+        text?: {
+            /** Specifies a callback function that returns the text to be displayed in an indicator. */
+            customizeText?: (indicatedValue: { value: number; valueText: string }) => string;
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in an indicator. */
+            format?: string;
+            /** Specifies the range bar's label indent in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by an indicator. */
+            precision?: number;
+        };
+        offset?: number;
+        length?: number;
+        width?: number;
+        /** Specifies the length of an arrow for the indicator of the textCloud type in pixels. */
+        arrowLength?: number;
+        /** Sets the array of colors to be used for coloring subvalue indicators. */
+        palette?: Array<any>;
+        /** Specifies the distance between the needle and the center of a gauge for the indicator of a needle-like type. */
+        indentFromCenter?: number;
+        /** Specifies the second color for the indicator of the twoColorNeedle type. */
+        secondColor?: string;
+        /** Specifies the length of a twoNeedleColor type indicator tip as a percentage. */
+        secondFraction?: number;
+        /** Specifies the spindle's diameter in pixels for the indicator of a needle-like type. */
+        spindleSize?: number;
+        /** Specifies the inner diameter in pixels, so that the spindle has the shape of a ring. */
+        spindleGapSize?: number;
+        /** Specifies the orientation of the rangeBar indicator on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of the rangeBar indicator on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface SharedGaugeOptions {
+        /** Specifies animation options. */
+        animation?: viz.core.Animation;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /** Specifies a subtitle for a gauge. */
+        subtitle?: {
+            /** Specifies font options for the subtitle. */
+            font?: viz.core.Font;
+            /** Specifies a text for the subtitle. */
+            text?: string;
+        };
+        /** Specifies a title for a gauge. */
+        title?: {
+            /** Specifies font options for the title. */
+            font?: viz.core.Font;
+            /** Specifies a title's position on the gauge. */
+            position?: string;
+            /** Specifies a text for the title. */
+            text?: string;
+        };
+        /** Specifies options for gauge tooltips. */
+        tooltip?: viz.core.Tooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+    }
+    export interface BaseGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies the blank space in pixels between the widget's extreme elements and the boundaries of the area provided for the widget (see the size option). */
+        margin?: viz.core.Margins;
+        /** Specifies options of the gauge's range container. */
+        rangeContainer?: BaseRangeContainer;
+        /** Specifies a gauge's scale options. */
+        scale?: BaseScale;
+        /** Specifies the appearance options of subvalue indicators. */
+        subvalueIndicator?: BaseValueIndicator;
+        /** Specifies a set of subvalues to be designated by the subvalue indicators. */
+        subvalues?: Array<number>;
+        /** Specifies the main value on a gauge. */
+        value?: number;
+        /** Specifies the appearance options of the value indicator. */
+        valueIndicator?: BaseValueIndicator;
+    }
+    /** A gauge widget. */
+    export class dxBaseGauge extends viz.core.BaseWidget {
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Returns the main gauge value. */
+        value(): number;
+        /** Updates a gauge value. */
+        value(value: number): void;
+        /** Returns an array of gauge subvalues. */
+        subvalues(): Array<number>;
+        /** Updates gauge subvalues. */
+        subvalues(subvalues: Array<number>): void;
+    }
+    export interface LinearRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of a range container on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+        /** Specifies the width of the range container's start and end boundaries in the dxLinearGauge widget. */
+        width?: any;
+        /** Specifies an end width of a range container. */
+        end?: number;
+        /** Specifies a start width of a range container. */
+        start?: number;
+    }
+    export interface LinearScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface LinearScale extends BaseScale {
+        /** Specifies the orientation of scale ticks on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        label?: LinearScaleLabel;
+        /** Specifies the orientation of scale ticks on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface dxLinearGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxLinearGauge widget. */
+        geometry?: {
+            /** Indicates whether to display the dxLinearGauge widget vertically or horizontally. */
+            orientation?: string;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: LinearRangeContainer;
+        scale?: LinearScale;
+    }
+    /** A widget that represents a gauge with a linear scale. */
+    export class dxLinearGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxLinearGaugeOptions);
+        constructor(element: Element, options?: dxLinearGaugeOptions);
+    }
+    export interface CircularRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container in the dxCircularGauge widget. */
+        orientation?: string;
+        /** Specifies the range container's width in pixels. */
+        width?: number;
+    }
+    export interface CircularScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface CircularScale extends BaseScale {
+        label?: CircularScaleLabel;
+        /** Specifies the orientation of scale ticks. */
+        orientation?: string;
+    }
+    export interface dxCircularGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxCircularGauge widget. */
+        geometry?: {
+            /** Specifies the end angle of the circular gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the circular gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: CircularRangeContainer;
+        scale?: CircularScale;
+    }
+    /** A widget that represents a gauge with a circular scale. */
+    export class dxCircularGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxCircularGaugeOptions);
+        constructor(element: Element, options?: dxCircularGaugeOptions);
+    }
+    export interface dxBarGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies a color for the remaining segment of the bar's track. */
+        backgroundColor?: string;
+        /** Specifies a distance between bars in pixels. */
+        barSpacing?: number;
+        /** Specifies a base value for bars. */
+        baseValue?: number;
+        /** Specifies an end value for the gauge's invisible scale. */
+        endValue?: number;
+        /** Defines the shape of the gauge's arc. */
+        geometry?: {
+            /** Specifies the end angle of the bar gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the bar gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies the options of the labels that accompany gauge bars. */
+        label?: {
+            /** Specifies a color for the label connector text. */
+            connectorColor?: string;
+            /** Specifies the width of the label connector in pixels. */
+            connectorWidth?: number;
+            /** Specifies a callback function that returns a text for labels. */
+            customizeText?: (barValue: { value: number; valueText: string }) => string;
+            /** Specifies font options for bar labels. */
+            font?: viz.core.Font;
+            /** Specifies a format for bar labels. */
+            format?: string;
+            /** Specifies the distance between the upper bar and bar labels in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by labels. */
+            precision?: number;
+            /** Specifies whether bar labels appear on a gauge or not. */
+            visible?: boolean;
+        };
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: string;
+        /** Defines the radius of the bar that is closest to the center relatively to the radius of the topmost bar. */
+        relativeInnerRadius?: number;
+        /** Specifies a start value for the gauge's invisible scale. */
+        startValue?: number;
+        /** Specifies the array of values to be indicated on a bar gauge. */
+        values?: Array<number>;
+    }
+    /** A circular bar widget. */
+    export class dxBarGauge extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxBarGaugeOptions);
+        constructor(element: Element, options?: dxBarGaugeOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws the widget. */
+        render(): void;
+        /** Returns an array of gauge values. */
+        values(): Array<number>;
+        /** Updates the values displayed by a gauge. */
+        values(values: Array<number>): void;
+    }
+}
+interface JQuery {
+    dxLinearGauge(options?: DevExpress.viz.gauges.dxLinearGaugeOptions): JQuery;
+    dxLinearGauge(methodName: string, ...params: any[]): any;
+    dxLinearGauge(methodName: "instance"): DevExpress.viz.gauges.dxLinearGauge;
+    dxCircularGauge(options?: DevExpress.viz.gauges.dxCircularGaugeOptions): JQuery;
+    dxCircularGauge(methodName: string, ...params: any[]): any;
+    dxCircularGauge(methodName: "instance"): DevExpress.viz.gauges.dxCircularGauge;
+    dxBarGauge(options?: DevExpress.viz.gauges.dxBarGaugeOptions): JQuery;
+    dxBarGauge(methodName: string, ...params: any[]): any;
+    dxBarGauge(methodName: "instance"): DevExpress.viz.gauges.dxBarGauge;
+}
+declare module DevExpress.viz.rangeSelector {
+    export interface dxRangeSelectorOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the options for the range selector's background. */
+        background?: {
+            /** Specifies the background color for the dxRangeSelector. */
+            color?: string;
+            /** Specifies image options. */
+            image?: {
+                /** Specifies a location for the image in the background of a range selector. */
+                location?: string;
+                /** Specifies the image's URL. */
+                url?: string;
+            };
+            /** Indicates whether or not the background (background color and/or image) is visible. */
+            visible?: boolean;
+        };
+        /** Specifies the dxRangeSelector's behavior options. */
+        behavior?: {
+            /** Indicates whether or not you can swap sliders. */
+            allowSlidersSwap?: boolean;
+            /** 
+Indicates whether or not animation is enabled.
+ */
+            animationEnabled?: boolean;
+            /** Specifies when to call the onSelectedRangeChanged function. */
+            callSelectedRangeChanged?: string;
+            /** Indicates whether or not an end user can specify the range using a mouse, without the use of sliders. */
+            manualRangeSelectionEnabled?: boolean;
+            /** Indicates whether or not an end user can shift the selected range to the required location on a scale by clicking. */
+            moveSelectedRangeByClick?: boolean;
+            /** Indicates whether to snap a slider to ticks. */
+            snapToTicks?: boolean;
+        };
+        /** Specifies the options required to display a chart as the range selector's background. */
+        chart?: {
+            /** Specifies a coefficient for determining an indent from the bottom background boundary to the lowest chart point. */
+            bottomIndent?: number;
+            /** An object defining the common configuration options for the chart’s series. */
+            commonSeriesSettings?: viz.charts.CommonSeriesSettings;
+            /** An object providing options for managing data from a data source. */
+            dataPrepareSettings?: {
+                /** Specifies whether or not to validate values from a data source. */
+                checkTypeForAllData?: boolean;
+                /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+                convertToAxisDataType?: boolean;
+                /** Specifies how to sort series points. */
+                sortingMethod?: any;
+            };
+            /** Specifies a value indicating whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
+            equalBarWidth?: any;
+            /** An object defining the chart’s series. */
+            series?: Array<viz.charts.SeriesConfig>;
+            /** Defines options for the series template. */
+            seriesTemplate?: viz.charts.SeriesTemplate;
+            /** Specifies a coefficient for determining an indent from the background's top boundary to the topmost chart point. */
+            topIndent?: number;
+            /** Specifies whether or not to filter the series points depending on their quantity. */
+            useAggregation?: boolean;
+            /** Specifies options for the chart's value axis. */
+            valueAxis?: {
+                /** Indicates whether or not the chart's value axis must be inverted. */
+                inverted?: boolean;
+                /** Specifies the value to be raised to a power when generating ticks for a logarithmic value axis. */
+                logarithmBase?: number;
+                /** Specifies the maximum value of the chart's value axis. */
+                max?: number;
+                /** Specifies the minimum value of the chart's value axis. */
+                min?: number;
+                /** Specifies the type of the value axis. */
+                type?: string;
+                /** Specifies the desired type of axis values. */
+                valueType?: string;
+            };
+        };
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies a data source for the scale values and for the chart at the background. */
+        dataSource?: any;
+        /** Specifies the data source field that provides data for the scale. */
+        dataSourceField?: string;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies the blank space in pixels between the dxRangeSelector widget's extreme elements and the boundaries of the area provided for the widget (see size). */
+        margin?: viz.core.Margins;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options of the range selector's scale. */
+        scale?: {
+            /** Specifies the scale's end value. */
+            endValue?: any;
+            /** Specifies common options for scale labels. */
+            label?: {
+                /** Specifies a callback function that returns the text to be displayed in scale labels. */
+                customizeText?: (scaleValue: { value: any; valueText: string; }) => string;
+                /** Specifies font options for the text displayed in the range selector's scale labels. */
+                font?: viz.core.Font;
+                /** Specifies a format for the text displayed in scale labels. */
+                format?: string;
+                /** Specifies a precision for the formatted value displayed in the scale labels. */
+                precision?: number;
+                /** Specifies a spacing between scale labels and the background bottom edge. */
+                topIndent?: number;
+                /** Specifies whether or not the scale's labels are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the value to be raised to a power when generating ticks for a logarithmic scale. */
+            logarithmBase?: number;
+            /** Specifies an interval between major ticks. */
+            majorTickInterval?: any;
+            /** Specifies options for the date-time scale's markers. */
+            marker?: {
+                /** Defines the options that can be set for the text that is displayed by the scale markers. */
+                label?: {
+                    /** Specifies a callback function that returns the text to be displayed in scale markers. */
+                    customizeText?: (markerValue: { value: any; valueText: string }) => string;
+                    /** Specifies a format for the text displayed in scale markers. */
+                    format?: string;
+                };
+                /** Specifies the height of the marker's separator. */
+                separatorHeight?: number;
+                /** Specifies the space between the marker label and the marker separator. */
+                textLeftIndent?: number;
+                /** Specifies the space between the marker's label and the top edge of the marker's separator. */
+                textTopIndent?: number;
+                /** Specified the indent between the marker and the scale lables. */
+                topIndent?: number;
+                /** Indicates whether scale markers are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the maximum range that can be selected. */
+            maxRange?: any;
+            /** Specifies the number of minor ticks between neighboring major ticks. */
+            minorTickCount?: number;
+            /** 
+Specifies an interval between minor ticks.
+ */
+            minorTickInterval?: any;
+            /** Specifies the minimum range that can be selected. */
+            minRange?: any;
+            /** Specifies the height of the space reserved for the scale in pixels. */
+            placeholderHeight?: number;
+            /** Indicates whether or not to set ticks of a date-time scale at the beginning of each date-time interval. */
+            setTicksAtUnitBeginning?: boolean;
+            /** Specifies whether or not to show ticks for the boundary scale values, when neither major ticks nor minor ticks are created for these values. */
+            showCustomBoundaryTicks?: boolean;
+            /** Indicates whether or not to show minor ticks on the scale. */
+            showMinorTicks?: boolean;
+            /** Specifies the scale's start value. */
+            startValue?: any;
+            /** Specifies options defining the appearance of scale ticks. */
+            tick?: {
+                /** Specifies the color of scale ticks (both major and minor ticks). */
+                color?: string;
+                /** Specifies the opacity of scale ticks (both major and minor ticks). */
+                opacity?: number;
+                /** Specifies the width of the scale's ticks (both major and minor ticks). */
+                width?: number;
+            };
+            /** Specifies the type of the scale. */
+            type?: string;
+            /** Specifies whether or not to expand the current tick interval if labels overlap each other. */
+            useTicksAutoArrangement?: boolean;
+            /** Specifies the type of values on the scale. */
+            valueType?: string;
+			/** Specifies the order of arguments on a discrete scale. */
+			categories?: Array<any>;
+        };
+        /** Specifies the range to be selected when displaying the dxRangeSelector. */
+        selectedRange?: {
+            /** Specifies the start value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            startValue?: any;
+            /** Specifies the end value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            endValue?: any;
+        };
+        /** Specifies the color of the selected range. */
+        selectedRangeColor?: string;
+        /** Range selector's indent options. */
+        indent?: {
+            /** Specifies range selector's left indent. */
+            left?: number;
+            /** Specifies range selector's right indent. */
+            right?: number;
+        };
+        selectedRangeChanged?: (selectedRange: { startValue: any; endValue: any; }) => void;
+        /** A handler for the selectedRangeChanged event. */
+        onSelectedRangeChanged?: (e: {
+            startValue: any;
+            endValue: any;
+            component: dxRangeSelector;
+            element: Element;
+        }) => void;
+        /** Specifies range selector shutter options. */
+        shutter?: {
+            /** Specifies shutter color. */
+            color?: string;
+            /** Specifies the opacity of the color of shutters. */
+            opacity?: number;
+        };
+        /** Specifies in pixels the size of the dxRangeSelector widget. */
+        size?: viz.core.Size;
+        /** Specifies the appearance of the range selector's slider handles. */
+        sliderHandle?: {
+            /** Specifies the color of the slider handles. */
+            color?: string;
+            /** Specifies the opacity of the slider handles. */
+            opacity?: number;
+            /** Specifies the width of the slider handles. */
+            width?: number;
+        };
+        /** Defines the options of the range selector slider markers. */
+        sliderMarker?: {
+            /** Specifies the color of the slider markers. */
+            color?: string;
+            /** Specifies a callback function that returns the text to be displayed by slider markers. */
+            customizeText?: (scaleValue: { value: any; valueText: any; }) => string;
+            /** Specifies font options for the text displayed by the range selector slider markers. */
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in slider markers. */
+            format?: string;
+            /** Specifies the color used for the slider marker text when the currently selected range does not match the minRange and maxRange values. */
+            invalidRangeColor?: string;
+            /**
+             * Specifies the empty space between the marker's border and the marker’s text.
+             * @deprecated Use the 'paddingTopBottom' and 'paddingLeftRight' options instead
+             */
+            padding?: number;
+            /** Specifies the empty space between the marker's top and bottom borders and the marker's text. */
+            paddingTopBottom?: number;
+            /** Specifies the empty space between the marker's left and right borders and the marker's text. */
+            paddingLeftRight?: number;
+            /** Specifies the placeholder height of the slider marker. */
+            placeholderHeight?: number;
+            /**
+             * Specifies in pixels the height and width of the space reserved for the range selector slider markers.
+             * @deprecated Use the 'placeholderHeight' and 'indent' options instead
+             */
+            placeholderSize?: {
+                /** Specifies the height of the placeholder for the left and right slider markers. */
+                height?: number;
+                /** Specifies the width of the placeholder for the left and right slider markers. */
+                width?: {
+                    /** Specifies the width of the left slider marker's placeholder. */
+                    left?: number;
+                    /** Specifies the width of the right slider marker's placeholder. */
+                    right?: number;
+                };
+            };
+            /** Specifies a precision for the formatted value displayed in slider markers. */
+            precision?: number;
+            /** Indicates whether or not the slider markers are visible. */
+            visible?: boolean;
+        };
+    }
+    /** A widget that allows end users to select a range of values on a scale. */
+    export class dxRangeSelector extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxRangeSelectorOptions);
+        constructor(element: Element, options?: dxRangeSelectorOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(skipChartAnimation?: boolean): void;
+        /** Returns the currently selected range. */
+        getSelectedRange(): { startValue: any; endValue: any; };
+        /** Sets a specified range. */
+        setSelectedRange(selectedRange: { startValue: any; endValue: any; }): void;
+    }
+}
+interface JQuery {
+    dxRangeSelector(options?: DevExpress.viz.rangeSelector.dxRangeSelectorOptions): JQuery;
+    dxRangeSelector(methodName: string, ...params: any[]): any;
+    dxRangeSelector(methodName: "instance"): DevExpress.viz.rangeSelector.dxRangeSelector;
+}
+declare module DevExpress.viz.map {
+    /** This section describes the fields and methods that can be used in code to manipulate the Area object. */
+    export interface Area {
+        /** Contains the element type. */
+        type: string;
+        /** Return the value of an attribute. */
+        attribute(name: string): any;
+        /** Provides information about the selection state of an area. */
+        selected(): boolean;
+        /** Sets a new selection state for an area. */
+        selected(state: boolean): void;
+        /** Applies the area settings specified as a parameter and updates the area appearance. */
+        applySettings(settings: any): void;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Markers object. */
+    export interface Marker {
+        /** Contains the descriptive text accompanying the map marker. */
+        text: string;
+        /** Contains the type of the element. */
+        type: string;
+        /** Contains the URL of an image map marker. */
+        url: string;
+        /** Contains the value of a bubble map marker. */
+        value: number;
+        /** Contains the values of a pie map marker. */
+        values: Array<number>;
+        /** Returns the value of an attribute. */
+        attribute(name: string): any;
+        /** Returns the coordinates of a specific marker. */
+        coordinates(): Array<number>;
+        /** Provides information about the selection state of a marker. */
+        selected(): boolean;
+        /** Sets a new selection state for a marker. */
+        selected(state: boolean): void;
+        /** Applies the marker settings specified as a parameter and updates the marker appearance. */
+        applySettings(settings: any): void;
+    }
+    export interface AreaSettings {
+        /** Specifies the width of the area border in pixels. */
+        borderWidth?: number;
+        /** Specifies a color for the area border. */
+        borderColor?: string;
+        click?: any;
+        /** Specifies a color for an area. */
+        color?: string;
+        /** Specifies the function that customizes each area individually. */
+        customize?: (areaInfo: Area) => AreaSettings;
+        /** Specifies a color for the area border when the area is hovered over. */
+        hoveredBorderColor?: string;
+        /** Specifies the pixel-measured width of the area border when the area is hovered over. */
+        hoveredBorderWidth?: number;
+        /** Specifies a color for an area when this area is hovered over. */
+        hoveredColor?: string;
+        /** Specifies whether or not to change the appearance of an area when it is hovered over. */
+        hoverEnabled?: boolean;
+        /** Configures area labels. */
+        label?: {
+            /** Specifies the data field that provides data for area labels. */
+            dataField?: string;
+            /** Enables area labels. */
+            enabled?: boolean;
+            /** Specifies font options for area labels. */
+            font?: viz.core.Font;
+        };
+        /** Specifies the name of the palette or a custom range of colors to be used for coloring a map. */
+        palette?: any;
+        /** Specifies the number of colors in a palette. */
+        paletteSize?: number;
+        /** Allows you to paint areas with similar attributes in the same color. */
+        colorGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for coloring areas. */
+        colorGroupingField?: string;
+        /** Specifies a color for the area border when the area is selected. */
+        selectedBorderColor?: string;
+        /** Specifies a color for an area when this area is selected. */
+        selectedColor?: string;
+        /** Specifies the pixel-measured width of the area border when the area is selected. */
+        selectedBorderWidth?: number;
+        selectionChanged?: (area: Area) => void;
+        /** Specifies whether single or multiple areas can be selected on a vector map. */
+        selectionMode?: string;
+    }
+    export interface MarkerSettings {
+        /** Specifies a color for the marker border. */
+        borderColor?: string;
+        /** Specifies the width of the marker border in pixels. */
+        borderWidth?: number;
+        click?: any;
+        /** Specifies a color for a marker of the dot or bubble type. */
+        color?: string;
+        /** Specifies the function that customizes each marker individually. */
+        customize?: (markerInfo: Marker) => MarkerSettings;
+        font?: Object;
+        /** Specifies the pixel-measured width of the marker border when the marker is hovered over. */
+        hoveredBorderWidth?: number;
+        /** Specifies a color for the marker border when the marker is hovered over. */
+        hoveredBorderColor?: string;
+        /** Specifies a color for a marker of the dot or bubble type when this marker is hovered over. */
+        hoveredColor?: string;
+        /** Specifies whether or not to change the appearance of a marker when it is hovered over. */
+        hoverEnabled?: boolean;
+        /** Specifies marker label options. */
+        label?: {
+            /** Enables marker labels. */
+            enabled?: boolean;
+            /** Specifies font options for marker labels. */
+            font?: viz.core.Font;
+        };
+        /** Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if you use markers of the bubble type. */
+        maxSize?: number;
+        /** Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if you use markers of the bubble type. */
+        minSize?: number;
+        /** Specifies the opacity of markers. Setting this option makes sense only if you use markers of the bubble type. */
+        opacity?: number;
+        /** Specifies the pixel-measured width of the marker border when the marker is selected. */
+        selectedBorderWidth?: number;
+        /** Specifies a color for the marker border when the marker is selected. */
+        selectedBorderColor?: string;
+        /** Specifies a color for a marker of the dot or bubble type when this marker is selected. */
+        selectedColor?: string;
+        selectionChanged?: (marker: Marker) => void;
+        /** Specifies whether a single or multiple markers can be selected on a vector map. */
+        selectionMode?: string;
+        /** Specifies the size of markers. Setting this option makes sense for any type of marker except bubble. */
+        size?: number;
+        /** Specifies the type of markers to be used on the map. */
+        type?: string;
+        /** Specifies the name of a palette or a custom set of colors to be used for coloring markers of the pie type. */
+        palette?: any;
+        /** Allows you to paint markers with similar attributes in the same color. */
+        colorGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for coloring markers. */
+        colorGroupingField?: string;
+        /** Allows you to display bubbles with similar attributes in the same size. */
+        sizeGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for sizing bubble markers. */
+        sizeGroupingField?: string;
+    }
+    export interface dxVectorMapOptions extends viz.core.BaseWidgetOptions {
+        /** An object specifying options for the map areas. */
+        areaSettings?: AreaSettings;
+        /** Specifies the options for the map background. */
+        background?: {
+            /** Specifies a color for the background border. */
+            borderColor?: string;
+            /** Specifies a color for the background. */
+            color?: string;
+        };
+        /** Specifies the positioning of a map in geographical coordinates. */
+        bounds?: Array<number>;
+        /** Specifies the options of the control bar. */
+        controlBar?: {
+            /** Specifies a color for the outline of the control bar elements. */
+            borderColor?: string;
+            /** Specifies a color for the inner area of the control bar elements. */
+            color?: string;
+            /** Specifies whether or not to display the control bar. */
+            enabled?: boolean;
+            /** Specifies the margin of the control bar in pixels. */
+            margin?: number;
+            /** Specifies the position of the control bar. */
+            horizontalAlignment?: string;
+            /** Specifies the position of the control bar. */
+            verticalAlignment?: string;
+            /** Specifies the opacity of the Control_Bar. */
+            opacity?: number;
+        };
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies a data source for the map area. */
+        mapData?: any;
+        /** Specifies a data source for the map markers. */
+        markers?: any;
+        /** An object specifying options for the map markers. */
+        markerSettings?: MarkerSettings;
+        /** Specifies the size of the dxVectorMap widget. */
+        size?: viz.core.Size;
+        /** Specifies tooltip options. */
+        tooltip?: viz.core.Tooltip;
+        /** Configures map legends. */
+        legends?: Array<Legend>;
+        /** Specifies whether or not the map should respond when a user rolls the mouse wheel. */
+        wheelEnabled?: boolean;
+        /** Specifies whether the map should respond to touch gestures. */
+        touchEnabled?: boolean;
+        /** Disables the zooming capability. */
+        zoomingEnabled?: boolean;
+        /** Specifies the geographical coordinates of the center for a map. */
+        center?: Array<number>;
+        centerChanged?: (center: Array<number>) => void;
+        /** A handler for the centerChanged event. */
+        onCenterChanged?: (e: {
+			center: Array<number>;
+			component: dxVectorMap;
+			element: Element;
+        }) => void;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** Specifies a number that is used to zoom a map initially. */
+        zoomFactor?: number;
+        /** Specifies a map's maximum zoom factor. */
+        maxZoomFactor?: number;
+        zoomFactorChanged?: (zoomFactor: number) => void;
+        /** A handler for the zoomFactorChanged event. */
+        onZoomFactorChanged?: (e: {
+            zoomFactor: number;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        click?: any;
+        /** A handler for the click event. */
+        onClick?: any;
+        /** A handler for the areaClick event. */
+        onAreaClick?: any;
+        /** A handler for the areaSelectionChanged event. */
+        onAreaSelectionChanged?: (e: {
+            target: Area;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /** A handler for the markerClick event. */
+        onMarkerClick?: any;
+        /** A handler for the markerSelectionChanged event. */
+        onMarkerSelectionChanged?: (e: {
+            target: Marker;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /** Disables the panning capability. */
+        panningEnabled?: boolean;
+    }
+    export interface Legend extends viz.core.BaseLegend {
+        /** Specifies text for legend items. */
+        customizeText?: (itemInfo: { start: number; end: number; index: number; color: string; size: number; }) => string;
+        /** Specifies text for a hint that appears when a user hovers the mouse pointer over the text of a legend item. */
+        customizeHint?: (itemInfo: { start: number; end: number; index: number; color: string; size: number }) => string;
+        /** Specifies the source of data for the legend. */
+        source?: string;
+    }
+    /** A vector map widget. */
+    export class dxVectorMap extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxVectorMapOptions);
+        constructor(element: Element, options?: dxVectorMapOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Gets the current coordinates of the map center. */
+        center(): Array<number>;
+        /** Sets the coordinates of the map center. */
+        center(centerCoordinates: Array<number>): void;
+        /** Deselects all the selected areas on a map. The areas are displayed in their initial style after. */
+        clearAreaSelection(): void;
+        /** Deselects all the selected markers on a map. The markers are displayed in their initial style after. */
+        clearMarkerSelection(): void;
+        /** Deselects all the selected area and markers on a map at once. The areas and markers are displayed in their initial style after. */
+        clearSelection(): void;
+        /** Converts client area coordinates into map coordinates. */
+        convertCoordinates(x: number, y: number): Array<number>;
+        /** Returns an array with all the map areas. */
+        getAreas(): Array<Area>;
+        /** Returns an array with all the map markers. */
+        getMarkers(): Array<Marker>;
+        /** Gets the current coordinates of the map viewport. */
+        viewport(): Array<any>;
+        /** Sets the coordinates of the map viewport. */
+        viewport(viewportCoordinates: Array<number>): void;
+        /** Gets the current value of the map zoom factor. */
+        zoomFactor(): number;
+        /** Sets the value of the map zoom factor. */
+        zoomFactor(zoomFactor: number): void;
+    }
+}
+interface JQuery {
+    dxVectorMap(options?: DevExpress.viz.map.dxVectorMapOptions): JQuery;
+    dxVectorMap(methodName: string, ...params: any[]): any;
+    dxVectorMap(methodName: "instance"): DevExpress.viz.map.dxVectorMap;
+}
+declare module DevExpress.viz.sparklines {
+    export interface SparklineTooltip extends viz.core.Tooltip {
+        /**
+         * Specifies how a tooltip is horizontally aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        horizontalAlignment?: string;
+        /**
+         * Specifies how a tooltip is vertically aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        verticalAlignment?: string;
+    }
+    export interface BaseSparklineOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the blank space between the widget's extreme elements and the boundaries of the area provided for the widget in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of the widget. */
+        size?: viz.core.Size;
+        /** Specifies tooltip options. */
+        tooltip?: SparklineTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+    }
+    /** Overridden by descriptions for particular widgets. */
+    export class BaseSparkline extends viz.core.BaseWidget {
+        /** Redraws a widget. */
+        render(): void;
+    }
+    export interface dxBulletOptions extends BaseSparkline {
+        /** Specifies a color for the bullet bar. */
+        color?: string;
+        /** Specifies an end value for the invisible scale. */
+        endScaleValue?: number;
+        /** Specifies whether or not to show the target line. */
+        showTarget?: boolean;
+        /** Specifies whether or not to show the line indicating zero on the invisible scale. */
+        showZeroLevel?: boolean;
+        /** Specifies a start value for the invisible scale. */
+        startScaleValue?: number;
+        /** Specifies the value indicated by the target line. */
+        target?: number;
+        /** Specifies a color for both the target and zero level lines. */
+        targetColor?: string;
+        /** Specifies the width of the target line. */
+        targetWidth?: number;
+        /** Specifies the primary value indicated by the bullet bar. */
+        value?: number;
+    }
+    /** A bullet graph widget. */
+    export class dxBullet extends BaseSparkline {
+        constructor(element: JQuery, options?: dxBulletOptions);
+        constructor(element: Element, options?: dxBulletOptions);
+    }
+    export interface dxSparklineOptions extends BaseSparklineOptions {
+        /** Specifies the data source field that provides arguments for a sparkline. */
+        argumentField?: string;
+        /** Sets a color for the bars indicating negative values. Available for a sparkline of the bar type only. */
+        barNegativeColor?: string;
+        /** Sets a color for the bars indicating positive values. Available for a sparkline of the bar type only. */
+        barPositiveColor?: string;
+        /** Specifies a data source for the sparkline. */
+        dataSource?: Array<any>;
+        /** Sets a color for the boundary of both the first and last points on a sparkline. */
+        firstLastColor?: string;
+        /** Specifies whether a sparkline ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Sets a color for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineColor?: string;
+        /** Specifies a width for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineWidth?: number;
+        /** Sets a color for the bars indicating the values that are less than the winloss threshold. Available for a sparkline of the winloss type only. */
+        lossColor?: string;
+        /** Sets a color for the boundary of the maximum point on a sparkline. */
+        maxColor?: string;
+        /** Sets a color for the boundary of the minimum point on a sparkline. */
+        minColor?: string;
+        /** Sets a color for points on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointColor?: string;
+        /** Specifies the diameter of sparkline points in pixels. Available for the sparklines of line- and area-like types. */
+        pointSize?: number;
+        /** Specifies a symbol to use as a point marker on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointSymbol?: string;
+        /** Specifies whether or not to indicate both the first and last values on a sparkline. */
+        showFirstLast?: boolean;
+        /** Specifies whether or not to indicate both the minimum and maximum values on a sparkline. */
+        showMinMax?: boolean;
+        /** Determines the type of a sparkline. */
+        type?: string;
+        /** Specifies the data source field that provides values for a sparkline. */
+        valueField?: string;
+        /** Sets a color for the bars indicating the values greater than a winloss threshold. Available for a sparkline of the winloss type only. */
+        winColor?: string;
+        /** Specifies a value that serves as a threshold for the sparkline of the winloss type. */
+        winlossThreshold?: number;
+        /** Specifies the minimum value of the sparkline value axis. */
+        minValue?: number;
+        /** Specifies the maximum value of the sparkline's value axis. */
+        maxValue?: number;
+    }
+    /** A sparkline widget. */
+    export class dxSparkline extends BaseSparkline {
+        constructor(element: JQuery, options?: dxSparklineOptions);
+        constructor(element: Element, options?: dxSparklineOptions);
+    }
+}
+interface JQuery {
+    dxBullet(options?: DevExpress.viz.sparklines.dxBulletOptions): JQuery;
+    dxBullet(methodName: string, ...params: any[]): any;
+    dxBullet(methodName: "instance"): DevExpress.viz.sparklines.dxBullet;
+    dxSparkline(options?: DevExpress.viz.sparklines.dxSparklineOptions): JQuery;
+    dxSparkline(methodName: string, ...params: any[]): any;
+    dxSparkline(methodName: "instance"): DevExpress.viz.sparklines.dxSparkline;
+}
diff --git a/devextreme/dx.devextreme-tests.ts b/devextreme/dx.devextreme-tests.ts
index ef147c2c6..78b09d15a 100644
--- a/devextreme/dx.devextreme-tests.ts
+++ b/devextreme/dx.devextreme-tests.ts
@@ -5,7 +5,7 @@ module Tests.ui {
         activeStateEnabled: true,
         allowColumnReordering: true,
         allowColumnResizing: true,
-        onCellClick: function () { },
+        onCellClick: function() { },
         cellHintEnabled: true,
         columnAutoWidth: true,
         columnChooser: {
@@ -17,67 +17,52 @@ module Tests.ui {
         },
         columns: [
             {
-                text: '5 columns with custom css class', value: [
-                    { dataField: 'Processed', dataType: 'boolean', allowSorting: false },
-                    { dataField: 'CustomerID', cssClass: 'customCssClass' },
-                    'OrderDate',
-                    { dataField: 'Freight', validationRules: [{ type: "range", min: 1, max: 100 }] },
-                    { dataField: 'ShipName', validationRules: [{ type: 'required' }] },
-                    'ShipCity']
-            },
-            {
-                text: 'with show editor always', value: [
-                    { dataField: 'Processed', dataType: 'boolean', allowSorting: false, showEditorAlways: true },
-                    { dataField: 'OrderDate', dataType: 'date', showEditorAlways: true },
-                    { dataField: 'CustomerID', showEditorAlways: true },
-                    { dataField: 'Freight', showEditorAlways: true },
-                    { dataField: 'ShipName', showEditorAlways: true }]
-            },
-            {
-                text: 'custom template/edit/header template', value: [
-                    'CustomerID',
-                    'OrderDate',
-                    'Freight',
-                    {
-                        dataField: 'ShipVia',
-                        editCellTemplate: function (container: JQuery, options: { value: number }) {
-                            container.addClass('dx-editor-cell');
-                            container.append($('<div />').dxSelectBox({
-                                value: options.value,
-                                dataSource: [
-                                    { ShipperID: 1, CompanyName: 'Speedy Express' },
-                                    { ShipperID: 2, CompanyName: 'United Package' },
-                                    { ShipperID: 3, CompanyName: 'Federal Shipping' }
-                                ],
-                                valueExpr: 'ShipperID',
-                                displayExpr: 'CompanyName'
-                            }));
-                        },
-                        cellTemplate: function (container: JQuery, options: { value: number }) {
-                            container.text(String(options.value));
-                        },
-                        headerCellTemplate: function (container: JQuery, options: { headerCaption: string }) {
-                            container.append($('<div/>').css({ border: '1px solid red' }).text(options.headerCaption));
-                        }
-                    },
-                    'ShipName',
-                    'ShipCity']
-            },
-            { text: 'none', value: '' },
-            {
-                text: 'custom template/header hogan template', value: [
-                    'CustomerID',
-                    'OrderDate',
-                    'Freight',
-                    {
-                        dataField: 'ShipVia',
-                        cellTemplate: '#hoganColumnTemplate',
-                        headerCellTemplate: $('#hoganHeaderColumnTemplate')
-                    },
-                    'ShipName',
-                    'ShipCity']
-            }],
-        customizeColumns: function (columns) {
+                alignment: "center",
+                allowFixing: true,
+                allowEditing: true,
+                allowFiltering: true,
+                allowGrouping: true,
+                allowHiding: true,
+                allowReordering: true,
+                allowResizing: true,
+                allowSearch: true,
+                allowSorting: true,
+                autoExpandGroup: true,
+                calculateCellValue: function(rowData: Object) { return "test-value"; },
+                calculateFilterExpression: function(filterValue: any, selectedFilterOperation: string) { return []; },
+                caption: "Test column",
+                cellTemplate: function(container: JQuery, options: Object) { $("<span>Template</span>").appendTo(container); },
+                cssClass: "test-ccs-class-name",
+                customizeText: function(cellInfo: { value: any, valueText: string; }) { return "New text" },
+                dataField: "Test",
+                dataType: "string",
+                encodeHtml: true,
+                falseText: "FALSE",
+                filterOperations: ["contains", "notcontains"],
+                filterType: "exclude",
+                filterValue: "Test-filter-value",
+                fixed: true,
+                fixedPosition: "right",
+                groupIndex: 0,
+                lookup: {
+                    allowClearing: true,
+                    dataSource: ["first", "second"],
+                    displayExpr: "this",
+                    valueExpr: "this"
+                },
+                name: "test-column-name",
+                showEditorAlways: true,
+                showInColumnChooser: true,
+                showWhenGrouped: true,
+                sortIndex: 1,
+                sortOrder: "desc",
+                trueText: "TRUE",
+                visible: true,
+                visibleIndex: 0,
+                width: "100%"
+            }
+        ],
+        customizeColumns: function(columns) {
             var i: number;
             for (i = 0; i < columns.length; i++) {
                 if (columns[i].dataField.indexOf('Date') > 0) {
@@ -94,16 +79,16 @@ module Tests.ui {
                         valueExpr: 'CustomerID',
                         displayExpr: 'ContactName'
                     }
-                        }
+                }
                 if (columns[i].dataField === 'EmployeeID') {
                     columns[i].lookup = {
                         dataSource: { store: [], sort: 'LastName' },
                         valueExpr: 'EmployeeID',
-                        displayExpr: function (data: any) {
+                        displayExpr: function(data: any) {
                             return data.LastName + ' ' + data.FirstName;
                         }
                     }
-                        }
+                }
                 if (columns[i].dataField === 'ShipVia') {
                     columns[i].lookup = {
                         dataSource: [
@@ -114,14 +99,14 @@ module Tests.ui {
                         valueExpr: 'ShipperID',
                         displayExpr: 'CompanyName'
                     }
-                        }
+                }
                 if (columns[i].dataField === 'ShipCity') {
-                    columns[i].editCellTemplate = function (container: JQuery, options: { value: string; setValue: Function }) {
+                    columns[i].editCellTemplate = function(container: JQuery, options: { value: string; setValue: Function }) {
                         $('<div/>').dxAutocomplete({
-                            items: ["Bern", "Lyon", "Lander"],
+                            dataSource: ["Bern", "Lyon", "Lander"],
                             value: options.value,
-                            onValueChange: function (e:{ value: string }) {
-                                options.setValue(e.value);
+                            onValueChanged: function() {
+                                options.setValue("test-value");
                             }
                         }).appendTo(container);
                     }
@@ -242,10 +227,10 @@ module Tests.viz {
             { valueField: 's8' }
         ],
         title: 'Long Chart\'s Title',
-        onPointClick: function (arg: any) {
+        onPointClick: function(arg: any) {
             arg.target.isSelected() ? arg.target.clearSelection() : arg.target.select();
         },
-        onSeriesClick: function (arg: any) {
+        onSeriesClick: function(arg: any) {
             arg.target.isVisible() ? arg.target.hide() : arg.target.show();
         }
     };
@@ -313,8 +298,8 @@ module Tests.data {
         pageSize: 25,
         paginate: true,
 
-        map: function (item) { return item; },
-        postProcess: function (data) { return data; },
+        map: function(item) { return item; },
+        postProcess: function(data) { return data; },
         searchExpr: "expr",
         searchOperation: "contains",
         searchValue: "somevalue",
@@ -328,7 +313,7 @@ module Tests.data {
     });
 
     new DevExpress.data.CustomStore(<DevExpress.data.CustomStoreOptions>{
-        load: function () {
+        load: function() {
             return $.Deferred().promise();
         }
     });
diff --git a/devextreme/dx.devextreme.d.ts b/devextreme/dx.devextreme.d.ts
index aff710888..c2bf7a1a2 100644
--- a/devextreme/dx.devextreme.d.ts
+++ b/devextreme/dx.devextreme.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for DevExtreme 15.1.5
+// Type definitions for DevExtreme 15.1.6
 // Project: http://js.devexpress.com/
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -35,7 +35,7 @@ declare module DevExpress {
             brokenRules: any[];
             validators: IValidator[];
         }
-        export interface GroupConfig extends EventsMixin<GroupConfig>  {
+        export interface GroupConfig extends EventsMixin<GroupConfig> {
             group: any;
             validators: IValidator[];
             validate(): ValidationGroupValidationResult;
@@ -56,14 +56,14 @@ declare module DevExpress {
         /** Validates the rules that are defined within the dxValidator objects that are registered for the specified ViewModel. */
         export function validateModel(model: Object): ValidationGroupValidationResult;
         /** Registers all the dxValidator objects by which the fields of the specified ViewModel are extended. */
-        export function registerModelForValidation(model: Object) : void;
+        export function registerModelForValidation(model: Object): void;
     }
     export var hardwareBackButton: JQueryCallback;
     /** Processes the hardware back button click. */
     export function processHardwareBackButton(): void;
     /** Specifies whether or not the entire application/site supports right-to-left representation. */
     export var rtlEnabled: boolean;
-    /** Registers a new component in the DevExpress.ui namespace, and a jQuery plugin and Knockout binding for the required component. */
+    /** Registers a new component in the DevExpress.ui namespace as a jQuery plugin, Angular directive and Knockout binding. */
     export function registerComponent(name: string, componentClass: Object): void;
     /** Registers a new component in the specified namespace as a jQuery plugin, Angular directive and Knockout binding. */
     export function registerComponent(name: string, namespace: Object, componentClass: Object): void;
@@ -323,7 +323,7 @@ declare module DevExpress {
             key(): any;
             /** Returns the key of the Store item that matches the specified object. */
             keyOf(obj: Object): any;
-            /** Starts loading the data. */
+            /** Starts loading data. */
             load(obj?: LoadOptions): JQueryPromise<any[]>;
             /** Removes the data item specified by the key. */
             remove(key: any): JQueryPromise<any>;
@@ -427,6 +427,8 @@ declare module DevExpress {
             select?: Object;
             /** An array of the strings that represent the names of the navigation properties to be loaded simultaneously with the OData store's entity. */
             expand?: Object;
+            /** Specifies whether or not the DataSource instance requests the total count of items available in the storage. */
+            requireTotalCount?: boolean;
             /** Specifies the initial sort option value. */
             sort?: Object;
             /** Specifies the underlying Store instance used to access data. */
@@ -496,6 +498,10 @@ declare module DevExpress {
             select(): Object;
             /** Sets the select option value. */
             select(expr: Object): void;
+            /** Returns the current requireTotalCount option value. */
+            requireTotalCount(): boolean;
+            /** Sets the requireTotalCount option value. */
+            requireTotalCount(value: boolean): void;
             /** Returns the current sort option value. */
             sort(): Object;
             /** Sets the sort option value. */
@@ -817,11 +823,26 @@ declare module DevExpress {
         export function setTemplateEngine(name: string): void;
         /** Sets a custom template engine defined via custom compile and render functions. */
         export function setTemplateEngine(options: Object): void;
-        /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
-        export var utils: {
-            /** Sets parameters for the viewport meta tag. */
-            initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
-        };
+    }
+    /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
+    export var utils: {
+        /** Sets parameters for the viewport meta tag. */
+        initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
+    };
+    /** An object that serves as a namespace for DevExtreme Data Visualization Widgets. */
+    export module viz {
+        /** Applies a theme for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(theme: string): void;
+        /** Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(platform: string, colorScheme: string): void;
+        /** Registers a new theme based on the existing one. */
+        export function registerTheme(customTheme: Object, baseTheme: string): void;
+        /** Applies a predefined or registered custom palette to all visualization widgets at once. */
+        export function currentPalette(paletteName: string): void;
+        /** Obtains the color sets of a predefined or registered palette. */
+        export function getPalette(paletteName: string): Object;
+        /** Registers a new palette. */
+        export function registerPalette(paletteName: string, palette: Object): void;
     }
 }
 declare module DevExpress.ui {
@@ -894,7 +915,7 @@ declare module DevExpress.ui {
         constructor(element: JQuery, options?: dxTooltipOptions);
         constructor(element: Element, options?: dxTooltipOptions);
     }
-    export interface dxDropDownListOptions extends dxDropDownEditorOptions {
+    export interface dxDropDownListOptions extends dxDropDownEditorOptions, DataExpressionMixinOptions {
         /** Returns the value currently displayed by the widget. */
         displayValue?: string;
         /** The minimum number of characters that must be entered into the text box to begin a search. */
@@ -1191,7 +1212,7 @@ declare module DevExpress.ui {
         /** Updates the dimensions of the scrollable contents. */
         update(): void;
     }
-    export interface dxRadioGroupOptions extends CollectionWidgetOptions {
+    export interface dxRadioGroupOptions extends CollectionWidgetOptions, DataExpressionMixinOptions {
         /** Specifies the radio group layout. */
         layout?: string;
     }
@@ -1747,9 +1768,9 @@ declare module DevExpress.ui {
         /** A Globalize format string specifying the date display format. */
         formatString?: string;
         /** The last date that can be selected within the widget. */
-        max?: Date;
+        max?: any;
         /** The minimum date that can be selected within the widget. */
-        min?: Date;
+        min?: any;
         /** The text displayed by the widget when the widget value is not yet specified. This text is also used as a title of the date picker. */
         placeholder?: string;
         /**
@@ -1757,8 +1778,8 @@ declare module DevExpress.ui {
          * @deprecated Use 'pickerType' option instead.
          */
         useCalendar?: boolean;
-        /** A Date object specifying the date and time currently selected using the date box. */
-        value?: Date;
+        /** An object or a value, specifying the date and time currently selected using the date box. */
+        value?: any;
         /**
          * Specifies whether or not the widget uses the native HTML input element.
          * @deprecated Use 'pickerType' option instead.
@@ -1768,7 +1789,7 @@ declare module DevExpress.ui {
         interval?: number;
         /** Specifies the maximum zoom level of a calendar, which is used to pick the date. */
         maxZoomLevel?: string;
-	/** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
+        /** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
         minZoomLevel?: string;
         /** Specifies the type of date/time picker. */
         pickerType?: string;
@@ -1806,8 +1827,8 @@ declare module DevExpress.ui {
         maxZoomLevel?: string;
         /** Specifies the minimum zoom level of the calendar. */
         minZoomLevel?: string;
-		/** The template to be used for rendering calendar cells. */
-		cellTemplate?: any;
+        /** The template to be used for rendering calendar cells. */
+        cellTemplate?: any;
     }
     /** A calendar widget. */
     export class dxCalendar extends Editor {
@@ -1848,7 +1869,7 @@ declare module DevExpress.ui {
     /** A container widget used to arrange inner elements. */
     export class dxBox extends CollectionWidget {
         constructor(element: JQuery, options?: dxBoxOptions);
-        constructor(element: Element, options?: dxBoxOptions);    
+        constructor(element: Element, options?: dxBoxOptions);
     }
     export interface dxResponsiveBoxOptions extends CollectionWidgetOptions {
         /** Specifies the collection of rows for the grid used to position layout elements. */
@@ -1866,14 +1887,77 @@ declare module DevExpress.ui {
         constructor(element: Element, options?: dxBoxOptions);
     }
     export interface dxAutocompleteOptions extends dxDropDownListOptions {
-        /** Specifies the current value displayed by the widget. */
-        value?: string;
-        /** The minimum number of characters that must be entered into the text box to begin a search. */
-        minSearchLength?: number;
+        accessKey?: string;
+        activeStateEnabled?: boolean;
+        attr?: any;
+        dataSource?: any;
+        disabled?: boolean;
+        displayValue?: string;
+        fieldEditEnabled?: boolean;
+        focusStateEnabled?: boolean;
+        height?: string | number | (() => string | number);
+        hint?: string;
+        hoverStateEnabled?: boolean;
+        isValid?: boolean;
+        items?: any[];
+        /**
+         * The template to be used for rendering items.
+         * Defaults Value: "item"
+         */
+        itemTemplate?: string | Node | JQuery | (() => string | Node | JQuery);
         /** Specifies the maximum count of items displayed by the widget. */
         maxItemCount?: number;
+
+        maxLength?: string | number;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+
+
+        mode?: string; // "text" | "email" | "search" | "tel" | "url" | "password"
+        onChange?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onClosed?: (e: { component: any; element: JQuery; model: any }) => void;
+        onContentReady?: (e: { component: any; element: JQuery; model: any }) => void;
+        onCopy?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onCut?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onDisposing?: (e: { component: any; element: JQuery; model: any }) => void;
+        onEnterKey?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onFocusIn?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onFocusOut?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onInitialized?: (e: { component: any; element: JQuery }) => void;
+        onInput?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onItemClick?: (e: { component: any; element: JQuery; model: any; itemElement: HTMLElement }) => void;
+        onKeyDown?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onKeyPress?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onKeyUp?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onOpened?: (e: { component: any; element: JQuery; model: any }) => void;
+        onOptionChanged?: (e: { component: any; element: JQuery; model: any; value: any }) => void;
+        onPaste?: (e: { component: any; element: JQuery; model: any; event: JQueryEventObject }) => void;
+        onSelectionChanged?: (e: { component: any; element: JQuery; model: any; selectedItem: any }) => void;
+        onValueChanged?: (e: { component: any; element: JQuery; model: any; value: any; previousValue: any; itemData: any; jQueryEvent: JQueryEventObject }) => void;
+        opened?: boolean;
+        placeholder?: string;
+        readOnly?: boolean;
+        rtlEnabled?: boolean;
+        searchExpr?: string;
+        searchMode?: string; // "contains" | "startswith"
+        searchTimeout?: number;
         /** Gets the currently selected item. */
-        selectedItem?: Object;
+        selectedItem?: any;
+        showClearButton?: boolean;
+        spellcheck?: boolean;
+        tabIndex?: number;
+        text?: string;
+        validationError?: any;
+        validationMessageMode?: string; // "auto" | "always"
+        /** Specifies the current value displayed by the widget. */
+        value?: string;
+        /**
+         * CAn be any DOM event names separated by spaces.
+         */
+        valueChangeEvent?: string;
+        valueExpr?: string | Function;
+        visible?: boolean;
+        width?: string | number | (() => string | number);
     }
     /** A textbox widget that supports autocompletion. */
     export class dxAutocomplete extends dxDropDownList {
@@ -2661,6 +2745,8 @@ declare module DevExpress.ui {
         updateAppointment(target: Object, appointment: Object): void;
         /** Deletes the appointment defined by the parameter from the the data associated with the widget. */
         deleteAppointment(appointment: Object): void;
+        /** Scrolls the scheduler work space to the specified time. */
+        scrollToTime(hours: number, minutes: number): void;
     }
     export interface dxColorBoxOptions extends dxDropDownEditorOptions {
         /** Specifies the text displayed on the button that applies changes and closes the drop-down editor. */
@@ -2735,6 +2821,10 @@ declare module DevExpress.ui {
         onItemExpanded?: Function;
         /** A handler for the itemCollapsed event. */
         onItemCollapsed?: Function;
+        onItemClick?: Function;
+        onItemContextMenu?: Function;
+        onItemRendered?: Function;
+        onItemHold?: Function;
         hoverStateEnabled?: boolean;
         focusStateEnabled?: boolean;
     }
@@ -2951,9 +3041,9 @@ declare module DevExpress.ui {
         lookup?: {
             /** Specifies whether or not a user can nullify values of a lookup column. */
             allowClearing?: boolean;
-            /** 
-Specifies the data source providing data for a lookup column.
- */
+            /**
+             * Specifies the data source providing data for a lookup column.
+             */
             dataSource?: any;
             /** Specifies the expression defining the data source field whose values must be displayed. */
             displayExpr?: any;
@@ -2986,6 +3076,9 @@ Specifies the data source providing data for a lookup column.
         showInColumnChooser?: boolean;
         /** Specifies the identifier of the column. */
         name?: string;
+        // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+        text?: string;
+        value?: any;
     }
     export interface dxDataGridOptions extends WidgetOptions {
         /** Specifies whether the outer borders of the grid are visible or not. */
@@ -3081,10 +3174,10 @@ Specifies the data source providing data for a lookup column.
                 cancel?: string;
             }
         };
-        /** 
-An array of grid columns.
- */
-        columns?: Array<dxDataGridColumn>;
+        /**
+         * An array of grid columns.
+         */
+        columns?: dxDataGridColumn[];
         onContentReady?: Function;
         contentReadyAction?: Function;
         /** Specifies a function that customizes grid columns after they are created. */
@@ -3181,9 +3274,9 @@ An array of grid columns.
             autoExpandAll?: boolean;
             /** Specifies the message displayed in a group row when the corresponding group is continued from the previous page. */
             groupContinuedMessage?: string;
-            /** 
-Specifies the message displayed in a group row when the corresponding group continues on the next page.
- */
+            /**
+             * Specifies the message displayed in a group row when the corresponding group continues on the next page.
+             */
             groupContinuesMessage?: string;
         };
         /** Specifies options that configure the group panel. */
@@ -3563,9 +3656,9 @@ Specifies the message displayed in a group row when the corresponding group cont
         removeRow(rowIndex: number): void;
         /** Saves changes made in a grid. */
         saveEditData(): void;
-        /** 
-Searches grid records by a search string.
- */
+        /**
+         * Searches grid records by a search string.
+         */
         searchByText(text: string): void;
         /** Selects all grid records. */
         selectAll(): void;
@@ -3795,6 +3888,8 @@ declare module DevExpress.framework {
         onExecute?: any;
         /** Indicates whether or not the widget that displays this command is disabled. */
         disabled?: boolean;
+        /** Specifies whether the current command should is rendered when a view is being rendered, or after a view has been shown. */
+        renderStage?: string;
         /** Specifies the name of the icon shown inside the widget associated with this command. */
         icon?: string;
         iconSrc?: string;
@@ -4042,6 +4137,36 @@ declare module DevExpress.framework {
     }
 }
 declare module DevExpress.viz.core {
+    /**
+     * Applies a theme for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(theme) method instead.
+     */
+    export function currentTheme(theme: string): void;
+    /**
+     * Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(platform, colorScheme) method instead.
+     */
+    export function currentTheme(platform: string, colorScheme: string): void;
+    /**
+     * Registers a new theme based on the existing one.
+     * @deprecated Use the DevExpress.viz.registerTheme(customTheme, baseTheme) method instead.
+     */
+    export function registerTheme(customTheme: Object, baseTheme: string): void;
+    /**
+     * Applies a predefined or registered custom palette to all visualization widgets at once.
+     * @deprecated Use the DevExpress.viz.currentPalette(paletteName) method instead.
+     */
+    export function currentPalette(paletteName: string): void;
+    /**
+     * Obtains the color sets of a predefined or registered palette.
+     * @deprecated Use the DevExpress.viz.getPalette(paletteName) method instead.
+     */
+    export function getPalette(paletteName: string): Object;
+    /**
+     * Registers a new palette.
+     * @deprecated Use the DevExpress.viz.registerPalette(paletteName, palette) method instead.
+     */
+    export function registerPalette(paletteName: string, palette: Object): void;
     export interface Border {
         /** Sets a border color for a selected series. */
         color?: string;
@@ -4210,16 +4335,16 @@ declare module DevExpress.viz.core {
         }) => void;
         /** A handler for the incidentOccurred event. */
         onIncidentOccurred?: (
-            component: BaseWidget,
-            element: Element,
-            target: {
-                id: string;
-                type: string;
-                args: any;
-                text: string;
-                widget: string;
-                version: string;
-            }
+        component: BaseWidget,
+        element: Element,
+        target: {
+            id: string;
+            type: string;
+            args: any;
+            text: string;
+            widget: string;
+            version: string;
+        }
         ) => void;
         /** Notifies a widget that it is embedded into an HTML page that uses a path modifier. */
         pathModified?: boolean;
@@ -4245,7 +4370,7 @@ declare module DevExpress.viz.charts {
         clearSelection(): void;
         /** Gets the color of a particular series. */
         getColor(): string;
-		/**
+        /**
          * Gets a point from the series point collection based on the specified argument.
          * @deprecated getPointsByArg(pointArg).md
          */
@@ -4450,8 +4575,8 @@ declare module DevExpress.viz.charts {
         /** Specifies a precision for the percentage values displayed in the labels of a full-stacked-like series. */
         percentPrecision?: number;
     }
-	export interface BaseCommonSeriesConfig {
-		/** Specifies the data source field that provides arguments for series points. */
+    export interface BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
         argumentField?: string;
         axis?: string;
         /** An object defining the label configuration options for a series in the dxChart widget. */
@@ -4511,83 +4636,83 @@ declare module DevExpress.viz.charts {
         visible?: boolean;
         /** Specifies a line width. */
         width?: number;
-		/** Configures error bars. */
-		valueErrorBar?: {
-			/** Specifies whether error bars must be displayed in full or partially. */
-			displayMode?: string;
-			/** Specifies the data field that provides data for low error values. */
-			lowValueField?: string;
-			/** Specifies the data field that provides data for high error values. */
-			highValueField?: string;
-			/** Specifies how error bar values must be calculated. */
-			type?: string;
-			/** Specifies the value to be used for generating error bars. */
-			value?: number;
-			/** Specifies the color of error bars. */
-			color?: string;
-			/** Specifies the opacity of error bars. */
-			opacity?: number;
-			/** Specifies the length of the lines that indicate the error bar edges. */
-            edgeLength?: number;
-			/** Specifies the width of the error bar line. */
-			lineWidth?: number;
-		};
-	}
-	export interface CommonPointOptions {
-			/** Specifies border options for points in the line and area series. */
-            border?: viz.core.Border;
-            /** Specifies the points color. */
+        /** Configures error bars. */
+        valueErrorBar?: {
+            /** Specifies whether error bars must be displayed in full or partially. */
+            displayMode?: string;
+            /** Specifies the data field that provides data for low error values. */
+            lowValueField?: string;
+            /** Specifies the data field that provides data for high error values. */
+            highValueField?: string;
+            /** Specifies how error bar values must be calculated. */
+            type?: string;
+            /** Specifies the value to be used for generating error bars. */
+            value?: number;
+            /** Specifies the color of error bars. */
             color?: string;
-            /** Specifies what series points to highlight when a point is hovered over. */
-            hoverMode?: string;
-            /** An object defining configuration options for a hovered point. */
-            hoverStyle?: {
-                /** An object defining the border options for a hovered point. */
-                border?: viz.core.Border;
-                /** Sets a color for a point when it is hovered over. */
-                color?: string;
-                /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
-                size?: number;
-            };
-            /** Specifies what series points to highlight when a point is selected. */
-            selectionMode?: string;
-            /** An object defining configuration options for a selected point. */
-            selectionStyle?: {
-                /** An object defining the border options for a selected point. */
-                border?: viz.core.Border;
-                /** <p>Sets a color for a point when it is selected.</p> */
-                color?: string;
-                /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
-                size?: number;
-            };
-            /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
+            /** Specifies the opacity of error bars. */
+            opacity?: number;
+            /** Specifies the length of the lines that indicate the error bar edges. */
+            edgeLength?: number;
+            /** Specifies the width of the error bar line. */
+            lineWidth?: number;
+        };
+    }
+    export interface CommonPointOptions {
+        /** Specifies border options for points in the line and area series. */
+        border?: viz.core.Border;
+        /** Specifies the points color. */
+        color?: string;
+        /** Specifies what series points to highlight when a point is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered point. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered point. */
+            border?: viz.core.Border;
+            /** Sets a color for a point when it is hovered over. */
+            color?: string;
+            /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
             size?: number;
-            /** Specifies a symbol for presenting points of the line and area series. */
-            symbol?: string;
-            visible?: boolean;
-	}
-	export interface ChartCommonPointOptions extends CommonPointOptions {
-			/** An object specifying the parameters of an image that is used as a point marker. */
-            image?: {
-                /** Specifies the height of an image that is used as a point marker. */
-                height?: any;
-                /** Specifies a URL leading to the image to be used as a point marker. */
-                url?: any;
-                /** Specifies the width of an image that is used as a point marker. */
-                width?: any;
-            };
-	}
-	export interface PolarCommonPointOptions extends CommonPointOptions {
-			/** An object specifying the parameters of an image that is used as a point marker. */
-            image?: {
-                /** Specifies the height of an image that is used as a point marker. */
-                height?: number;
-                /** Specifies a URL leading to the image to be used as a point marker. */
-                url?: string;
-                /** Specifies the width of an image that is used as a point marker. */
-                width?: number;
-            };
-	}
+        };
+        /** Specifies what series points to highlight when a point is selected. */
+        selectionMode?: string;
+        /** An object defining configuration options for a selected point. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected point. */
+            border?: viz.core.Border;
+            /** <p>Sets a color for a point when it is selected.</p> */
+            color?: string;
+            /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
+            size?: number;
+        };
+        /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
+        size?: number;
+        /** Specifies a symbol for presenting points of the line and area series. */
+        symbol?: string;
+        visible?: boolean;
+    }
+    export interface ChartCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: any;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: any;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: any;
+        };
+    }
+    export interface PolarCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: number;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: string;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: number;
+        };
+    }
     /** An object that defines configuration options for chart series. */
     export interface CommonSeriesConfig extends BaseCommonSeriesConfig {
         /** Specifies the data source field that provides a 'close' value for a _candleStick_ or _stock_ series. */
@@ -4678,14 +4803,14 @@ declare module DevExpress.viz.charts {
         /** Sets the series type. */
         type?: string;
     }
-	/** An object that defines configuration options for polar chart series. */
-	export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
-		/** Specifies whether or not to close the chart by joining the end point with the first point. */
+    /** An object that defines configuration options for polar chart series. */
+    export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies whether or not to close the chart by joining the end point with the first point. */
         closed?: boolean;
         label?: SeriesConfigLabel;
         point?: PolarCommonPointOptions;
-	}
-	export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
+    }
+    export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
         /** An object that specifies configuration options for all series of the <i>area</i> type in the chart. */
         area?: CommonPolarSeriesConfig;
         /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
@@ -4783,7 +4908,7 @@ declare module DevExpress.viz.charts {
         /** Specifies a data source field that represents the series name. */
         nameField?: string;
     }
-	export interface PolarSeriesTemplate {
+    export interface PolarSeriesTemplate {
         /** Specifies a callback function that returns a series object with individual series settings. */
         customizeSeries?: (seriesName: string) => PolarSeriesConfig;
         /** Specifies a data source field that represents the series name. */
@@ -4800,18 +4925,18 @@ declare module DevExpress.viz.charts {
     export interface PolarCommonConstantLineLabel {
         /** Indicates whether or not to display labels for the axis constant lines. */
         visible?: boolean;
-		/** Specifies font options for a constant line label. */
+        /** Specifies font options for a constant line label. */
         font?: viz.core.Font;
-	}
-	export interface ConstantLineStyle {
-		/** Specifies a color for a constant line. */
+    }
+    export interface ConstantLineStyle {
+        /** Specifies a color for a constant line. */
         color?: string;
         /** Specifies a dash style for a constant line. */
         dashStyle?: string;
         /** Specifies a constant line width in pixels. */
         width?: number;
-	}
-	export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
+    }
+    export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
         /** An object defining constant line label options. */
         label?: ChartCommonConstantLineLabel;
         /** Specifies the space between the constant line label and the left/right side of the constant line. */
@@ -4819,24 +4944,24 @@ declare module DevExpress.viz.charts {
         /** Specifies the space between the constant line label and the top/bottom side of the constant line. */
         paddingTopBottom?: number;
     }
-	export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
-		/** An object defining constant line label options. */
+    export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
         label?: PolarCommonConstantLineLabel;
-	}
-	export interface CommonAxisLabel {
-		/** Specifies font options for axis labels. */
+    }
+    export interface CommonAxisLabel {
+        /** Specifies font options for axis labels. */
         font?: viz.core.Font;
         /** Specifies the spacing between an axis and its labels in pixels. */
         indentFromAxis?: number;
         /** Indicates whether or not axis labels are visible. */
         visible?: boolean;
-	}
+    }
     export interface ChartCommonAxisLabel extends CommonAxisLabel {
         /** Specifies the label's position relative to the tick (grid line). */
         alignment?: string;
-		/** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
         overlappingBehavior?: {
-			/** Specifies how to arrange axis labels. */
+            /** Specifies how to arrange axis labels. */
             mode?: string;
             /** Specifies the angle used to rotate axis labels. */
             rotationAngle?: number;
@@ -4848,7 +4973,7 @@ declare module DevExpress.viz.charts {
         /** Specifies the overlap resolving algorithm to be applied to axis labels. */
         overlappingBehavior?: string;
     }
-	export interface CommonAxisTitle {
+    export interface CommonAxisTitle {
         /** Specifies font options for an axis title. */
         font?: viz.core.Font;
         /** Specifies a margin for an axis title in pixels. */
@@ -4857,7 +4982,7 @@ declare module DevExpress.viz.charts {
     export interface BaseCommonAxisSettings {
         /** Specifies the color of the line that represents an axis. */
         color?: string;
-		/** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
+        /** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
         discreteAxisDivisionMode?: string;
         /** An object defining the configuration options for the grid lines of an axis in the dxPolarChart widget. */
         grid?: {
@@ -4870,7 +4995,7 @@ declare module DevExpress.viz.charts {
             /** Specifies the width of grid lines. */
             width?: number;
         };
-		/** Specifies the options of the minor grid. */
+        /** Specifies the options of the minor grid. */
         minorGrid?: {
             /** Specifies a color for the lines of the minor grid. */
             color?: string;
@@ -4896,7 +5021,7 @@ declare module DevExpress.viz.charts {
             /** Indicates whether or not ticks are visible on an axis. */
             visible?: boolean;
         };
-		/** Specifies the options of the minor ticks. */
+        /** Specifies the options of the minor ticks. */
         minorTick?: {
             /** Specifies a color for the minor ticks. */
             color?: string;
@@ -4910,18 +5035,18 @@ declare module DevExpress.viz.charts {
         /** Specifies the width of the line that represents an axis in the chart. */
         width?: number;
     }
-	export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
+    export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
         /** Specifies the appearance of all the widget's constant lines. */
         constantLineStyle?: ChartCommonConstantLineStyle;
         /** An object defining the label configuration options that are common for all axes in the dxChart widget. */
         label?: ChartCommonAxisLabel;
         /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
-		maxValueMargin?: number;
+        maxValueMargin?: number;
         /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
-		minValueMargin?: number;
+        minValueMargin?: number;
         /** Specifies, in pixels, the space reserved for an axis. */
         placeholderSize?: number;
-		/** An object defining configuration options for strip style. */
+        /** An object defining configuration options for strip style. */
         stripStyle?: {
             /** An object defining the configuration options for a strip label style. */
             label?: {
@@ -4942,7 +5067,7 @@ declare module DevExpress.viz.charts {
         /** Indicates whether or not to display series with indents from axis boundaries. */
         valueMarginsEnabled?: boolean;
     }
-	export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
+    export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
         /** Specifies the appearance of all the widget's constant lines. */
         constantLineStyle?: PolarCommonConstantLineStyle;
         /** An object defining the label configuration options that are common for all axes in the dxPolarChart widget. */
@@ -4964,22 +5089,22 @@ declare module DevExpress.viz.charts {
         /** Specifies the text to be displayed in a constant line label. */
         text?: string;
     }
-	export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
+    export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
         /** Specifies the text to be displayed in a constant line label. */
         text?: string;
     }
-	export interface AxisLabel {
-		  /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
+    export interface AxisLabel {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
         customizeHint?: (argument: { value: any; valueText: string }) => string;
-          /** Specifies a callback function that returns the text to be displayed in value axis labels. */
+        /** Specifies a callback function that returns the text to be displayed in value axis labels. */
         customizeText?: (argument: { value: any; valueText: string }) => string;
-          /** Specifies a format for the text displayed by axis labels. */
+        /** Specifies a format for the text displayed by axis labels. */
         format?: string;
-          /** Specifies a precision for the formatted value displayed in the axis labels. */
+        /** Specifies a precision for the formatted value displayed in the axis labels. */
         precision?: number;
-	}
-    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel {}
-	export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel {}
+    }
+    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel { }
+    export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel { }
     export interface AxisTitle extends CommonAxisTitle {
         /** Specifies the text for the value axis title. */
         text?: string;
@@ -4989,19 +5114,19 @@ declare module DevExpress.viz.charts {
         label?: ChartConstantLineLabel;
     }
     export interface ChartConstantLine extends ChartConstantLineStyle {
-		/** An object defining constant line label options. */
+        /** An object defining constant line label options. */
         label?: ChartConstantLineLabel;
         /** Specifies a value to be displayed by a constant line. */
         value?: any;
-	}
-	export interface PolarConstantLine extends PolarCommonConstantLineStyle {
-	/** An object defining constant line label options. */
+    }
+    export interface PolarConstantLine extends PolarCommonConstantLineStyle {
+        /** An object defining constant line label options. */
         label?: PolarConstantLineLabel;
         /** Specifies a value to be displayed by a constant line. */
         value?: any;
-	}
-	export interface Axis {
-	    /** Specifies a coefficient for dividing the value axis. */
+    }
+    export interface Axis {
+        /** Specifies a coefficient for dividing the value axis. */
         axisDivisionFactor?: number;
         /** Specifies the order in which discrete values are arranged on the value axis. */
         categories?: Array<any>;
@@ -5015,11 +5140,11 @@ declare module DevExpress.viz.charts {
         minorTickCount?: number;
         /** Specifies the required type of the value axis. */
         type?: string;
-		/** Specifies the pane on which the current value axis will be displayed. */
+        /** Specifies the pane on which the current value axis will be displayed. */
         pane?: string;
         /** Specifies options for value axis strips. */
         strips?: Array<Strip>;
-	}
+    }
     export interface ChartAxis extends ChartCommonAxisSettings, Axis {
         /** Defines an array of the value axis constant lines. */
         constantLines?: Array<ChartConstantLine>;
@@ -5036,52 +5161,52 @@ declare module DevExpress.viz.charts {
         /** Specifies the title for a value axis. */
         title?: AxisTitle;
     }
-	export interface PolarAxis extends PolarCommonAxisSettings, Axis {
+    export interface PolarAxis extends PolarCommonAxisSettings, Axis {
         /** Defines an array of the value axis constant lines. */
         constantLines?: Array<PolarConstantLine>;
         /** Specifies options for value axis labels. */
         label?: PolarAxisLabel;
     }
-	export interface ArgumentAxis {
-	    /** Specifies the desired type of axis values. */
+    export interface ArgumentAxis {
+        /** Specifies the desired type of axis values. */
         argumentType?: string;
         /** Specifies the elements that will be highlighted when the argument axis is hovered over. */
         hoverMode?: string;
-	}
-    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis {}
-	export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
-	    /** Specifies a start angle for the argument axis in degrees. */
+    }
+    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis { }
+    export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
+        /** Specifies a start angle for the argument axis in degrees. */
         startAngle?: number;
         /** Specifies whether or not to display the first point at the angle specified by the startAngle option. */
         firstPointOnStartAngle?: boolean;
         /** Specifies the period of the argument values in the data source. */
         period?: number;
-	}
-	export interface ValueAxis {
+    }
+    export interface ValueAxis {
         /** Specifies the name of the value axis. */
         name?: string;
         /** Specifies whether or not to indicate a zero value on the value axis. */
         showZero?: boolean;
         /** Specifies the desired type of axis values. */
         valueType?: string;
-		}
+    }
     export interface ChartValueAxis extends ChartAxis, ValueAxis {
         /** Specifies the spacing, in pixels, between multiple value axes in a chart. */
         multipleAxesSpacing?: number;
         /** Specifies the value by which the chart's value axes are synchronized. */
         synchronizedValue?: number;
     }
-	export interface PolarValueAxis extends PolarAxis, ValueAxis {
-	    /** Indicates whether to display series with indents from axis boundaries. */
-	    valueMarginsEnabled?: boolean;
-		/** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+    export interface PolarValueAxis extends PolarAxis, ValueAxis {
+        /** Indicates whether to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
         maxValueMargin?: number;
         /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
         minValueMargin?: number;
-		tick?: {
-			visible?: boolean;
-		}
-	}
+        tick?: {
+            visible?: boolean;
+        }
+    }
     export interface CommonPane {
         /** Specifies a background color in a pane. */
         backgroundColor?: string;
@@ -5222,7 +5347,7 @@ declare module DevExpress.viz.charts {
             asyncSeriesRendering?: boolean;
         }): void;
     }
-	export interface AdvancedLegend extends core.BaseLegend {
+    export interface AdvancedLegend extends core.BaseLegend {
         /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
         customizeHint?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
         /** <p>Specifies a callback function that returns the text to be displayed by legend items.</p> */
@@ -5263,14 +5388,14 @@ declare module DevExpress.viz.charts {
         /** Specifies whether a single series or multiple series can be selected in the chart. */
         seriesSelectionMode?: string;
         /** Specifies how the chart must behave when series point labels overlap. */
-        resolveLabelOverlapping?: string; 
+        resolveLabelOverlapping?: string;
     }
     export interface Legend extends AdvancedLegend {
         /** Specifies whether the legend is located outside or inside the chart's plot. */
         position?: string;
     }
     export interface ChartTooltip extends BaseChartTooltip {
-        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies only to the Bar series. */
+        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies to the Bar and Bubble series. */
         location?: string;
         /** Specifies the kind of information to display in a tooltip. */
         shared?: boolean;
@@ -5404,7 +5529,7 @@ declare module DevExpress.viz.charts {
             /** Specifies whether or not point labels can be hidden when the layout is adapting. */
             keepLabels?: boolean;
         };
-	    /** Indicates whether or not to display a "spider web". */
+        /** Indicates whether or not to display a "spider web". */
         useSpiderWeb?: boolean;
         /** Specifies argument axis options for the dxPolarChart widget. */
         argumentAxis?: PolarArgumentAxis;
@@ -5458,7 +5583,7 @@ declare module DevExpress.viz.charts {
         onLegendClick?: any;
         legendClick?: any;
         /** Specifies how the chart must behave when series point labels overlap. */
-        resolveLabelOverlapping?: string; 
+        resolveLabelOverlapping?: string;
     }
     /** A circular chart widget for HTML JS applications. */
     export class dxPieChart extends BaseChart {
@@ -5830,7 +5955,7 @@ declare module DevExpress.viz.rangeSelector {
         behavior?: {
             /** Indicates whether or not you can swap sliders. */
             allowSlidersSwap?: boolean;
-            /** 
+            /**
 Indicates whether or not animation is enabled.
  */
             animationEnabled?: boolean;
@@ -5860,6 +5985,8 @@ Indicates whether or not animation is enabled.
             };
             /** Specifies a value indicating whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
             equalBarWidth?: any;
+            /** Sets the name of the palette to be used in the range selector's chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+            palette?: any;
             /** An object defining the chart’s series. */
             series?: Array<viz.charts.SeriesConfig>;
             /** Defines options for the series template. */
@@ -5943,7 +6070,7 @@ Indicates whether or not animation is enabled.
             maxRange?: any;
             /** Specifies the number of minor ticks between neighboring major ticks. */
             minorTickCount?: number;
-            /** 
+            /**
 Specifies an interval between minor ticks.
  */
             minorTickInterval?: any;
@@ -5974,8 +6101,8 @@ Specifies an interval between minor ticks.
             useTicksAutoArrangement?: boolean;
             /** Specifies the type of values on the scale. */
             valueType?: string;
-			/** Specifies the order of arguments on a discrete scale. */
-			categories?: Array<any>;
+            /** Specifies the order of arguments on a discrete scale. */
+            categories?: Array<any>;
         };
         /** Specifies the range to be selected when displaying the dxRangeSelector. */
         selectedRange?: {
@@ -6276,9 +6403,9 @@ declare module DevExpress.viz.map {
         centerChanged?: (center: Array<number>) => void;
         /** A handler for the centerChanged event. */
         onCenterChanged?: (e: {
-			center: Array<number>;
-			component: dxVectorMap;
-			element: Element;
+            center: Array<number>;
+            component: dxVectorMap;
+            element: Element;
         }) => void;
         /** A handler for the tooltipShown event. */
         onTooltipShown?: (e: {
diff --git a/diff/diff.d.ts b/diff/diff.d.ts
index 9ccbb10a8..f5c2cc48f 100644
--- a/diff/diff.d.ts
+++ b/diff/diff.d.ts
@@ -39,6 +39,8 @@ declare module JsDiff {
 
     function diffWordsWithSpace(oldStr:string, newStr:string):IDiffResult[];
 
+    function diffJson(oldObj: Object, newObj: Object): IDiffResult[];
+
     function diffLines(oldStr:string, newStr:string):IDiffResult[];
 
     function diffCss(oldStr:string, newStr:string):IDiffResult[];
diff --git a/documentdb-server/documentdb-server-tests.ts b/documentdb-server/documentdb-server-tests.ts
new file mode 100644
index 000000000..722fdbec5
--- /dev/null
+++ b/documentdb-server/documentdb-server-tests.ts
@@ -0,0 +1,1016 @@
+/// <reference path="documentdb-server.d.ts" />
+
+// Samples taken from http://dl.windowsazure.com/documentDB/jsserverdocs/Collection.html
+function chain() {
+    var name: string = "John";
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.name == name; })
+        .map(function (doc: any) { return { name: doc.name, age: doc.age }; })
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function filter() {
+    // Example 1: get documents(people) with age < 30.
+    var result: IQueryResponse = __.filter(function (doc: any) { return doc.age < 30; });
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 2: get documents (people) with age < 30 and select only name.
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.age < 30; })
+        .pluck("name")
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 3: get document (person) with id = 1 and delete it.
+    var result: IQueryResponse = __.filter(function (doc: any) { return doc.id === 1; }, function (err: IFeedCallbackError, feed: Array<any>, options: IFeedCallbackOptions) {
+        if (err) throw err;
+        if (!__.deleteDocument(feed[0].getSelfLink())) throw new Error("deleteDocument was not accepted");
+    });
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function flatten() {
+    // Get documents (people) with age < 30, select tags (an array property)
+    // and flatten the result into one array for all documents.
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.age < 30; })
+        .map(function (doc: any) { return doc.tags; })
+        .flatten()
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function map() {
+    // Example 1: select only name and age for each document (person).
+    var result: IQueryResponse = __.map(function (doc: any) { return { name: doc.name, age: doc.age }; });
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 2: select name and age for each document (person), and return only people with age < 30.
+    var result: IQueryResponse = __.chain()
+        .map(function (doc: any) { return { name: doc.name, age: doc.age }; })
+        .filter(function (doc: any) { return doc.age < 30; })
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function pluck() {
+    // Get documents (people) with age < 30 and select only name.
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.age < 30; })
+        .pluck("name")
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function sortBy() {
+    // Example 1: sort documents (people) by age
+    var result: IQueryResponse = __.sortBy(function (doc: any) { return doc.age; })
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 2: sortBy in a chain by name
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.age < 30; })
+        .sortBy(function (doc: any) { return doc.name; })
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function sortByDescending() {
+    // Example 1: sort documents (people) by age in descending order
+    var result: IQueryResponse = __.sortByDescending(function (doc: any) { return doc.age; })
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 2: sortBy in a chain by name in descending order
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.age < 30; })
+        .sortByDescending(function (doc: any) { return doc.name; })
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+}
+function value() {
+    // Example 1: use defaults: the result goes to the response body.
+    var result: IQueryResponse = __.chain()
+        .filter(function (doc: any) { return doc.name == "John"; })
+        .pluck("age")
+        .value();
+    if (!result.isAccepted) throw new Error("The call was not accepted");
+    // Example 2: use options and callback.
+    function usingOptionsAndCallback (continuationToken: string) {
+        var result = __.chain()
+            .filter(function (doc: any) { return doc.name == "John"; })
+            .pluck("age")
+            .value({ continuation: continuationToken }, function (err: IFeedCallbackError, feed: Array<any>, options: IFeedCallbackOptions) {
+            if (err) throw err;
+            __.response.setBody({
+                result: feed,
+                continuation: options.continuation
+            });
+        });
+        if (!result.isAccepted) throw new Error("The call was not accepted");
+    }
+}
+
+// Samples taken from https://github.com/Azure/azure-documentdb-js-server/tree/master/samples
+/**
+* This script called as stored procedure to import lots of documents in one batch.
+* The script sets response body to the number of docs imported and is called multiple times 
+* by the client until total number of docs desired by the client is imported.
+* @param  {Object[]} docs - Array of documents to import.
+*/
+function bulkImport(docs: Array<Object>) {
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+
+    // The count of imported docs, also used as current doc index.
+    var count: number = 0;
+
+    // Validate input.
+    if (!docs) throw new Error("The array is undefined or null.");
+
+    var docsLength: number = docs.length;
+    if (docsLength == 0) {
+        getContext().getResponse().setBody(0);
+        return;
+    }
+
+    // Call the CRUD API to create a document.
+    tryCreate(docs[count], callback);
+
+    // Note that there are 2 exit conditions:
+    // 1) The createDocument request was not accepted. 
+    //    In this case the callback will not be called, we just call setBody and we are done.
+    // 2) The callback was called docs.length times.
+    //    In this case all documents were created and we don't need to call tryCreate anymore. Just call setBody and we are done.
+    function tryCreate(doc: Object, callback: (err: IRequestCallbackError, doc: Object, options: IRequestCallbackOptions) => void): void {
+        var isAccepted = collection.createDocument(collectionLink, doc, callback);
+
+        // If the request was accepted, callback will be called.
+        // Otherwise report current count back to the client, 
+        // which will call the script again with remaining set of docs.
+        // This condition will happen when this stored procedure has been running too long
+        // and is about to get cancelled by the server. This will allow the calling client
+        // to resume this batch from the point we got to before isAccepted was set to false
+        if (!isAccepted) getContext().getResponse().setBody(count);
+    }
+
+    // This is called when collection.createDocument is done and the document has been persisted.
+    function callback(err: IRequestCallbackError, doc: Object, options: IRequestCallbackOptions) {
+        if (err) throw err;
+
+        // One more document has been inserted, increment the count.
+        count++;
+
+        if (count >= docsLength) {
+            // If we have created all documents, we are done. Just set the response.
+            getContext().getResponse().setBody(count);
+        } else {
+            // Create next document.
+            tryCreate(docs[count], callback);
+        }
+    }
+}
+
+/**
+* This is executed as stored procedure to count the number of docs in the collection.
+* To avoid script timeout on the server when there are lots of documents (100K+), the script executed in batches,
+* each batch counts docs to some number and returns continuation token.
+* The script is run multiple times, starting from empty continuation, 
+* then using continuation returned by last invocation script until continuation returned by the script is null/empty string.
+*
+* @param {String} filterQuery - Optional filter for query (e.g. "SELECT * FROM docs WHERE docs.category = 'food'").
+* @param {String} continuationToken - The continuation token passed by request, continue counting from this token.
+*/
+function count(filterQuery: string, continuationToken: string) {
+    var collection: ICollection = getContext().getCollection();
+    var maxResult: number = 25; // MAX number of docs to process in one batch, when reached, return to client/request continuation. 
+    // intentionally set low to demonstrate the concept. This can be much higher. Try experimenting.
+    // We've had it in to the high thousands before seeing the stored proceudre timing out.
+
+    // The number of documents counted.
+    var result: number = 0;
+
+    tryQuery(continuationToken);
+
+    // Helper method to check for max result and call query.
+    function tryQuery(nextContinuationToken: string) {
+        var responseOptions: Object = { continuation: nextContinuationToken, pageSize: maxResult };
+
+        // In case the server is running this script for long time/near timeout, it would return false,
+        // in this case we set the response to current continuation token, 
+        // and the client will run this script again starting from this continuation.
+        // When the client calls this script 1st time, is passes empty continuation token.
+        if (result >= maxResult || !query(responseOptions)) {
+            setBody(nextContinuationToken);
+        }
+    }
+
+    function query(responseOptions: IFeedOptions) {
+        // For empty query string, use readDocuments rather than queryDocuments -- it's faster as doesn't need to process the query.
+        return (filterQuery && filterQuery.length) ?
+            collection.queryDocuments(collection.getSelfLink(), filterQuery, responseOptions, onReadDocuments) :
+            collection.readDocuments(collection.getSelfLink(), responseOptions, onReadDocuments);
+    }
+
+    // This is callback is called from collection.queryDocuments/readDocuments.
+    function onReadDocuments(err: IFeedCallbackError, docFeed: Array<any>, responseOptions: IFeedCallbackOptions) {
+        if (err) {
+            throw 'Error while reading document: ' + err;
+        }
+
+        // Increament the number of documents counted so far.
+        result += docFeed.length;
+
+        // If there is continuation, call query again with it, 
+        // otherwise we are done, in which case set continuation to null.
+        if (responseOptions.continuation) {
+            tryQuery(responseOptions.continuation);
+        } else {
+            setBody(null);
+        }
+    }
+
+    // Set response body: use an object the client is expecting (2 properties: result and continuationToken).
+    function setBody(continuationToken: string) {
+        var body: Object = { count: result, continuationToken: continuationToken };
+        getContext().getResponse().setBody(body);
+    }
+}
+
+/**
+* This is run as stored procedure and does the following:
+* - create ordered result set (result) which is an array sorted by orderByFieldName parameter.
+* - call collection.queryDocuments.
+* - in the callback for each document, insert into an array (result)
+* - in the end, sort the resulting array and return it to the client
+*
+* Important notes:
+* - The resulting record set could be too large to fit into one response
+*   - To walk around that, we setBody by one element and catch the REQUEST_ENTITY_TOO_LARGE exception.
+*     When we get the exception, return resulting set to the client with continuation token
+*     to continue from item index specified by this token.
+*   - Note that when continuation is called, it will be different transaction
+*
+* @param {String} filterQuery - Optional filter for query.
+* @param {String} orderByFieldName - The name of the field to order by resulting set.
+* @param {String} continuationToken - The continuation token passed by request, continue counting from this token.
+*/
+function orderBy(filterQuery: string, orderByFieldName: string, continuationToken: number) {
+    // HTTP error codes sent to our callback funciton by DocDB server.
+    var ErrorCode: any = {
+        REQUEST_ENTITY_TOO_LARGE: 413,
+    }
+
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var result: Array<any> = new Array();
+
+    tryQuery({});
+
+    function tryQuery(options: IFeedOptions) {
+        var isAccepted: boolean = (filterQuery && filterQuery.length) ?
+            collection.queryDocuments(collectionLink, filterQuery, options, callback) :
+            collection.readDocuments(collectionLink, options, callback)
+
+        if (!isAccepted) throw new Error("Source dataset is too large to complete the operation.");
+    }
+
+    /**
+    * queryDocuments callback.
+    * @param {Error} err - Error object in case of error/exception.
+    * @param {Array} queryFeed - array containing results of the query.
+    * @param {ResponseOptions} responseOptions.
+    */
+    function callback(err: IFeedCallbackError, queryFeed: Array<any>, responseOptions: IFeedCallbackOptions) {
+        if (err) {
+            throw err;
+        }
+
+        // Iterate over document feed and store documents into the result array.
+        queryFeed.forEach(function (element: any, index: number, array: Array<any>) {
+            result[result.length] = element;
+        });
+
+        if (responseOptions.continuation) {
+            // If there is continuation, call query again providing continuation token.
+            tryQuery({ continuation: responseOptions.continuation });
+        } else {
+            // We are done with querying/got all results. Sort the results and return from the script.
+            result.sort(compare);
+
+            fillResponse();
+        }
+    }
+
+    // Compare two objects(documents) using field specified by the orderByFieldName parameter.
+    // Return 0 if equal, -1 if less, 1 if greater.
+    function compare(x: any, y: any) {
+        if (x[orderByFieldName] == y[orderByFieldName]) return 0;
+        else if (x[orderByFieldName] < y[orderByFieldName]) return -1;
+        return 1;
+    }
+
+    // This is called in the very end on an already sorted array.
+    // Sort the results and set the response body.
+    function fillResponse() {
+        // Main script is called with continuationToken which is the index of 1st item to start result batch from.
+        // Slice the result array and discard the beginning. From now on use the 'continuationResult' var.
+        var continuationResult: Array<any> = result;
+        if (continuationToken) continuationResult = result.slice(continuationToken);
+        else continuationToken = 0;
+
+        // Get/initialize the response.
+        var response: IResponse = getContext().getResponse();
+        response.setBody(null);
+
+        // Take care of response body getting too large:
+        // Set Response iterating by one element. When we fail due to MAX response size, return to the client requesting continuation.
+        var i = 0;
+        for (; i < continuationResult.length; ++i) {
+            try {
+                // Note: setBody is very expensive vs appendBody, use appendBody with simple approximation JSON.stringify(element).
+                response.appendBody(JSON.stringify(continuationResult[i]));
+            } catch (ex) {
+                if (!ex.number == ErrorCode.REQUEST_ENTITY_TOO_LARGE) throw ex;
+                break;
+            }
+        }
+        
+        // Now next batch to return to client has i elements.
+        // Slice the continuationResult if needed and discard the end.
+        var partialResult: Array<any> = continuationResult;
+        var newContinuation: string = null;
+        if (i < continuationResult.length) {
+            partialResult = continuationResult.slice(0, i);
+        }
+
+        // Finally, set response body.
+        response.setBody({ result: result, continuation: newContinuation });
+    }
+}
+
+
+/**
+* This is run as stored procedure and does the following:
+* - get 1st document in the collection, convert to JSON, prepend string specified by the prefix parameter 
+*   and set response to the result of that.
+*
+* @param {String} prefix - The string to prepend to the 1st document in collection.
+*/
+function simple(prefix: string) {
+    var collection: ICollection = getContext().getCollection();
+
+    // Query documents and take 1st item.
+    var isAccepted: boolean = collection.queryDocuments(
+        collection.getSelfLink(),
+        'SELECT * FROM root r',
+        function (err: IFeedCallbackError, feed: Array<any>, options: IFeedCallbackOptions) {
+            if (err) throw err;
+
+            // Check the feed and if it's empty, set the body to 'no docs found',
+            // Otherwise just take 1st element from the feed.
+            if (!feed || !feed.length) getContext().getResponse().setBody("no docs found");
+            else getContext().getResponse().setBody(prefix + JSON.stringify(feed[0]));
+        });
+
+    if (!isAccepted) throw new Error("The query wasn't accepted by the server. Try again/use continuation token between API and script.");
+}
+
+/**
+ * A DocumentDB stored procedure that bulk deletes documents for a given query.<br/>
+ * Note: You may need to execute this sproc multiple times (depending whether the sproc is able to delete every document within the execution timeout limit).
+ *
+ * @function
+ * @param {string} query - A query that provides the documents to be deleted (e.g. "SELECT * FROM c WHERE c.founded_year = 2008")
+ * @returns {Object.<number, boolean>} Returns an object with the two properties:<br/>
+ *   deleted - contains a count of documents deleted<br/>
+ *   continuation - a boolean whether you should execute the sproc again (true if there are more documents to delete; false otherwise).
+ */
+function bulkDeleteSproc(query: string) {
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var response: IResponse = getContext().getResponse();
+    var responseBody: any = {
+        deleted: 0,
+        continuation: true
+    };
+
+    // Validate input.
+    if (!query) throw new Error("The query is undefined or null.");
+
+    tryQueryAndDelete();
+
+    // Recursively runs the query w/ support for continuation tokens.
+    // Calls tryDelete(documents) as soon as the query returns documents.
+    function tryQueryAndDelete(continuation?: string) {
+        var requestOptions: IFeedOptions = { continuation: continuation };
+
+        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, retrievedDocs: Array<any>, responseOptions: IFeedCallbackOptions) {
+            if (err) throw err;
+
+            if (retrievedDocs.length > 0) {
+                // Begin deleting documents as soon as documents are returned form the query results.
+                // tryDelete() resumes querying after deleting; no need to page through continuation tokens.
+                //  - this is to prioritize writes over reads given timeout constraints.
+                tryDelete(retrievedDocs);
+            } else if (responseOptions.continuation) {
+                // Else if the query came back empty, but with a continuation token; repeat the query w/ the token.
+                tryQueryAndDelete(responseOptions.continuation);
+            } else {
+                // Else if there are no more documents and no continuation token - we are finished deleting documents.
+                responseBody.continuation = false;
+                response.setBody(responseBody);
+            }
+        });
+
+        // If we hit execution bounds - return continuation: true.
+        if (!isAccepted) {
+            response.setBody(responseBody);
+        }
+    }
+
+    // Recursively deletes documents passed in as an array argument.
+    // Attempts to query for more on empty array.
+    function tryDelete(documents: Array<IDocumentMeta>) {
+        if (documents.length > 0) {
+            // Delete the first document in the array.
+            var isAccepted: boolean = collection.deleteDocument(documents[0]._self, {}, function (err, responseOptions) {
+                if (err) throw err;
+
+                responseBody.deleted++;
+                documents.shift();
+                // Delete the next document in the array.
+                tryDelete(documents);
+            });
+
+            // If we hit execution bounds - return continuation: true.
+            if (!isAccepted) {
+                response.setBody(responseBody);
+            }
+        } else {
+            // If the document array is empty, query for more documents.
+            tryQueryAndDelete();
+        }
+    }
+}
+
+/**
+ * A DocumentDB stored procedure that updates a document by id, using a similar syntax to MongoDB's update operator.<br/>
+ * <br/>
+ * The following operations are supported:<br/>
+ * <br/>
+ * Field Operators:<br/>
+ * <ul>
+ *   <li>$inc - Increments the value of the field by the specified amount.</li>
+ *   <li>$mul - Multiplies the value of the field by the specified amount.</li>
+ *   <li>$rename - Renames a field.</li>
+ *   <li>$set - Sets the value of a field in a document.</li>
+ *   <li>$unset - Removes the specified field from a document.</li>
+ *   <li>$min - Only updates the field if the specified value is less than the existing field value.</li>
+ *   <li>$max - Only updates the field if the specified value is greater than the existing field value.</li>
+ *   <li>$currentDate - Sets the value of a field to current date as a Unix Epoch.</li>
+ * </ul>
+ * <br/>
+ * Array Operators:<br/>
+ * <ul>
+ *   <li>$addToSet - Adds elements to an array only if they do not already exist in the set.</li>
+ *   <li>$pop - Removes the first or last item of an array.</li>
+ *   <li>$push - Adds an item to an array.</li>
+ * </ul>
+ * <br/>
+ * Note: Performing multiple operations on the same field may yield unexpected results.<br/>
+ *
+ * @example <caption>Increment the property "counter" by 1 in the document where id = "foo".</caption>
+ * updateSproc("foo", {$inc: {counter: 1}});
+ *
+ * @example <caption>Set the property "message" to "Hello World" and the "messageDate" to the current date in the document where id = "bar".</caption>
+ * updateSproc("bar", {$set: {message: "Hello World"}, $currentDate: {messageDate: ""}});
+ *
+ * @function
+ * @param {string} id - The id for your document.
+ * @param {object} update - the modifications to apply.
+ * @returns {object} the updated document.
+ */
+function updateSproc(id: string, update: Object) {
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var response: IResponse = getContext().getResponse();
+
+    // Validate input.
+    if (!id) throw new Error("The id is undefined or null.");
+    if (!update) throw new Error("The update is undefined or null.");
+
+    tryQueryAndUpdate();
+
+    // Recursively queries for a document by id w/ support for continuation tokens.
+    // Calls tryUpdate(document) as soon as the query returns a document.
+    function tryQueryAndUpdate(continuation?: string) {
+        var query: IParameterizedQuery = { query: "select * from root r where r.id = @id", parameters: [{ name: "@id", value: id }] };
+        var requestOptions: IFeedOptions = { continuation: continuation };
+
+        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, documents: Array<any>, responseOptions: IFeedCallbackOptions) {
+            if (err) throw err;
+
+            if (documents.length > 0) {
+                // If the document is found, update it.
+                // There is no need to check for a continuation token since we are querying for a single document.
+                tryUpdate(documents[0]);
+            } else if (responseOptions.continuation) {
+                // Else if the query came back empty, but with a continuation token; repeat the query w/ the token.
+                // It is highly unlikely for this to happen when performing a query by id; but is included to serve as an example for larger queries.
+                tryQueryAndUpdate(responseOptions.continuation);
+            } else {
+                // Else a document with the given id does not exist..
+                throw new Error("Document not found.");
+            }
+        });
+
+        // If we hit execution bounds - throw an exception.
+        // This is highly unlikely given that this is a query by id; but is included to serve as an example for larger queries.
+        if (!isAccepted) {
+            throw new Error("The stored procedure timed out.");
+        }
+    }
+
+    // Updates the supplied document according to the update object passed in to the sproc.
+    function tryUpdate(document: IDocumentMeta) {
+
+        // DocumentDB supports optimistic concurrency control via HTTP ETag.
+        var requestOptions: IReplaceOptions = { etag: document._etag };
+
+        // Update operators.
+        inc(document, update);
+        mul(document, update);
+        rename(document, update);
+        set(document, update);
+        unset(document, update);
+        min(document, update);
+        max(document, update);
+        currentDate(document, update);
+        addToSet(document, update);
+        pop(document, update);
+        push(document, update);
+
+        // Update the document.
+        var isAccepted: boolean = collection.replaceDocument(document._self, document, requestOptions, function (err, updatedDocument, responseOptions) {
+            if (err) throw err;
+
+            // If we have successfully updated the document - return it in the response body.
+            response.setBody(updatedDocument);
+        });
+
+        // If we hit execution bounds - throw an exception.
+        if (!isAccepted) {
+            throw new Error("The stored procedure timed out.");
+        }
+    }
+
+    // Operator implementations.
+    // The $inc operator increments the value of a field by a specified amount.
+    function inc(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$inc) {
+            fields = Object.keys(update.$inc);
+            for (i = 0; i < fields.length; i++) {
+                if (isNaN(update.$inc[fields[i]])) {
+                    // Validate the field; throw an exception if it is not a number (can't increment by NaN).
+                    throw new Error("Bad $inc parameter - value must be a number")
+                } else if (document[fields[i]]) {
+                    // If the field exists, increment it by the given amount.
+                    document[fields[i]] += update.$inc[fields[i]];
+                } else {
+                    // Otherwise set the field to the given amount.
+                    document[fields[i]] = update.$inc[fields[i]];
+                }
+            }
+        }
+    }
+
+    // The $mul operator multiplies the value of the field by the specified amount.
+    function mul(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$mul) {
+            fields = Object.keys(update.$mul);
+            for (i = 0; i < fields.length; i++) {
+                if (isNaN(update.$mul[fields[i]])) {
+                    // Validate the field; throw an exception if it is not a number (can't multiply by NaN).
+                    throw new Error("Bad $mul parameter - value must be a number")
+                } else if (document[fields[i]]) {
+                    // If the field exists, multiply it by the given amount.
+                    document[fields[i]] *= update.$mul[fields[i]];
+                } else {
+                    // Otherwise set the field to 0.
+                    document[fields[i]] = 0;
+                }
+            }
+        }
+    }
+
+    // The $rename operator renames a field.
+    function rename(document: any, update: any) {
+        var fields: Array<string>, i: number, existingFieldName: string, newFieldName: string;
+
+        if (update.$rename) {
+            fields = Object.keys(update.$rename);
+            for (i = 0; i < fields.length; i++) {
+                existingFieldName = fields[i];
+                newFieldName = update.$rename[fields[i]];
+
+                if (existingFieldName == newFieldName) {
+                    throw new Error("Bad $rename parameter: The new field name must differ from the existing field name.")
+                } else if (document[existingFieldName]) {
+                    // If the field exists, set/overwrite the new field name and unset the existing field name.
+                    document[newFieldName] = document[existingFieldName];
+                    delete document[existingFieldName];
+                } else {
+                    // Otherwise this is a noop.
+                }
+            }
+        }
+    }
+
+    // The $set operator sets the value of a field.
+    function set(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$set) {
+            fields = Object.keys(update.$set);
+            for (i = 0; i < fields.length; i++) {
+                document[fields[i]] = update.$set[fields[i]];
+            }
+        }
+    }
+
+    // The $unset operator removes the specified field.
+    function unset(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$unset) {
+            fields = Object.keys(update.$unset);
+            for (i = 0; i < fields.length; i++) {
+                delete document[fields[i]];
+            }
+        }
+    }
+
+    // The $min operator only updates the field if the specified value is less than the existing field value.
+    function min(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$min) {
+            fields = Object.keys(update.$min);
+            for (i = 0; i < fields.length; i++) {
+                if (update.$min[fields[i]] < document[fields[i]]) {
+                    document[fields[i]] = update.$min[fields[i]];
+                }
+            }
+        }
+    }
+
+    // The $max operator only updates the field if the specified value is greater than the existing field value.
+    function max(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$max) {
+            fields = Object.keys(update.$max);
+            for (i = 0; i < fields.length; i++) {
+                if (update.$max[fields[i]] > document[fields[i]]) {
+                    document[fields[i]] = update.$max[fields[i]];
+                }
+            }
+        }
+    }
+
+    // The $currentDate operator sets the value of a field to current date as a POSIX epoch.
+    function currentDate(document: any, update: any) {
+        var currentDate: Date = new Date();
+        var fields: Array<string>, i: number;
+
+        if (update.$currentDate) {
+            fields = Object.keys(update.$currentDate);
+            for (i = 0; i < fields.length; i++) {
+                // ECMAScript's Date.getTime() returns milliseconds, where as POSIX epoch are in seconds.
+                document[fields[i]] = Math.round(currentDate.getTime() / 1000);
+            }
+        }
+    }
+
+    // The $addToSet operator adds elements to an array only if they do not already exist in the set.
+    function addToSet(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$addToSet) {
+            fields = Object.keys(update.$addToSet);
+
+            for (i = 0; i < fields.length; i++) {
+                if (!Array.isArray(document[fields[i]])) {
+                    // Validate the document field; throw an exception if it is not an array.
+                    throw new Error("Bad $addToSet parameter - field in document must be an array.")
+                } else if (document[fields[i]].indexOf(update.$addToSet[fields[i]]) === -1) {
+                    // Add the element if it doesn't already exist in the array.
+                    document[fields[i]].push(update.$addToSet[fields[i]]);
+                }
+            }
+        }
+    }
+
+    // The $pop operator removes the first or last item of an array.
+    // Pass $pop a value of -1 to remove the first element of an array and 1 to remove the last element in an array.
+    function pop(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$pop) {
+            fields = Object.keys(update.$pop);
+
+            for (i = 0; i < fields.length; i++) {
+                if (!Array.isArray(document[fields[i]])) {
+                    // Validate the document field; throw an exception if it is not an array.
+                    throw new Error("Bad $pop parameter - field in document must be an array.")
+                } else if (update.$pop[fields[i]] < 0) {
+                    // Remove the first element from the array if it's less than 0 (be flexible).
+                    document[fields[i]].shift();
+                } else {
+                    // Otherwise, remove the last element from the array (have 0 default to javascript's pop()).
+                    document[fields[i]].pop();
+                }
+            }
+        }
+    }
+
+    // The $push operator adds an item to an array.
+    function push(document: any, update: any) {
+        var fields: Array<string>, i: number;
+
+        if (update.$push) {
+            fields = Object.keys(update.$push);
+
+            for (i = 0; i < fields.length; i++) {
+                if (!Array.isArray(document[fields[i]])) {
+                    // Validate the document field; throw an exception if it is not an array.
+                    throw new Error("Bad $push parameter - field in document must be an array.")
+                } else {
+                    // Push the element in to the array.
+                    document[fields[i]].push(update.$push[fields[i]]);
+                }
+            }
+        }
+    }
+}
+
+/**
+ * A DocumentDB stored procedure that upserts a given document (insert new or update if present) using its id property.<br/>
+ * This implementation tries to create, and if the create fails then query for the document with the specified document's id, then replace it. 
+ * Use this sproc if creates are more common than replaces, otherwise use "upsertOptimizedForReplace" 
+ *
+ * @function
+ * @param {Object} document - A document that should be upserted into this collection.
+ * @returns {Object.<string>} Returns an object with the property:<br/>
+ *   op - created (or) replaced.
+ */
+function upsert(document: IDocumentMeta) {
+    var context: IContext = getContext();
+    var collection: ICollection = context.getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var response: IResponse = context.getResponse();
+    var errorCodes: any = { CONFLICT: 409 };
+
+    // Not checking for existence of document.id for compatibility with createDocument.
+    if (!document) throw new Error("The document is undefined or null.");
+
+    tryCreate(document, callback);
+
+    function tryCreate(doc: IDocumentMeta, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
+        var isAccepted: boolean = collection.createDocument(collectionLink, doc, callback);
+        if (!isAccepted) throw new Error("Unable to schedule create document");
+        response.setBody({ "op": "created" });
+    }
+
+    // To replace the document, first issue a query to find it and then call replace.
+    function tryReplace(doc: IDocumentMeta, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
+        retrieveDoc(doc, null, function (retrievedDocs: Array<IDocumentMeta>) {
+            var isAccepted: boolean = collection.replaceDocument(retrievedDocs[0]._self, doc, callback);
+            if (!isAccepted) throw new Error("Unable to schedule replace document");
+            response.setBody({ "op": "replaced" });
+        });
+    }
+
+    function retrieveDoc(doc: IDocumentMeta, continuation: string, callback: Function) {
+        var query: IParameterizedQuery = { query: "select * from root r where r.id = @id", parameters: [{ name: "@id", value: doc.id }] };
+        var requestOptions: IFeedOptions = { continuation: continuation };
+        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, retrievedDocs: Array<any>, responseOptions: IFeedCallbackOptions) {
+            if (err) throw err;
+
+            if (retrievedDocs.length > 0) {
+                callback(retrievedDocs);
+            } else if (responseOptions.continuation) {
+                // Conservative check for continuation. Not expected to hit in practice for the "id query"
+                retrieveDoc(doc, responseOptions.continuation, callback);
+            } else {
+                throw new Error("Error in retrieving document: " + doc.id);
+            }
+        });
+        if (!isAccepted) throw new Error("Unable to query documents");
+    }
+
+    // This is called when collection.createDocument is done in order to
+    // process the result.
+    function callback(err: IRequestCallbackError, doc: any, options: IRequestCallbackOptions) {
+        if (err) {
+            // Replace the document if status code is 409 and upsert is enabled
+            if (err.number == errorCodes.CONFLICT) {
+                return tryReplace(document, callback);
+            } else {
+                throw err;
+            }
+        }
+    }
+}
+
+/**
+ * A DocumentDB stored procedure that upserts a given document (insert new or update if present) using its id property.<br/>
+ * This implementation queries for the document's id, and creates if absent and replaces if found.
+ * Use this sproc if replaces are more common than creates, otherwise use "upsert" 
+ *
+ * @function
+ * @param {Object} document - A document that should be upserted into this collection.
+ * @returns {Object.<string>} Returns an object with the property:<br/>
+ *   op - created (or) replaced.
+ */
+function upsertOptimizedForReplace(document: any) {
+    var context: IContext = getContext();
+    var collection: ICollection = context.getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var response: IResponse = context.getResponse();
+
+    // Not checking for existence of document.id for compatibility with createDocument.
+    if (!document) throw new Error("The document is undefined or null.");
+
+    retrieveDoc(document, null, callback);
+
+    function retrieveDoc(doc: IDocumentMeta, continuation: string, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
+        var query: IParameterizedQuery = { query: "select * from root r where r.id = @id", parameters: [{ name: "@id", value: doc.id }] };
+        var requestOptions: IFeedOptions = { continuation: continuation };
+        var isAccepted: boolean = collection.queryDocuments(collectionLink, query, requestOptions, function (err: IFeedCallbackError, retrievedDocs: Array<any>, responseOptions: IFeedCallbackOptions) {
+            if (err) throw err;
+            if (retrievedDocs.length > 0) {
+                tryReplace(retrievedDocs[0], doc, callback);
+            } else if (responseOptions.continuation) {
+                // Conservative check for continuation. Not expected to hit in practice for the "id query".
+                retrieveDoc(doc, responseOptions.continuation, callback);
+            } else {
+                tryCreate(doc, callback);
+            }
+        });
+        if (!isAccepted) throw new Error("Unable to query documents");
+    }
+
+    function tryCreate(doc: any, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
+        var isAccepted = collection.createDocument(collectionLink, doc, callback);
+        if (!isAccepted) throw new Error("Unable to schedule create document");
+        response.setBody({ "op": "created" });
+    }
+
+    function tryReplace(docToReplace: IDocumentMeta, docContent: any, callback: (err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions) => void) {
+        var isAccepted = collection.replaceDocument(docToReplace._self, docContent, callback);
+        if (!isAccepted) throw new Error("Unable to schedule replace document");
+        response.setBody({ "op": "replaced" });
+    }
+
+    function callback(err: IRequestCallbackError, obj: any, options: IRequestCallbackOptions): void {
+        if (err) throw err;
+    }
+}
+
+/**
+* This script runs as a pre-trigger when a document is inserted:
+* for each inserted document, validate/canonicalize document.weekday and create field document.createdTime.
+*/
+function validateClass() {
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+    var doc: any = getContext().getRequest().getBody();
+
+    // Validate/canonicalize the data.
+    doc.weekday = canonicalizeWeekDay(doc.weekday);
+
+    // Insert auto-created field 'createdTime'.
+    doc.createdTime = new Date();
+
+    // Update the request -- this is what is going to be inserted.
+    getContext().getRequest().setBody(doc);
+
+    function canonicalizeWeekDay(day: string) {
+        // Simple input validation.
+        if (!day || !day.length || day.length < 3) throw new Error("Bad input: " + day);
+
+        // Try to see if we can canonicalize the day.
+        var days: Array<string> = ["Monday", "Tuesday", "Wednesday", "Friday", "Saturday", "Sunday"];
+        var fullDay: string;
+        days.forEach(function (x: string) {
+            if (day.substring(0, 3).toLowerCase() == x.substring(0, 3).toLowerCase()) fullDay = x;
+        });
+        if (fullDay) return fullDay;
+
+        // Couldn't get the weekday from input. Throw.
+        throw new Error("Bad weekday: " + day);
+    }
+}
+
+/**
+* This script runs as a trigger:
+* for each inserted document, look at document.size and update aggregate properties of metadata document: minSize, maxSize, totalSize.
+*/
+function updateMetadata() {
+    // HTTP error codes sent to our callback funciton by DocDB server.
+    var ErrorCode: any = {
+        RETRY_WITH: 449,
+    }
+
+    var collection: ICollection = getContext().getCollection();
+    var collectionLink: string = collection.getSelfLink();
+
+    // Get the document from request (the script runs as trigger, thus the input comes in request).
+    var doc: any = getContext().getRequest().getBody();
+
+    // Check the doc (ignore docs with invalid/zero size and metaDoc itself) and call updateMetadata.
+    if (!doc.isMetadata && doc.size != undefined && doc.size > 0) {
+        getAndUpdateMetadata();
+    }
+
+    function getAndUpdateMetadata() {
+        // Get the meta document. We keep it in the same collection. it's the only doc that has .isMetadata = true.
+        var isAccepted: boolean = collection.queryDocuments(collectionLink, 'SELECT * FROM root r WHERE r.isMetadata = true', function (err: IFeedCallbackError, feed: Array<any>, options: IFeedCallbackOptions) {
+            if (err) throw err;
+            if (!feed || !feed.length) throw new Error("Failed to find the metadata document.");
+
+            // The metadata document.
+            var metaDoc: any = feed[0];
+
+            // Update metaDoc.minSize:
+            // for 1st document use doc.Size, for all the rest see if it's less than last min.
+            if (metaDoc.minSize == 0) metaDoc.minSize = doc.size;
+            else metaDoc.minSize = Math.min(metaDoc.minSize, doc.size);
+            
+            // Update metaDoc.maxSize.
+            metaDoc.maxSize = Math.max(metaDoc.maxSize, doc.size);
+
+            // Update metaDoc.totalSize.
+            metaDoc.totalSize += doc.size;
+            
+            // Update/replace the metadata document in the store.
+            var isAccepted: boolean = collection.replaceDocument(metaDoc._self, metaDoc, function (err: IRequestCallbackError) {
+                if (err) throw err;
+                // Note: in case concurrent updates causes conflict with ErrorCode.RETRY_WITH, we can't read the meta again 
+                //       and update again because due to Snapshot isolation we will read same exact version (we are in same transaction).
+                //       We have to take care of that on the client side.
+            });
+            if (!isAccepted) throw new Error("The call replaceDocument(metaDoc) returned false.");
+        });
+        if (!isAccepted) throw new Error("The call queryDocuments for metaDoc returned false.");
+    }
+}
+
+/**
+ * This script is meant to run as a pre-trigger to enforce the uniqueness of the "name" property.
+ */
+
+function validateName() {
+    var collection: ICollection = getContext().getCollection();
+    var request: IRequest = getContext().getRequest();
+    var docToCreate: any = request.getBody();
+
+    // Reject documents that do not have a name property by throwing an exception.
+    if (!docToCreate.name) {
+        throw new Error('Document must include a "name" property.');
+    }
+
+    lookForDuplicates();
+
+    function lookForDuplicates(continuation?: string) {
+        var query: IParameterizedQuery = {
+            query: 'SELECT * FROM myCollection c WHERE c.name = @name',
+            parameters: [{
+                name: '@name',
+                value: docToCreate.name
+            }]
+        };
+        var requestOptions: IFeedOptions = {
+            continuation: continuation
+        };
+
+        var isAccepted: boolean = collection.queryDocuments(collection.getSelfLink(), query, requestOptions,
+            function (err: IFeedCallbackError, results: Array<any>, responseOptions: IFeedCallbackOptions) {
+                if (err) {
+                    throw new Error('Error querying for documents with duplicate names: ' + err.body);
+                }
+                if (results.length > 0) {
+                    // At least one document with name exists.
+                    throw new Error('Document with the name, ' + docToCreate.name + ', already exists: ' + JSON.stringify(results[0]));
+                } else if (responseOptions.continuation) {
+                    // Else if the query came back empty, but with a continuation token; repeat the query w/ the token.
+                    // This is highly unlikely; but is included to serve as an example for larger queries.
+                    lookForDuplicates(responseOptions.continuation);
+                } else {
+                    // Success, no duplicates found! Do nothing.
+                }
+            }
+        );
+
+        // If we hit execution bounds - throw an exception.
+        // This is highly unlikely; but is included to serve as an example for more complex operations.
+        if (!isAccepted) {
+            throw new Error('Timeout querying for document with duplicate name.');
+        }
+    }
+}
diff --git a/documentdb-server/documentdb-server.d.ts b/documentdb-server/documentdb-server.d.ts
new file mode 100644
index 000000000..e878960b1
--- /dev/null
+++ b/documentdb-server/documentdb-server.d.ts
@@ -0,0 +1,538 @@
+// Type definitions for DocumentDB server side JavaScript SDK
+// Project: http://dl.windowsazure.com/documentDB/jsserverdocs
+// Definitions by: François Nguyen <https://github.com/lith-light-g>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/** The Context object provides access to all operations that can be performed on DocumentDB data, as well as access to the request and response objects. */
+interface IContext {
+    /** Gets the collection object. */
+    getCollection(): ICollection;
+    /** Gets the request object. */
+    getRequest(): IRequest;
+    /**
+     * Gets the response object.
+     * Note: this is not available in pre-triggers.
+     */
+    getResponse(): IResponse;
+}
+
+/**
+ * The __ object can be used as a shortcut to the Collection and Context objects.
+ * It derives from the ICollection object via prototype and defines request and response properties
+ * which are shortcuts to getContext().getRequest() and getContext().getResponse().
+ */
+interface I__Object extends ICollection {
+    /** Alias for getContext().getRequest() */
+    request: IRequest;
+    /** Alias for getContext().getResponse() */
+    response: IResponse;
+}
+
+interface IQueryAPI {
+    /**
+     * Execute a filter on the input stream of documents, resulting in a subset of the input stream that matches the given filter.
+     * When filter is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param predicate The predicate function for a filter query, which acts as a truth test of whether a document should be filtered or not.
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    filter(predicate: (document: Object) => boolean,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    filter<T>(predicate: (document: Object) => boolean,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Produce a new set of documents by mapping/projecting the properties of the documents in the input document stream through the given mapping predicate.
+     * When map is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param predicate The predicate function for a map/projection, which maps the input document's properties into a new document object.
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    map(predicate: (document: Object) => Object,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    map<T>(predicate: (document: Object) => Object,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Produce a new set of documents by extracting a single property from each document in the input document stream. This is equivalent to a map call that projects only propertyName.
+     * When pluck is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param propertyName Name of the property to pluck from all documents in the current collection
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    pluck(propertyName: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    pluck<T>(propertyName: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Flatten nested arrays from each document in the input document stream.
+     * When flatten is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param isShallow If true, flattens only the first level of nested arrays (false by default)
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    flatten(isShallow?: boolean,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    flatten<T>(isShallow?: boolean,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Produce a new set of documents by sorting the documents in the input document stream in ascending order using the given predicate.
+     * When sortBy is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param predicate Predicate function defining the property to sort by.
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    sortBy(predicate: (document: Object) => string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortBy(predicate: (document: Object) => number,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortBy<T>(predicate: (document: Object) => string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortBy<T>(predicate: (document: Object) => number,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Produce a new set of documents by sorting the documents in the input document stream in descending order using the given predicate.
+     * When sortByDescending is called by itself, the input document stream is the set of all documents in the current document collection. When used in a chained call, the input document stream is the set of documents returned from the previous query function.
+     * @param predicate Predicate function defining the property to sort by.
+     * @param options Optional query options. Should not be used in a chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body. Should not be used in a chained call.
+     */
+    sortByDescending(predicate: (document: Object) => string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortByDescending(predicate: (document: Object) => number,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortByDescending<T>(predicate: (document: Object) => string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    sortByDescending<T>(predicate: (document: Object) => number,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    /**
+     * Terminating call for a chained query. Should be used in conjunction with the opening chain call to perform chained queries.
+     * When value is called, the query is queued for execution with the given options and callback.
+     * @param options Optional query options for the entire chained call.
+     * @param callback Optional callback for the operation. If no callback is provided, any error in the operation will be thrown and the result document set will be written to the Response body.
+     */
+    value(options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): IQueryResponse;
+    value<T>(options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): IQueryResponse;
+}
+	
+/**
+ * Stored procedures and triggers are registered for a particular collection. The Collection object supports create, read, update and delete (CRUD) and query operations on documents and attachments in the current collection.
+ * All collection operations are completed asynchronously. You can provide a callback to handle the result of the operation, and to perform error handling if necessary.
+ * Stored procedures and triggers are executed in a time-limited manner. Long-running stored procedures and triggers are defensively timed out and all transactions performed are rolled back.
+ * We stop queuing collection operations if the stored procedure is close to timing out. You can inspect the boolean return value of all collection operations to see if an operation was not queued and handle this situation gracefully.
+ */
+interface ICollection extends IQueryAPI {		
+    /** Opening call to start a chained query. Should be used in conjunction with the closing value call to perform chained queries. */
+    chain(): IQueryResponse;
+
+    /**
+     * Create an attachment for the document.
+     * @param documentLink resource link of the collection under which the document will be created
+     * @param body metadata that defines the attachment media like media, contentType. It can include any other properties as part of the metedata.
+     * @param options optional create options
+     * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+     */
+    createAttachment(documentLink: string,
+        body: IAttachment,
+        options?: ICreateOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+			
+	/**
+	 * Create a document under the collection.
+	 * @param collectionLink resource link of the collection under which the document will be created
+	 * @param body of the document. The "id" property is required and will be generated automatically if not provided (this behaviour can be overriden using the CreateOptions). Any other properties can be added.
+	 * @param optional create options
+	 * @param optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    createDocument(collectionLink: string,
+        body: Object,
+        options?: ICreateOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+		
+	/**
+	 * Delete an attachment.
+	 * @param attachmentLink resource link of the attachment to be deleted
+	 * @param options optional delete options.
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    deleteAttachment(attachmentLink: string,
+        options?: IDeleteOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+		
+	/**
+	 * Delete a document.
+	 * @param documentLink resource link of the document to delete
+	 * @param options optional delete options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    deleteDocument(documentLink: string,
+        options?: IDeleteOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+		
+    /** Get alt link (name-based link) of current collection. */
+    getAltLink(): string;
+
+    /** Get self link of current collection. */
+    getSelfLink(): string;
+		
+	/**
+	 * Execute a SQL query on the attachments for the document.
+	 * @param documentLink resource link of the document whose attachments are being queried
+	 * @param query SQL query string. This can also be a JSON object to pass in a parameterized query along with the values.
+	 * @param options optional query options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    queryAttachments(documentLink: string,
+        query: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    queryAttachments(documentLink: string,
+        query: IParameterizedQuery,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+		
+	/**
+	 * Execute a SQL query on the documents of the collection.
+	 * @param collectionLink resource link of the collection whose documents are being queried
+	 * @param filterQuery SQL query string. This can also be a JSON object to pass in a parameterized query along with the values.
+	 * @param options optional query options.
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    queryDocuments(collectionLink: string,
+        filterQuery: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    queryDocuments<T>(collectionLink: string,
+        filterQuery: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): boolean;
+    queryDocuments(collectionLink: string,
+        filterQuery: IParameterizedQuery,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    queryDocuments<T>(collectionLink: string,
+        filterQuery: IParameterizedQuery,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): boolean;
+			
+	/**
+	 * Read an Attachment.
+	 * @param attachmenLink resource link of the attachment to read
+	 * @param options optional read options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    readAttachment(attachmenLink: string,
+        options?: IReadOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+			
+	/**
+	 * Get all attachments for the document.
+	 * @param documentLink resource link of the document whose attachments are being read
+	 * @param options optional read feed options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    readAttachments(documentLink: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+		
+	/**
+	 * Read a document.
+	 * @param documentLink resource link of the document to read
+	 * @param options optional read options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    readDocument(documentLink: string,
+        options?: IReadOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+    readDocument<T>(documentLink: string,
+        options?: IReadOptions,
+        callback?: (error: IRequestCallbackError, resources: T, options: IRequestCallbackOptions) => void): boolean;
+		
+	/**
+	 * Get all documents for the collection.
+	 * @param collectionLink resource link of the collection whose documents are being read
+	 * @param options optional read feed options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    readDocuments(collectionLink: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<Object>, options: IFeedCallbackOptions) => void): boolean;
+    readDocuments<T>(collectionLink: string,
+        options?: IFeedOptions,
+        callback?: (error: IFeedCallbackError, resources: Array<T>, options: IFeedCallbackOptions) => void): boolean;
+			
+	/**
+	 * Replace an attachment.
+	 * @param attachmentLink resource link of the attachment to be replaced
+	 * @param attachment new attachment body
+	 * @param options optional replace options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    replaceAttachment(attachmentLink: string,
+        attachment: Object,
+        options?: IReplaceOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+			
+	/**
+	 * Replace a document.
+	 * @param documentLink resource link of the document
+	 * @param document new document body
+	 * @param options optional replace options
+	 * @param callback optional callback for the operation. If no callback is provided, any error in the operation will be thrown.
+	 */
+    replaceDocument(documentLink: string,
+        document: Object,
+        options?: IReplaceOptions,
+        callback?: (error: IRequestCallbackError, resources: Object, options: IRequestCallbackOptions) => void): boolean;
+}
+	
+/** Options associated with a create operation. */
+interface ICreateOptions {
+    /** Specifies indexing directives. */
+    indexAction?: string;
+    /** Disables automatic generation of "id" field of the document to be created (if it is not provided) */
+    disableAutomaticIdGeneration?: string;
+}
+	
+/** Options associated with a delete operation. */
+interface IDeleteOptions {
+	/**
+	 * The entity tag associated with the resource.
+	 * This is matched with the persisted resource before deletion.
+	 */
+    etag?: string;
+}
+	
+/** Will contain error information if an error occurs, undefined otherwise. */
+interface IFeedCallbackError {
+    /** The HTTP response code corresponding to the error. */
+    number: number;
+    /** A string containing the error information. */
+    body: string;
+}
+	
+/** Information associated with the response to the operation. */
+interface IFeedCallbackOptions {
+    /** Opaque token for continuing the read feed or query. */
+    continuation: string;
+    /** Comma delimited string containing the collection's current quota metrics (storage, number of stored procedure, triggers and UDFs) after completion of the operation. */
+    currentCollectionSizeInMB: string;
+    /** Comma delimited string containing the collection's maximum quota metrics (storage, number of stored procedure, triggers and UDFs). */
+    maxCollectionSizeInMB: string;
+}
+	
+/** Options associated with a read feed or query operation. */
+interface IFeedOptions {
+	/**
+	 * Max number of items to be returned in the enumeration operation.
+	 * Value is 100 by default
+	 */
+    pageSize?: number;
+    /** Opaque token for continuing the enumeration. */
+    continuation?: string;
+    /** Allow scan on the queries which couldn't be served as indexing was opted out on the requested paths (only for queryDocuments() and queryAttachments()) */
+    enableScan?: boolean;
+    /** Allow order by with low precision (only for queryDocuments(), sortBy() and sortByDescending()) */
+    enableLowPrecisionOrderBy?: boolean;
+}
+
+/**
+ * Object returned from a query function, namely chain, filter, map, pluck, flatten, or value.
+ * If the query is part of a chained call, then this object can be used to chain further queries until the final terminating value call.
+ */
+interface IQueryResponse extends IQueryAPI {
+    /** True if the query has been queued, false if it is not queued because of a pending timeout. */
+    isAccepted: boolean;
+}
+	
+/** Options associated with a read operation. */
+interface IReadOptions {
+    /** The conditional HTTP method ifNoneMatch value. */
+    ifNoneMatch?: string;
+}
+	
+/** Options associated with a replace operation. */
+interface IReplaceOptions {
+    /** Specifies indexing directives. */
+    indexAction?: string;
+	/**
+	 * The entity tag associated with the resource.
+	 * This is matched with the persisted resource before deletion.
+	 */
+    etag?: string;
+}
+	
+/** Will contain error information if an error occurs, undefined otherwise. */
+interface IRequestCallbackError {
+    /** The HTTP response code corresponding to the error. */
+    number: number;
+    /** A string containing the error information. */
+    body: string;
+}
+	
+/** Information associated with the response to the operation. */
+interface IRequestCallbackOptions {
+    /** Comma delimited string containing the collection's current quota metrics (storage, number of stored procedure, triggers and UDFs) after completion of the operation. */
+    currentCollectionSizeInMB: string;
+    /** Comma delimited string containing the collection's maximum quota metrics (storage, number of stored procedure, triggers and UDFs). */
+    maxCollectionSizeInMB: string;
+    /** Set to true if the requested resource has not been modified compared to the provided ETag in the ifNoneMatch parameter for a read request. */
+    notModified: boolean;
+}
+
+interface IAttachment extends Object {
+    /** MIME contentType of the attachment */
+    contentType: string;
+    /** media link associated with the attachment content */
+    media: string;
+}
+
+interface IDocumentMeta extends Object {
+    id: string;
+    _self: string;
+    _ts: string;
+    _rid?: string;
+    _etag?: string;
+    _attachments?: string;
+}
+	
+/**
+ * The Request object represents the request message that was sent to the server. This includes information about HTTP headers and the body of the HTTP request sent to the server.
+ * For triggers, the request represents the operation that is executing when the trigger is run. For example, if the trigger is being run ("triggered") on the creation of a document, then
+ * the request body contains the JSON body of the document to be created. This can be accessed through the request object and (as JSON) can be natively consumed in JavaScript.
+ * For stored procedures, the request contains information about the request sent to execute the stored procedure.
+ */
+interface IRequest {
+	/**
+	 * Gets the request body.
+	 */
+    getBody(): Object;
+    getBody<T>(): T;
+	/**
+	 * Gets a specified request header value.
+	 * @param key the name of the header to retrieve
+	 */
+    getValue(key: string): string;
+	/**
+	 * Sets the request body.
+	 * Note: this can be only used in a pre-trigger to overwrite the existing request body.
+	 * The overwritten request body will then be used in the operation associated with this pre-trigger.
+	 * @param value the value to set in the request body
+	 */
+    setBody(value: string): void;
+    setBody(value: Object): void;
+	/**
+	 * Sets a specified request header value.
+	 * Note: this method cannot be used to create new headers.
+	 * @param key the name of the header
+	 * @param value the value of the header
+	 */
+    setValue(key: string, value: string): void;
+}
+	
+/**
+ * The Response object represents the response message that will be sent from the server in response to the requested operation. This includes information about the HTTP headers and body of the response from the server.
+ * The Response object is not present in pre-triggers because they are run before the response is generated.
+ * For post-triggers, the response represents the operation that was executed before the trigger. For example, if the post-trigger is being run ("triggered") after the creation of a document, then
+ * the response body contains the JSON body of the document that was created. This can be accessed through the response object and (as JSON) can be natively consumed in JavaScript.
+ * For stored procedures, the response can be manipulated to send output back to the client-side.
+ * Note: this object not available in pre-triggers
+ */
+interface IResponse {
+	/**
+	 * Gets the response body.
+	 */
+    getBody(): Object;
+    getBody<T>(): T;
+	/**
+	 * Gets a maximum quota allowed for the resource associated with a post-trigger
+	 * Note: this method is only available in post-triggers
+	 */
+    getMaxResourceQuota(): string;
+	/**
+	 * Gets a current quota usage for the resource associated with a post-trigger
+	 * Note: this method is only available in post-triggers
+	 */
+    getResourceQuotaCurrentUsage(): string;
+	/**
+	 * Gets a specified response header value.
+	 * @param key the name of the header to retrieve
+	 */
+    getValue(key: string): string;
+	/**
+	 * Sets the response body.
+	 * Note: This cannot be done in pre-triggers.
+	 * In post-triggers, the response body is already set with the requested resource and will be overwritten with this call.
+	 * In stored procedures, this call can be used to set the response message body as output to the calling client.
+	 */
+    setBody(value: string): void;
+    setBody(value: Object): void;
+	/**
+	 * Sets a specified response header value.
+	 * Note: this method cannot be used to create new headers.
+	 * @param key the name of the header
+	 * @param value the value of the header
+	 */
+    getValue(key: string, value: string): void;
+
+    appendBody(value: string): void;
+    appendBody(value: Object): void;
+}
+
+/** Can be used as the query parameter in queryAttachments and queryDocuments. */
+interface IParameterizedQuery {
+    /** SQL query string. */
+    query: string;
+    /** Parameters */
+    parameters: Array<IQueryParam>;
+}
+
+/** Parameter interface for parameterized queries */
+interface IQueryParam {
+    /** Name to use in the query */
+    name: string;
+    /** Value of the parameter */
+    value: any;
+}
+
+/** List of error codes returned by database operations in the RequestCallback and FeedCallback. See the corresponding error message for more details. */
+interface IErrorCodes {
+    // Client error
+    /** (400) Request failed due to bad inputs **/
+    BadRequest: number;
+    /** (403) Request was denied access to the resource **/
+    Forbidden: number;
+    /** (404) Request tried to access a resource which doesn't exist **/
+    NotFound: number;
+    /** (409) Resource with the specified id already exists **/
+    Conflict: number;
+    /** (412) Conditions specified in the request options were not met **/
+    PreconditionFailed: number;
+    /** (413) Request failed because it was too large **/
+    RequestEntityTooLarge: number;
+    /** (449) Request conflicted with the current state of a resource and must be retried from a new transaction from the client side **/
+    RetryWith: number;
+    // Server error
+    /** (500) Server encountered an unexpected error in processing the request **/
+    InternalServerError: number;
+}
+
+declare function getContext(): IContext;
+declare var __: I__Object;
+declare var ErrorCodes: IErrorCodes;
\ No newline at end of file
diff --git a/dompurify/dompurify-tests.ts b/dompurify/dompurify-tests.ts
index d9d6e0bd6..5cc6e067b 100644
--- a/dompurify/dompurify-tests.ts
+++ b/dompurify/dompurify-tests.ts
@@ -6,3 +6,52 @@ dompurify.sanitize('<script>alert("hi")</script>');
 dompurify.addHook('beforeSanitizeElements', (el, data, config) => {
   return el;
 });
+
+//examples from the DOMPurify README
+let dirty = '<script>alert("hi")</script><p>Totally safe<p><p onerror="blowUp()">Totally not safe</p>';
+
+// allow only <b>
+dompurify.sanitize(dirty, {ALLOWED_TAGS: ['b']});
+
+// allow only <b> and <q> with style attributes (for whatever reason)
+dompurify.sanitize(dirty, {ALLOWED_TAGS: ['b', 'q'], ALLOWED_ATTR: ['style']});
+
+// leave all as it is but forbid <style>
+dompurify.sanitize(dirty, {FORBID_TAGS: ['style']});
+
+// leave all as it is but forbid style attributes
+dompurify.sanitize(dirty, {FORBID_ATTR: ['style']});
+
+// extend the existing array of allowed tags
+dompurify.sanitize(dirty, {ADD_TAGS: ['my-tag']});
+
+// extend the existing array of attributes
+dompurify.sanitize(dirty, {ADD_ATTR: ['my-attr']});
+
+// prohibit HTML5 data attributes (default is true)
+dompurify.sanitize(dirty, {ALLOW_DATA_ATTR: false});
+
+// return a DOM HTMLBodyElement instead of an HTML string (default is false)
+dompurify.sanitize(dirty, {RETURN_DOM: true});
+
+// return a DOM DocumentFragment instead of an HTML string (default is false)
+dompurify.sanitize(dirty, {RETURN_DOM_FRAGMENT: true});
+
+// return a DOM DocumentFragment instead of an HTML string (default is false)
+// also import it into the current document (default is false).
+// RETURN_DOM_IMPORT must be set if you would like to append
+// the returned node to the current document
+let clean = dompurify.sanitize(dirty, {RETURN_DOM_FRAGMENT: true, RETURN_DOM_IMPORT: true});
+document.body.appendChild(clean);
+
+// return entire document including <html> tags (default is false)
+dompurify.sanitize(dirty, {WHOLE_DOCUMENT: true});
+
+// make output safe for usage in jQuery's $()/html() method (default is false)
+dompurify.sanitize(dirty, {SAFE_FOR_JQUERY: true});
+
+// disable DOM Clobbering protection on output (default is true, handle with care!)
+dompurify.sanitize(dirty, {SANITIZE_DOM: false});
+
+// discard an element's content when the element is removed (default is true)
+dompurify.sanitize(dirty, {KEEP_CONTENT: false});
diff --git a/dompurify/dompurify.d.ts b/dompurify/dompurify.d.ts
index b1f24b00e..b8eb19455 100644
--- a/dompurify/dompurify.d.ts
+++ b/dompurify/dompurify.d.ts
@@ -1,11 +1,30 @@
 // Type definitions for DOM Purify
 // Project: https://github.com/cure53/DOMPurify
-// Definitions by: Dave Taylor <http://davetayls.me>
+// Definitions by: Dave Taylor <http://davetayls.me>, Samira Bazuzi <https://github.com/bazuzi>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface IDOMPurify {
   sanitize(s:string):string;
-  addHook(hook:string, cb:(currentNode:Element, data:any, config:any) => Element):void;
+  sanitize(s:string, config:IDOMPurifyConfig):any;
+
+  addHook(hook:string, cb:(currentNode:Element, data:any, config:IDOMPurifyConfig) => Element):void;
+}
+
+interface IDOMPurifyConfig {
+  ADD_ATTR?:string[];
+  ADD_TAGS?:string[];
+  ALLOW_DATA_ATTR?:boolean;
+  ALLOWED_ATTR?:string[];
+  ALLOWED_TAGS?:string[];
+  FORBID_ATTR?:string[];
+  FORBID_TAGS?:string[];
+  KEEP_CONTENT?:boolean;
+  RETURN_DOM?:boolean;
+  RETURN_DOM_FRAGMENT?:boolean;
+  RETURN_DOM_IMPORT?:boolean;
+  SAFE_FOR_JQUERY?:boolean;
+  SANITIZE_DOM?:boolean;
+  WHOLE_DOCUMENT?:boolean;
 }
 
 declare var DOMPurify:IDOMPurify;
diff --git a/donna/donna.d.ts b/donna/donna.d.ts
index fed09fa98..c953764d1 100644
--- a/donna/donna.d.ts
+++ b/donna/donna.d.ts
@@ -25,6 +25,7 @@ declare module DonnaTypes {
         type: string;
         name: string;
         bindingType: string;
+        paramNames?: string[];
         classProperties?: any[];
         prototypeProperties?: number[][];
         doc?: string;
diff --git a/dragula/dragula-amd-tests.ts b/dragula/dragula-amd-tests.ts
index 99cb5e043..0dcca91e2 100644
--- a/dragula/dragula-amd-tests.ts
+++ b/dragula/dragula-amd-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./dragula.d.ts" />
+
 import dragula = require("dragula");
 
 // containers
diff --git a/drop/drop.d.ts b/drop/drop.d.ts
index 85cfd0766..a48cb8fb3 100644
--- a/drop/drop.d.ts
+++ b/drop/drop.d.ts
@@ -22,6 +22,7 @@ declare module drop {
         content?: Element | string | ((drop?: Drop) => string) | ((drop?: Drop) => Element);
         position?: string;
         openOn?: string;
+        classes?: string;
         constrainToWindow?: boolean;
         constrainToScrollParent?: boolean;
         remove?: boolean;
diff --git a/dropzone/dropzone-commonjs-tests.ts b/dropzone/dropzone-commonjs-tests.ts
new file mode 100644
index 000000000..c25b339e8
--- /dev/null
+++ b/dropzone/dropzone-commonjs-tests.ts
@@ -0,0 +1,187 @@
+/// <reference path="./dropzone.d.ts"/>
+
+import Dropzone = require("dropzone");
+
+const dropzoneFromString = new Dropzone(".test");
+const dropzoneFromElement = new Dropzone(document.getElementById("test"));
+
+const dropzoneWithOptions = new Dropzone(".test", {
+	url: "/some/url",
+	method: "post",
+	withCredentials: false,
+	parallelUploads: 2,
+	uploadMultiple: true,
+	maxFilesize: 1024,
+	paramName: "file",
+	createImageThumbnails: true,
+	maxThumbnailFilesize: 1024,
+	thumbnailWidth: 50,
+	thumbnailHeight: 50,
+	filesizeBase: 1000,
+	maxFiles: 100,
+	params: {
+		additional: "param"
+	},
+	clickable: true,
+	ignoreHiddenFiles: true,
+	acceptedFiles: "image/*",
+	autoProcessQueue: true,
+	autoQueue: true,
+	addRemoveLinks: true,
+	previewsContainer: "<div></div>",
+	capture: "camera",
+
+	dictDefaultMessage: "",
+	dictFallbackMessage: "",
+	dictFallbackText: "",
+	dictFileTooBig: "",
+	dictInvalidFileType: "",
+	dictResponseError: "",
+	dictCancelUpload: "",
+	dictCancelUploadConfirmation: "",
+	dictRemoveFile: "",
+	dictRemoveFileConfirmation: "",
+	dictMaxFilesExceeded: "",
+
+	accept: (file:DropzoneFile, done:(error?:string|Error) => void) => {
+		if (file.accepted) {
+			file.previewElement.classList.add("accepted");
+			file.previewTemplate.classList.add("accepted");
+			file.previewsContainer.classList.add("accepted");
+			done();
+		}
+		else {
+			done(new Error(file.status));
+		}
+	},
+	init: () => console.log("Initialized"),
+	forceFallback: false,
+	fallback: () => console.log("Fallback"),
+	resize: (file:DropzoneFile) => ({
+		srcX: 0,
+		srcY: 0,
+		trgX: 10,
+		trgY: 10,
+		srcWidth: 100,
+		srcHeight: 100,
+		trgWidth: 50,
+		trgHeight: 50,
+		optWidth: 50,
+		optHeight: 50
+	}),
+
+	drop: (e:DragEvent) => console.log("Drop"),
+	dragstart: (e:DragEvent) => console.log("Dragstart"),
+	dragend: (e:DragEvent) => console.log("Dragend"),
+	dragenter: (e:DragEvent) => console.log("Dragenter"),
+	dragover: (e:DragEvent) => console.log("Dragover"),
+	dragleave: (e:DragEvent) => console.log("Dragleave"),
+	paste: (e:DragEvent) => console.log("Paste"),
+
+	reset: () => console.log("Reset"),
+
+	addedfile: (file:DropzoneFile) => console.log("Addedfile"),
+	addedfiles: (files:DropzoneFile[]) => console.log("Addedfiles"),
+	removedfile: (file:DropzoneFile) => console.log("Removedfile"),
+	thumbnail: (file:DropzoneFile, dataUrl:string) => console.log("Thumbnail"),
+
+	error: (file:DropzoneFile, message:string|Error) => console.log("Error"),
+	errormultiple: (files:DropzoneFile[], message:string|Error) => console.log("Errormultiple"),
+
+	processing: (file:DropzoneFile) => console.log("Processing"),
+	processingmultiple: (files:DropzoneFile[]) => console.log("Processingmultiple"),
+
+	uploadprogress: (file:DropzoneFile, progress:number, bytesSent:number) => console.log("Uploadprogress"),
+	totaluploadprogress: (totalProgress:number, totalBytes:number, totalBytesSent:number) => console.log("Totaluploadprogress"),
+
+	sending: (file:DropzoneFile, xhr:XMLHttpRequest, formData:{}) => console.log("Sending"),
+	sendingmultiple: (files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}) => console.log("Sendingmultiple"),
+
+	success: (file:DropzoneFile) => console.log("Success"),
+	successmultiple: (files:DropzoneFile[]) => console.log("Successmultiple"),
+
+	canceled: (file:DropzoneFile) => console.log("Canceled"),
+	canceledmultiple: (file:DropzoneFile[]) => console.log("Canceledmultiple"),
+
+	complete: (file:DropzoneFile) => console.log("Complete"),
+	completemultiple: (file:DropzoneFile[]) => console.log("Completemultiple"),
+
+	maxfilesexceeded: (file:DropzoneFile) => console.log("Maxfilesexceeded"),
+	maxfilesreached: (files:DropzoneFile[]) => console.log("Maxfilesreached"),
+	queuecomplete: () => console.log("Queuecomplete"),
+
+	previewTemplate: "<div></div>",
+});
+
+var dropzoneWithOptionsVariations:Dropzone;
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: ".test"
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: document.getElementById("test")
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: [".test", ".test"]
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: [document.getElementById("test"), document.getElementById("test")]
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: ["test", document.getElementById("test")]
+});
+
+const dropzone = new Dropzone(".test");
+
+dropzone.enable();
+dropzone.disable();
+
+dropzone.files.forEach(f => {
+	if (f.accepted) {
+		f.previewElement.classList.add("accepted");
+		f.previewTemplate.classList.add("accepted");
+		f.previewsContainer.classList.add("accepted");
+	}
+	else {
+		console.log(f.status.toUpperCase());
+	}
+});
+
+const firstFile = dropzone.files[0];
+dropzone.removeFile(firstFile);
+dropzone.addFile(firstFile);
+dropzone.enqueueFile(firstFile);
+dropzone.processFile(firstFile);
+dropzone.uploadFile(firstFile);
+dropzone.cancelUpload(firstFile);
+dropzone.createThumbnail(firstFile, () => {
+	console.log("createThumbnail")
+});
+dropzone.createThumbnailFromUrl(firstFile, "/some/url", () => {
+	console.log("createThumbnailFromUrl")
+});
+dropzone.accept(firstFile, (e:string|Error) => {
+	console.log(e);
+});
+
+const acceptedFiles = dropzone.getAcceptedFiles();
+dropzone.processFiles(acceptedFiles);
+
+const rejectedFiles = dropzone.getRejectedFiles();
+dropzone.enqueueFiles(rejectedFiles);
+
+const queuedFiles = dropzone.getQueuedFiles();
+dropzone.processFiles(queuedFiles);
+
+const uploadingFiles = dropzone.getUploadingFiles();
+dropzone.processFiles(uploadingFiles);
+
+const activeFiles = dropzone.getActiveFiles();
+dropzone.processFiles(activeFiles);
+
+const addedFiles = dropzone.getFilesWithStatus(Dropzone.ADDED);
+dropzone.processFiles(addedFiles);
+
+dropzone.processQueue();
+dropzone.removeAllFiles(true);
+
+dropzone.destroy();
diff --git a/dropzone/dropzone-tests.ts b/dropzone/dropzone-tests.ts
new file mode 100644
index 000000000..e15d6e038
--- /dev/null
+++ b/dropzone/dropzone-tests.ts
@@ -0,0 +1,188 @@
+/// <reference path="./dropzone.d.ts"/>
+
+const dropzoneFromString = new Dropzone(".test");
+const dropzoneFromElement = new Dropzone(document.getElementById("test"));
+
+const dropzoneWithOptions = new Dropzone(".test", {
+	url: "/some/url",
+	method: "post",
+	withCredentials: false,
+	parallelUploads: 2,
+	uploadMultiple: true,
+	maxFilesize: 1024,
+	paramName: "file",
+	createImageThumbnails: true,
+	maxThumbnailFilesize: 1024,
+	thumbnailWidth: 50,
+	thumbnailHeight: 50,
+	filesizeBase: 1000,
+	maxFiles: 100,
+	params: {
+		additional: "param"
+	},
+	headers: {
+		"Some-Header": "Value"
+	},
+	clickable: true,
+	ignoreHiddenFiles: true,
+	acceptedFiles: "image/*",
+	autoProcessQueue: true,
+	autoQueue: true,
+	addRemoveLinks: true,
+	previewsContainer: "<div></div>",
+	capture: "camera",
+
+	dictDefaultMessage: "",
+	dictFallbackMessage: "",
+	dictFallbackText: "",
+	dictFileTooBig: "",
+	dictInvalidFileType: "",
+	dictResponseError: "",
+	dictCancelUpload: "",
+	dictCancelUploadConfirmation: "",
+	dictRemoveFile: "",
+	dictRemoveFileConfirmation: "",
+	dictMaxFilesExceeded: "",
+
+	accept: (file:DropzoneFile, done:(error?:string|Error) => void) => {
+		if (file.accepted) {
+			file.previewElement.classList.add("accepted");
+			file.previewTemplate.classList.add("accepted");
+			file.previewsContainer.classList.add("accepted");
+			done();
+		}
+		else {
+			done(new Error(file.status));
+		}
+	},
+	init: () => console.log("Initialized"),
+	forceFallback: false,
+	fallback: () => console.log("Fallback"),
+	resize: (file:DropzoneFile) => ({
+		srcX: 0,
+		srcY: 0,
+		trgX: 10,
+		trgY: 10,
+		srcWidth: 100,
+		srcHeight: 100,
+		trgWidth: 50,
+		trgHeight: 50,
+		optWidth: 50,
+		optHeight: 50
+	}),
+
+	drop: (e:DragEvent) => console.log("Drop"),
+	dragstart: (e:DragEvent) => console.log("Dragstart"),
+	dragend: (e:DragEvent) => console.log("Dragend"),
+	dragenter: (e:DragEvent) => console.log("Dragenter"),
+	dragover: (e:DragEvent) => console.log("Dragover"),
+	dragleave: (e:DragEvent) => console.log("Dragleave"),
+	paste: (e:DragEvent) => console.log("Paste"),
+
+	reset: () => console.log("Reset"),
+
+	addedfile: (file:DropzoneFile) => console.log("Addedfile"),
+	addedfiles: (files:DropzoneFile[]) => console.log("Addedfiles"),
+	removedfile: (file:DropzoneFile) => console.log("Removedfile"),
+	thumbnail: (file:DropzoneFile, dataUrl:string) => console.log("Thumbnail"),
+
+	error: (file:DropzoneFile, message:string|Error) => console.log("Error"),
+	errormultiple: (files:DropzoneFile[], message:string|Error) => console.log("Errormultiple"),
+
+	processing: (file:DropzoneFile) => console.log("Processing"),
+	processingmultiple: (files:DropzoneFile[]) => console.log("Processingmultiple"),
+
+	uploadprogress: (file:DropzoneFile, progress:number, bytesSent:number) => console.log("Uploadprogress"),
+	totaluploadprogress: (totalProgress:number, totalBytes:number, totalBytesSent:number) => console.log("Totaluploadprogress"),
+
+	sending: (file:DropzoneFile, xhr:XMLHttpRequest, formData:{}) => console.log("Sending"),
+	sendingmultiple: (files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}) => console.log("Sendingmultiple"),
+
+	success: (file:DropzoneFile) => console.log("Success"),
+	successmultiple: (files:DropzoneFile[]) => console.log("Successmultiple"),
+
+	canceled: (file:DropzoneFile) => console.log("Canceled"),
+	canceledmultiple: (file:DropzoneFile[]) => console.log("Canceledmultiple"),
+
+	complete: (file:DropzoneFile) => console.log("Complete"),
+	completemultiple: (file:DropzoneFile[]) => console.log("Completemultiple"),
+
+	maxfilesexceeded: (file:DropzoneFile) => console.log("Maxfilesexceeded"),
+	maxfilesreached: (files:DropzoneFile[]) => console.log("Maxfilesreached"),
+	queuecomplete: () => console.log("Queuecomplete"),
+
+	previewTemplate: "<div></div>",
+});
+
+var dropzoneWithOptionsVariations:Dropzone;
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: ".test"
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: document.getElementById("test")
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: [".test", ".test"]
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: [document.getElementById("test"), document.getElementById("test")]
+});
+dropzoneWithOptionsVariations = new Dropzone(".test", {
+	clickable: ["test", document.getElementById("test")]
+});
+
+const dropzone = new Dropzone(".test");
+
+dropzone.enable();
+dropzone.disable();
+
+dropzone.files.forEach(f => {
+	if (f.accepted) {
+		f.previewElement.classList.add("accepted");
+		f.previewTemplate.classList.add("accepted");
+		f.previewsContainer.classList.add("accepted");
+	}
+	else {
+		console.log(f.status.toUpperCase());
+	}
+});
+
+const firstFile = dropzone.files[0];
+dropzone.removeFile(firstFile);
+dropzone.addFile(firstFile);
+dropzone.enqueueFile(firstFile);
+dropzone.processFile(firstFile);
+dropzone.uploadFile(firstFile);
+dropzone.cancelUpload(firstFile);
+dropzone.createThumbnail(firstFile, () => {
+	console.log("createThumbnail")
+});
+dropzone.createThumbnailFromUrl(firstFile, "/some/url", () => {
+	console.log("createThumbnailFromUrl")
+});
+dropzone.accept(firstFile, (e:string|Error) => {
+	console.log(e);
+});
+
+const acceptedFiles = dropzone.getAcceptedFiles();
+dropzone.processFiles(acceptedFiles);
+
+const rejectedFiles = dropzone.getRejectedFiles();
+dropzone.enqueueFiles(rejectedFiles);
+
+const queuedFiles = dropzone.getQueuedFiles();
+dropzone.processFiles(queuedFiles);
+
+const uploadingFiles = dropzone.getUploadingFiles();
+dropzone.processFiles(uploadingFiles);
+
+const activeFiles = dropzone.getActiveFiles();
+dropzone.processFiles(activeFiles);
+
+const addedFiles = dropzone.getFilesWithStatus(Dropzone.ADDED);
+dropzone.processFiles(addedFiles);
+
+dropzone.processQueue();
+dropzone.removeAllFiles(true);
+
+dropzone.destroy();
diff --git a/dropzone/dropzone.d.ts b/dropzone/dropzone.d.ts
index 106e10313..93f9ca25b 100644
--- a/dropzone/dropzone.d.ts
+++ b/dropzone/dropzone.d.ts
@@ -1,10 +1,23 @@
 // Type definitions for Dropzone 4.0.1
 // Project: http://www.dropzonejs.com/
-// Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>
+// Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Vasya Aksyonov <https://github.com/outring>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../jquery/jquery.d.ts"/>
 
+interface DropzoneResizeInfo {
+	srcX?:number;
+	srcY?:number;
+	trgX?:number;
+	trgY?:number;
+	srcWidth?:number;
+	srcHeight?:number;
+	trgWidth?:number;
+	trgHeight?:number;
+	optWidth?:number;
+	optHeight?:number;
+}
+
 interface DropzoneFile extends File {
 	previewElement: HTMLElement;
 	previewTemplate: HTMLElement;
@@ -18,109 +31,239 @@ interface DropzoneOptions {
 	method?: string;
 	withCredentials?: boolean;
 	parallelUploads?: number;
+	uploadMultiple?: boolean;
 	maxFilesize?: number;
 	paramName?: string;
-	uploadMultiple?: boolean;
-	headers?: any;
-	addRemoveLinks?: boolean;
-	previewsContainer?: string;
-	clickable?: any;
 	createImageThumbnails?: boolean;
 	maxThumbnailFilesize?: number;
 	thumbnailWidth?: number;
 	thumbnailHeight?: number;
+	filesizeBase?: number;
 	maxFiles?: number;
-	resize?: ( file?: any ) => any;
-	init?: () => void;
+	params?: {};
+	headers?: {};
+	clickable?: boolean|string|HTMLElement|(string|HTMLElement)[];
+	ignoreHiddenFiles?: boolean;
 	acceptedFiles?: string;
-	accept?: ( file: DropzoneFile, doneCallback: ( ...args ) => void ) => void;
 	autoProcessQueue?: boolean;
-	previewTemplate?: string;
-	forceFallback?: boolean;
-	fallback?: () => void;
+	autoQueue?: boolean;
+	addRemoveLinks?: boolean;
+	previewsContainer?: boolean|string|HTMLElement;
+	capture?: string;
 
-	// dictionary options
 	dictDefaultMessage?: string;
 	dictFallbackMessage?: string;
 	dictFallbackText?: string;
-	dictInvalidFileType?: string;
 	dictFileTooBig?: string;
+	dictInvalidFileType?: string;
 	dictResponseError?: string;
 	dictCancelUpload?: string;
 	dictCancelUploadConfirmation?: string;
 	dictRemoveFile?: string;
 	dictRemoveFileConfirmation?: string;
 	dictMaxFilesExceeded?: string;
+
+	accept?(file:DropzoneFile, done:(error?:string|Error) => void):void;
+	init?():void;
+	forceFallback?: boolean;
+	fallback?():void;
+	resize?(file:DropzoneFile):DropzoneResizeInfo;
+
+	drop?(e:DragEvent):void;
+	dragstart?(e:DragEvent):void;
+	dragend?(e:DragEvent):void;
+	dragenter?(e:DragEvent):void;
+	dragover?(e:DragEvent):void;
+	dragleave?(e:DragEvent):void;
+	paste?(e:DragEvent):void;
+
+	reset?():void;
+
+	addedfile?(file:DropzoneFile):void;
+	addedfiles?(files:DropzoneFile[]):void;
+	removedfile?(file:DropzoneFile):void;
+	thumbnail?(file:DropzoneFile, dataUrl:string):void;
+
+	error?(file:DropzoneFile, message:string|Error, xhr:XMLHttpRequest):void;
+	errormultiple?(files:DropzoneFile[], message:string|Error, xhr:XMLHttpRequest):void;
+
+	processing?(file:DropzoneFile):void;
+	processingmultiple?(files:DropzoneFile[]):void;
+
+	uploadprogress?(file:DropzoneFile, progress:number, bytesSent:number):void;
+	totaluploadprogress?(totalProgress:number, totalBytes:number, totalBytesSent:number):void;
+
+	sending?(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
+	sendingmultiple?(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
+
+	success?(file:DropzoneFile, responseText:string):void;
+	successmultiple?(files:DropzoneFile[], responseText:string):void;
+
+	canceled?(file:DropzoneFile):void;
+	canceledmultiple?(file:DropzoneFile[]):void;
+
+	complete?(file:DropzoneFile):void;
+	completemultiple?(file:DropzoneFile[]):void;
+
+	maxfilesexceeded?(file:DropzoneFile):void;
+	maxfilesreached?(files:DropzoneFile[]):void;
+	queuecomplete?():void;
+
+	previewTemplate?: string;
 }
 
 declare class Dropzone {
-	constructor( container: string, options?: DropzoneOptions );
-	constructor( container: HTMLElement, options?: DropzoneOptions );
+	constructor(container:string|HTMLElement, options?:DropzoneOptions);
 
-	static autoDiscover: boolean;
-	static options: any;
-	static confirm: ( question: string, accepted: () => void, rejected?: () => void ) => void;
+	static autoDiscover:boolean;
+	static options:any;
+	static confirm:(question:string, accepted:() => void, rejected?:() => void) => void;
 
-	files: DropzoneFile[];
+	static ADDED:string;
+	static QUEUED:string;
+	static ACCEPTED:string;
+	static UPLOADING:string;
+	static PROCESSING:string;
+	static CANCELED:string;
+	static ERROR:string;
+	static SUCCESS:string;
 
-	enable(): void;
-	disable(): void;
-	destroy(): Dropzone;
+	files:DropzoneFile[];
 
-	on( eventName, callback: ( ...args ) => any );
+	enable():void;
 
-	off( eventName ): void;
+	disable():void;
 
-	addFile( file: DropzoneFile ): void;
+	destroy():Dropzone;
 
-	removeFile( file: DropzoneFile ): void;
+	addFile(file:DropzoneFile):void;
 
-	removeAllFiles( cancelIfNecessary?: boolean ): void;
+	removeFile(file:DropzoneFile):void;
 
-	processQueue(): void;
+	removeAllFiles(cancelIfNecessary?:boolean):void;
 
-	cancelUpload( file: DropzoneFile ): void;
+	processQueue():void;
 
-	processFiles ( files: DropzoneFile[] ): void;
-	processFile( file: DropzoneFile ): void;
+	cancelUpload(file:DropzoneFile):void;
 
-	uploadFile( file: DropzoneFile ): void;
+	processFiles(files:DropzoneFile[]):void;
 
-	getAcceptedFiles(): DropzoneFile[];
+	processFile(file:DropzoneFile):void;
 
-	getRejectedFiles(): DropzoneFile[];
+	uploadFile(file:DropzoneFile):void;
 
-	getQueuedFiles(): DropzoneFile[];
+	getAcceptedFiles():DropzoneFile[];
 
-	getUploadingFiles(): DropzoneFile[];
+	getRejectedFiles():DropzoneFile[];
 
-	accept( file: DropzoneFile, done: ( error?: string ) => {} ):void;
-	getActiveFiles(): DropzoneFile[];
-	getFilesWithStatus( status: string ): DropzoneFile[];
-	enqueueFile( file: DropzoneFile ): void;
-	enqueueFiles( file: DropzoneFile[] ): void;
-	createThumbnail( file: DropzoneFile, callback?: (...any) => {}): any;
-	createThumbnailFromUrl( file: DropzoneFile, url: string, callback?: ( ...any ) => any ): any;
+	getQueuedFiles():DropzoneFile[];
 
-	emit( eventName: string, file: DropzoneFile, str?: string );
-	emit( eventName: "thumbnail", file: DropzoneFile, path: string );
-	emit( eventName: "addedfile", file: DropzoneFile );
-	emit( eventName: "removedfile", file: DropzoneFile );
-	emit( eventName: "processing", file: DropzoneFile );
-	emit( eventName: "canceled", file: DropzoneFile );
-	emit( eventName: "complete", file: DropzoneFile );
+	getUploadingFiles():DropzoneFile[];
+
+	accept(file:DropzoneFile, done:(error?:string|Error) => void):void;
+
+	getActiveFiles():DropzoneFile[];
+
+	getFilesWithStatus(status:string):DropzoneFile[];
+
+	enqueueFile(file:DropzoneFile):void;
+
+	enqueueFiles(file:DropzoneFile[]):void;
+
+	createThumbnail(file:DropzoneFile, callback?:(...args:any[]) => void):any;
+
+	createThumbnailFromUrl(file:DropzoneFile, url:string, callback?:(...args:any[]) => void):any;
+
+	on(eventName:string, callback:(...args:any[]) => void):void;
+
+	off(eventName:string):void;
+
+	emit(eventName:string, ...args:any[]):void;
+
+	on(eventName:"drop", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragstart", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragend", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragenter", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragover", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragleave", callback:(e:DragEvent) => any):void;
+	on(eventName:"paste", callback:(e:DragEvent) => any):void;
+
+	on(eventName:"reset"):void;
+
+	on(eventName:"addedfile", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"addedfiles", callback:(files:DropzoneFile[]) => any):void;
+	on(eventName:"removedfile", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"thumbnail", callback:(file:DropzoneFile, dataUrl:string) => any):void;
+
+	on(eventName:"error", callback:(file:DropzoneFile, message:string|Error) => any):void;
+	on(eventName:"errormultiple", callback:(files:DropzoneFile[], message:string|Error) => any):void;
+
+	on(eventName:"processing", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"processingmultiple", callback:(files:DropzoneFile[]) => any):void;
+
+	on(eventName:"uploadprogress", callback:(file:DropzoneFile, progress:number, bytesSent:number) => any):void;
+	on(eventName:"totaluploadprogress", callback:(totalProgress:number, totalBytes:number, totalBytesSent:number) => any):void;
+
+	on(eventName:"sending", callback:(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}) => any):void;
+	on(eventName:"sendingmultiple", callback:(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}) => any):void;
+
+	on(eventName:"success", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"successmultiple", callback:(files:DropzoneFile[]) => any):void;
+
+	on(eventName:"canceled", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"canceledmultiple", callback:(file:DropzoneFile[]) => any):void;
+
+	on(eventName:"complete", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"completemultiple", callback:(file:DropzoneFile[]) => any):void;
+
+	on(eventName:"maxfilesexceeded", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"maxfilesreached", callback:(files:DropzoneFile[]) => any):void;
+	on(eventName:"queuecomplete"):void;
+
+	emit(eventName:"drop", e:DragEvent):void;
+	emit(eventName:"dragstart", e:DragEvent):void;
+	emit(eventName:"dragend", e:DragEvent):void;
+	emit(eventName:"dragenter", e:DragEvent):void;
+	emit(eventName:"dragover", e:DragEvent):void;
+	emit(eventName:"dragleave", e:DragEvent):void;
+	emit(eventName:"paste", e:DragEvent):void;
+
+	emit(eventName:"reset"):void;
+
+	emit(eventName:"addedfile", file:DropzoneFile):void;
+	emit(eventName:"addedfiles", files:DropzoneFile[]):void;
+	emit(eventName:"removedfile", file:DropzoneFile):void;
+	emit(eventName:"thumbnail", file:DropzoneFile, dataUrl:string):void;
+
+	emit(eventName:"error", file:DropzoneFile, message:string|Error):void;
+	emit(eventName:"errormultiple", files:DropzoneFile[], message:string|Error):void;
+
+	emit(eventName:"processing", file:DropzoneFile):void;
+	emit(eventName:"processingmultiple", files:DropzoneFile[]):void;
+
+	emit(eventName:"uploadprogress", file:DropzoneFile, progress:number, bytesSent:number):void;
+	emit(eventName:"totaluploadprogress", totalProgress:number, totalBytes:number, totalBytesSent:number):void;
+
+	emit(eventName:"sending", file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
+	emit(eventName:"sendingmultiple", files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
+
+	emit(eventName:"success", file:DropzoneFile):void;
+	emit(eventName:"successmultiple", files:DropzoneFile[]):void;
+
+	emit(eventName:"canceled", file:DropzoneFile):void;
+	emit(eventName:"canceledmultiple", file:DropzoneFile[]):void;
+
+	emit(eventName:"complete", file:DropzoneFile):void;
+	emit(eventName:"completemultiple", file:DropzoneFile[]):void;
+
+	emit(eventName:"maxfilesexceeded", file:DropzoneFile):void;
+	emit(eventName:"maxfilesreached", files:DropzoneFile[]):void;
+	emit(eventName:"queuecomplete"):void;
 
-	emit( eventName: string, e: Event );
-	emit( eventName: "drop", e: Event );
-	emit( eventName: "dragstart", e: Event );
-	emit( eventName: "dragend", e: Event );
-	emit( eventName: "dragenter", e: Event );
-	emit( eventName: "dragover", e: Event );
-	emit( eventName: "dragleave", e: Event );
 }
 
 interface JQuery {
-	dropzone( options: DropzoneOptions ): Dropzone;
+	dropzone(options:DropzoneOptions): Dropzone;
 }
 
 declare module "dropzone" {
diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts
index 8545b0b5e..a46f2484e 100644
--- a/easeljs/easeljs.d.ts
+++ b/easeljs/easeljs.d.ts
@@ -925,7 +925,7 @@ declare module createjs {
         static framerate: number;
         static interval: number;
         static maxDelta: number;
-        static paused: number;
+        static paused: boolean;
         static RAF: string;
         static RAF_SYNCHED: string;
         static TIMEOUT: string;
diff --git a/easy-xapi-utils/easy-xapi-utils-tests.ts b/easy-xapi-utils/easy-xapi-utils-tests.ts
new file mode 100644
index 000000000..d80a7976c
--- /dev/null
+++ b/easy-xapi-utils/easy-xapi-utils-tests.ts
@@ -0,0 +1,43 @@
+/**
+ * Created by karl on 14/07/15.
+ */
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../easy-xapi/easy-xapi.d.ts" />
+/// <reference path="./easy-xapi-utils.d.ts" />
+
+import express = require('express');
+import eXapi = require('easy-xapi');
+import eUtils = require('easy-xapi-utils');
+
+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('/', eUtils.isLoggedIn(), function (req, res) {
+            res.send('ok');
+        });
+        app.get('/role', eUtils.isLoggedIn('admin'), function (req, res) {
+            res.send('ok');
+        });
+        app.get('/', eUtils.isLoggedOut(), function (req, res) {
+            res.send('ok');
+        });
+        app.get('/role', eUtils.hasRole('guest'), function (req, res) {
+            res.send('ok');
+        });
+    }
+});
+
+xApi.listen();
diff --git a/easy-xapi-utils/easy-xapi-utils.d.ts b/easy-xapi-utils/easy-xapi-utils.d.ts
new file mode 100644
index 000000000..637829098
--- /dev/null
+++ b/easy-xapi-utils/easy-xapi-utils.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for easy-xapi-utils
+// Project: https://github.com/DeadAlready/easy-xapi-utils
+// 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="../easy-x-headers/easy-x-headers.d.ts" />
+
+declare module "easy-xapi-utils" {
+    import express = require('express');
+
+    export function isLoggedIn(role?: string): express.RequestHandler;
+    export function isLoggedOut(): express.RequestHandler;
+    export function hasRole(role: string): express.RequestHandler;
+}
diff --git a/ejs/ejs-tests.ts b/ejs/ejs-tests.ts
new file mode 100644
index 000000000..fd03dd1e0
--- /dev/null
+++ b/ejs/ejs-tests.ts
@@ -0,0 +1,4 @@
+/// <reference path="ejs.d.ts"/>
+import ejs = require("ejs");
+var people = ['geddy', 'neil', 'alex'];
+var    html = ejs.render('<%= people.join(", "); %>', { people: people });
diff --git a/ejs/ejs.d.ts b/ejs/ejs.d.ts
new file mode 100644
index 000000000..56e755a46
--- /dev/null
+++ b/ejs/ejs.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for ejs.js v2.3.3
+// Project: http://ejs.co/
+// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare module "ejs" {
+    namespace Ejs {
+        type Data = { [name: string]: any };
+        type Dependencies = string[];
+        var cache: Cache;
+        var localsName: string;
+        function resolveInclude(name: string, filename: string): string;
+        function compile(template: string, opts?: Options): (TemplateFunction);
+        function render(template: string, data?: Data, opts?: Options): string;
+        function renderFile(path: string, data?: Data, opts?: Options, cb?: Function): any;// TODO RenderFileCallback return type
+        function clearCache(): any;
+
+        function TemplateFunction(data: Data): any;
+        interface TemplateFunction {
+            dependencies: Dependencies;
+        }
+        interface Options {
+            cache?: any;
+            filename?: string;
+            context?: any;
+            compileDebug?: boolean;
+            client?: boolean;
+            delimiter?: string;
+            debug?: any;
+            _with?: boolean;
+        }
+        class Template {
+            constructor(text: string, opts: Options);
+            opts: Options;
+            templateText: string;
+            mode: string;
+            truncate: boolean;
+            currentLine: number;
+            source: string;
+            dependencies: Dependencies;
+            createRegex(): RegExp;
+            compile(): TemplateFunction;
+            generateSource(): any;
+            parseTemplateText(): string[];
+            scanLine(line: string): any;
+
+        }
+        module Template {
+            interface MODES {
+                EVAL: string;
+                ESCAPED: string;
+                RAW: string;
+                COMMENT: string;
+                LITERAL: string;
+            }
+        }
+        function escapeRegexChars(s: string): string;
+        function escapeXML(markup: string): string;
+        function shallowCopy<T1>(to: T1, fro: any): T1;
+        interface Cache {
+            _data: { [name: string]: any };
+            set(key: string, val: any): any;
+            get(key: string): any;
+        }
+        var cache: Cache;
+        function resolve(from1: string, to: string): string;
+        function resolve(from1: string, from2: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
+        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
+        function resolve(...args: string[]): string;
+        function normalize(path: string): string;
+        function isAbsolute(path: string): boolean;
+        function join(...args: string[]): string;
+        function relative(from: string, to: string): string;
+        var sep: string;
+        var delimiter: string;
+        function dirname(path: string): string;
+        function basename(path: string): string;
+        function extname(path: string): string;
+        function filter(xs: any, f: any): any; // TODO WHUT?
+
+
+    }
+    export = Ejs;
+}
\ No newline at end of file
diff --git a/ember/ember.d.ts b/ember/ember.d.ts
index 00ea077dd..6a28a80fe 100644
--- a/ember/ember.d.ts
+++ b/ember/ember.d.ts
@@ -349,6 +349,8 @@ interface CoreObjectArguments {
     Override to implement teardown.
     **/
     willDestroy?: Function;
+    
+    [propName: string]: any;
 }
 
 interface EnumerableConfigurationOptions {
@@ -998,7 +1000,7 @@ declare module Ember {
         @static
         @param {Object} [args] - Object containing values to use within the new class
         **/
-        static extend<T>(args ?: CoreObjectArguments): T;
+        static extend<T>(args?: CoreObjectArguments): T;
         /**
         Creates a new subclass.
         @method extend
diff --git a/envify/envify-tests.ts b/envify/envify-tests.ts
new file mode 100644
index 000000000..52387a3e6
--- /dev/null
+++ b/envify/envify-tests.ts
@@ -0,0 +1,21 @@
+/// <reference path="envify.d.ts" />
+/// <reference path="../browserify/browserify.d.ts" />
+
+import browserify = require('browserify');
+import envify = require('envify/custom');
+import fs = require('fs');
+
+
+var b = browserify('main.js')
+    , output = fs.createWriteStream('bundle.js');
+
+b.transform(envify({
+    NODE_ENV: 'development'
+}));
+b.bundle().pipe(output);
+
+b.transform(envify({
+    _: 'purge'
+    , NODE_ENV: 'development'
+}));
+
diff --git a/envify/envify.d.ts b/envify/envify.d.ts
new file mode 100644
index 000000000..39479f503
--- /dev/null
+++ b/envify/envify.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for envify
+// Project: https://github.com/hughsk/envify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "envify" {
+	var envify: Function;
+	export = envify;
+}
+
+declare module "envify/custom" {
+	function envify(environment: { [name: string]: any }): Function;
+	export = envify;
+}
diff --git a/es6-shim/es6-shim.d.ts b/es6-shim/es6-shim.d.ts
index cff5a9b7e..30621b372 100644
--- a/es6-shim/es6-shim.d.ts
+++ b/es6-shim/es6-shim.d.ts
@@ -12,7 +12,7 @@ interface IteratorResult<T> {
 
 interface IterableShim<T> {
     /**
-      * Shim for an ES6 iterable. Not intended for direct use by user code. 
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
       */
     "_es6-shim iterator_"(): Iterator<T>;
 }
@@ -39,7 +39,7 @@ interface StringConstructor {
 
     /**
       * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
+      * as such the first argument will be a well formed template call site object and the rest
       * parameter will contain the substitution values.
       * @param template A well-formed template string call site representation.
       * @param substitutions A set of substitution values.
@@ -49,40 +49,40 @@ interface StringConstructor {
 
 interface String {
     /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point
+      * value of the UTF-16 encoded code point starting at the string element at position pos in
+      * the String resulting from converting this object to a String.
+      * If there is no element at that position, the result is undefined.
       * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
       */
     codePointAt(pos: number): number;
 
     /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
+      * Returns true if searchString appears as a substring of the result of converting this
+      * object to a String, at one or more positions that are
       * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
+      * @param searchString search string
       * @param position If position is undefined, 0 is assumed, so as to search all of the String.
       */
     includes(searchString: string, position?: number): boolean;
 
     /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
       * endPosition – length(this). Otherwise returns false.
       */
     endsWith(searchString: string, endPosition?: number): boolean;
 
     /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * Returns a String value that is made from count copies appended together. If count is 0,
       * T is the empty String is returned.
       * @param count number of copies to append
       */
     repeat(count: number): string;
 
     /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
       * position. Otherwise returns false.
       */
     startsWith(searchString: string, position?: number): boolean;
@@ -130,19 +130,14 @@ interface String {
     sub(): string;
 
     /** Returns a <sup> HTML element */
-    sup(): string;    
+    sup(): string;
 
     /**
-      * Shim for an ES6 iterable. Not intended for direct use by user code. 
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
       */
     "_es6-shim iterator_"(): IterableIteratorShim<string>;
 }
 
-interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
-}
-
 interface ArrayConstructor {
     /**
       * Creates an array from an array-like object.
@@ -180,24 +175,24 @@ interface ArrayConstructor {
 }
 
 interface Array<T> {
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the value of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
 
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
+    /**
+      * Returns the index of the first element in the array where predicate is true, and undefined
       * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
     findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
@@ -205,41 +200,41 @@ interface Array<T> {
     /**
       * Returns the this object after filling the section identified by start and end with value
       * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * @param start index to start filling the array at. If start is negative, it is treated as
+      * length+start where length is the length of the array.
+      * @param end index to stop filling the array at. If end is negative, it is treated as
       * length+end.
       */
     fill(value: T, start?: number, end?: number): T[];
 
-    /** 
+    /**
       * Returns the this object after copying a section of the array identified by start and end
       * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * @param target If target is negative, it is treated as length+target where length is the
+      * length of the array.
+      * @param start If start is negative, it is treated as length+start. If end is negative, it
       * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
+      * @param end If not specified, length of the this object is used as its default value.
       */
     copyWithin(target: number, start: number, end?: number): T[];
 
-    /** 
+    /**
       * Returns an array of key, value pairs for every entry in the array
       */
     entries(): IterableIteratorShim<[number, T]>;
 
-    /** 
+    /**
       * Returns an list of keys in the array
       */
     keys(): IterableIteratorShim<number>;
 
-    /** 
+    /**
       * Returns an list of values in the array
       */
     values(): IterableIteratorShim<T>;
 
     /**
-      * Shim for an ES6 iterable. Not intended for direct use by user code. 
+      * Shim for an ES6 iterable. Not intended for direct use by user code.
       */
     "_es6-shim iterator_"(): IterableIteratorShim<T>;
 }
@@ -247,14 +242,14 @@ interface Array<T> {
 interface NumberConstructor {
     /**
       * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
+      * that is representable as a Number value, which is approximately:
       * 2.2204460492503130808472633361816 x 10‍−‍16.
       */
     EPSILON: number;
 
     /**
       * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
@@ -267,7 +262,7 @@ interface NumberConstructor {
     isInteger(number: number): boolean;
 
     /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
       * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
@@ -280,30 +275,30 @@ interface NumberConstructor {
       */
     isSafeInteger(number: number): boolean;
 
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
+    /**
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as
+      * a Number value.
       * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
       */
     MAX_SAFE_INTEGER: number;
 
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
+    /**
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as
+      * a Number value.
       * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
       */
     MIN_SAFE_INTEGER: number;
 
     /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
+      * Converts a string to a floating-point number.
+      * @param string A string that contains a floating-point number.
       */
     parseFloat(string: string): number;
 
     /**
       * Converts A string to an integer.
       * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString.
       * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
       * All other strings are considered decimal.
       */
@@ -312,7 +307,7 @@ interface NumberConstructor {
 
 interface ObjectConstructor {
     /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
       * target object. Returns the target object.
       * @param target The target object to copy to.
       * @param sources One or more source objects to copy properties from.
@@ -390,7 +385,7 @@ interface Math {
     log1p(x: number): number;
 
     /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of
       * the natural logarithms).
       * @param x A numeric expression.
       */
@@ -497,21 +492,21 @@ interface Promise<T> {
 }
 
 interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
+    /**
+      * A reference to the prototype.
       */
     prototype: Promise<any>;
 
     /**
      * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments:
+     * a resolve callback used resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
     new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
 
     /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
      * resolve, or rejected when any Promise is rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
@@ -519,7 +514,7 @@ interface PromiseConstructor {
     all<T>(values: IterableShim<T | PromiseLike<T>>): Promise<T[]>;
 
     /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
      * or rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
@@ -670,4 +665,4 @@ declare module "es6-shim" {
         function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
         function setPrototypeOf(target: any, proto: any): boolean;
     }
-}
\ No newline at end of file
+}
diff --git a/express-jwt/express-jwt.d.ts b/express-jwt/express-jwt.d.ts
index 615afd2ac..77f296b1f 100644
--- a/express-jwt/express-jwt.d.ts
+++ b/express-jwt/express-jwt.d.ts
@@ -12,12 +12,22 @@ declare module "express-jwt" {
 
     function jwt(options: jwt.Options): jwt.RequestHandler;
 
+    interface IDoneCallback<T> {
+        (err: Error, result: T): void;
+    }
+
+    type ICallback = <T>(req: express.Request, payload: T, done: IDoneCallback<boolean>) => void;
+
     module jwt {
         export interface Options {
-            secret: string;
+            secret: string|ICallback;
             userProperty?: string;
             skip?: string[];
             credentialsRequired?: boolean;
+            isRevoked?: boolean;
+            requestProperty?: string;
+            getToken?: ICallback;
+            [property: string]: any;
         }
         export interface RequestHandler extends express.RequestHandler {
             unless?: typeof unless;
diff --git a/express-less/express-less-tests.ts b/express-less/express-less-tests.ts
new file mode 100644
index 000000000..3fee687f2
--- /dev/null
+++ b/express-less/express-less-tests.ts
@@ -0,0 +1,12 @@
+/// <reference path="./express-less.d.ts" />
+
+import express = require('express');
+import expressLess = require('express-less');
+
+var app = express();
+var lessOptions: expressLess.Options = {};
+lessOptions.compress = true;
+lessOptions.debug = true;
+
+app.use('/less-css', expressLess(__dirname));
+app.use('/less-css-with-options', expressLess(__dirname + "/less", lessOptions));
diff --git a/express-less/express-less.d.ts b/express-less/express-less.d.ts
new file mode 100644
index 000000000..b3c7008cd
--- /dev/null
+++ b/express-less/express-less.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for express-less
+// Project: https://www.npmjs.com/package/express-less
+// Definitions by: xyb <https://github.com/xieyubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module "express-less" {
+    import express = require('express');
+
+    function less(root: string, options?: less.Options): express.RequestHandler;
+
+    module less {
+        export interface Options {
+            debug?: boolean;
+            compress?: boolean;
+        }
+    }
+
+    export = less;
+}
diff --git a/express-route-fs/express-route-fs-tests.ts b/express-route-fs/express-route-fs-tests.ts
new file mode 100644
index 000000000..1516d80dc
--- /dev/null
+++ b/express-route-fs/express-route-fs-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="express-route-fs.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+import express = require('express');
+import routeFs = require('express-route-fs');
+
+var app = express();
+
+routeFs(app);
diff --git a/express-route-fs/express-route-fs.d.ts b/express-route-fs/express-route-fs.d.ts
new file mode 100644
index 000000000..a63fa61df
--- /dev/null
+++ b/express-route-fs/express-route-fs.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for express-route-fs v0.1.0
+// Project: https://github.com/kripod/express-route-fs
+// Definitions by: Kristóf Poduszló <https://github.com/kripod>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "express-route-fs" {
+    /**
+     Sets up file system-based routing in Express.
+     @param {Object} app Express application object.
+     @param {Object[]} [options] Options for setting up routes.
+     */
+    function routeFs(app: any, options?: any): void;
+    export = routeFs;
+}
diff --git a/express/express.d.ts b/express/express.d.ts
index b54f6e2fb..e2f6d5df2 100644
--- a/express/express.d.ts
+++ b/express/express.d.ts
@@ -106,6 +106,8 @@ declare module "express" {
             use(handler: ErrorRequestHandler): T;
             use(path: string, ...handler: RequestHandler[]): T;
             use(path: string, handler: ErrorRequestHandler): T;
+            use(path: string[], ...handler: RequestHandler[]): T;
+            use(path: string[], handler: ErrorRequestHandler): T;
         }
 
         export function Router(options?: any): Router;
@@ -410,6 +412,10 @@ declare module "express" {
             originalUrl: string;
 
             url: string;
+            
+            baseUrl: string;
+            
+            app: Application;
         }
 
         interface MediaType {
diff --git a/fabricjs/fabricjs-tests.ts b/fabricjs/fabricjs-tests.ts
index 89c882b05..5800879f3 100644
--- a/fabricjs/fabricjs-tests.ts
+++ b/fabricjs/fabricjs-tests.ts
@@ -34,8 +34,8 @@ function sample1() {
 
 function sample2() {
 
-  var dot, i,
-    t1, t2,
+  var dot: fabric.ICircle, i: number,
+    t1: number, t2: number,
     startTimer = function() {
       t1 = new Date().getTime();
       return t1;
@@ -89,16 +89,16 @@ function sample2() {
 
 function sample3() {
 
-  var $ = function(id) { return document.getElementById(id) };
+  var $: (id: string) => HTMLElement = function(id: string) { return document.getElementById(id) };
 
-  function applyFilter(index, filter) {
-    var obj = <fabric.IImage>canvas.getActiveObject();
+  function applyFilter(index: number, filter: any) {
+    var obj: fabric.IImage = <fabric.IImage>canvas.getActiveObject();
     obj.filters[index] = filter;
     obj.applyFilters(canvas.renderAll.bind(canvas));
   }
 
-  function applyFilterValue(index, prop, value) {
-    var obj = <fabric.IImage>canvas.getActiveObject();
+  function applyFilterValue(index: number, prop: string, value: any) {
+    var obj: fabric.IImage = <fabric.IImage>canvas.getActiveObject();
     if (obj.filters[index]) {
       obj.filters[index][prop] = value;
       obj.applyFilters(canvas.renderAll.bind(canvas));
@@ -214,7 +214,7 @@ function sample3() {
 function sample4() {
 
   var canvas = new fabric.Canvas('c');
-  var $ = function(id) { return document.getElementById(id); };
+  var $: (id: string) => HTMLElement = function(id: string) { return document.getElementById(id); };
 
   var rect = new fabric.Rect({
     width: 100,
@@ -339,10 +339,10 @@ function sample6() {
     canvas.centerObject(obj);
     canvas.add(obj);
 
-    canvas.add(obj.clone(() => {}).set({ left: 100, top: 100, angle: -15 }));
-    canvas.add(obj.clone(() => {}).set({ left: 480, top: 100, angle: 15 }));
-    canvas.add(obj.clone(() => {}).set({ left: 100, top: 400, angle: -15 }));
-    canvas.add(obj.clone(() => {}).set({ left: 480, top: 400, angle: 15 }));
+    canvas.add(obj.clone(() => { }).set({ left: 100, top: 100, angle: -15 }));
+    canvas.add(obj.clone(() => { }).set({ left: 480, top: 100, angle: 15 }));
+    canvas.add(obj.clone(() => { }).set({ left: 100, top: 400, angle: -15 }));
+    canvas.add(obj.clone(() => { }).set({ left: 480, top: 400, angle: 15 }));
 
     canvas.on('mouse:move', function(options) {
       var p = canvas.getPointer(options.e);
@@ -456,7 +456,7 @@ function sample8() {
       top = fabric.util.getRandomInt(0 + offset, 500 - offset),
       angle = fabric.util.getRandomInt(-20, 40),
       width = fabric.util.getRandomInt(30, 50),
-      opacity = (function(min, max) { return Math.random() * (max - min) + min; })(0.5, 1);
+      opacity = (function(min: number, max: number) { return Math.random() * (max - min) + min; })(0.5, 1);
 
 
     switch (className) {
@@ -522,7 +522,7 @@ function sample8() {
         break;
 
       case 'shape':
-        var id = element.id, match;
+        var id: any = element.id, match: RegExpExecArray;
         if (match = /\d+$/.exec(id)) {
           fabric.loadSVGFromURL('../assets/' + match[0] + '.svg', function(objects, options) {
             var loadedObject = fabric.util.groupSVGElements(objects, options);
@@ -586,7 +586,7 @@ function sample8() {
     }
   };
 
-  var supportsInputOfType = function(type) {
+  var supportsInputOfType = function(type: string) {
     return function() {
       var el = <HTMLInputElement>document.createElement('input');
       try {
@@ -746,7 +746,7 @@ function sample8() {
   canvas.on('object:selected', onObjectSelected);
   canvas.on('group:selected', onObjectSelected);
 
-  function onObjectSelected(e) {
+  function onObjectSelected(e: fabric.IEvent) {
     var selectedObject = e.target;
 
     for (var i = activeObjectButtons.length; i--;) {
@@ -1033,7 +1033,7 @@ function sample8() {
       };
 
       canvas.on('object:selected', function(e: fabric.IEvent) {
-        slider.value = String((<fabric.IText>e.target).lineHeight );
+        slider.value = String((<fabric.IText>e.target).lineHeight);
       });
     })();
   }
@@ -1050,6 +1050,6 @@ function sample8() {
 
 function sample9() {
   var canvas = new fabric.Canvas('c');
-  canvas.setBackgroundImage('yolo.jpg',() => { "a" }, { opacity: 45 });
-  canvas.setBackgroundImage('yolo.jpg',() => { "a" });
+  canvas.setBackgroundImage('yolo.jpg', () => { "a" }, { opacity: 45 });
+  canvas.setBackgroundImage('yolo.jpg', () => { "a" });
 }
diff --git a/fabricjs/fabricjs.d.ts b/fabricjs/fabricjs.d.ts
index 503b8c7db..d4ac5ad75 100644
--- a/fabricjs/fabricjs.d.ts
+++ b/fabricjs/fabricjs.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for FabricJS v1.5.0
 // Project: http://fabricjs.com/
-// Definitions by: Oliver Klemencic <https://github.com/oklemencic/>, Joseph Livecchi <https://github.com/joewashear007/>
+// Definitions by: Oliver Klemencic <https://github.com/oklemencic/>, Joseph Livecchi <https://github.com/joewashear007/>, Michael Randolph <https://github.com/mrand01/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /* tslint:disable:no-unused-variable */
@@ -41,7 +41,7 @@ declare module fabric {
    * @param {Function} callback
    * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
    */
-  function loadSVGFromString(string: string, callback: (results: IObject[], options: any) => void, reviver?: Function);
+  function loadSVGFromString(string: string, callback: (results: IObject[], options: any) => void, reviver?: Function): void;
   /**
    * Takes url corresponding to an SVG document, and parses it into a set of fabric objects.
    * Note that SVG is fetched via XMLHttpRequest, so it needs to conform to SOP (Same Origin Policy)
@@ -49,14 +49,14 @@ declare module fabric {
    * @param {Function} callback
    * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
    */
-  function loadSVGFromURL(url: string, callback: (results: IObject[], options: any) => void, reviver?: Function);
+  function loadSVGFromURL(url: string, callback: (results: IObject[], options: any) => void, reviver?: Function): void;
   /**
    * Returns CSS rules for a given SVG document
    * @param {SVGDocument} doc SVG document to parse
    */
   function getCSSRules(doc: SVGElement): any;
 
-  function parseElements(elements: any[], callback: Function, options: any, reviver?: Function);
+  function parseElements(elements: any[], callback: Function, options: any, reviver?: Function): void;
   /**
    * Parses "points" attribute, returning an array of values
    * @param {String} points points attribute string
@@ -99,7 +99,7 @@ declare module fabric {
    * @param {Function} callback Callback to call when parsing is finished; It's being passed an array of elements (parsed from a document).
    * @param {Function} [reviver] Method for further parsing of SVG elements, called after each fabric object created.
    */
-  function parseSVGDocument(doc: SVGElement, callback: (results: IObject[], options: any) => void, reviver?: Function);
+  function parseSVGDocument(doc: SVGElement, callback: (results: IObject[], options: any) => void, reviver?: Function): void;
   /**
    * Parses "transform" attribute, returning an array of values
    * @param {String} attributeValue String containing attribute value
@@ -111,11 +111,11 @@ declare module fabric {
   /**
    * Wrapper around `console.log` (when available) 
    */
-  function log(...values: any[]);
+  function log(...values: any[]): void;
   /**
    * Wrapper around `console.warn` (when available) 
    */
-  function warn(...values: any[]);
+  function warn(...values: any[]): void;
 
   ////////////////////////////////////////////////////
   // Classes
@@ -438,7 +438,7 @@ declare module fabric {
     /**
      * Sets source of this color (where source is an array representation; ex: [200, 200, 100, 1]) 
      */
-    setSource(source: number[]);
+    setSource(source: number[]): void;
 
     /**
      * Returns color represenation in RGB format ex: rgb(0-255,0-255,0-255) 
@@ -474,7 +474,7 @@ declare module fabric {
      * Sets value of alpha channel for this color
      * @param {Number} alpha Alpha value 0-1
      */
-    setAlpha(alpha: number);
+    setAlpha(alpha: number): void;
 
     /**
      * Transforms color to its grayscale representation 
@@ -627,17 +627,17 @@ declare module fabric {
     /**
      * Appends a point to intersection 
      */
-    appendPoint(point: IPoint);
+    appendPoint(point: IPoint): void;
     /**
      * Appends points to intersection 
      */
-    appendPoints(points: IPoint[]);
+    appendPoints(points: IPoint[]): void;
   }
   interface IIntersectionStatic {
     /**
      * Intersection class
      */
-    new (status?: string);
+    new (status?: string): void;
     /**
      * Checks if polygon intersects another polygon 
      */
@@ -1313,7 +1313,7 @@ declare module fabric {
     /**
      * Callback; invoked right before object is about to be scaled/rotated
      */
-    onBeforeScaleRotate(target: IObject);
+    onBeforeScaleRotate(target: IObject): void;
 
     // Functions from object straighten mixin
     // --------------------------------------------------------------------------------------------------------------------------------
@@ -1839,12 +1839,12 @@ declare module fabric {
     filters: IBaseFilter[];
   }
   interface IImage extends IObject, IImageOptions {
-    initialize(element?: string|HTMLImageElement, options?: IImageOptions);
+    initialize(element?: string|HTMLImageElement, options?: IImageOptions): void;
     /**
      * Applies filters assigned to this image (from "filters" array)
      * @param {Function} callback Callback is invoked when all filters have been applied and new image is generated
      */
-    applyFilters(callback: Function);
+    applyFilters(callback: Function): void;
     /**
      * Returns a clone of an instance
      * @param {Function} callback Callback is invoked with a clone as a first argument
@@ -1871,7 +1871,7 @@ declare module fabric {
      * @return {String} Source of an image
      */
     getSrc(): string;
-    render(ctx: CanvasRenderingContext2D, noTransform: boolean);
+    render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
 
     /**
      * Sets image element for this instance to a specified one.
@@ -2539,7 +2539,7 @@ declare module fabric {
      * Sets object's properties from options
      * @param {Object} [options] Options object
      */
-    setOptions(options: any);
+    setOptions(options: any): void;
     /**
      * Sets sourcePath of an object
      * @param {String} value Value to set sourcePath to
@@ -2850,7 +2850,7 @@ declare module fabric {
   }
 
   interface IPathGroup extends IObject {
-    initialize(paths: IPath[], options?: IObjectOptions);
+    initialize(paths: IPath[], options?: IObjectOptions): void;
     /**
      * Returns number representation of object's complexity
      * @return {Number} complexity
@@ -2865,7 +2865,7 @@ declare module fabric {
      * Renders this group on a specified context
      * @param {CanvasRenderingContext2D} ctx Context to render this instance on
      */
-    render(ctx: CanvasRenderingContext2D);
+    render(ctx: CanvasRenderingContext2D): void;
     /**
      * Returns dataless object representation of this path group
      * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
@@ -2993,7 +2993,7 @@ declare module fabric {
     minY?: number;
   }
   interface IPolyline extends IObject, IPolylineOptions {
-    initialize(points: IPoint[], options?: IPolylineOptions);
+    initialize(points: IPoint[], options?: IPolylineOptions): void;
     /**
      * Returns complexity of an instance
      * @return {Number} complexity of this instance
@@ -3158,7 +3158,7 @@ declare module fabric {
      * Renders text instance on a specified context
      * @param {CanvasRenderingContext2D} ctx Context to render on
      */
-    render(ctx: CanvasRenderingContext2D, noTransform: boolean);
+    render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
     /**
      * Returns object representation of an instance
      * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
@@ -3347,7 +3347,7 @@ declare module fabric {
      * Returns true if object has no styling
      */
     isEmptyStyles(): boolean;
-    render(ctx: CanvasRenderingContext2D, noTransform: boolean);
+    render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
     /**
      * Returns object representation of an instance
      * @method toObject
@@ -4149,37 +4149,41 @@ declare module fabric {
     requestAnimFrame(callback: Function): void;
   }
 
+  interface IUtilAminEaseFunction {
+    (t: number, b: number, c: number, d: number): number;
+  }
+
   interface IUtilAnimEase {
-    easeInBack(): Function;
-    easeInBounce(): Function;
-    easeInCirc(): Function;
-    easeInCubic(): Function;
-    easeInElastic(): Function;
-    easeInExpo(): Function;
-    easeInOutBack(): Function;
-    easeInOutBounce(): Function;
-    easeInOutCirc(): Function;
-    easeInOutCubic(): Function;
-    easeInOutElastic(): Function;
-    easeInOutExpo(): Function;
-    easeInOutQuad(): Function;
-    easeInOutQuart(): Function;
-    easeInOutQuint(): Function;
-    easeInOutSine(): Function;
-    easeInQuad(): Function;
-    easeInQuart(): Function;
-    easeInQuint(): Function;
-    easeInSine(): Function;
-    easeOutBack(): Function;
-    easeOutBounce(): Function;
-    easeOutCirc(): Function;
-    easeOutCubic(): Function;
-    easeOutElastic(): Function;
-    easeOutExpo(): Function;
-    easeOutQuad(): Function;
-    easeOutQuart(): Function;
-    easeOutQuint(): Function;
-    easeOutSine(): Function;
+    easeInBack: IUtilAminEaseFunction;
+    easeInBounce: IUtilAminEaseFunction;
+    easeInCirc: IUtilAminEaseFunction;
+    easeInCubic: IUtilAminEaseFunction;
+    easeInElastic: IUtilAminEaseFunction;
+    easeInExpo: IUtilAminEaseFunction;
+    easeInOutBack: IUtilAminEaseFunction;
+    easeInOutBounce: IUtilAminEaseFunction;
+    easeInOutCirc: IUtilAminEaseFunction;
+    easeInOutCubic: IUtilAminEaseFunction;
+    easeInOutElastic: IUtilAminEaseFunction;
+    easeInOutExpo: IUtilAminEaseFunction;
+    easeInOutQuad: IUtilAminEaseFunction;
+    easeInOutQuart: IUtilAminEaseFunction;
+    easeInOutQuint: IUtilAminEaseFunction;
+    easeInOutSine: IUtilAminEaseFunction;
+    easeInQuad: IUtilAminEaseFunction;
+    easeInQuart: IUtilAminEaseFunction;
+    easeInQuint: IUtilAminEaseFunction;
+    easeInSine: IUtilAminEaseFunction;
+    easeOutBack: IUtilAminEaseFunction;
+    easeOutBounce: IUtilAminEaseFunction;
+    easeOutCirc: IUtilAminEaseFunction;
+    easeOutCubic: IUtilAminEaseFunction;
+    easeOutElastic: IUtilAminEaseFunction;
+    easeOutExpo: IUtilAminEaseFunction;
+    easeOutQuad: IUtilAminEaseFunction;
+    easeOutQuart: IUtilAminEaseFunction;
+    easeOutQuint: IUtilAminEaseFunction;
+    easeOutSine: IUtilAminEaseFunction;
   }
 
   interface IUtilArc {
@@ -4360,13 +4364,13 @@ declare module fabric {
      * @param {Object} [properties] Properties shared by all instances of this class
      *                  (be careful modifying objects defined here as this would affect all instances)
      */
-    createClass(parent: Function, properties?: any);
+    createClass(parent: Function, properties?: any): void;
     /**
      * Helper for creation of "classes".
      * @param {Object} [properties] Properties shared by all instances of this class
      *                  (be careful modifying objects defined here as this would affect all instances)
      */
-    createClass(properties?: any);
+    createClass(properties?: any): void;
 
   }
 
diff --git a/faker/faker-tests.ts b/faker/faker-tests.ts
new file mode 100644
index 000000000..db953fd83
--- /dev/null
+++ b/faker/faker-tests.ts
@@ -0,0 +1,173 @@
+/// <reference path="faker.d.ts" />
+
+let resultStr: string;
+let resultBool: boolean;
+let resultNum: number;
+let resultStrArr: string[];
+let resultDate: Date;
+
+import faker = require('faker');
+faker.locale = 'en';
+
+resultStr = faker.address.zipCode();
+resultStr = faker.address.zipCode('###');
+resultStr = faker.address.city();
+resultStr = faker.address.city(0);
+resultStr = faker.address.cityPrefix();
+resultStr = faker.address.citySuffix();
+resultStr = faker.address.streetName();
+resultStr = faker.address.streetAddress();
+resultStr = faker.address.streetAddress(false);;
+resultStr = faker.address.streetSuffix();
+resultStr = faker.address.streetPrefix();
+resultStr = faker.address.secondaryAddress();
+resultStr = faker.address.county();
+resultStr = faker.address.country();
+resultStr = faker.address.countryCode();
+resultStr = faker.address.state();
+resultStr = faker.address.state(false);
+resultStr = faker.address.stateAbbr();
+resultStr = faker.address.latitude();
+resultStr = faker.address.longitude();
+
+resultStr = faker.commerce.color();
+resultStr = faker.commerce.department();
+resultStr = faker.commerce.productName();
+resultStr = faker.commerce.price();
+resultStr = faker.commerce.price(0, 0, 0, '#');
+resultStr = faker.commerce.productAdjective();
+resultStr = faker.commerce.productMaterial();
+resultStr = faker.commerce.product();
+
+resultStrArr = faker.company.suffixes();
+resultStr = faker.company.companyName();
+resultStr = faker.company.companyName(0);
+resultStr = faker.company.companySuffix();
+resultStr = faker.company.catchPhrase();
+resultStr = faker.company.bs();
+resultStr = faker.company.catchPhraseAdjective();
+resultStr = faker.company.catchPhraseDescriptor();
+resultStr = faker.company.catchPhraseNoun();
+resultStr = faker.company.bsAdjective();
+resultStr = faker.company.bsBuzz();
+resultStr = faker.company.bsNoun();
+
+resultDate = faker.date.past();
+resultDate = faker.date.future();
+resultDate = faker.date.between('foo', 'bar');
+resultDate = faker.date.between(new Date(), new Date());
+resultDate = faker.date.recent();
+resultDate = faker.date.recent(100);
+resultStr = faker.date.month();
+resultStr = faker.date.month({
+	abbr: true,
+	context: true
+});
+resultStr = faker.date.weekday();
+resultStr = faker.date.weekday({
+	abbr: true,
+	context: true
+});
+
+resultStr = faker.finance.account();
+resultStr = faker.finance.account(0);
+resultStr = faker.finance.accountName();
+resultStr = faker.finance.mask();
+resultStr = faker.finance.mask(0, false, false);
+resultStr = faker.finance.amount();
+resultStr = faker.finance.amount(0, 0, 0, '#');
+resultStr = faker.finance.transactionType();
+resultStr = faker.finance.currencyCode();
+resultStr = faker.finance.currencyName();
+resultStr = faker.finance.currencySymbol();
+
+resultStr = faker.hacker.abbreviation();
+resultStr = faker.hacker.adjective();
+resultStr = faker.hacker.noun();
+resultStr = faker.hacker.verb();
+resultStr = faker.hacker.ingverb();
+resultStr = faker.hacker.phrase();
+
+resultStr = faker.helpers.randomize();
+resultNum = faker.helpers.randomize([1,2,3,4]);
+resultStr = faker.helpers.randomize(['foo', 'bar', 'quux']);
+resultStr = faker.helpers.slugify('foo bar quux');
+resultStr = faker.helpers.replaceSymbolWithNumber('foo# bar#');
+resultStr = faker.helpers.replaceSymbols('foo# bar? quux#');
+resultStrArr = faker.helpers.shuffle(['foo', 'bar', 'quux']);
+resultStr = faker.helpers.mustache('{{foo}}{{bar}}', {foo: 'x', bar: 'y'});
+
+const card = faker.helpers.createCard();
+resultStr = card.name;
+resultStr = card.address.streetA;
+const contextualCard = faker.helpers.contextualCard();
+resultStr = contextualCard.name;
+resultStr = contextualCard.address.suite;
+const userCard = faker.helpers.userCard();
+resultStr = userCard.name;
+resultStr = userCard.address.suite;
+
+resultStr = faker.internet.avatar();
+resultStr = faker.internet.email();
+resultStr = faker.internet.email('foo', 'bar', 'quux');
+resultStr = faker.internet.protocol();
+resultStr = faker.internet.url();
+resultStr = faker.internet.domainName();
+resultStr = faker.internet.domainSuffix();
+resultStr = faker.internet.domainWord();
+resultStr = faker.internet.ip();
+resultStr = faker.internet.userAgent();
+resultStr = faker.internet.color();
+resultStr = faker.internet.color(0, 0, 0);
+resultStr = faker.internet.mac();
+resultStr = faker.internet.password();
+resultStr = faker.internet.password(0, false, '#', 'foo');
+
+resultStrArr = faker.lorem.words();
+resultStrArr = faker.lorem.words(0);
+resultStr = faker.lorem.sentence();
+resultStr = faker.lorem.sentence(0, 0);
+resultStr = faker.lorem.sentences();
+resultStr = faker.lorem.sentences(0);
+resultStr = faker.lorem.paragraph();
+resultStr = faker.lorem.paragraph(0);
+resultStr = faker.lorem.paragraphs();
+resultStr = faker.lorem.paragraphs(0, '');
+
+resultStr = faker.name.firstName();
+resultStr = faker.name.firstName(0);
+resultStr = faker.name.lastName();
+resultStr = faker.name.lastName(0);
+resultStr = faker.name.findName();
+resultStr = faker.name.findName('', '', 0);
+resultStr = faker.name.jobTitle();
+resultStr = faker.name.prefix();
+resultStr = faker.name.suffix();
+resultStr = faker.name.title();
+resultStr = faker.name.jobDescriptor();
+resultStr = faker.name.jobArea();
+resultStr = faker.name.jobType();
+
+resultStr = faker.phone.phoneNumber();
+resultStr = faker.phone.phoneNumber('#');
+resultStr = faker.phone.phoneNumberFormat();
+// https://github.com/Marak/faker.js/blob/master/lib/phone_number.js#L9-L13
+resultStr = faker.phone.phoneNumberFormat(0);
+resultStr = faker.phone.phoneFormats();
+
+resultNum = faker.random.number();
+resultNum = faker.random.number(0);
+resultNum = faker.random.number({
+	min: 0,
+	max: 0,
+	precision: 0
+});
+resultStr = faker.random.arrayElement();
+resultStr = faker.random.arrayElement(['foo', 'bar', 'quux'])
+resultStr = faker.random.objectElement();
+resultStr = faker.random.objectElement({foo: 'bar', field: 'foo'});
+resultStr = faker.random.uuid();
+resultBool = faker.random.boolean();
+
+import fakerEn = require('faker/locale/en');
+resultStr = faker.name.firstName();
diff --git a/faker/faker.d.ts b/faker/faker.d.ts
new file mode 100644
index 000000000..6397dd993
--- /dev/null
+++ b/faker/faker.d.ts
@@ -0,0 +1,400 @@
+// Type definitions for faker
+// Project: http://marak.com/faker.js/
+// Definitions by: Bas Pennings <https://github.com/basp/>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare var fakerStatic: Faker.FakerStatic;
+
+declare module Faker {
+	interface FakerStatic {
+		locale: string;
+
+		address: {
+			zipCode(format?: string): string;
+			city(format?: number): string;
+			cityPrefix(): string;
+			citySuffix(): string;
+			streetName(): string;
+			streetAddress(useFullAddress?: boolean): string;
+			streetSuffix(): string;
+			streetPrefix(): string;
+			secondaryAddress(): string;
+			county(): string;
+			country(): string;
+			countryCode(): string;
+			state(useAbbr?: boolean): string;
+			stateAbbr(): string;
+			latitude(): string;
+			longitude(): string;
+		};
+
+		commerce: {
+			color(): string;
+			department(): string;
+			productName(): string;
+			price(min?: number, max?: number, dec?: number, symbol?: string): string;
+			productAdjective(): string;
+			productMaterial(): string;
+			product(): string;
+		};
+
+		company: {
+			suffixes(): string[];
+			companyName(format?: number): string;
+			companySuffix(): string;
+			catchPhrase(): string;
+			bs(): string;
+			catchPhraseAdjective(): string;
+			catchPhraseDescriptor(): string;
+			catchPhraseNoun(): string;
+			bsAdjective(): string;
+			bsBuzz(): string;
+			bsNoun(): string;
+		};
+
+		date: {
+			past(years?: number, refDate?: string|Date): Date;
+			future(years?: number, refDate?: string|Date): Date;
+			between(from: string|number|Date, to: string|Date): Date;
+			recent(days?: number): Date;
+			month(options?: { abbr?: boolean, context?: boolean }): string;
+			weekday(options?: { abbr?: boolean, context?: boolean }): string;
+		};
+
+		fake(str: string): string;
+
+		finance: {
+			account(length?: number): string;
+			accountName(): string;
+			mask(length?: number, parens?: boolean, elipsis?: boolean): string;
+			amount(min?:number, max?: number, dec?: number, symbol?: string): string;
+			transactionType(): string;
+			currencyCode(): string;
+			currencyName(): string;
+			currencySymbol(): string;
+		};
+
+		hacker: {
+			abbreviation(): string;
+			adjective(): string;
+			noun(): string;
+			verb(): string;
+			ingverb(): string;
+			phrase(): string;
+		};
+
+		helpers: {
+			randomize<T>(array: T[]): T;
+			randomize(): string;
+			slugify(string?: string): string;
+			replaceSymbolWithNumber(string?: string, symbol?: string): string;
+			replaceSymbols(string?: string): string;
+			shuffle<T>(o: T[]): T[];
+			shuffle(): string[];
+			mustache(str: string, data: { [key: string]: string|((substring: string, ...args: any[]) => string) }): string;
+			createCard(): Faker.Card;
+			contextualCard(): Faker.ContextualCard;
+			userCard(): Faker.UserCard;
+			createTransaction(): Faker.Transaction;
+		};
+
+
+		image: {
+			image(): string;
+			avatar(): string;
+			imageUrl(width?: number, height?: number, category?: string): string;
+			abstract(width?: number, height?: number): string;
+			animals(width?: number, height?: number): string;
+			business(width?: number, height?: number): string;
+			cats(width?: number, height?: number): string;
+			city(width?: number, height?: number): string;
+			food(width?: number, height?: number): string;
+			nightlife(width?: number, height?: number): string;
+			fashion(width?: number, height?: number): string;
+			people(width?: number, height?: number): string;
+			nature(width?: number, height?: number): string;
+			sports(width?: number, height?: number): string;
+			technics(width?: number, height?: number): string;
+			transport(width?: number, height?: number): string;
+		};
+
+		internet: {
+			avatar(): string;
+			email(firstName?: string, lastName?: string, provider?: string): string;
+			userName(firstName?: string, lastName?: string): string;
+			protocol(): string;
+			url(): string;
+			domainName(): string;
+			domainSuffix(): string;
+			domainWord(): string;
+			ip(): string;
+			userAgent(): string;
+			color(baseRed255?: number, baseGreen255?: number, baseBlue255?: number): string;
+			mac(): string;
+			password(len?: number, memorable?: boolean, pattern?: string|RegExp, prefix?: string): string;
+		};
+
+		lorem: {
+			words(num?: number): string[];
+			sentence(wordCount?: number, range?: number): string;
+			sentences(sentenceCount?: number): string;
+			paragraph(sentenceCount?: number): string;
+			paragraphs(paragraphCount?: number, separator?: string): string;
+		};
+
+		name: {
+			firstName(gender?: number): string;
+			lastName(gender?: number): string;
+			findName(firstName?: string, lastName?: string, gender?: number): string;
+			jobTitle(): string;
+			prefix(): string;
+			suffix(): string;
+			title(): string;
+			jobDescriptor(): string;
+			jobArea(): string;
+			jobType(): string;
+		};
+
+		phone: {
+			phoneNumber(format?: string): string;
+			phoneNumberFormat(phoneFormatsArrayIndex?: number): string;
+			phoneFormats(): string;
+		};
+
+		random: {
+			number(max: number): number;
+			number(options?: { min?: number, max?: number, precision?: number }): number;
+			arrayElement(): string;
+			arrayElement<T>(array: T[]): T;
+			objectElement(object?: { [key: string]: any }, field?: "key"): string;
+			objectElement<T>(object?: { [key: string]: T }, field?: any): T;
+			uuid(): string;
+			boolean(): boolean;
+		};
+	}
+
+	interface Card {
+		name: string;
+		username: string;
+		email: string;
+		address: FullAddress;
+		phone: string;
+		website: string;
+		company: Company;
+		posts: Post[];
+		accountHistory: string[];
+	}
+
+	interface FullAddress {
+		streetA: string;
+		streetB: string;
+		streetC: string;
+		streetD: string;
+		city: string;
+		state: string;
+		county: string;
+		zipcode: string;
+		geo: Geo;
+	}
+
+	interface Geo {
+		lat: string;
+		lng: string;
+	}
+
+	interface Company {
+		name: string;
+		catchPhrase: string;
+		bs: string;
+	}
+
+	interface Post {
+		words: string;
+		sentence: string;
+		sentences: string;
+		paragraph: string;
+	}
+
+	interface ContextualCard {
+		name: string;
+		username: string;
+		email: string;
+		dob: Date;
+		phone: string;
+		address: Address;
+		website: string;
+		company: Company;
+	}
+
+	interface Address {
+		street: string;
+		suite: string;
+		city: string;
+		state: string;
+		zipcode: string;
+		geo: Geo;
+	}
+
+	interface UserCard {
+		name: string;
+		username: string;
+		email: string;
+		address: Address;
+		phone: string;
+		website: string;
+		company: Company;
+	}
+
+	interface Transaction {
+		amount: string;
+		date: Date;
+		business: string;
+		name: string;
+		type: string;
+		account: string;
+	}
+}
+
+declare module "faker" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de_AT" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/de_CH" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/el_GR" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_AU" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_BORK" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_CA" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_GB" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_IE" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_IND" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_US" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/en_au_ocker" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/es" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/es_MX" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fa" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fr" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/fr_CA" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ge" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/it" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ja" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ko" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nb_NO" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nep" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/nl" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/pl" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/pt_BR" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/ru" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/sk" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/sv" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/tr" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/uk" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/vi" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/zh_CN" {
+	export = fakerStatic;
+}
+
+declare module "faker/locale/zh_TW" {
+	export = fakerStatic;
+}
diff --git a/famous/famous.d.ts b/famous/famous.d.ts
index 8b05774d8..a02ac86f0 100644
--- a/famous/famous.d.ts
+++ b/famous/famous.d.ts
@@ -125,7 +125,13 @@ declare module "famous/dom-renderables" {
 	}
 	
 	export interface IDOMElementOptions {
+		tagName?: string;
+		classes?: string[];
+		attributes?: { [attributeName: string]: string };
+		properties?: { [attributeName: string]: string };
+		id?: string;
 		content?: string;
+		cutout?: boolean;
 	}
 }
 
diff --git a/fancybox/fancybox-tests.ts b/fancybox/fancybox-tests.ts
index dce30bf43..d84a06815 100644
--- a/fancybox/fancybox-tests.ts
+++ b/fancybox/fancybox-tests.ts
@@ -116,7 +116,7 @@ $(".fancybox").fancybox({
     }
 });
 $(".fancybox").fancybox({
-    beforeLoad: function () {
+    beforeLoad: () => {
         this.title = 'Image ' + (this.index + 1) + ' of ' + this.group.length + (this.title ? ' - ' + this.title : '');
     }
 });
diff --git a/fancybox/fancybox.d.ts b/fancybox/fancybox.d.ts
index 03a20bebf..7182f7cad 100644
--- a/fancybox/fancybox.d.ts
+++ b/fancybox/fancybox.d.ts
@@ -6,7 +6,7 @@
 
 /// <reference path="../jquery/jquery.d.ts" />
 
-interface FancyboxOptions {
+interface FancyboxOptions extends FancyboxCallback {
     padding?: any; // number or []
     margin?: any; // number or []
     width?: any; // number or []
@@ -96,16 +96,16 @@ interface FancyboxMethods {
 }
 
 interface FancyboxCallback {
-    onCancel;
-    beforeLoad;
-    afterLoad;
-    beforeShow;
-    afterShow;
-    beforeClose;
-    afterClose;
-    onUpdate;
-    onPlayStart;
-    onPlayEnd;
+    onCancel?: Function;
+    beforeLoad?: Function;
+    afterLoad?: Function;
+    beforeShow?: Function;
+    afterShow?: Function;
+    beforeClose?: Function;
+    afterClose?: Function;
+    onUpdate?: Function;
+    onPlayStart?: Function;
+    onPlayEnd?: Function;
 }
 
 interface FancyboxThumbnailHelperOptions {
diff --git a/favico.js/favico.js-tests.ts b/favico.js/favico.js-tests.ts
new file mode 100644
index 000000000..74130d587
--- /dev/null
+++ b/favico.js/favico.js-tests.ts
@@ -0,0 +1,68 @@
+/// <reference path="./favico.js.d.ts"/>
+
+
+// constructor options
+
+var plain = (): favicojs.Favico => new Favico({
+});
+
+var repositioned = (): favicojs.Favico => new Favico({
+    position: 'upleft'
+});
+
+var shaped = (): favicojs.Favico => new Favico({
+    type: 'rectangle'
+});
+
+var usingCustomFont = (): favicojs.Favico => new Favico({
+    fontFamily: 'FontAwesome',
+    elementId: 'badgefont'
+});
+
+var colored = (): favicojs.Favico => new Favico({
+    bgColor: '#5CB85C',
+    textColor: '#ff0'
+});
+
+var domBound = (): favicojs.Favico => new Favico({
+    element: document.getElementById('favico')
+});
+
+var iconUrlHandler = (url: string): void => {
+    console.log(url);
+};
+var withDataUrl = (): favicojs.Favico => new Favico({
+    dataUrl: iconUrlHandler
+});
+
+
+var favicons: favicojs.Favico[] = [
+    plain(),
+    repositioned(),
+    shaped(),
+    usingCustomFont(),
+    colored(),
+    domBound(),
+    withDataUrl(),
+];
+
+
+// public methods
+
+favicons.map(favico => {
+
+    // badge
+    favico.badge(2);
+    favico.badge(3, 'slide');
+    favico.badge(3000, {animation: 'none', type: 'rectangle'});
+    favico.reset();
+
+    // image
+    favico.image(document.getElementById('image'));
+
+    // video
+    favico.video(document.getElementById('video'));
+
+    // webcam
+    favico.webcam();
+});
diff --git a/favico.js/favico.js.d.ts b/favico.js/favico.js.d.ts
new file mode 100644
index 000000000..37121f9c8
--- /dev/null
+++ b/favico.js/favico.js.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for favico.js
+// Project: http://lab.ejci.net/favico.js/
+// Definitions by: Yu Matsushita <https://github.com/drowse314-dev-ymat>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare module favicojs {
+
+    interface FavicoJsStatic {
+        new (opt?: FavicoJsOptions): Favico;
+    }
+
+    interface FavicoJsOptions {
+        bgColor?: string;
+        textColor?: string;
+        fontFamily?: string;
+        fontStyle?: string;
+        type?: string;
+        position?: string;
+        animation?: string;
+        elementId?: string;
+        element?: HTMLElement;
+        dataUrl?: (url: string) => any;
+    }
+
+    interface Favico {
+
+        badge(number: number): void;
+        badge(number: number, animation: string): void;
+        badge(number: number, opts: FavicoJsOptions): void;
+
+        reset(): void;
+
+        image(imageElement: HTMLElement): void;
+
+        video(imageElement: HTMLElement): void;
+
+        webcam(): void;
+    }
+}
+
+
+declare var Favico: favicojs.FavicoJsStatic;
diff --git a/fbsdk/fbsdk-tests.ts b/fbsdk/fbsdk-tests.ts
index e359369ad..8ec38d8bc 100644
--- a/fbsdk/fbsdk-tests.ts
+++ b/fbsdk/fbsdk-tests.ts
@@ -1,29 +1,29 @@
 /// <reference path="fbsdk.d.ts" />
 
 window.fbAsyncInit = function() {
-	FB.init(
-		{
-			appId      : '{your-app-id}',
-			xfbml      : true,
-			version    : 'v2.0'
-		}
-	);
+    FB.init(
+        {
+            appId      : '{your-app-id}',
+            xfbml      : true,
+            version    : 'v2.0'
+        }
+    );
 
-	FB.ui(
-		{
-			method: 'share',
-			href: 'https://developers.facebook.com/docs/dialogs/'
-		},
-		function(response) {
-			console.log(response);
-		}
-	);
+    FB.ui(
+        {
+            method: 'share',
+            href: 'https://developers.facebook.com/docs/dialogs/'
+        },
+        function(response) {
+            console.log(response);
+        }
+    );
 
-	FB.api(
-		"/me",
-		"POST",
-		function (fbResponse){
-			console.log(fbResponse);
-		}
-	);
+    FB.api(
+        "/me",
+        "POST",
+        function (fbResponse){
+            console.log(fbResponse);
+        }
+    );
 };
\ No newline at end of file
diff --git a/fbsdk/fbsdk.d.ts b/fbsdk/fbsdk.d.ts
index eb3f23269..2be6f513a 100644
--- a/fbsdk/fbsdk.d.ts
+++ b/fbsdk/fbsdk.d.ts
@@ -4,132 +4,186 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface FBInitParams{
-	appId ?: string;
-	authResponse ?: string;
-	cookie ?: boolean;
-	frictionlessRequests ?: boolean;
-	hideFlashCallback ?: Function;
-	logging ?: boolean;
-	status ?: boolean;
-	version ?: string;
-	xfbml ?: boolean;
+    appId?: string;
+    authResponse?: string;
+    cookie?: boolean;
+    frictionlessRequests?: boolean;
+    hideFlashCallback?: Function;
+    logging?: boolean;
+    status?: boolean;
+    version?: string;
+    xfbml?: boolean;
 }
 
-interface FBUIParams{
-	method : string;
+interface ShareDialogParams {
+    method: string; // "share"
+    href: string;
 }
 
+interface PageTabDialogParams {
+    method: string; // "pagetab"
+    app_id: string;
+    redirect_uri?: string;
+    display?: any;
+}
+
+interface RequestsDialogParams {
+    method: string; // "apprequests"
+    app_id: string;
+    redirect_uri?: string;
+    to?: string;
+    message: string;
+    action_type?: string; // "send" | "askfor" | "turn"
+    object_id?: string;
+    filters: string /* "app_users" | "app_non_users" */ | {
+        name: string;
+        user_ids: string[];
+    };
+    suggestions?: string[];
+    exclude_ids?: string[];
+    max_recipients?: number;
+    data?: string;
+    title?: string;
+}
+
+interface SendDialogParams {
+    method: string; // "send"
+    app_id: string;
+    redirect_uri?: string;
+    display?: any;
+    to?: string;
+    link: string;
+}
+
+interface PayDialogParams {
+    method: string; // "pay"
+    action: string; // "purchaseitem"
+    product: string;
+    quantity?: number;
+    quantity_min?: number;
+    quantity_max?: number;
+    request_id?: string;
+    pricepoint_id?: string;
+    test_currency?: string;
+}
+
+declare type FBUIParams = ShareDialogParams
+                        | PageTabDialogParams
+                        | RequestsDialogParams
+                        | SendDialogParams
+                        | PayDialogParams;
+
 interface FBLoginOptions{
-	auth_type ?: string;
-	scope ?: string;
-	return_scopes ?: boolean;
-	enable_profile_selector ?: boolean;
-	profile_selector_ids ?: string;
+    auth_type?: string;
+    scope?: string;
+    return_scopes?: boolean;
+    enable_profile_selector?: boolean;
+    profile_selector_ids?: string;
 }
 
 interface FBSDKEvents{
-	/* This method allows you to subscribe to a range of events, and define callback functions for when they fire. */
-	subscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
+    /* This method allows you to subscribe to a range of events, and define callback functions for when they fire. */
+    subscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
 
-	/* This method allows you to un-subscribe a callback from any events previously subscribed to using .Event.subscribe(). */
-	unsubscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
+    /* This method allows you to un-subscribe a callback from any events previously subscribed to using .Event.subscribe(). */
+    unsubscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
 }
 
 interface FBSDKXFBML{
-	/* This function parses and renders XFBML markup in a document on the fly. */
-	parse(ParseElement ?: Element) : void;
-	parse(ParseElement ?: HTMLElement) : void;
+    /* This function parses and renders XFBML markup in a document on the fly. */
+    parse(ParseElement?: Element) : void;
+    parse(ParseElement?: HTMLElement) : void;
 }
 
 interface FBSDKCanvasPrefetcher{
-	/* Tells Facebook that the current page uses a specified resource. */
-	addStaticResource(res : string) : void;
+    /* Tells Facebook that the current page uses a specified resource. */
+    addStaticResource(res : string) : void;
 
-	/* Controls how statistics are collected on resources used by your application. */
-	setCollectionMode(option : string) : void;
+    /* Controls how statistics are collected on resources used by your application. */
+    setCollectionMode(option : string) : void;
 }
 
 interface FBSDKCanvasSize{
-	height ?: Number;
-	width ?: Number;
+    height?: Number;
+    width?: Number;
 }
 
 interface FBSDKCanvasDoneLoading{
-	time_delta_ms : Number;
+    time_delta_ms : Number;
 }
 
 interface FBSDKCanvas{
-	Prefetcher : FBSDKCanvasPrefetcher;
+    Prefetcher : FBSDKCanvasPrefetcher;
 
-	/* Hides the HTML element passed in via the elem param from view. */
-	hideFlashElement(element : Element) : void;
-	hideFlashElement(element : HTMLElement) : void;
+    /* Hides the HTML element passed in via the elem param from view. */
+    hideFlashElement(element : Element) : void;
+    hideFlashElement(element : HTMLElement) : void;
 
-	/* Displays the HTML element passed in via the elem param, after it has been hidden via FB.Canvas.hideFlashElement. */
-	showFlashElement(element : Element) : void;
-	showFlashElement(element : HTMLElement) : void;
+    /* Displays the HTML element passed in via the elem param, after it has been hidden via FB.Canvas.hideFlashElement. */
+    showFlashElement(element : Element) : void;
+    showFlashElement(element : HTMLElement) : void;
 
-	/* Tells Facebook to scroll to a specific location of your canvas page. */
-	scrollTo(x : Number, y : Number) : void;
+    /* Tells Facebook to scroll to a specific location of your canvas page. */
+    scrollTo(x : Number, y : Number) : void;
 
-	/* Starts or stops a timer which will grow your iframe to fit the content every few milliseconds. */
-	setAutoGrow(stopTimer : boolean) : void;
-	setAutoGrow(diffInterval : Number) : void;
-	setAutoGrow(stopTimer : boolean, diffInterval : Number) : void
+    /* Starts or stops a timer which will grow your iframe to fit the content every few milliseconds. */
+    setAutoGrow(stopTimer : boolean) : void;
+    setAutoGrow(diffInterval : Number) : void;
+    setAutoGrow(stopTimer : boolean, diffInterval : Number) : void
 
-	/* Tells Facebook to resize your iframe. */
-	setSize(canvasSizeOptions : FBSDKCanvasSize) : void;
+    /* Tells Facebook to resize your iframe. */
+    setSize(canvasSizeOptions : FBSDKCanvasSize) : void;
 
-	/* Registers the callback for inline processing (i.e. without page reload) of user actions when they click on any link to the current app from Canvas */
-	setUrlHandler(handler ?: Function) : string;
+    /* Registers the callback for inline processing (i.e. without page reload) of user actions when they click on any link to the current app from Canvas */
+    setUrlHandler(handler?: Function) : string;
 
-	/* Calls you back with an integer, in milliseconds, of the timing of the page load, beginning from the time when the first bytes arrive on
-		the client, and ending from the point at which you call this function.
-	*/
-	setDoneLoading(handler ?: Function) : FBSDKCanvasDoneLoading;
+    /* Calls you back with an integer, in milliseconds, of the timing of the page load, beginning from the time when the first bytes arrive on
+        the client, and ending from the point at which you call this function.
+    */
+    setDoneLoading(handler?: Function) : FBSDKCanvasDoneLoading;
 
-	/* Call startTimer to resume the timer after a period of time for the page load that you didn't wish to measure, which you began by calling stopTimer. */
-	startTimer() : void;
+    /* Call startTimer to resume the timer after a period of time for the page load that you didn't wish to measure, which you began by calling stopTimer. */
+    startTimer() : void;
 
-	/* Call stopTimer when you wish to stop timing the page load for a period of time */
-	stopTimer(handler ?: (fbResponseObject : Object) => any) : void;
+    /* Call stopTimer when you wish to stop timing the page load for a period of time */
+    stopTimer(handler?: (fbResponseObject : Object) => any) : void;
 }
 
 interface FBSDK{
-	/* This method is used to initialize and setup the SDK. */
-	init(fbInitObject : FBInitParams) : void;
+    /* This method is used to initialize and setup the SDK. */
+    init(fbInitObject : FBInitParams) : void;
 
-	/* This method lets you make calls to the Graph API. */
-	api(path : string, method : string, callback : (fbResponseObject : Object) => any) :  Object;
-	api(path : string, params : Object, callback : (fbResponseObject : Object) => any) :  Object;
-	api(path : string, method : string, params : Object, callback : (fbResponseObject : Object) => any) : Object;
+    /* This method lets you make calls to the Graph API. */
+    api(path : string, method : string, callback : (fbResponseObject : Object) => any) :  Object;
+    api(path : string, params : Object, callback : (fbResponseObject : Object) => any) :  Object;
+    api(path : string, method : string, params : Object, callback : (fbResponseObject : Object) => any) : Object;
 
-	/* This method is used to trigger different forms of Facebook created UI dialogs. */
-	ui(params : FBUIParams, handler : (fbResponseObject : Object) => any) : void;
+    /* This method is used to trigger different forms of Facebook created UI dialogs. */
+    ui(params : FBUIParams, handler : (fbResponseObject : Object) => any) : void;
 
-	/* Allows you to determine if a user is logged in to Facebook and has authenticated your app */
-	getLoginStatus(handler : Function, force ?: Boolean) : void;
+    /* Allows you to determine if a user is logged in to Facebook and has authenticated your app */
+    getLoginStatus(handler : Function, force?: Boolean) : void;
 
-	/* Calling FB.login prompts the user to authenticate your application using the Login Dialog. */
-	login(handler : (fbResponseObject : Object) => any, params ?: FBLoginOptions): void;
+    /* Calling FB.login prompts the user to authenticate your application using the Login Dialog. */
+    login(handler : (fbResponseObject : Object) => any, params?: FBLoginOptions): void;
 
-	/* Log the user out of your site and Facebook */
-	logout(handler : (fbResponseObject : Object) => any) : void;
+    /* Log the user out of your site and Facebook */
+    logout(handler : (fbResponseObject : Object) => any) : void;
 
-	/* Synchronous accessor for the current authResponse. */
-	getAuthResponse() : Object;
+    /* Synchronous accessor for the current authResponse. */
+    getAuthResponse() : Object;
 
-	Event : FBSDKEvents;
-	XFBML : FBSDKXFBML;
-	Canvas : FBSDKCanvas;
+    Event : FBSDKEvents;
+    XFBML : FBSDKXFBML;
+    Canvas : FBSDKCanvas;
 }
 
 interface Window{
-	fbAsyncInit() : any;
+    fbAsyncInit() : any;
 }
 
 declare module "FB" {
-	export = FB;
+    export = FB;
 }
 
 declare var FB : FBSDK;
diff --git a/featherlight/featherlight-tests.ts b/featherlight/featherlight-tests.ts
new file mode 100644
index 000000000..ed74a201e
--- /dev/null
+++ b/featherlight/featherlight-tests.ts
@@ -0,0 +1,169 @@
+// Tests by: Kaur Kuut <https://github.com/xStrom>
+
+///<reference path="../jquery/jquery.d.ts" />
+///<reference path="featherlight.d.ts" />
+
+// Every option as default
+var defaultOptions = {
+	namespace: 'featherlight',
+	targetAttr: 'data-featherlight',
+	variant: null as string,
+	resetCss: false,
+	background: null as string,
+	openTrigger: 'click',
+	closeTrigger: 'click',
+	filter: null as string,
+	root: 'body',
+	openSpeed: 250,
+	closeSpeed: 250,
+	closeOnClick: 'background',
+	closeOnEsc: true,
+	closeIcon: '&#10005;',
+	loading: '',
+	persist: false,
+	otherClose: null as string,
+	beforeOpen: $.noop,
+	beforeContent: $.noop,
+	beforeClose: $.noop,
+	afterOpen: $.noop,
+	afterContent: $.noop,
+	afterClose: $.noop,
+	onKeyUp: $.noop,
+	onResize: $.noop,
+	type: null as string,
+	contentFilters: ['jquery', 'image', 'html', 'ajax', 'iframe', 'text']
+};
+
+// Every option changed
+var changedOptions = {
+	namespace: 'foo',
+	targetAttr: 'foo',
+	variant: 'foo',
+	resetCss: true,
+	background: '<div/>',
+	openTrigger: 'focus',
+	closeTrigger: 'blur',
+	filter: 'foo',
+	root: 'foo',
+	openSpeed: 'fast',
+	closeSpeed: 'fast',
+	closeOnClick: false,
+	closeOnEsc: false,
+	closeIcon: 'foo',
+	loading: 'foo',
+	persist: 'shared',
+	otherClose: 'foo',
+	beforeOpen: (e: JQueryEventObject) => false,
+	beforeContent: (e: JQueryEventObject) => false,
+	beforeClose: (e: JQueryEventObject) => false,
+	afterOpen: (e: JQueryEventObject) => false,
+	afterContent: (e: JQueryEventObject) => false,
+	afterClose: (e: JQueryEventObject) => false,
+	onKeyUp: (e: JQueryEventObject) => false,
+	onResize: (e: JQueryEventObject) => false,
+	type: 'text'
+};
+
+// Turn off auto bind
+$.featherlight.autoBind = false;
+
+// Change some defaults
+$.featherlight.defaults.namespace = 'foo';
+$.featherlight.defaults.openSpeed = 500;
+$.featherlight.defaults.persist = true;
+$.featherlight.defaults.text = 'foo';
+
+// Do the simplest manual bind
+$('#id').featherlight();
+
+// Bind #id to open #fl
+$('#id').featherlight('#fl');
+
+// Bind #id to open #fl with persistance
+$('#id').featherlight('#fl', {persist: true});
+
+// Bind #id to open jQuery object
+$('#id').featherlight($('<span>Foo!</span>'));
+
+// Bind #id to open jQuery object with persistance
+$('#id').featherlight($('<span>Foo!</span>'), {persist: true});
+
+// Bind #id to open #fl with every option set to default
+$('#id').featherlight('#fl', defaultOptions);
+
+// Bind #id to open jQuery object with every option set to default
+$('#id').featherlight($('<span>Foo!</span>'), defaultOptions);
+
+// Bind #id to open #fl with every option changed
+$('#id').featherlight('#fl', changedOptions);
+
+// Bind #id to open jQuery object with every option changed
+$('#id').featherlight($('<span>Foo!</span>'), changedOptions);
+
+// Open the default
+$.featherlight();
+new $.featherlight;
+
+// Open just text
+$.featherlight({text: 'Foo!'}).open();
+new $.featherlight({text: 'Foo!'}).open();
+
+// Open #fl, and close it
+$.featherlight('#fl').close();
+new $.featherlight('#fl').close();
+
+// Open #fl with persistance, and close it
+$.featherlight('#fl', {persist: true}).close();
+new $.featherlight('#fl', {persist: true}).close();
+
+// Open jQuery object, and close it
+$.featherlight($('<span>Foo!</span>')).close();
+new $.featherlight($('<span>Foo!</span>')).close();
+
+// Open jQuery object with persistance, and close it
+$.featherlight($('<span>Foo!</span>'), {persist: true}).close();
+new $.featherlight($('<span>Foo!</span>'), {persist: true}).close();
+
+// Open #fl with every option set to default, and close it
+$.featherlight('#fl', defaultOptions).close();
+new $.featherlight('#fl', defaultOptions).close();
+
+// Open jQuery object with every option set to default, and close it
+$.featherlight($('<span>Foo!</span>'), defaultOptions).close();
+new $.featherlight($('<span>Foo!</span>'), defaultOptions).close();
+
+// Open #fl with every option changed, and close it
+$.featherlight('#fl', changedOptions).close();
+new $.featherlight('#fl', changedOptions).close();
+
+// Open jQuery object with every option changed, and close it
+$.featherlight($('<span>Foo!</span>'), changedOptions).close();
+new $.featherlight($('<span>Foo!</span>'), changedOptions).close();
+
+// Define a custom content filter
+// Note: Unfortunately $.featherlight.contentFilters.feed = .. doesn't seem to work
+$.featherlight.contentFilters['feed'] = {
+	regex: /^feed:/,
+	process: function(url: string) { return $('Loading...'); }
+};
+
+// Close the currently open fl
+$.featherlight.close();
+
+// Get all the opened fls and close the first
+$.featherlight.opened()[0].close();
+
+// Get the currently opened fl
+var fl = $.featherlight.current();
+
+// .. and close it
+fl.close();
+
+// .. and open it once more
+fl.open();
+
+// .. and edit its namespace
+fl.namespace = 'foo';
+
+// .. and add a special event handler
+fl.afterClose = (e: JQueryEventObject) => false;
diff --git a/featherlight/featherlight.d.ts b/featherlight/featherlight.d.ts
new file mode 100644
index 000000000..ad4c1d1c2
--- /dev/null
+++ b/featherlight/featherlight.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for Featherlight v1.3.4
+// Project: https://noelboss.github.io/featherlight/
+// Definitions by: Kaur Kuut <https://github.com/xStrom>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../jquery/jquery.d.ts" />
+
+declare module Featherlight {
+	interface Config {
+		namespace?: string;
+		targetAttr?: string;
+		variant?: string;
+		resetCss?: boolean;
+		background?: string;
+		openTrigger?: string;
+		closeTrigger?: string;
+		filter?: string;
+		root?: string;
+		openSpeed?: number | string;
+		closeSpeed?: number | string;
+		closeOnClick?: boolean | string;
+		closeOnEsc?: boolean;
+		closeIcon?: string;
+		loading?: string;
+		persist?: boolean | string;
+		otherClose?: string;
+		beforeOpen?: (event: JQueryEventObject) => any;
+		beforeContent?: (event: JQueryEventObject) => any;
+		beforeClose?: (event: JQueryEventObject) => any;
+		afterOpen?: (event: JQueryEventObject) => any;
+		afterContent?: (event: JQueryEventObject) => any;
+		afterClose?: (event: JQueryEventObject) => any;
+		onKeyUp?: (event: JQueryEventObject) => any;
+		onResize?: (event: JQueryEventObject) => any;
+		type?: string;
+		contentFilters?: any;
+		jquery?: JQuery;
+		image?: string;
+		html?: string;
+		ajax?: string;
+		text?: string;
+	}
+
+	interface ContentFilter {
+		regex?: RegExp;
+		test?(data: JQuery | string): boolean;
+		process?(data: JQuery | string): JQuery | JQueryPromise<JQuery>;
+	}
+
+	interface ContentFilters {
+		[name: string]: ContentFilter;
+	}
+
+	interface Featherlight extends Config {
+		target: JQuery | string;
+		$instance: JQuery;
+		$content: JQuery;
+
+		setup(target: JQuery, config?: Config): Featherlight;
+		setup(target: string, config?: Config): Featherlight;
+		setup(config: Config): Featherlight;
+		setup(): Featherlight;
+
+		getContent(): JQuery | JQueryPromise<JQuery>;
+		setContent($content: JQuery): Featherlight;
+		setContent($content: JQueryPromise<JQuery>): Featherlight;
+		open(event?: JQueryEventObject): JQueryPromise<JQuery>;
+		close(event?: JQueryEventObject): JQueryPromise<JQuery>;
+	}
+
+	interface FeatherlightStatic {
+		($content: JQuery, config?: Config): Featherlight;
+		($content: string, config?: Config): Featherlight;
+		(config: Config): Featherlight;
+		(): Featherlight;
+
+		new($content: JQuery, config?: Config): Featherlight;
+		new($content: string, config?: Config): Featherlight;
+		new(config: Config): Featherlight;
+		new(): Featherlight;
+
+		attach($source: JQuery, $content: JQuery, config?: Config): JQuery;
+		attach($source: JQuery, $content: string, config?: Config): JQuery;
+		attach($source: JQuery, config: Config): JQuery;
+		attach($source: JQuery): JQuery;
+
+		id: number;
+		autoBind: boolean | string;
+		defaults: Config;
+		contentFilters: ContentFilters;
+		functionAttributes: string[];
+
+		readElementConfig(element: HTMLElement, namespace: string): any;
+		extend(child: any, defaults: any): any;
+		current(): Featherlight;
+		opened(): Featherlight[];
+		close(): JQueryPromise<JQuery>;
+	}
+
+	interface JQueryExtension {
+		($content: JQuery, config?: Config): JQuery;
+		($content: string, config?: Config): JQuery;
+		(config: Config): JQuery;
+		(): JQuery;
+	}
+}
+
+interface JQueryStatic {
+	featherlight: Featherlight.FeatherlightStatic;
+}
+
+interface JQuery {
+	featherlight: Featherlight.JQueryExtension;
+}
diff --git a/fhir/fhir-tests.ts b/fhir/fhir-tests.disabled.ts
similarity index 100%
rename from fhir/fhir-tests.ts
rename to fhir/fhir-tests.disabled.ts
diff --git a/findup-sync/findup-sync-tests.ts b/findup-sync/findup-sync-tests.ts
index f4aab395a..55eab3617 100644
--- a/findup-sync/findup-sync-tests.ts
+++ b/findup-sync/findup-sync-tests.ts
@@ -11,3 +11,7 @@ str = findup(['foo', 'bar']);
 str = findup('foo', {
 	debug: true
 });
+
+str = findup('foo', {
+	cwd: "c:\\"
+});
diff --git a/findup-sync/findup-sync.d.ts b/findup-sync/findup-sync.d.ts
index a5bb5b49d..b7bf674e2 100644
--- a/findup-sync/findup-sync.d.ts
+++ b/findup-sync/findup-sync.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for findup-sync v0.1.3
+// Type definitions for findup-sync v0.3.0
 // Project: https://github.com/cowboy/node-findup-sync
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../minimatch/minimatch.d.ts" />
@@ -8,8 +8,11 @@
 declare module 'findup-sync' {
 	import minimatch = require('minimatch');
 
-	function mod(pattern: string, opts?: minimatch.IOptions): string;
-	function mod(pattern: string[], opts?: minimatch.IOptions): string;
+	interface IOptions extends minimatch.IOptions {
+		cwd?: string;
+	}
+
+	function mod(pattern: string[] | string, opts?: IOptions): string;
 
 	export = mod;
 }
diff --git a/firebase/firebase.d.ts b/firebase/firebase.d.ts
index 6302336e1..df792c713 100644
--- a/firebase/firebase.d.ts
+++ b/firebase/firebase.d.ts
@@ -65,23 +65,23 @@ interface FirebaseDataSnapshot {
 
 interface FirebaseOnDisconnect {
 	/**
-	 * Ensures the data at this location is set to the specified value when the client is disconnected 
+	 * Ensures the data at this location is set to the specified value when the client is disconnected
 	 * (due to closing the browser, navigating to a new page, or network issues).
 	 */
 	set(value: any, onComplete?: (error: any) => void): void;
 	/**
-	 * Ensures the data at this location is set to the specified value and priority when the client is disconnected 
+	 * Ensures the data at this location is set to the specified value and priority when the client is disconnected
 	 * (due to closing the browser, navigating to a new page, or network issues).
 	 */
 	setWithPriority(value: any, priority: string, onComplete?: (error: any) => void): void;
 	setWithPriority(value: any, priority: number, onComplete?: (error: any) => void): void;
 	/**
-	 * Writes the enumerated children at this Firebase location when the client is disconnected 
+	 * Writes the enumerated children at this Firebase location when the client is disconnected
 	 * (due to closing the browser, navigating to a new page, or network issues).
 	 */
 	update(value: Object, onComplete?: (error: any) => void): void;
 	/**
-	 * Ensures the data at this location is deleted when the client is disconnected 
+	 * Ensures the data at this location is deleted when the client is disconnected
 	 * (due to closing the browser, navigating to a new page, or network issues).
 	 */
 	remove(onComplete?: (error: any) => void): void;
@@ -127,13 +127,13 @@ interface FirebaseQuery {
 	 */
 	limit(limit: number): FirebaseQuery;
 	/**
-	 * Creates a Query with the specified starting point. 
+	 * Creates a Query with the specified starting point.
 	 * The generated Query includes children which match the specified starting point.
 	 */
 	startAt(value: string, key?: string): FirebaseQuery;
 	startAt(value: number, key?: string): FirebaseQuery;
 	/**
-	 * Creates a Query with the specified ending point. 
+	 * Creates a Query with the specified ending point.
 	 * The generated Query includes children which match the specified ending point.
 	 */
 	endAt(value: string, key?: string): FirebaseQuery;
@@ -263,7 +263,7 @@ interface Firebase extends FirebaseQuery {
 	/**
 	 * Creates a new user account using an email / password combination.
 	 */
-	createUser(credentials: FirebaseCredentials, onComplete: (error: any) => void): void;
+	createUser(credentials: FirebaseCredentials, onComplete: (error: any, userData: any) => void): void;
 	/**
 	 * Updates the email associated with an email / password user account.
 	 */
@@ -298,7 +298,7 @@ interface FirebaseStatic {
 
 	ServerValue: {
 		/**
-		 * A placeholder value for auto-populating the current timestamp 
+		 * A placeholder value for auto-populating the current timestamp
 		 * (time since the Unix epoch, in milliseconds) by the Firebase servers.
 		 */
 		TIMESTAMP: any;
diff --git a/flake-idgen/flake-idgen-tests.ts b/flake-idgen/flake-idgen-tests.ts
new file mode 100644
index 000000000..5828bc913
--- /dev/null
+++ b/flake-idgen/flake-idgen-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="flake-idgen.d.ts"/>
+
+// require flake-idgen
+import FlakeId = require('flake-idgen');
+let flakeIdGen1 = new FlakeId({datacenter: 9, worker: 7});
+
+// create flake IDs
+console.log(flakeIdGen1.next());
+console.log(flakeIdGen1.next());
+console.log(flakeIdGen1.next());
+
+// create flake IDs using a callback
+flakeIdGen1.next((err, id) => {
+	console.info(id);
+});
+
+flakeIdGen1.next((err, id) => {
+	console.info(id);
+});
+
+let flakeIdGen2 = new FlakeId();
+let flakeIdGen3 = new FlakeId({datacenter: 9, worker: 7});
+let flakeIdGen4 = new FlakeId({epoch: 1300000000000})
+console.info(flakeIdGen2.next());
+console.info(flakeIdGen3.next());
+console.info(flakeIdGen4.next());
+
diff --git a/flake-idgen/flake-idgen.d.ts b/flake-idgen/flake-idgen.d.ts
new file mode 100644
index 000000000..9462eaba4
--- /dev/null
+++ b/flake-idgen/flake-idgen.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for flakge-idgen 0.1.4
+// Project: https://github.com/T-PWK/flake-idgen
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'flake-idgen' {
+	interface ConstructorOptions {
+		datacenter?: number;
+		worker?: number;
+		id?: number;
+		epoch?: number;
+		seqMask?: number;
+	}
+
+	class FlakeId {
+		constructor(options?: ConstructorOptions);
+		next(callback?: (err: Error, id: Buffer) => void): Buffer;
+	}
+	export = FlakeId;
+}
diff --git a/flowjs/flowjs-tests.ts b/flowjs/flowjs-tests.ts
new file mode 100644
index 000000000..8bedad003
--- /dev/null
+++ b/flowjs/flowjs-tests.ts
@@ -0,0 +1,78 @@
+/// <reference path="flowjs.d.ts" />
+
+// flow object
+var flowObject: flowjs.IFlow;
+var bool: boolean = flowObject.support;
+bool = flowObject.supportDirectory;
+var obj: Object = flowObject.opts;
+var flowFileArray: flowjs.IFlowFile[] = flowObject.files;
+
+flowObject.assignBrowse(<HTMLElement[]> [], false, false, {});
+flowObject.assignDrop(<HTMLElement[]> []);
+flowObject.unAssignDrop(<HTMLElement[]> []);
+flowObject.on("", () => {});
+flowObject.off("", () => {});
+flowObject.upload();
+flowObject.pause();
+flowObject.resume();
+flowObject.cancel();
+flowObject.progress();
+bool = flowObject.isUploading();
+flowObject.addFile(<File> {});
+flowObject.removeFile(<flowjs.IFlowFile> {});
+var flowFile: flowjs.IFlowFile = flowObject.getFromUniqueIdentifier("");
+var num: number = flowObject.getSize();
+num = flowObject.sizeUploaded();
+num = flowObject.timeRemaining();
+
+// flow options
+var flowOptions: flowjs.IFlowOptions = {};
+flowOptions.target = "";
+flowOptions.singleFile = true;
+flowOptions.chunkSize= 0;
+flowOptions.forceChunkSize = true;
+flowOptions.simultaneousUploads= 0;
+flowOptions.fileParameterName = "";
+flowOptions.query = {};
+flowOptions.headers = {};
+flowOptions.withCredentials = true;
+flowOptions.method = "";
+flowOptions.testMethod = "";
+flowOptions.uploadMethod = "";
+flowOptions.allowDuplicateUploads = true;
+flowOptions.prioritizeFirstAndLastChunk = true;
+flowOptions.testchunks = true;
+flowOptions.preprocess = () => {};
+flowOptions.initFileFn = () => {};
+flowOptions.generateUniqueIdentifier = () => {};
+flowOptions.maxChunkRetries= 0;
+flowOptions.chunkRetryInterval= 0;
+flowOptions.progressCallbacksInterval= 0;
+flowOptions.speedSmoothingFactor= 0;
+flowOptions.successStatuses = [""];
+flowOptions.permanentErrors = [""];
+
+// flow file
+flowObject = flowFile.flowObj;
+var htmlFile: File = flowFile.file;
+var str: string = flowFile.name;
+str = flowFile.relativePath;
+num = flowFile.size;
+str = flowFile.uniqueIdentifier;
+num = flowFile.averageSpeed;
+num = flowFile.currentSpeed;
+var anyArray: any[] = flowFile.chunks;
+bool = flowFile.paused;
+bool = flowFile.error;
+num = flowFile.progress(true);
+flowFile.pause();
+flowFile.resume();
+flowFile.cancel();
+flowFile.retry();
+flowFile.bootstrap();
+bool = flowFile.isUploading();
+bool = flowFile.isComplete;
+num = flowFile.sizeUploaded;
+num = flowFile.timeRemaining;
+str = flowFile.getExtension;
+str = flowFile.getType;
diff --git a/flowjs/flowjs.d.ts b/flowjs/flowjs.d.ts
new file mode 100644
index 000000000..e9e90055b
--- /dev/null
+++ b/flowjs/flowjs.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for flowjs
+// Project: https://github.com/flowjs/flow.js
+// Definitions by: Ryan McNamara <https://github.com/ryan10132>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module flowjs {
+    interface IFlow {
+        support: boolean;
+        supportDirectory: boolean;
+        opts: Object;
+        files: IFlowFile[];
+
+        assignBrowse(domNodes: HTMLElement[], isDirectory: boolean, singleFile: boolean, attributes: Object): void;
+        assignDrop(domNodes: HTMLElement[]): void;
+        unAssignDrop(domNodes: HTMLElement[]): void;
+        on(event: string, callback: Function): void;
+        off(event?: string, callback?: Function): void;
+        upload(): void;
+        pause(): void;
+        resume(): void;
+        cancel(): void;
+        progress(): number;
+        isUploading(): boolean;
+        addFile(file: File): void;
+        removeFile(file: IFlowFile): void;
+        getFromUniqueIdentifier(uniqueIdentifier: string): IFlowFile;
+        getSize(): number;
+        sizeUploaded(): number;
+        timeRemaining(): number;
+    }
+
+    interface IFlowOptions {
+        target?: string;
+        singleFile?: boolean;
+        chunkSize?: number;
+        forceChunkSize?: boolean;
+        simultaneousUploads?: number;
+        fileParameterName?: string;
+        query?: Object;
+        headers?: Object;
+        withCredentials?: boolean;
+        method?: string;
+        testMethod?: string;
+        uploadMethod?: string;
+        allowDuplicateUploads?: boolean;
+        prioritizeFirstAndLastChunk?: boolean;
+        testchunks?: boolean;
+        preprocess?: Function;
+        initFileFn?: Function;
+        generateUniqueIdentifier?: Function;
+        maxChunkRetries?: number;
+        chunkRetryInterval?: number;
+        progressCallbacksInterval?: number;
+        speedSmoothingFactor?: number;
+        successStatuses?: string[];
+        permanentErrors?: string[];
+    }
+
+    interface IFlowFile {
+        flowObj: IFlow;
+        file: File;
+        name: string;
+        relativePath: string;
+        size: number;
+        uniqueIdentifier: string;
+        averageSpeed: number;
+        currentSpeed: number;
+        chunks: any[];
+        paused: boolean;
+        error: boolean;
+
+        progress(relative: boolean): number;
+        pause(): void;
+        resume(): void;
+        cancel(): void;
+        retry(): void;
+        bootstrap(): void;
+        isUploading(): boolean;
+        isComplete: boolean;
+        sizeUploaded: number;
+        timeRemaining: number;
+        getExtension: string;
+        getType: string;
+    }
+}
diff --git a/fontoxml/fontoxml-tests.ts b/fontoxml/fontoxml-tests.ts
new file mode 100644
index 000000000..7821806cf
--- /dev/null
+++ b/fontoxml/fontoxml-tests.ts
@@ -0,0 +1,28 @@
+///<reference path='fontoxml.d.ts' />
+
+var workflow:com.fontoxml.IWorkflowInfo = {
+	id:"1",
+	displayName:"workflow"
+}
+
+var user:com.fontoxml.IUserInfo = {
+	id: "123",
+	displayName: "test",
+	roleId: "editor"
+}
+
+var init:com.fontoxml.IInvocator = {
+	documentIds: ["11-22-33","44-55-66"],
+	cmsBaseUrl: "/test/",
+	editSessionToken: "aa-bb-cc-dd-ee",
+	user: user,
+	workflow: workflow,
+	autosave: false,
+	heartbeat: 300	
+}
+
+var simpleinit:com.fontoxml.IInvocator = {
+	documentIds: ["11-22-33","44-55-66"],
+	cmsBaseUrl: "/test/",
+	editSessionToken: "aa-bb-cc-dd-ee"
+}
\ No newline at end of file
diff --git a/fontoxml/fontoxml.d.ts b/fontoxml/fontoxml.d.ts
new file mode 100644
index 000000000..4d621c234
--- /dev/null
+++ b/fontoxml/fontoxml.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for FontoXML
+// Project: http://www.fontoxml.com/
+// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module com.fontoxml
+{
+	//This is a description of how to invoke the FontoXML editor, and instruct it to load (a) document(s).
+	//Please keep in mind that the URL length may be limited in certain browsers, so a safe limit of 2000 characters
+	//for the whole URL including query parameters should be used.
+	export interface IInvocator
+	{
+		//The document id's of the documents to load from the CMS.
+		documentIds: string[];
+		//The base URL where the CMS endpoints are exposed.
+	        cmsBaseUrl: string;
+	        //The edit session token to use for accessing the CMS endpoints.
+                editSessionToken: string;
+                //User information.
+		user?: IUserInfo;
+		//Workflow information.
+		workflow?: IWorkflowInfo;
+		//Allow/disallow auto-save functionality.
+		autosave?: boolean;
+		//If set to a positive integer, enable the Heartbeat API to send every x seconds.
+		heartbeat?: number;
+	}
+	
+	export interface IWorkflowInfo
+	{
+		id:string;
+		displayName:string;
+	}
+
+	export interface IUserInfo extends IWorkflowInfo
+	{
+		roleId:string;
+	}
+	
+}
\ No newline at end of file
diff --git a/form-data/form-data.d.ts b/form-data/form-data.d.ts
index 98dc1567d..2af4565cc 100644
--- a/form-data/form-data.d.ts
+++ b/form-data/form-data.d.ts
@@ -11,5 +11,6 @@ declare module "form-data" {
 		getHeaders(): Object;
 		// TODO expand pipe
 		pipe(to: any): any;
+		submit(params: string|Object, callback: (error: any, response: any) => void): any;
 	}
 }
diff --git a/freedom/freedom-core-env.d.ts b/freedom/freedom-core-env.d.ts
new file mode 100644
index 000000000..bc77bf64e
--- /dev/null
+++ b/freedom/freedom-core-env.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for freedom v0.6.26
+// Project: https://github.com/freedomjs/freedom
+// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./freedom.d.ts" />
+
+declare var freedom :freedom.FreedomInCoreEnv;
diff --git a/freedom/freedom-module-env.d.ts b/freedom/freedom-module-env.d.ts
new file mode 100644
index 000000000..5a6a08f2e
--- /dev/null
+++ b/freedom/freedom-module-env.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for freedom v0.6.26
+// Project: https://github.com/freedomjs/freedom
+// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./freedom.d.ts" />
+
+declare var freedom :freedom.FreedomInModuleEnv;
diff --git a/freedom/freedom-tests.ts b/freedom/freedom-tests.ts
new file mode 100644
index 000000000..e83d0cd13
--- /dev/null
+++ b/freedom/freedom-tests.ts
@@ -0,0 +1,24 @@
+/// <reference path="../es6-promise/es6-promise.d.ts"/>
+/// <reference path="freedom.d.ts" />
+
+var freedomModule :freedom.FreedomInModuleEnv;
+var freedomCore :freedom.FreedomInCoreEnv;
+
+var parentModule :freedom.ParentModuleThing = freedomModule();
+parentModule.on('message', (x :string) => {
+});
+
+var coreInModule :freedom.Core = freedomModule['core']();
+coreInModule.getLogger('tag').then((logger :freedom.Logger) => {
+  logger.log('message');
+});
+
+var freedomConsole :freedom.Console.Console = freedomModule['core.console']();
+var doneLogging :Promise<void> = freedomConsole.log('source', 'message');
+
+freedomCore('freedom-module.json', {
+  'logger': 'loggingprovider.json',
+  'debug': 'log'
+}).then((moduleFactory) => {
+  moduleFactory.close();
+});
diff --git a/freedom/freedom.d.ts b/freedom/freedom.d.ts
new file mode 100644
index 000000000..f012c9dea
--- /dev/null
+++ b/freedom/freedom.d.ts
@@ -0,0 +1,573 @@
+// Type definitions for freedom v0.6.26
+// Project: https://github.com/freedomjs/freedom
+// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../es6-promise/es6-promise.d.ts"/>
+
+declare module freedom {
+    // Common on/emit for message passing interfaces.
+    interface EventDispatchFn<T> { (eventType: string, value?: T): void; }
+    interface EventHandlerFn<T> {
+        (eventType: string, handler: (eventData:T) => void): void;
+    }
+
+    interface Error {
+        errcode: string;
+        message: string;
+    }
+
+    // TODO: replace OnAndEmit with EventHandler and EventEmitter;
+    interface OnAndEmit<T,T2> {
+        on: EventHandlerFn<T>;
+        emit: EventDispatchFn<T2>;
+    }
+
+    interface EventHandler {
+        // Adds |f| as an event handler for all subsiquent events of type |t|.
+        on(t: string, f: Function): void;
+        // Adds |f| as an event handler for only the next event of type |t|.
+        once(t: string, f: Function): void;
+        // The |off| function removes the event event handling function |f| from
+        // both |on| and the |once| event handling.
+        off(t: string, f: Function): void;
+    }
+
+    interface PortModule<T, T2> extends OnAndEmit<T, T2> {
+        controlChannel: string;
+    }
+
+    interface ModuleSelfConstructor {
+        // Identifies a named API's provider class.
+        provideSynchronous: (classFn?: Function) => void;
+        provideAsynchronous :(classFn?: Function) => void;
+        providePromises: (classFn?: Function) => void;
+    }
+
+    interface ParentModuleThing extends ModuleSelfConstructor, OnAndEmit<any, any> {
+    }
+
+    interface Logger {
+        debug(...args: any[]): void;
+        info(...args: any[]): void;
+        log(...args: any[]): void;
+        warn(...args: any[]): void;
+        error(...args: any[]): void;
+    }
+
+    // See |Core_unprivileged| in |core.unprivileged.js|
+    interface Core {
+        // Create a new channel which which to communicate between modules.
+        createChannel(): Promise<ChannelSpecifier>;
+        // Given an ChannelEndpointIdentifier for a channel, create a proxy event
+        // interface for it.
+        bindChannel(channelIdentifier: string): Promise<Channel>;
+        // Returns the list of identifiers describing the dependency path.
+        getId(): Promise<string[]>;
+        getLogger(tag: string): Promise<Logger>;
+    }
+
+    // Channels are ways that freedom modules can send each other messages.
+    interface Channel extends OnAndEmit<any,any> {
+        close(): void;
+    }
+
+    // Specification for a channel.
+    interface ChannelSpecifier {
+        channel: Channel;  // How to communicate over this channel.
+         // A freedom channel endpoint identifier. Can be passed over a freedom
+         // message-passing boundary.  It is used to create a channel to the freedom
+         // module that called createChannel and created this ChannelSpecifier.
+         identifier: string;
+    }
+
+    // This is the first argument given to a core provider's constructor. It is an
+    // object that describes the parent module the core provider instance has been
+    // created for.
+    interface CoreProviderParentApp {
+        manifestId: string;
+        config: {
+            views: {[viewName: string]: Object};
+        };
+        global: {
+            removeEventListener: (s: string, f: Function, b: boolean) => void;
+        };
+    }
+
+    // A Freedom module sub is both a function and an object with members. The
+    // type |T| is the type of the module's stub interface.
+    interface FreedomModuleFactoryManager<T> {
+        // This is the factory constructor for a new instance of a stub/channel to a
+        // module.
+        (...args: any[]): T;
+        // This is the call to close a particular stub's channel and resources. It
+        // is assumed that the argument is a result of the factory constructor. If
+        // no argument is supplied, all stubs are closed.
+        close: (freedomModuleStubInstance?: T) => Promise<void>;
+        api: string;
+    }
+
+    interface FreedomInCoreEnvOptions {
+        debug?: string;  // debug level
+        logger?: string;  // string to json for logging provider.
+    }
+
+    interface FreedomInCoreEnv extends OnAndEmit<any,any> {
+        // Represents the call to freedom when you create a root module. Returns a
+        // promise to a factory constructor for the freedom module. The
+        // |manifestPath| should be a path to a json string that specifies the
+        // freedom module.
+        (manifestPath: string, options?: FreedomInCoreEnvOptions):
+                Promise<FreedomModuleFactoryManager<any>>;
+    }
+
+    interface FreedomInModuleEnv {
+        // Represents the call to freedom(), which returns the parent module's
+        // freedom stub interface in an on/emit style. This is a getter.
+        (): ParentModuleThing;
+
+        // Creates an interface to the freedom core provider which can be used to
+        // create loggers and channels.
+        // Note: unlike other providers, core is a getter.
+        'core': FreedomModuleFactoryManager<Core>;
+        'core.console': FreedomModuleFactoryManager<Console.Console>;
+        'core.rtcdatachannel': FreedomModuleFactoryManager<RTCDataChannel.RTCDataChannel>;
+        'core.rtcpeerconnection': FreedomModuleFactoryManager<RTCPeerConnection.RTCPeerConnection>;
+        'core.storage': FreedomModuleFactoryManager<Storage.Storage>;
+        'core.tcpsocket': FreedomModuleFactoryManager<TcpSocket.Socket>;
+        'core.udpsocket': FreedomModuleFactoryManager<UdpSocket.Socket>;
+        'pgp': FreedomModuleFactoryManager<PgpProvider.PgpProvider>;
+        'portControl': FreedomModuleFactoryManager<PortControl.PortControl>;
+
+        // We use this specification so that you can reference freedom sub-modules by
+        // an array-lookup of its name. One day, maybe we'll have a nicer way to do
+        // this.
+        [moduleName: string]: FreedomModuleFactoryManager<any>;
+    }
+
+    // This generic interface represents any freedom method. Its purpose is to extend
+    // the basic definition to include the reckless call method, which does not
+    // produce a reply message.
+    interface Method0<R> {
+        (): Promise<R>;
+        reckless: () => void;
+    }
+    interface Method1<T, R> {
+        (a: T): Promise<R>;
+        reckless: (a: T) => void;
+    }
+    interface Method2<T, U, R> {
+        (a: T, b: U) : Promise<R>;
+        reckless: (a: T, b: U) => void;
+    }
+    interface Method3<T, U, V, R> {
+        (a: T, b: U, c: V): Promise<R>;
+        reckless: (a: T, b: U, c: V) => void;
+    }
+}
+
+declare module freedom.Console {
+    interface Console {
+        log(source: string, message: string): Promise<void>;
+        debug(source: string, message: string): Promise<void>;
+        info(source: string, message: string): Promise<void>;
+        warn(source: string, message: string): Promise<void>;
+        error(source: string, message: string): Promise<void>;
+    }
+}
+
+declare module freedom.RTCDataChannel {
+    interface Message {
+        // Exactly one of the below must be specified.
+        text?: string;
+        buffer?: ArrayBuffer;
+        binary?: Blob;  // Not yet supported in Chrome.
+    }
+
+    // Constructed by |freedom['rtcdatachannel'](id)| where |id| is a string
+    // representing the channel id created by an |rtcpeerconnection| object.
+    interface RTCDataChannel {
+        getLabel(): Promise<string>;
+        getOrdered(): Promise<boolean>;
+        getMaxPacketLifeTime(): Promise<number>;
+        getMaxRetransmits(): Promise<number>;
+        getProtocol(): Promise<string>;
+        getNegotiated(): Promise<boolean>;
+        getId(): Promise<number>;
+        getReadyState(): Promise<string>;
+        getBufferedAmount(): Promise<number>;
+
+        on(t: 'onopen', f: () => void): void;
+        on(t: 'onerror', f: () => void): void;
+        on(t: 'onclose', f: () => void): void;
+        on(t: 'onmessage', f: (m: Message) => void): void;
+        on(t: string, f: Function): void;
+
+        close(): Promise<void>;
+        getBinaryType(): Promise<string>;
+        setBinaryType(type: string): Promise<void>;
+        send: freedom.Method1<string, void>;
+        sendBuffer: freedom.Method1<ArrayBuffer, void>;
+    }
+}
+
+declare module freedom.RTCPeerConnection {
+    interface RTCIceServer {
+        urls: string[];
+        username?: string;
+        credential?: string;
+    }
+
+    interface RTCConfiguration {
+        iceServers: RTCIceServer[];
+        iceTransports?: string;
+        peerIdentity?: string;
+    }
+
+    interface RTCOfferOptions {
+        offerToReceiveVideo?: number;
+        offerToReceiveAudio?: number;
+        voiceActivityDetection?: boolean;
+        iceRestart?: boolean;
+    }
+
+    interface RTCSessionDescription {
+        type: string;
+        sdp: string;
+    }
+
+    interface RTCIceCandidate {
+        candidate: string;
+        sdpMid?: string;
+        sdpMLineIndex?: number;
+    }
+
+    interface OnIceCandidateEvent {
+        candidate: RTCIceCandidate
+    }
+
+    interface RTCDataChannelInit {
+        ordered?: boolean;
+        maxPacketLifeTime?: number;
+        maxRetransmits?: number;
+        protocol?: string;
+        negotiated?: boolean;
+        id?: number;
+    }
+
+    // Note: the freedom factory constructor
+    // |freedom['rtcpeerconnection'](config)| to create an RTCPeerConnection has
+    // |RTCConfiguration| as the type of its config its argument.
+    interface RTCPeerConnection {
+        createOffer(options?: RTCOfferOptions): Promise<RTCSessionDescription>;
+        createAnswer(): Promise<RTCSessionDescription>;
+
+        setLocalDescription(desc: RTCSessionDescription): Promise<void>;
+        getLocalDescription(): Promise<RTCSessionDescription>;
+        setRemoteDescription(desc: RTCSessionDescription): Promise<void>;
+        getRemoteDescription(): Promise<RTCSessionDescription>;
+
+        getSignalingState(): Promise<string>;
+
+        updateIce(configuration: RTCConfiguration): Promise<void>;
+
+        addIceCandidate(candidate: RTCIceCandidate): Promise<void>;
+
+        getIceGatheringState(): Promise<string>;
+        getIceConnectionState(): Promise<string>;
+
+        getConfiguration(): Promise<RTCConfiguration>;
+
+        getLocalStreams(): Promise<string[]>;
+        getRemoteStreams(): Promise<string[]>;
+        getStreamById(id: string): Promise<string>;
+        addStream(ref: string): Promise<void>;
+        removeStream(ref: string): Promise<void>;
+
+        close(): Promise<void>;
+
+        createDataChannel(label: string, init: RTCDataChannelInit): Promise<string>;
+
+        getStats(selector?: string): Promise<any>;
+
+        on(t: 'ondatachannel', f: (d: {channel: string}) => void): void;
+        on(t: 'onnegotiationneeded', f: () => void): void;
+        on(t: 'onicecandidate', f: (d: OnIceCandidateEvent) => void): void;
+        on(t: 'onsignalingstatechange', f: () => void): void;
+        on(t: 'onaddstream', f: (d: {stream: number}) => void): void;
+        on(t: 'onremovestream', f: (d: {stream: number}) => void): void;
+        on(t: 'oniceconnectionstatechange', f: () => void): void;
+        on(t: string, f: Function): void;
+    }
+}
+
+declare module freedom.Storage {
+    interface Storage {
+        // Fetch array of all keys.
+        keys(): Promise<string[]>;
+        // Fetch a value for a key.
+        get(key: string): Promise<string>;
+        // Sets a value to a key. Fulfills promise with the previous value, if it
+        // exists.
+        set(key: string, value: string): Promise<string>;
+        // Remove a single key. Fulfills promise with previous value, if exists.
+        remove(key: string): Promise<string>;
+        // Remove all data from storage.
+        clear(): Promise<void>;
+    }  // class Storage
+}
+
+declare module freedom.TcpSocket {
+    interface DisconnectInfo {
+        errcode: string;
+        message: string;
+    }
+
+    interface ReadInfo {
+        data: ArrayBuffer;
+    }
+
+    interface WriteInfo {
+        bytesWritten: number;
+    }
+
+    interface SocketInfo {
+        connected: boolean;
+        localAddress?: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+    }
+
+    interface ConnectInfo {
+        socket: number;
+        host: string;
+        port: number;
+    }
+
+    // The TcpSocket class (freedom['core.TcpSocket'])
+    interface Socket {
+        listen(address: string, port: number): Promise<void>;
+        connect(hostname: string, port: number): Promise<void>;
+        secure(): Promise<void>;
+        write: freedom.Method1<ArrayBuffer, WriteInfo>;
+        pause: freedom.Method0<void>;
+        resume: freedom.Method0<void>;
+        getInfo(): Promise<SocketInfo>;
+        close(): Promise<void>;
+        // TcpSockets have 3 types of events:
+        on(type: 'onConnection', f: (i: ConnectInfo) => void): void;
+        on(type: 'onData', f: (i:ReadInfo) => void): void;
+        off(type: 'onData', f: (i: ReadInfo) => void): void;
+        on(type: 'onDisconnect', f: (i: DisconnectInfo) => void): void;
+        on(eventType: string, f: (i: Object) => void): void;
+        off(eventType: string, f: (i: Object) => void): void;
+    }
+}
+
+declare module freedom.UdpSocket {
+    // Type for the chrome.socket.getInfo callback:
+    //   https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
+    // This is also the type returned by getInfo().
+    interface SocketInfo {
+        // Note that there are other fields but these are the ones we care about.
+        localAddress: string;
+        localPort: number;
+    }
+
+    // Type for the chrome.socket.recvFrom callback:
+    //   http://developer.chrome.com/apps/socket#method-recvFrom
+    // This is also the type returned to onData callbacks.
+    interface RecvFromInfo {
+        resultCode: number;
+        address: string;
+        port: number;
+        data: ArrayBuffer;
+    }
+
+    interface Implementation {
+        bind(address: string, port: number, continuation: () => void) : void;
+        sendTo(data: ArrayBuffer, address: string, port: number,
+               continuation: (bytesWritten: number) => void): void;
+        destroy(continuation: () => void): void;
+        getInfo(continuation: (socketInfo: SocketInfo) => void): void;
+    }
+
+    interface Socket {
+        bind: (address: string, port: number) => Promise<void>;
+        sendTo: freedom.Method3<ArrayBuffer, string, number, number>;
+        destroy: () => Promise<void>;
+        on: (name: string, listener: Function) => void;
+        getInfo: () => Promise<SocketInfo>;
+    }
+}
+
+declare module freedom.PgpProvider {
+    interface PublicKey {
+        key: string;
+        fingerprint: string;
+    }
+
+    interface VerifyDecryptResult {
+        data: ArrayBuffer;
+        signedBy: string[];
+    }
+
+    interface PgpProvider {
+        // Standard freedom crypto API
+        setup(passphrase: string, userid: string): Promise<void>;
+        clear(): Promise<void>;
+        exportKey(): Promise<PublicKey>;
+        signEncrypt(data: ArrayBuffer, encryptKey?: string,
+                    sign?: boolean): Promise<ArrayBuffer>;
+        verifyDecrypt(data: ArrayBuffer,
+                      verifyKey?: string): Promise<VerifyDecryptResult>;
+        armor(data: ArrayBuffer, type?: string): Promise<string>;
+        dearmor(data: string): Promise<ArrayBuffer>;
+    }
+}
+
+declare module freedom.PortControl {
+    interface Mapping {
+        internalIp: string;
+        internalPort: number;
+        externalIp?: string;
+        externalPort: number;
+        lifetime: number;
+        protocol: string;
+        timeoutId?: number;
+        nonce?: number[];
+        errInfo?: string;
+    }
+
+    // A collection of Mappings
+    interface ActiveMappings {
+        [extPort: string]: Mapping;
+    }
+
+    // An object returned by probeProtocolSupport()
+    interface ProtocolSupport {
+        natPmp: boolean;
+        pcp: boolean;
+        upnp: boolean;
+    }
+
+    // Main interface for the module
+    interface PortControl {
+        addMapping(intPort: number, extPort: number, lifetime: number): Promise<Mapping>;
+        deleteMapping(extPort: number): Promise<boolean>;
+        probeProtocolSupport(): Promise<ProtocolSupport>;
+
+        probePmpSupport(): Promise<boolean>;
+        addMappingPmp(intPort: number, extPort: number, lifetime: number): Promise<Mapping>;
+        deleteMappingPmp(extPort: number): Promise<boolean>;
+
+        probePcpSupport(): Promise<boolean>;
+        addMappingPcp(intPort: number, extPort: number, lifetime: number): Promise<Mapping>;
+        deleteMappingPcp(extPort: number): Promise<boolean>;
+
+        probeUpnpSupport(): Promise<boolean>;
+        addMappingUpnp(intPort: number, extPort: number, lifetime: number,
+                controlUrl?: string): Promise<Mapping>;
+        deleteMappingUpnp(extPort: number): Promise<boolean>;
+
+        getActiveMappings(): Promise<ActiveMappings>;
+        getPrivateIps(): Promise<string[]>;
+        close(): Promise<void>;
+    }
+}
+
+declare module freedom.Social {
+    // Status of a client connected to a social network.
+    interface ClientState {
+        userId: string;
+        clientId: string;
+        status: string;  // Either ONLINE, OFFLINE, or ONLINE_WITH_OTHER_APP
+        timestamp: number;
+    }
+
+    // The profile of a user on a social network.
+    interface UserProfile {
+        userId: string;
+        name: string;
+        url?: string;
+        // Image URI (e.g. data:image/png;base64,adkwe329...)
+        imageData?: string;
+        timestamp?: number;
+    }
+
+    interface Users {
+        [userId: string]: UserProfile;
+    }
+
+    interface Clients {
+        [clientId: string]: ClientState;
+    }
+
+    // Event for an incoming messages
+    interface IncomingMessage {
+        // UserID/ClientID/status of user from whom the message comes from.
+        from: ClientState;
+        // Message contents.
+        message: string;
+    }
+
+    // A request to login to a specific network as a specific agent
+    interface LoginRequest {
+        // Name of the application connecting to the network. Other logins with
+        // the same agent field will be listed as having status |ONLINE|, where
+        // those with different agents will be listed as
+        // |ONLINE_WITH_OTHER_CLIENT|
+        agent: string;
+        // Version of application
+        version: string;
+        // URL of application
+        url: string;
+        // When |interactive === true| social will always prompt user for login.
+        // Promise fails if the user did not login or provided invalid
+        // credentials. When |interactive === false|, promise fails unless the
+        // social provider has  cached tokens/credentials.
+        interactive: boolean;
+        // When true, social provider will remember the token/credentials.
+        rememberLogin: boolean;
+    }
+
+    interface Social {
+        // Generic Freedom Event stuff. |on| binds an event handler to event type
+        // |eventType|. Every time |eventType|  event is raised, the function |f|
+        // will be called.
+        //
+        // Message type |onMessage| happens when the user receives a message from
+        // another contact.
+        on(eventType: string, f: Function) : void;
+        on(eventType: 'onMessage', f: (message: IncomingMessage) => void): void;
+        // Message type |onRosterProfile| events are received when another user's
+        // profile is received or when a client changes status.
+        on(eventType: 'onUserProfile', f: (profile: UserProfile) => void): void;
+        // Message type |onMyStatus| is received when the user's client's status
+        // changes, e.g. when disconnected and online status becomes offline.
+        on(eventType: 'onClientState', f: (status: ClientState) => void): void;
+
+        // Do a singleton event binding: |f| will only be called once, on the next
+        // event of type |eventType|. Same events as above.
+        once(eventType: string, f: Function): void;
+
+        login(loginRequest: LoginRequest): Promise<ClientState>;
+        getUsers(): Promise<Users>;
+        getClients(): Promise<Clients>;
+
+        // Send a message to user on your network
+        // If the message is sent to a userId, it is sent to all clients
+        // If the message is sent to a clientId, it is sent to just that one client
+        // If the destination id is not specified or invalid, promise rejects.
+        sendMessage(destinationId: string, message: string): Promise<void>;
+
+        // Logs the user out of the social network. After the logout promise, the
+        // user status is OFFLINE.
+        logout(): Promise<void>;
+
+        // Forget any tokens/credentials used for logging in with the last used
+        // userId.
+        clearCachedCredentials(): Promise<void>;
+    }
+} // declare module Social
diff --git a/fs-ext/fs-ext-tests.ts b/fs-ext/fs-ext-tests.ts
new file mode 100644
index 000000000..aba507c6d
--- /dev/null
+++ b/fs-ext/fs-ext-tests.ts
@@ -0,0 +1,28 @@
+/// <reference path="fs-ext.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+import fs = require('fs-ext');
+
+var num:number;
+var str:string;
+
+//from node.js 'fs' module 
+fs.appendFileSync(str, "data");
+
+fs.flock(num, str, (err)=>{ 
+});
+fs.flockSync(num, str);
+
+fs.fcntl(num, str, num, (err, res)=>{	
+});
+fs.fcntl(num, str, (err, res)=>{
+});
+fs.fcntlSync(num, str, num);
+
+fs.seek(num, num, num, (err, pos)=>{
+});
+fs.seekSync(num, num, num);
+
+fs.utime(str, num, num, (err)=>{
+});
+fs.utimeSync(str, num, num);
diff --git a/fs-ext/fs-ext.d.ts b/fs-ext/fs-ext.d.ts
new file mode 100644
index 000000000..00f63c5a0
--- /dev/null
+++ b/fs-ext/fs-ext.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for fs-ext
+// Project: https://github.com/baudehlo/node-fs-ext
+// Definitions by: Oguzhan Ergin <https://github.com/OguzhanE>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../node/node.d.ts"/>
+
+declare module "fs-ext" {
+	export * from "fs";
+ 
+	/**
+	* Asynchronous flock(2). No arguments other than a possible error are passed to the callback. 
+	* @param fd File Descriptor
+	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+	**/
+	export function flock(fd: number, flags: string, callback: (err: Error) => void): void;
+
+	/**
+	* Synchronous flock(2). Throws an exception on error.
+	* @param fd File Descriptor
+	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+ 	**/
+	export function flockSync(fd: number, flags: string):void;
+	
+	/**
+	* Asynchronous fcntl(2).
+	* @param fd File Descriptor
+	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+	* @param arg arg
+	**/
+	export function fcntl(fd: number, cmd: string, arg: number, callback: (err: Error, result: number) => void):void;
+
+	/**
+	* Asynchronous fcntl(2).
+	* @param fd File Descriptor
+	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+	**/
+	export function fcntl(fd: number, cmd: string, callback: (err: Error, result: number) => void):void;
+
+	/**
+	* Synchronous fcntl(2). Throws an exception on error.
+	* @param fd File Descriptor
+	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+	* @param arg arg
+	* @return Returns flags
+	**/
+	export function fcntlSync(fd: number, cmd: string, arg?: number): number;
+
+	/**
+	* Asynchronous lseek(2).
+	* @param fd File Descriptor
+	* @param offset Offset
+	* @param whence 
+	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+	**/
+	export function seek(fd: number, offset: number, whence: number, callback: (err: Error, currFilePos: number) => void): void;
+  
+	/**
+	* Synchronous lseek(2). Throws an exception on error. Returns current file position.
+	* @param fd File Descriptor
+	* @param offset Offset
+	* @param whence 
+	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+	* @returns Returns current file position.
+	**/
+	export function seekSync(fd: number, offset: number, whence: number): number;
+
+	/**
+	* Asynchronous utime(2).
+	* @param path File path
+	* @param atime
+	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+	* Just like for utime(2), the absence of the atime and mtime means 'now'.
+	* @param mtime
+	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+	* Just like for utime(2), the absence of the atime and mtime means 'now'.
+	**/
+	export function utime(path: string, atime: number, mtime: number, callback: (err: Error) => void):void;
+
+	/**
+	* Synchronous version of utime(). Throws an exception on error.
+	* @param path File path
+	* @param atime
+	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+	* Just like for utime(2), the absence of the atime and mtime means 'now'.
+	* @param mtime
+	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+	* Just like for utime(2), the absence of the atime and mtime means 'now'.
+	**/
+	export function utimeSync(path: string, atime: number, mtime: number):void;
+}
diff --git a/fullCalendar/fullCalendar-tests.ts b/fullCalendar/fullCalendar-tests.ts
index e7c01a27e..6890cbe42 100644
--- a/fullCalendar/fullCalendar-tests.ts
+++ b/fullCalendar/fullCalendar-tests.ts
@@ -67,7 +67,7 @@ $('#calendar').fullCalendar({
 $('#calendar').fullCalendar('option', 'aspectRatio', 1.8);
 
 $('#calendar').fullCalendar({
-    viewDisplay: function (view) {
+    viewRender: function(view) {
         alert('The new title of the view is ' + view.title);
     }
 });
diff --git a/geoip-lite/geoip-lite-tests.ts b/geoip-lite/geoip-lite-tests.ts
new file mode 100644
index 000000000..fb809369b
--- /dev/null
+++ b/geoip-lite/geoip-lite-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="geoip-lite.d.ts"/>
+
+// require geoip-lite
+import geoip = require('geoip-lite');
+
+// lookup an IP addres
+var geo = geoip.lookup('199.16.156.125');
+
+// convert the ip block range to string
+if (geo) {
+	let rangeStart = geoip.pretty(geo.range[0]);
+	let rangeEnd = geoip.pretty(geo.range[1]);
+}
+
+// start the data update watcher
+geoip.startWatchingDataUpdate();
+
+// stop the data update watcher
+geoip.stopWatchingDataUpdate();
diff --git a/geoip-lite/geoip-lite.d.ts b/geoip-lite/geoip-lite.d.ts
new file mode 100644
index 000000000..7e5057d49
--- /dev/null
+++ b/geoip-lite/geoip-lite.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for GeoIP-lite 1.1.6
+// Project: https://github.com/bluesmoon/node-geoip
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'geoip-lite' {
+	module mod {
+		export interface Lookup {
+			range: Array<number>; // range start, end
+			country: string;
+			region: string;
+			city: string;
+			ll: Array<number>; // latitude, longitude
+		}
+
+		export function lookup(ip: string): Lookup;
+		export function pretty(ip: number): string;
+		export function startWatchingDataUpdate(): void;
+		export function stopWatchingDataUpdate(): void;
+	}
+	export = mod;
+}
diff --git a/geojson/geojson.d.ts b/geojson/geojson.d.ts
index 1f8a23db5..9413a9c86 100644
--- a/geojson/geojson.d.ts
+++ b/geojson/geojson.d.ts
@@ -44,7 +44,6 @@ declare module GeoJSON {
     */
     export interface MultiPoint extends GeometryObject
     {
-    
         coordinates: Position[]
     }
 
diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index d353dfeb3..4e359e257 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -43,7 +43,12 @@ app.on('ready', () => {
 
 	// and load the index.html of the app.
 	mainWindow.loadUrl(`file://${__dirname}/index.html`);
+	mainWindow.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
+	mainWindow.webContents.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
 
+	mainWindow.openDevTools()
+	var opened: boolean = mainWindow.isDevToolsOpened()
+	mainWindow.toggleDevTools()
 	// Emitted when the window is closed.
 	mainWindow.on('closed', () => {
 		// Dereference the window object, usually you would store windows
@@ -51,6 +56,35 @@ app.on('ready', () => {
 		// when you should delete the corresponding element.
 		mainWindow = null;
 	});
+
+	mainWindow.print({silent: true, printBackground: false});
+	mainWindow.webContents.print({silent: true, printBackground: false});
+	mainWindow.print();
+	mainWindow.webContents.print();
+
+	mainWindow.print({silent: true, printBackground: false});
+	mainWindow.webContents.print({silent: true, printBackground: false});
+	mainWindow.print();
+	mainWindow.webContents.print();
+
+	mainWindow.printToPDF({
+		marginsType: 1,
+		pageSize: 'A3',
+		printBackground: true,
+		printSelectionOnly: true,
+		landscape: true,
+	}, (error: Error, data: Buffer) => {});
+
+	mainWindow.webContents.printToPDF({
+		marginsType: 1,
+		pageSize: 'A3',
+		printBackground: true,
+		printSelectionOnly: true,
+		landscape: true,
+	}, (error: Error, data: Buffer) => {});
+
+	mainWindow.printToPDF({}, (err, data) => {});
+	mainWindow.webContents.printToPDF({}, (err, data) => {});
 });
 
 // Desktop environment integration
@@ -377,6 +411,7 @@ app.on('ready', () => {
 	]);
 	appIcon.setToolTip('This is my application.');
 	appIcon.setContextMenu(contextMenu);
+	appIcon.setImage('/path/to/new/icon');
 });
 
 // clipboard
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index 5df526bfc..92fff65f7 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -356,6 +356,10 @@ declare module GitHubElectron {
 		 * Closes the developer tools.
 		 */
 		closeDevTools(): void;
+		/**
+		 * Returns whether the developer tools are opened.
+		 */
+		isDevToolsOpened(): boolean;
 		/**
 		 * Toggle the developer tools.
 		 */
@@ -377,21 +381,29 @@ declare module GitHubElectron {
 		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
 		capturePage(callback: (image: NativeImage) => void): void;
 		/**
-		 * Prints the window's web page. Calling window.print() in a web page is
-		 * equivalent to calling BrowserWindow.print({silent: false, printBackground: false}).
+		 * Same with webContents.print([options])
 		 */
 		print(options?: {
-			/**
-			 * When false, Electron will pick up system's default printer and default
-			 * settings for printing.
-			 */
 			silent?: boolean;
 			printBackground?: boolean;
 		}): void;
+		/**
+		 * Same with webContents.printToPDF([options])
+		 */
+		printToPDF(options: {
+			marginsType?: number;
+			pageSize?: string;
+			printBackground?: boolean;
+			printSelectionOnly?: boolean;
+			landscape?: boolean;
+		}, callback: (error: Error, data: Buffer) => void): void;
 		/**
 		 * Same with webContents.loadUrl(url).
 		 */
-		loadUrl(url: string): void;
+		loadUrl(url: string, options?: {
+			httpReferrer?: string;
+			userAgent?: string;
+		}): void;
 		/**
 		 * Same with webContents.reload.
 		 */
@@ -528,7 +540,10 @@ declare module GitHubElectron {
 		 * Loads the url in the window.
 		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
 		 */
-		loadUrl(url: string): void;
+		loadUrl(url: string, options?: {
+			httpReferrer?: string;
+			userAgent?: string;
+		}): void;
 		/**
 		 * @returns The URL of current web page.
 		 */
@@ -659,6 +674,62 @@ declare module GitHubElectron {
 			 * @param isFulfilled Whether the JS promise is fulfilled.
 			 */
 			(isFulfilled: boolean) => void): void;
+		/**
+		 *
+		 * Prints window's web page. When silent is set to false, Electron will pick up system's default printer and default settings for printing.
+		 * Calling window.print() in web page is equivalent to call WebContents.print({silent: false, printBackground: false}).
+		 * Note:
+		 *   On Windows, the print API relies on pdf.dll. If your application doesn't need print feature, you can safely remove pdf.dll in saving binary size.
+		 */
+		print(options?: {
+			/**
+			 *  Don't ask user for print settings, defaults to false
+			 */
+			silent?: boolean;
+			/**
+			 * Also prints the background color and image of the web page, defaults to false.
+			 */
+			printBackground: boolean;
+		}): void;
+		/**
+		 * Prints windows' web page as PDF with Chromium's preview printing custom settings.
+		 */
+		printToPDF(options: {
+			/**
+			 * Specify the type of margins to use. Default is 0.
+			 *   0 - default
+			 *   1 - none
+			 *   2 - minimum
+			 */
+			marginsType?: number;
+			/**
+			 * String - Specify page size of the generated PDF. Default is A4.
+			 *   A4
+			 *   A3
+			 *   Legal
+			 *   Letter
+			 *   Tabloid
+			 */
+			pageSize?: string;
+			/**
+			 * Whether to print CSS backgrounds. Default is false.
+			 */
+			printBackground?: boolean;
+			/**
+			 * Whether to print selection only. Default is false.
+			 */
+			printSelectionOnly?: boolean;
+			/**
+			 * true for landscape, false for portrait.  Default is false.
+			 */
+			landscape?: boolean;
+		},
+		/**
+		 * Callback function on completed converting to PDF.
+		 *   error Error
+		 *   data Buffer - PDF file content
+		 */
+		callback: (error: Error, data: Buffer) => void): void;
 		/**
 		 * Send args.. to the web page via channel in asynchronous message, the web page
 		 * can handle it by listening to the channel event of ipc module.
@@ -1147,7 +1218,7 @@ declare module GitHubElectron {
 		/**
 		 * Sets the image associated with this tray icon.
 		 */
-		setImage(image: NativeImage): void;
+		setImage(image: NativeImage|string): void;
 		/**
 		 * Sets the image associated with this tray icon when pressed.
 		 */
diff --git a/glidejs/glidejs.d.ts b/glidejs/glidejs.d.ts
index bbf35f7e8..238f71206 100644
--- a/glidejs/glidejs.d.ts
+++ b/glidejs/glidejs.d.ts
@@ -32,7 +32,7 @@ declare module JQueryGlide {
         /**
          * Default: 500
          * Animation time in ms
-         * @type {Int}
+         * @type {number}
          */
         animationDuration?: number;
         /**
diff --git a/gm/gm.d.ts b/gm/gm.d.ts
index 2373300fe..f1fb40661 100644
--- a/gm/gm.d.ts
+++ b/gm/gm.d.ts
@@ -13,6 +13,7 @@ declare module "gm" {
 	module m {
 		export interface ClassOptions {
 			imageMagick?: boolean;
+			nativeAutoOrient?: boolean;
 		}
 
 		export interface CompareCallback {
diff --git a/graphviz/graphviz-tests.ts b/graphviz/graphviz-tests.ts
new file mode 100644
index 000000000..01fa79150
--- /dev/null
+++ b/graphviz/graphviz-tests.ts
@@ -0,0 +1,26 @@
+///<reference path="graphviz.d.ts"/>
+
+import graphviz = require('graphviz');
+
+// Create digraph G
+var g: graphviz.Graph = graphviz.digraph("G");
+
+// Add node (ID: Hello)
+var n1: graphviz.Node = g.addNode( "Hello", {"color" : "blue"} );
+n1.set( "style", "filled" );
+
+// Add node (ID: World)
+g.addNode( "World" );
+
+// Add edge between the two nodes
+var e: graphviz.Edge = g.addEdge( n1, "World" );
+e.set( "color", "red" );
+
+// Print the dot script
+console.log( g.to_dot() ); 
+
+// Set GraphViz path (if not in your path)
+g.setGraphVizPath( "/usr/local/bin" );
+
+// Generate a PNG output
+g.output( "png", "test01.png" );
diff --git a/graphviz/graphviz.d.ts b/graphviz/graphviz.d.ts
new file mode 100644
index 000000000..42dc3877a
--- /dev/null
+++ b/graphviz/graphviz.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for Graphviz 0.0.8
+// Project: git://github.com/glejeune/node-graphviz.git
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// graphviz.d.ts
+
+declare module 'graphviz' {
+
+  export interface HasAttributes {
+    set(name: string, value: any): void;
+    get(name: string): any;
+  }
+
+  export interface Node extends HasAttributes {
+  }
+
+  export interface Edge extends HasAttributes {
+  }
+
+  export interface OutputCallback {
+    (data: string): void;
+  }
+
+  export interface ErrorCallback {
+    (code: number, stdout: string, stderr: string): void;
+  }
+
+  export interface RenderOptions {
+    type: string;  // output file type (png, jpeg, ps, ...)
+    use: string;  // Graphviz command to use (dot, neato, ...)
+    path: string;  // GraphViz path
+    G: any;  // graph options
+    N: any;  // node options
+    E: any;  // edge options
+  }
+
+  export interface Graph extends HasAttributes {
+
+    addNode(id: string, attrs?: any): Node;
+    nodeCount(): number;
+
+    // TODO: Use union types when we have TS 1.4
+    addEdge(nodeOne: string, nodeTwo: string, attrs?: any): Edge;
+    addEdge(nodeOne: string, nodeTwo: Node, attrs?: any): Edge;
+    addEdge(nodeOne: Node, nodeTwo: string, attrs?: any): Edge;
+    addEdge(nodeOne: Node, nodeTwo: Node, attrs?: any): Edge;
+
+    edgeCount(): number;
+
+    // Subgraph (cluster) API
+    addCluster(id: string): Graph;
+    getCluster(id: string): Graph;
+    clusterCount(): number;
+
+    setNodeAttribut(name: string, value: any): void;
+    getNodeAttribut(name: string): any;
+
+    setEdgeAttribut(name: string, value: any): void;
+    getEdgeAttribut(name: string): any;
+
+    to_dot(): string;
+
+    // Graphviz command to use (dot, neato, ...)
+    use: string;
+
+    // Path containing Graphviz binaries.
+    setGraphVizPath(directoryPath: string): void;
+
+    // TODO: Use union types when we can have TS 1.4
+    render(type: string, filename: string, errback?: ErrorCallback): void;
+    render(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
+    render(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
+    render(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
+
+    // alias for render
+    output(type: string, filename: string, errback?: ErrorCallback): void;
+    output(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
+    output(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
+    output(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
+  }
+
+  export function graph(id: string): Graph;
+
+  export function digraph(id: string): Graph;
+
+  interface ParseCallback {
+    (graph: Graph): void;
+  }
+
+  export function parse(path: string, callback: ParseCallback, errback?: ErrorCallback): void;
+
+}
diff --git a/gridstack/gridstack-tests.ts b/gridstack/gridstack-tests.ts
new file mode 100644
index 000000000..9d04d037c
--- /dev/null
+++ b/gridstack/gridstack-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="gridstack.d.ts" />
+
+
+// Type definitions for Gridstack
+// Project: http://troolee.github.io/gridstack.js/
+// Definitions by: Pascal Senn <https://github.com/PascalSenn/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+var options = <IGridstackOptions> {
+    float: true
+};
+var gridstack:GridStack = $(document).gridstack(options);
+
+gridstack.add_widget("test", 1, 2, 3, 4, true);
+gridstack.batch_update();
+gridstack.cell_height();;
+gridstack.cell_height(2);
+gridstack.cell_width();
+gridstack.get_cell_from_pixel(<MousePosition>{ left:20, top: 20 });
diff --git a/gridstack/gridstack.d.ts b/gridstack/gridstack.d.ts
new file mode 100644
index 000000000..6ad3d862e
--- /dev/null
+++ b/gridstack/gridstack.d.ts
@@ -0,0 +1,241 @@
+// Type definitions for Gridstack
+// Project: http://troolee.github.io/gridstack.js/
+// Definitions by: Pascal Senn <https://github.com/PascalSenn/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface JQuery {
+    gridstack (options: IGridstackOptions):GridStack
+}
+
+interface GridStack {
+    /**
+     * Creates new widget and returns it.
+     *
+     *   Widget will be always placed even if result height is more than actual grid height. You need to use will_it_fit method before calling add_widget for additional check.
+     * 
+     * @param {string} el widget to add
+     * @param {number} x widget position x
+     * @param {number} y widget position y
+     * @param {number} width  widget dimension width
+     * @param {number} height widget dimension height
+     * @param {boolean} auto_position if true then x, y parameters will be ignored and widget will be places on the first available position
+     */
+    add_widget(el: string, x: number, y: number, width: number, height: number, auto_position: boolean): JQuery
+    /**
+    * Initializes batch updates. You will see no changes until commit method is called.
+    */
+    batch_update():void
+    /**
+    * Gets current cell height.
+    */
+    cell_height():number
+    /**
+    * Update current cell height. This method rebuilds an internal CSS style sheet. Note: You can expect performance issues if call this method too often.
+    * @param {number} val the cell height
+    */
+    cell_height(val:number):void
+    /**
+    * Gets current cell width.
+    */
+    cell_width():number
+    /**
+    * Finishes batch updates. Updates DOM nodes. You must call it after batch_update.
+    */
+    commit():void
+    /**
+    * Destroys a grid instance.
+    */
+    destroy(): void
+    /*
+    * Disables widgets moving/resizing.
+    */
+    disable(): void
+    /*
+    * Enables widgets moving/resizing.
+    */
+    enable(): void
+    /*
+    * Get the position of the cell under a pixel on screen.
+    * @param  {MousePosition}  position the position of the pixel to resolve in absolute coordinates, as an object with top and leftproperties
+    */
+    get_cell_from_pixel(position: MousePosition): CellPosition,
+    /*
+    * Checks if specified area is empty.
+    * @param {number} x the position x.
+    * @param {number} y the position y. 
+    * @param {number} width the width of to check
+    * @param {number} height the height of to check
+    */
+    is_area_empty(x: number, y: number, width: number, height: number): void
+    /*
+    * Locks/unlocks widget.
+    * @param {HTMLElement} el widget to modify.
+    * @param {boolean} val if true widget will be locked.
+    */
+    locked(el: HTMLElement, val: boolean): void
+    /*
+    * Set the minWidth for a widget.
+    * @param {HTMLElement} el widget to modify.
+    * @param {number} val A numeric value of the number of columns
+    */
+    min_width(el: HTMLElement, val: number): void
+    /*
+    * Set the minHeight for a widget.
+    * @param {HTMLElement} el widget to modify.
+    * @param {number} val A numeric value of the number of rows
+    */
+    min_height(el: HTMLElement, val: number): void
+     /*
+    * Enables/Disables moving.
+    * @param {HTMLElement} el widget to modify.
+    * @param {number} val if true widget will be draggable.
+    */
+    movable(el: HTMLElement, val: boolean): void
+    /**
+    * Changes widget position
+    * @param {HTMLElement} el  widget to modify
+    * @param {number} x new position x. If value is null or undefined it will be ignored.
+    * @param {number} y new position y. If value is null or undefined it will be ignored.
+    * 
+    */
+    move(el: HTMLElement, x: number, y: number): void
+    /**
+    * Removes widget from the grid.
+    * @param {HTMLElement} el  widget to modify
+    * @param {boolean} detach_node if false DOM node won't be removed from the tree (Optional. Default true).
+    */
+    remove_widget(el: HTMLElement, detach_node?: boolean): void
+    /**
+    * Removes all widgets from the grid.
+    */
+    remove_all(): void
+    /**
+    * Changes widget size
+    * @param {HTMLElement} el  widget to modify
+    * @param {number} width new dimensions width. If value is null or undefined it will be ignored.
+    * @param {number} height  new dimensions height. If value is null or undefined it will be ignored.
+    */
+    resize(el: HTMLElement, width: number, height: number): void
+    /**
+    * Enables/Disables resizing.
+    * @param {HTMLElement} el  widget to modify
+    * @param {boolean} val  if true widget will be resizable.
+    */
+    resizable(el: HTMLElement, val: boolean): void
+    /**
+    * Toggle the grid static state. Also toggle the grid-stack-static class.
+    * @param {boolean} static_value if true the grid become static.
+    */
+    set_static(static_value: boolean): void
+    /**
+    * Updates widget position/size.
+    * @param {HTMLElement} el  widget to modify
+    * @param {number} x new position x. If value is null or undefined it will be ignored.
+    * @param {number} y new position y. If value is null or undefined it will be ignored.
+    * @param {number} width new dimensions width. If value is null or undefined it will be ignored.
+    * @param {number} height  new dimensions height. If value is null or undefined it will be ignored.
+    */
+    update(el: HTMLElement, x: number, y: number, width: number, height: number): void
+    /**
+    * Returns true if the height of the grid will be less the vertical constraint. Always returns true if grid doesn't have height constraint.
+    * @param {number} x new position x. If value is null or undefined it will be ignored.
+    * @param {number} y new position y. If value is null or undefined it will be ignored.
+    * @param {number} width new dimensions width. If value is null or undefined it will be ignored.
+    * @param {number} height  new dimensions height. If value is null or undefined it will be ignored.
+    * @param {boolean} auto_position  if true then x, y parameters will be ignored and widget will be places on the first available position
+    */
+    will_it_fit(x: number, y: number, width: number, height: number, auto_position:boolean):boolean
+    
+
+}
+/**
+* Defines the coordiantes of a object
+*/
+interface MousePosition {
+    top: number,
+    left:number,
+}
+/**
+*   Defines the position of a cell inside the grid 
+*/
+interface CellPosition {
+    x: number,
+    y:number
+}
+declare module GridStackUI {
+    interface Utils {
+        /**
+        * Sorts array of nodes
+        *@param nodes array to sort
+        *@param dir 1 for asc, -1 for desc (optional)
+        *@param width width of the grid. If undefined the width will be calculated automatically (optional).
+        **/
+        sort(nodes: HTMLElement[], dir: number, width: number): void
+    }
+}
+/**
+* Gridstack Options
+* Defines the options for a Gridstack 
+*/
+interface IGridstackOptions {
+    /**
+     * if true the resizing handles are shown even if the user is not hovering over the widget (default: false)
+     */
+    always_show_resize_handle: boolean;
+    /**
+     * turns animation on (default: true)
+     */
+    animate: boolean;
+    /**
+     * if false gridstack will not initialize existing items (default: true)
+     */
+    auto: boolean;
+    /**
+     *  one cell height (default: 60)
+     */
+    cell_height: number;
+    /**
+     * allows to override jQuery UI draggable options. (default: { handle: '.grid-stack-item-content', scroll: true, appendTo: 'body' })
+     */
+    draggable: {};
+    /**
+    * draggable handle selector (default: '.grid-stack-item-content')
+    */
+     handle: string;
+    /**
+    * maximum rows amount.Default is 0 which means no maximum rows
+    */
+     height: number;
+    /** 
+    * enable floating widgets (default: false) See example
+    */
+    float: boolean;
+    /**
+    * widget class (default: 'grid-stack-item')
+    */
+     item_class: string;
+    /** 
+    * minimal width.If window width is less, grid will be shown in one - column mode (default: 768)
+    */
+    min_width: number;
+    /**
+    * class for placeholder (default: 'grid-stack-placeholder')
+    */
+    placeholder_class: string;
+    /**
+    * allows to override jQuery UI resizable options. (default: { autoHide: true, handles: 'se' })
+    */
+    resizable: {};
+    /**
+    * makes grid static (default false).If true widgets are not movable/ resizable.You don't even need jQueryUI draggable/resizable. A CSS class grid-stack-static is also added to the container.
+    */
+    static_grid: boolean; 
+    /**
+    * vertical gap size (default: 20)
+    */
+    vertical_margin: number; 
+    /**
+    * amount of columns (default: 12)
+    */
+    width: number;
+}
diff --git a/gulp-changed/gulp-changed-tests.ts b/gulp-changed/gulp-changed-tests.ts
new file mode 100644
index 000000000..dae92e0fd
--- /dev/null
+++ b/gulp-changed/gulp-changed-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="./gulp-changed.d.ts" />
+/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
+
+import * as gulp from "gulp";
+import changed = require("gulp-changed");
+import minifyHtml = require("gulp-minify-html");
+
+// Without options
+gulp.src("*.html")
+    .pipe(changed("build"))
+    .pipe(minifyHtml())
+    .pipe(gulp.dest("build"));
+
+// With some options
+gulp.src("*.html")
+    .pipe(changed("build", { hasChanged: changed.compareSha1Digest }))
+    .pipe(minifyHtml())
+    .pipe(gulp.dest("build"));
diff --git a/gulp-changed/gulp-changed.d.ts b/gulp-changed/gulp-changed.d.ts
new file mode 100644
index 000000000..f2a3e0d64
--- /dev/null
+++ b/gulp-changed/gulp-changed.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for gulp-changed
+// Project: https://github.com/sindresorhus/gulp-changed
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+/// <reference path="../vinyl/vinyl.d.ts"/>
+
+declare module "gulp-changed"
+{
+    import { Transform } from "stream";
+    import File = require("vinyl");
+
+    interface IComparator
+    {
+        /**
+         * @param stream Should be used to queue sourceFile if it passes some comparison
+         * @param callback Should be called when done
+         * @param sourceFile File to operate on
+         * @param destPath Destination for sourceFile as an absolute path
+         */
+        (stream: Transform, callback: Function, sourceFile: File, destPath: string): void;
+    }
+
+    interface IDestination
+    {
+        (file: string|Buffer): string;
+    }
+
+    interface IOptions
+    {
+        /**
+         * The working directory the folder is relative to.
+         * @default process.cwd()
+         */
+        cwd?: string;
+
+        /**
+         * Extension of the destination files.
+         */
+        extension?: string;
+
+        /**
+         * Function that determines whether the source file is different from the destination file.
+         * @default changed.compareLastModifiedTime
+         */
+        hasChanged?: IComparator;
+    }
+
+    interface IGulpChanged
+    {
+        (destination: string|IDestination, options?: IOptions): NodeJS.ReadWriteStream;
+
+        compareLastModifiedTime: IComparator;
+        compareSha1Digest: IComparator;
+    }
+
+    const changed: IGulpChanged;
+    export = changed;
+}
diff --git a/gulp-cheerio/gulp-cheerio-tests.ts b/gulp-cheerio/gulp-cheerio-tests.ts
new file mode 100644
index 000000000..8a32c57d2
--- /dev/null
+++ b/gulp-cheerio/gulp-cheerio-tests.ts
@@ -0,0 +1,93 @@
+/// <reference path="gulp-cheerio.d.ts" />
+/// <reference path="../vinyl/vinyl.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../cheerio/cheerio.d.ts" />
+
+import cheerio = require('gulp-cheerio');
+import gulp = require('gulp');
+import Vinyl = require('vinyl');
+
+//
+// There are two ways to use gulp-cheerio: synchronous and asynchronous. See the following usage examples:
+//
+
+gulp.task('sync', function () {
+    return gulp
+        .src(['src/*.html'])
+        .pipe(cheerio(function ($: CheerioStatic, file: Vinyl) {
+            // Each file will be run through cheerio and each corresponding `$` will be passed here.
+            // `file` is the gulp file object
+            // Make all h1 tags uppercase
+            $('h1').each(function () {
+                var h1 = $(this);
+                h1.text(h1.text().toUpperCase());
+            });
+        }))
+        .pipe(gulp.dest('dist/'));
+});
+gulp.task('async', function () {
+    return gulp
+        .src(['src/*.html'])
+        .pipe(cheerio(function ($: CheerioStatic, file: Vinyl, done: Function) {
+            // The only difference here is the inclusion of a `done` parameter.
+            // Call `done` when everything is finished. `done` accepts an error if applicable.
+            done();
+        }))
+        .pipe(gulp.dest('dist/'));
+});
+//TODO
+
+
+//
+// Additional options can be passed by passing an object as the main argument with your function as the run option:
+//
+
+
+gulp.task('sync', function () {
+    return gulp
+        .src(['src/*.html'])
+        .pipe(cheerio({
+            run: function ($: CheerioStatic, file: Vinyl) {
+                // Each file will be run through cheerio and each corresponding `$` will be passed here.
+                // `file` is the gulp file object
+                // Make all h1 tags uppercase
+                $('h1').each(function () {
+                    var h1 = $(this);
+                    h1.text(h1.text().toUpperCase());
+                });
+            }
+        }))
+        .pipe(gulp.dest('dist/'));
+});
+
+gulp.task('async', function () {
+    return gulp
+        .src(['src/*.html'])
+        .pipe(cheerio({
+            run: function ($: CheerioStatic, file: Vinyl, done: Function) {
+                // The only difference here is the inclusion of a `done` parameter.
+                // Call `done` when everything is finished. `done` accepts an error if applicable.
+                done();
+            }
+        }))
+        .pipe(gulp.dest('dist/'));
+});
+
+cheerio({
+    run: function () {},
+    parserOptions: {
+        // Options here
+    }
+});
+
+
+cheerio({
+    run: function () {},
+    parserOptions: {
+        xmlMode: true
+    }
+});
+
+cheerio({
+    cheerio: require('../cheerio/cheerio.d.ts') as CheerioStatic // special version of `cheerio`
+});
diff --git a/gulp-cheerio/gulp-cheerio.d.ts b/gulp-cheerio/gulp-cheerio.d.ts
new file mode 100644
index 000000000..3a558ae5b
--- /dev/null
+++ b/gulp-cheerio/gulp-cheerio.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for gulp-cheerio
+// Project: https://github.com/KenPowers/gulp-cheerio
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../cheerio/cheerio.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../vinyl/vinyl.d.ts"/>
+
+declare module "gulp-cheerio" {
+    import Vinyl = require('vinyl');
+
+    namespace cheerio {
+        interface Cheerio {
+            (callback: Callback): NodeJS.ReadWriteStream;
+            (option: Option): NodeJS.ReadWriteStream;
+        }
+
+        interface Callback {
+            ($: CheerioStatic, file: Vinyl, done?: Function): any;
+        }
+
+        interface Option {
+            run?: Callback;
+            parserOptions?: CheerioOptionsInterface;
+            cheerio?: CheerioStatic;
+        }
+    }
+
+    var cheerio: cheerio.Cheerio;
+
+    export = cheerio;
+}
+
diff --git a/gulp-coffeeify/gulp-coffeeify-tests.ts b/gulp-coffeeify/gulp-coffeeify-tests.ts
new file mode 100644
index 000000000..662428563
--- /dev/null
+++ b/gulp-coffeeify/gulp-coffeeify-tests.ts
@@ -0,0 +1,53 @@
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="gulp-coffeeify.d.ts" />
+
+import gulp = require('gulp');
+import coffeeify = require('gulp-coffeeify');
+
+// Basic usage
+gulp.task('scripts', function() {
+    gulp.src('src/coffee/**/*.coffee')
+        .pipe(coffeeify())
+        .pipe(gulp.dest('./build/js'));
+});
+
+gulp.task('scripts', function() {
+    gulp.src('src/coffee/**/*.coffee')
+        .pipe(coffeeify({
+            options: {
+                debug: true, // source map
+                paths: [__dirname + '/node_modules', __dirname + '/src/coffee']
+            }
+        }))
+        .pipe(gulp.dest('./build/js'));
+});
+
+gulp.task('scripts', function() {
+    gulp.src('src/coffee/**/*.coffee')
+        .pipe(coffeeify({
+            aliases: [
+                {
+                    cwd: 'src/coffee/app',
+                    base: 'app'
+                }
+            ]
+        }))
+        .pipe(gulp.dest('./build/js'));
+});
+
+var xform = function(data: string){
+    return 'module.exports = "' + data + '"';
+};
+gulp.task('scripts', function() {
+    gulp.src('src/coffee/**/*.coffee')
+        .pipe(coffeeify({
+            transforms: [
+                {
+                    ext: '.extension',
+                    transform: xform
+                }
+            ]
+        }))
+        .pipe(gulp.dest('./build/js'));
+});
+
diff --git a/gulp-coffeeify/gulp-coffeeify.d.ts b/gulp-coffeeify/gulp-coffeeify.d.ts
new file mode 100644
index 000000000..b847b8c03
--- /dev/null
+++ b/gulp-coffeeify/gulp-coffeeify.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for gulp-coffeeify
+// Project: https://github.com/nariyu/gulp-coffeeify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-coffeeify" {
+	namespace coffeeify {
+		interface Coffeeify {
+			(option?: Option): NodeJS.ReadWriteStream;
+		}
+
+		interface Option {
+			options?: {
+				debug?: boolean;
+				paths?: string[];
+			},
+			/**
+			 * [DEPRECATED]: You should use a 'paths' options of browserify.
+			 */
+			aliases?: Aliases;
+			/**
+			 * [DEPRECATED]
+			 */
+			transforms?: Transforms;
+		}
+
+		interface Aliases {
+			cwd?: string;
+			base?: string;
+		}
+
+		interface Transforms {
+			ext?: string;
+			transform?(data: string): string;
+		}
+	}
+
+	var coffeeify: coffeeify.Coffeeify;
+
+	export = coffeeify;
+}
+
diff --git a/gulp-coffeelint/gulp-coffeelint-tests.ts b/gulp-coffeelint/gulp-coffeelint-tests.ts
new file mode 100644
index 000000000..0022f9888
--- /dev/null
+++ b/gulp-coffeelint/gulp-coffeelint-tests.ts
@@ -0,0 +1,57 @@
+/// <reference path="gulp-coffeelint.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import coffeelint = require('gulp-coffeelint');
+import gulp = require('gulp');
+
+
+gulp.task('lint', function () {
+    gulp.src('./src/*.coffee')
+        .pipe(coffeelint())
+        .pipe(coffeelint.reporter())
+});
+
+gulp.src('./src/*.coffee')
+    .pipe(coffeelint())
+    .pipe(coffeelint.reporter('csv'));
+
+
+declare var stylish: Function;
+
+gulp.src('./src/*.coffee')
+    .pipe(coffeelint())
+    .pipe(coffeelint.reporter(stylish));
+
+gulp.src('./src/*.coffee')
+    .pipe(coffeelint())
+    .pipe(coffeelint.reporter('coffelint-stylish'));
+
+gulp.src('./src/*.coffee')
+    .pipe(coffeelint())
+    .pipe(coffeelint.reporter('coffeelint-stylish'))
+    .pipe(coffeelint.reporter('fail'));
+
+var myReporter = (function() {
+    function MyReporter(errorReport: any) {
+        this.errorReport = errorReport;
+    }
+
+    MyReporter.prototype.publish = function() {
+        var hasError = this.errorReport.hasError();
+        if (hasError) {
+            return console.log('Oh no!');
+        }
+        return console.log('Oh yeah!');
+    };
+
+    return MyReporter;
+})();
+
+gulp.task('lint', function() {
+    return gulp.src('./src/*.coffee')
+        .pipe(coffeelint())
+        .pipe(coffeelint.reporter(myReporter));
+});
+
+
+
diff --git a/gulp-coffeelint/gulp-coffeelint.d.ts b/gulp-coffeelint/gulp-coffeelint.d.ts
new file mode 100644
index 000000000..2b686574c
--- /dev/null
+++ b/gulp-coffeelint/gulp-coffeelint.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for gulp-coffeelint
+// Project: https://github.com/janraasch/gulp-coffeelint
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-coffeelint" {
+    namespace coffeelint {
+        interface Coffeelint {
+            /**
+             * @param optFile Absolute path of a json file containing options for coffeelint.
+             * @param opt Options you wish to send to coffeelint. If optFile is given, this will be ignored.
+             * @param literate Are we dealing with Literate CoffeeScript?
+             * @param rules Add custom rules to coffeelint.
+             */
+            (optFile?: string, opt?: any, literate?: boolean, rules?: Function[]): NodeJS.ReadWriteStream;
+            reporter(reporter?: string|Function): NodeJS.ReadWriteStream;
+        }
+    }
+
+    var coffeelint: coffeelint.Coffeelint;
+
+    export = coffeelint;
+}
+
diff --git a/gulp-concat/gulp-concat-tests.ts b/gulp-concat/gulp-concat-tests.ts
index 68f6e529d..f8ef7373d 100644
--- a/gulp-concat/gulp-concat-tests.ts
+++ b/gulp-concat/gulp-concat-tests.ts
@@ -2,7 +2,7 @@
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require("gulp");
-import concat = require("gulp-concat");
+import * as concat from "gulp-concat";
 
 gulp.task("concat:simple", () => {
     gulp.src(["file*.txt"])
diff --git a/gulp-concat/gulp-concat.d.ts b/gulp-concat/gulp-concat.d.ts
index cad21c303..b62212156 100644
--- a/gulp-concat/gulp-concat.d.ts
+++ b/gulp-concat/gulp-concat.d.ts
@@ -35,8 +35,11 @@ declare module "gulp-concat" {
         contents?: NodeJS.ReadableStream | Buffer;
     }
 
-    function concat(filename: string, options?: IOptions): NodeJS.ReadWriteStream;
-    function concat(options: IVinylOptions): NodeJS.ReadWriteStream;
+    interface IConcat {
+        (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
+        (options: IVinylOptions): NodeJS.ReadWriteStream;
+    }
 
-    export = concat;
+    var _tmp: IConcat;
+    export = _tmp;
 }
diff --git a/gulp-dtsm/gulp-dtsm-tests.ts b/gulp-dtsm/gulp-dtsm-tests.ts
new file mode 100644
index 000000000..f97f8705e
--- /dev/null
+++ b/gulp-dtsm/gulp-dtsm-tests.ts
@@ -0,0 +1,11 @@
+/// <reference path="./gulp-dtsm.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import dtsm = require('gulp-dtsm');
+import gulp = require('gulp');
+
+var stream: NodeJS.WritableStream = dtsm();
+
+gulp.task('dtsm', () => gulp.src('./dtsm.json').pipe(dtsm()));
+
diff --git a/gulp-dtsm/gulp-dtsm.d.ts b/gulp-dtsm/gulp-dtsm.d.ts
new file mode 100644
index 000000000..a8fe7878f
--- /dev/null
+++ b/gulp-dtsm/gulp-dtsm.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for gulp-dtsm 0.0.0
+// Project: https://github.com/9joneg/gulp-dtsm
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-dtsm" {
+  function dtsm(): NodeJS.WritableStream;
+
+  export = dtsm;
+}
+
diff --git a/gulp-espower/gulp-espower-tests.ts b/gulp-espower/gulp-espower-tests.ts
new file mode 100644
index 000000000..9240ee82d
--- /dev/null
+++ b/gulp-espower/gulp-espower-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="gulp-espower.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+
+import espower = require('gulp-espower');
+import * as gulp from 'gulp';
+
+gulp.src('src/*.coffee')
+    .pipe(espower())
+    .pipe(gulp.dest('out'));
+
+
+gulp.src('src/*.coffee')
+    .pipe(espower({ patterns: ['assert(value, [message])'] }))
+    .pipe(gulp.dest('out'));
diff --git a/gulp-espower/gulp-espower.d.ts b/gulp-espower/gulp-espower.d.ts
new file mode 100644
index 000000000..984afad9c
--- /dev/null
+++ b/gulp-espower/gulp-espower.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for gulp-espower
+// Project: https://github.com/power-assert-js/gulp-espower
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-espower" {
+
+    namespace espower {
+        interface Espower {
+            /**
+             * @param options Target patterns for power assert feature instrumentation.
+             */
+            (options?: Options): NodeJS.ReadWriteStream;
+        }
+
+        interface Options {
+            patterns: string[];
+        }
+    }
+
+    var espower: espower.Espower;
+
+    export = espower;
+}
+
diff --git a/gulp-gzip/gulp-gzip-tests.ts b/gulp-gzip/gulp-gzip-tests.ts
new file mode 100644
index 000000000..295e98b7f
--- /dev/null
+++ b/gulp-gzip/gulp-gzip-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="gulp-gzip.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import gzip = require('gulp-gzip');
+
+gzip({ append: true });
+
+gzip({ extension: 'zip' }); // note that the `.` should not be included in the extension
+
+gzip({ preExtension: 'gz' }); // note that the `.` should not be included in the extension
+
+gzip({ threshold: '1kb' });
+
+gzip({ threshold: 1024 });
+
+gzip({ threshold: true });
+
+gzip({ gzipOptions: { level: 9 } });
+
+gzip({ gzipOptions: { memLevel: 1 } });
+
+gulp.task('compress', function() {
+    gulp.src('./dev/scripts/*.js')
+        .pipe(gzip())
+        .pipe(gulp.dest('./public/scripts'));
+});
diff --git a/gulp-gzip/gulp-gzip.d.ts b/gulp-gzip/gulp-gzip.d.ts
new file mode 100644
index 000000000..8711153ed
--- /dev/null
+++ b/gulp-gzip/gulp-gzip.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for gulp-gzip
+// Project: https://github.com/jstuckey/gulp-gzip
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-gzip" {
+    import zlib = require('zlib');
+
+    namespace gzip {
+        interface Gzip {
+            (options?: Options): NodeJS.ReadWriteStream;
+        }
+
+        interface Options {
+            /**
+             * Appends .gz file extension if true.
+             * @default true
+             */
+            append?: boolean;
+            /**
+             * Appends an arbitrary extension to the filename. Disables append and preExtension options.
+             */
+            extension?: string;
+            /**
+             * Appends an arbitrary pre-extension to the filename. Disables append and extension options.
+             */
+            preExtension?: string;
+            /**
+             * Minimum size required to compress a file.
+             * @default false
+             */
+            threshold?: number|string|boolean;
+            /**
+             * Options object to pass through to zlib.Gzip.
+             * See <a href='https://nodejs.org/api/zlib.html#zlib_options'>zlib</a> documentation for more information.
+             */
+            gzipOptions?: zlib.ZlibOptions;
+        }
+    }
+
+    var gzip: gzip.Gzip;
+
+    export = gzip;
+}
+
diff --git a/gulp-help/gulp-help-tests.ts b/gulp-help/gulp-help-tests.ts
new file mode 100644
index 000000000..26abdf06a
--- /dev/null
+++ b/gulp-help/gulp-help-tests.ts
@@ -0,0 +1,47 @@
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="gulp-help.d.ts" />
+
+'use strict';
+
+import gulpHelp = require('gulp-help');
+
+var gulp = gulpHelp(require('gulp'));
+
+gulp.task('lint', 'Lints all server side js', function () {
+    var jshint: () => NodeJS.ReadWriteStream;
+
+    gulp.src('./lib/**/*.js')
+        .pipe(jshint());
+});
+
+gulp.task('task-hidden-from-help', false, function () {
+    // ...
+});
+
+gulp.task('version', 'prints the version.', [], function() {
+    // ...
+}, {
+    aliases: ['v', 'V']
+});
+
+gulp.task('version', 'prints the version.', [], function () {
+    // ...
+}, {
+    options: {
+        'env=prod': 'description of env, perhaps with available values',
+        'key=val': 'description of key & val',
+        'key': 'description of key'
+    }
+});
+
+var gulp2 = require('gulp');
+gulpHelp(gulp2, {
+    description: 'Desc',
+    aliases: ['h'],
+    hideEmpty: true,
+    hideDepsMessage: false,
+    afterPrintCallback(): any {
+        console.log('done');
+    }
+});
diff --git a/gulp-help/gulp-help.d.ts b/gulp-help/gulp-help.d.ts
new file mode 100644
index 000000000..dd47ed0f6
--- /dev/null
+++ b/gulp-help/gulp-help.d.ts
@@ -0,0 +1,119 @@
+// Type definitions for gulp-help
+// Project: https://github.com/chmontgomery/gulp-help
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../orchestrator/orchestrator.d.ts" />
+
+
+declare module "gulp-help" {
+    import Orchestrator = require('orchestrator');
+    import gulp = require('gulp');
+    type HelpOption = string|boolean;
+
+    namespace gulpHelp {
+        interface TaskMethod {
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+             * @param deps an array of tasks to be executed and completed before your task will run.
+             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+             * @param option task options
+             */
+            (name: string, help: HelpOption, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+             * @param deps an array of tasks to be executed and completed before your task will run.
+             */
+            (name: string, help: HelpOption, deps: string[]): any;
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+             * @param option task options
+             */
+            (name: string, help: HelpOption, fn?: gulp.TaskCallback, option?: TaskOptions): any;
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+             */
+            (name: string, help: HelpOption): any;
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param deps an array of tasks to be executed and completed before your task will run.
+             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+             * @param option task options
+             */
+            (name: string, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+            /**
+             * Define a task.
+             *
+             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+             * @param option task options
+             */
+            (name: string, fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        }
+
+        interface GulpHelp extends Orchestrator {
+            task: TaskMethod;
+            src: gulp.SrcMethod;
+            dest: gulp.DestMethod;
+            watch: gulp.WatchMethod;
+        }
+
+        interface TaskOptions {
+            /**
+             * List of aliases for this task
+             */
+            aliases?: string[];
+            /**
+             * Object documenting options which can be passed to your task
+             */
+            options?: { [key: string]: string };
+        }
+
+        interface GulpHelpOptions {
+            /**
+             * Modifies the default help message
+             */
+            description?: string;
+            /**
+             * Adds aliases to the default help task
+             */
+            aliases?: string[];
+            /**
+             * Hide all tasks with no help message defined. Useful when including 3rd party tasks
+             */
+            hideEmpty?: boolean;
+            /**
+             * Hide all task dependencies
+             */
+            hideDepsMessage?: boolean;
+            /**
+             * A function to run after the default help task runs
+             */
+            afterPrintCallback?: Function;
+        }
+
+    }
+
+    function gulpHelp(gulp: gulp.Gulp, options?: gulpHelp.GulpHelpOptions): gulpHelp.GulpHelp;
+
+    export = gulpHelp;
+}
+
diff --git a/gulp-if/gulp-if-tests.ts b/gulp-if/gulp-if-tests.ts
index e1ba54c91..6edb3bc13 100644
--- a/gulp-if/gulp-if-tests.ts
+++ b/gulp-if/gulp-if-tests.ts
@@ -1,10 +1,22 @@
 /// <reference path="./gulp-if.d.ts"/>
 /// <reference path="../gulp/gulp.d.ts"/>
-import gulp = require("gulp");
-import _if = require("gulp-if");
+import gulp = require('gulp');
+import _if = require('gulp-if');
 
-gulp.src("test.css")
-    .pipe(_if(true, gulp.src("test.css")));
+gulp.src('test.css')
+    .pipe(_if(true, gulp.src('test.css')));
 
-gulp.src("test.css")
-    .pipe(_if(false, gulp.src("test.css"), gulp.src("test.css")));
\ No newline at end of file
+gulp.src('test.css')
+    .pipe(_if(false, gulp.src('test.css'), gulp.src('test.css')));
+    
+gulp.src('test.css')
+    .pipe(_if({isDirectory: true}, gulp.src('test.css')));
+
+gulp.src('test.css')
+    .pipe(_if({isFile: true}, gulp.src('test.css')));
+    
+gulp.src('test.css')
+    .pipe(_if(file => true, gulp.src('test.css')));
+    
+gulp.src('test.css')
+    .pipe(_if(/.*?\.css/, gulp.src('test.css')));
\ No newline at end of file
diff --git a/gulp-if/gulp-if.d.ts b/gulp-if/gulp-if.d.ts
index 474682b9d..9eab80f8b 100644
--- a/gulp-if/gulp-if.d.ts
+++ b/gulp-if/gulp-if.d.ts
@@ -1,14 +1,64 @@
 // Type definitions for gulp-if
 // Project: https://github.com/robrich/gulp-if
-// Definitions by: Asana <https://asana.com>
+// Definitions by: Asana <https://asana.com>, Joe Skeen <http://github.com/joeskeen>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts"/>
+/// <reference path="../vinyl/vinyl.d.ts"/>
 
-declare module "gulp-if" {
-    function gulpIf(
-        condition: boolean,
-        stream: NodeJS.ReadWriteStream,
-        elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+declare module 'gulp-if' {
+    import fs = require('fs');
+    import vinyl = require('vinyl');
+    
+    interface GulpIf {
+        /** 
+         * gulp-if will pipe data to stream whenever condition is truthy.
+         * If condition is falsey and elseStream is passed, data will pipe to elseStream
+         * After data is piped to stream or elseStream or neither, data is piped down-stream.
+         * 
+         * @param condition whether input should be piped to stream
+         * @param stream the stream to pipe to if condition is true
+         * @param elseStream (optional) the stream to pipe to if condition is false 
+         */
+        (condition: boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+        /** 
+         * gulp-if will pipe data to stream whenever condition is truthy.
+         * If condition is falsey and elseStream is passed, data will pipe to elseStream
+         * After data is piped to stream or elseStream or neither, data is piped down-stream.
+         * 
+         * @param condition a Node Stat filter condition to be executed on the vinyl file's Stats object
+         * @param stream the stream to pipe to if condition is true
+         * @param elseStream (optional) the stream to pipe to if condition is false 
+         */
+        (condition: StatFilterCondition, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+        /** 
+         * gulp-if will pipe data to stream whenever condition is truthy.
+         * If condition is falsey and elseStream is passed, data will pipe to elseStream
+         * After data is piped to stream or elseStream or neither, data is piped down-stream.
+         * 
+         * @param condition a function taking a vinyl file and returning a boolean
+         * @param stream the stream to pipe to if condition is true
+         * @param elseStream (optional) the stream to pipe to if condition is false 
+         */
+        (condition: (fs: vinyl) => boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+        /** 
+         * gulp-if will pipe data to stream whenever condition is truthy.
+         * If condition is falsey and elseStream is passed, data will pipe to elseStream
+         * After data is piped to stream or elseStream or neither, data is piped down-stream.
+         * 
+         * @param condition a RegularExpression that works on the file.path
+         * @param stream the stream to pipe to if condition is true
+         * @param elseStream (optional) the stream to pipe to if condition is false 
+         */
+        (condition: RegExp, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    }
+    
+    interface StatFilterCondition {
+        isDirectory?: boolean; 
+        isFile?: boolean;
+    }
+    
+    var gulpIf: GulpIf; 
+    
     export = gulpIf;
 }
\ No newline at end of file
diff --git a/gulp-istanbul/gulp-istanbul-tests.ts b/gulp-istanbul/gulp-istanbul-tests.ts
index 0d64b53d0..aada03de1 100644
--- a/gulp-istanbul/gulp-istanbul-tests.ts
+++ b/gulp-istanbul/gulp-istanbul-tests.ts
@@ -7,7 +7,7 @@ function testFramework(): NodeJS.ReadWriteStream {
     return null;
 }
 
-gulp.task('test', function (cb) {
+gulp.task('test', function (cb: Function) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul()) // Covering files
         .pipe(gulp.dest('test-tmp/'))
@@ -19,7 +19,7 @@ gulp.task('test', function (cb) {
         });
 });
 
-gulp.task('test', function (cb) {
+gulp.task('test', function (cb: Function) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul({includeUntested: true})) // Covering files
         .pipe(istanbul.hookRequire())
@@ -31,7 +31,7 @@ gulp.task('test', function (cb) {
         });
 });
 
-gulp.task('test', function (cb) {
+gulp.task('test', function (cb: Function) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul({includeUntested: true})) // Covering files
         .pipe(istanbul.hookRequire())
@@ -42,4 +42,4 @@ gulp.task('test', function (cb) {
                 .pipe(istanbul.enforceThresholds({ thresholds: { global: 90 } })) //
                 .on('end', cb);
         });
-});
\ No newline at end of file
+});
diff --git a/gulp-less/gulp-less-tests.ts b/gulp-less/gulp-less-tests.ts
index 76e0a697c..a0671e766 100644
--- a/gulp-less/gulp-less-tests.ts
+++ b/gulp-less/gulp-less-tests.ts
@@ -4,6 +4,22 @@
 import gulp = require("gulp");
 import less = require("gulp-less");
 
+// Without options
+gulp.task("less", () => {
+    gulp.src("less/**/*.less")
+        .pipe(less())
+        .pipe(gulp.dest("public/css"));
+});
+
+// With an empty option object
+gulp.task("less", () => {
+    gulp.src("less/**/*.less")
+        .pipe(less({}))
+        .pipe(gulp.dest("public/css"));
+});
+
+
+// With some options
 gulp.task("less", () => {
     gulp.src("less/**/*.less")
         .pipe(less({
diff --git a/gulp-less/gulp-less.d.ts b/gulp-less/gulp-less.d.ts
index 9ca5e35b7..84adca370 100644
--- a/gulp-less/gulp-less.d.ts
+++ b/gulp-less/gulp-less.d.ts
@@ -8,7 +8,8 @@
 declare module "gulp-less" {
 
     interface IOptions {
-        paths: string[];
+        modifyVars?: {};
+        paths?: string[];
         plugins?: any[];
     }
 
diff --git a/gulp-newer/gulp-newer-tests.ts b/gulp-newer/gulp-newer-tests.ts
new file mode 100644
index 000000000..43f0c55cc
--- /dev/null
+++ b/gulp-newer/gulp-newer-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
+/// <reference path="./gulp-newer.d.ts" />
+
+import * as gulp from "gulp";
+import newer = require("gulp-newer");
+import minifyHtml = require("gulp-minify-html");
+
+gulp.src("*.html")
+    .pipe(newer("build"))
+    .pipe(minifyHtml())
+    .pipe(gulp.dest("build"));
+
+gulp.src("*.html")
+    .pipe(newer({ dest: "build" }))
+    .pipe(minifyHtml())
+    .pipe(gulp.dest("build"));
diff --git a/gulp-newer/gulp-newer.d.ts b/gulp-newer/gulp-newer.d.ts
new file mode 100644
index 000000000..ca4fdc9a1
--- /dev/null
+++ b/gulp-newer/gulp-newer.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for gulp-newer
+// Project: https://github.com/tschaub/gulp-newer
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+
+declare module "gulp-newer"
+{
+    interface IOptions
+    {
+        /**
+         * Path to destination directory or file.
+         */
+        dest: string;
+
+        /**
+         * Source files will be matched to destination files with the provided extension.
+         */
+        ext?: string;
+
+        /**
+         * Map relative source paths to relative destination paths.
+         */
+        map?: (relativePath: string) => string;
+    }
+
+    interface IGulpNewer
+    {
+        /**
+         * Create a transform stream that passes through files whose modification time
+         * is more recent than the corresponding destination file's modification time.
+         * @param dest Path to destination directory or file.
+         */
+        (dest: string): NodeJS.ReadWriteStream;
+
+        /**
+         * Create a transform stream that passes through files whose modification time
+         * is more recent than the corresponding destination file's modification time.
+         */
+        (options: IOptions): NodeJS.ReadWriteStream;
+    }
+
+    const newer: IGulpNewer;
+    export = newer;
+}
diff --git a/gulp-ng-annotate/gulp-ng-annotate-tests.ts b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
new file mode 100644
index 000000000..ef6e69600
--- /dev/null
+++ b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="gulp-ng-annotate.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import ngAnnotate = require('gulp-ng-annotate');
+import gulp = require('gulp');
+
+gulp.task('default', function () {
+    return gulp.src('src/app.js')
+        .pipe(ngAnnotate())
+        .pipe(gulp.dest('dist'));
+});
+
+ngAnnotate({
+    remove: true,
+    add: true,
+    single_quotes: true
+});
diff --git a/gulp-ng-annotate/gulp-ng-annotate.d.ts b/gulp-ng-annotate/gulp-ng-annotate.d.ts
new file mode 100644
index 000000000..8f25aeebb
--- /dev/null
+++ b/gulp-ng-annotate/gulp-ng-annotate.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for gulp-ng-annotate
+// Project: https://github.com/Kagami/gulp-ng-annotate
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-ng-annotate" {
+
+    namespace ngAnnotate {
+        interface NgAnnotate {
+            (option?: Option): NodeJS.ReadWriteStream;
+        }
+
+        //TODO: Should be on ng-annotate module
+        interface Option {
+            /**
+             * Add annotations where non-existing
+             */
+            add?: boolean;
+            /**
+             * Remove all existing annotations
+             */
+            remove?: boolean;
+            /**
+             * List optional matchers
+             */
+            list?: boolean;
+            /**
+             * Restrict matching further or to expand matching
+             */
+            regexp?: string;
+            /**
+             * Enable optional matcher
+             */
+            enable?: boolean;
+            /**
+             * Output '$scope' instead of "$scope".
+             */
+            single_quotes?: boolean;
+            /**
+             * Rename providers (services, factories, controllers, etc.) with a new name when declared and referenced through annotation
+             */
+            rename?: RenameOption[];
+            /**
+             * Load a user plugin with the provided path
+             */
+            plugin?: any[];
+        }
+
+        interface RenameOption {
+            from: string;
+            to: string;
+        }
+    }
+
+    var ngAnnotate: ngAnnotate.NgAnnotate;
+
+    export = ngAnnotate;
+}
+
diff --git a/gulp-nodemon/gulp-nodemon-tests.ts b/gulp-nodemon/gulp-nodemon-tests.ts
new file mode 100644
index 000000000..6a634558a
--- /dev/null
+++ b/gulp-nodemon/gulp-nodemon-tests.ts
@@ -0,0 +1,43 @@
+/// <reference path="gulp-nodemon.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import path = require('path');
+import nodemon = require('gulp-nodemon');
+
+gulp.task('start', function () {
+    nodemon({
+        script: 'server.js'
+        , ext: 'js html'
+        , env: { 'NODE_ENV': 'development' }
+    })
+});
+
+nodemon({
+    script: 'index.js'
+    , tasks: ['browserify']
+});
+
+nodemon({
+    script: './index.js'
+    , ext: 'js css'
+    , tasks: function (changedFiles: string[]): string[] {
+        var tasks: string[] = [];
+        changedFiles.forEach(function (file: string) {
+            if (path.extname(file) === '.js' && !~tasks.indexOf('lint')) tasks.push('lint')
+            if (path.extname(file) === '.css' && !~tasks.indexOf('cssmin')) tasks.push('cssmin')
+        });
+        return tasks
+    }
+});
+
+
+gulp.task('develop', function () {
+    nodemon({ script: 'server.js'
+        , ext: 'html js'
+        , ignore: ['ignored.js']
+        , tasks: ['lint'] })
+        .on('restart', function () {
+            console.log('restarted!')
+        })
+});
diff --git a/gulp-nodemon/gulp-nodemon.d.ts b/gulp-nodemon/gulp-nodemon.d.ts
new file mode 100644
index 000000000..98db475fe
--- /dev/null
+++ b/gulp-nodemon/gulp-nodemon.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for gulp-nodemon
+// Project: https://github.com/JacksonGariety/gulp-nodemon
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-nodemon" {
+    namespace nodemon {
+
+        interface Nodemon {
+            (option?: Option): EventEmitter;
+        }
+
+        interface Option extends _Option {
+            tasks?: string[]|((changedFiles: string[]) => string[]);
+        }
+
+        // TODO: Properties may be insufficient
+        // TODO: In future this interface should be moved to nodemon.d.ts
+        interface _Option {
+            env?:  { [key: string]: string|boolean|number; };
+            script?: string;
+            /**
+             * Extensions to look for, ie. js,jade,hbs.
+             */
+            ext?: string;
+            /**
+             * Execute script with "app", ie. -x "python -v".
+             */
+            exec?: string;
+            /**
+             * Watch directory "dir" or files. use once for each directory or file to watch.
+             */
+            watch?: string[];
+            /**
+             * Ignore specific files or directories.
+             */
+            ignore?: string[];
+            /**
+             * Minimise nodemon messages to start/stop only.
+             */
+            quiet?: boolean;
+            /**
+             * Show detail on what is causing restarts.
+             */
+            verbose?: boolean;
+            /**
+             * Try to read from stdin.
+             */
+            stdin?: boolean;
+            stdout?: boolean;
+            /**
+             * Execute script on change only, not startup
+             */
+            runOnChangeOnly?: boolean;
+            /**
+             * Debounce restart in seconds.
+             */
+            delay?: number;
+            /**
+             * Forces node to use the most compatible version for watching file changes.
+             */
+            legacyWatch?: boolean;
+            /**
+             * Exit on crash, allows use of nodemon with daemon tools like forever.js.
+             */
+            exitcrash?: boolean;
+            execMap?: { [key: string]: string|boolean|number; };
+            events?:  { [key: string]: string; };
+            restartable?: string;
+        }
+
+        interface EventEmitter extends NodeJS.EventEmitter {
+            addListener(event: string, listener: Function): EventEmitter;
+            addListener(event: string, tasks: string[]): EventEmitter;
+            on(event: string, listener: Function): EventEmitter;
+            on(event: string, tasks: string[]): EventEmitter;
+            once(event: string, listener: Function): EventEmitter;
+            once(event: string, tasks: string[]): EventEmitter;
+        }
+    }
+
+    var nodemon: nodemon.Nodemon;
+
+    export = nodemon;
+}
+
diff --git a/gulp-plumber/gulp-plumber-tests.ts b/gulp-plumber/gulp-plumber-tests.ts
new file mode 100644
index 000000000..cf055dad5
--- /dev/null
+++ b/gulp-plumber/gulp-plumber-tests.ts
@@ -0,0 +1,36 @@
+/// <reference path="../node/node" />
+/// <reference path="../gulp/gulp" />
+/// <reference path="gulp-plumber" />
+
+import gulp = require('gulp');
+import plumber = require('gulp-plumber');
+
+//default behavior
+gulp.src('./src/*.ext')
+    .pipe(plumber())
+    .pipe(gulp.dest('./dist'));
+
+//error handler function
+gulp.src('./src/*.ext')
+    .pipe(plumber((error) => {
+		console.log(error);
+	}))
+    .pipe(gulp.dest('./dist'));
+	
+gulp.src('./src/*.ext')
+    .pipe(plumber({}))
+    .pipe(gulp.dest('./dist'));
+    
+gulp.src('./src/*.ext')
+    .pipe(plumber({ inherit: false }))
+    .pipe(gulp.dest('./dist'));
+    
+gulp.src('./src/*.ext')
+    .pipe(plumber({ errorHandler: (error) => console.log(error) }))
+    .pipe(gulp.dest('./dist'));
+
+//plumber.stop()
+gulp.src('./src/*.scss')
+    .pipe(plumber())
+    .pipe(plumber.stop())
+    .pipe(gulp.dest('./dist'));
\ No newline at end of file
diff --git a/gulp-plumber/gulp-plumber.d.ts b/gulp-plumber/gulp-plumber.d.ts
new file mode 100644
index 000000000..693c4cbf9
--- /dev/null
+++ b/gulp-plumber/gulp-plumber.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for gulp-plumber
+// Project: https://github.com/floatdrop/gulp-plumber
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+declare module 'gulp-plumber' {
+	
+	/** Prevent pipe breaking caused by errors from gulp plugins */
+	interface GulpPlumber {
+		/**
+		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+		 * 
+		 * @param options Sets options as described in the Options interface
+		 */
+		(options?: Options): NodeJS.ReadWriteStream;
+		/**
+		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+		 * 
+		 * @param errorHandler the function to be attached to the stream on('error')
+		 */
+		(errorHandler: ErrorHandlerFunction): NodeJS.ReadWriteStream;
+		/** returns default behaviour for pipeline after it was piped */
+		stop(): NodeJS.ReadWriteStream;
+	}
+	
+	interface Options {
+		/** 
+		 * Handle errors in underlying streams and output them to console. Default true.
+		 * If function passed, it will be attached to stream on('error')
+		 * If false passed, error handler will not be attached
+		 * If undefined passed, default error handler will be attached
+		 */
+		errorHandler?: ErrorHandlerFunction | boolean;
+		/** Monkeypatch pipe functions in underlying streams in pipeline. Default true. */
+		inherit?: boolean;
+	}
+	
+	/** an error handler function to be attached to the stream on('error') */
+	interface ErrorHandlerFunction {
+		/** an error handler function to be attached to the stream on('error') */
+		(error: any): void;
+	}
+	
+	/** Prevent pipe breaking caused by errors from gulp plugins */
+	var gulpPlumber: GulpPlumber;
+	
+	export = gulpPlumber;
+}
diff --git a/gulp-protractor/gulp-protractor.d.ts b/gulp-protractor/gulp-protractor.d.ts
index d0317e2e2..fd98dbd43 100644
--- a/gulp-protractor/gulp-protractor.d.ts
+++ b/gulp-protractor/gulp-protractor.d.ts
@@ -7,6 +7,8 @@
 /// <reference path="../gulp/gulp.d.ts" />
 
 declare module 'gulp-protractor' {
+    import gulp = require('gulp');
+
     interface IOptions {
         configFile?: string;
         args?: Array<string>;
@@ -16,8 +18,8 @@ declare module 'gulp-protractor' {
     interface IGulpProtractor {
         getProtractorDir(): string;
         protractor(options?: IOptions): NodeJS.ReadWriteStream;
-        webdriver_standalone: gulp.ITaskCallback;
-        webdriver_update: gulp.ITaskCallback;
+        webdriver_standalone: gulp.TaskCallback;
+        webdriver_update: gulp.TaskCallback;
     }
 
     var protractor: IGulpProtractor;
diff --git a/gulp-sass/gulp-sass-tests.ts b/gulp-sass/gulp-sass-tests.ts
index b566b4cdf..b1aeef4b4 100644
--- a/gulp-sass/gulp-sass-tests.ts
+++ b/gulp-sass/gulp-sass-tests.ts
@@ -1,7 +1,7 @@
 /// <reference path="./gulp-sass.d.ts"/>
 /// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
-import sass = require("gulp-sass");
+import * as sass from "gulp-sass"; 
 
 gulp.task('sass', function () {
     gulp.src('./scss/*.scss')
@@ -12,5 +12,6 @@ gulp.task('sass', function () {
 gulp.task('sass', function () {
     gulp.src('./scss/*.scss')
         .pipe(sass({errLogToConsole: true}))
+        .pipe(sass.sync())
         .pipe(gulp.dest('./css'));
 });
\ No newline at end of file
diff --git a/gulp-sass/gulp-sass.d.ts b/gulp-sass/gulp-sass.d.ts
index 8d6d4c055..b133461dc 100644
--- a/gulp-sass/gulp-sass.d.ts
+++ b/gulp-sass/gulp-sass.d.ts
@@ -43,7 +43,12 @@ declare module "gulp-sass" {
         sync?: boolean;
     }
 
-    function sass(opts?: Options): NodeJS.ReadWriteStream;
+    interface Sass {
+        (opts?: Options): NodeJS.ReadWriteStream;
+        logError(error?: string): void;
+        sync(options?: Options): NodeJS.ReadWriteStream;
+    }
 
-    export = sass;
+    var _tmp: Sass;
+    export = _tmp;
 }
\ No newline at end of file
diff --git a/gulp-shell/gulp-shell-tests.ts b/gulp-shell/gulp-shell-tests.ts
new file mode 100644
index 000000000..eb3d1a5a4
--- /dev/null
+++ b/gulp-shell/gulp-shell-tests.ts
@@ -0,0 +1,42 @@
+/// <reference path="gulp-shell.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import shell = require('gulp-shell');
+import gulp = require('gulp');
+
+gulp.task('example', function () {
+    return gulp.src('*.js', {read: false})
+        .pipe(shell([
+        'echo <%= f(file.path) %>',
+        'ls -l <%= file.path %>'
+    ], {
+        templateData: {
+            f: function (s: string) {
+                return s.replace(/$/, '.bak')
+            }
+        }
+    }))
+});
+
+gulp.task('shorthand', shell.task([
+    'echo hello',
+    'echo world'
+]));
+
+var paths: any = {
+    js: ['*.js', 'test/*.js']
+};
+
+gulp.task('test', shell.task('mocha -R spec'));
+
+gulp.task('coverage', ['test'], shell.task('istanbul cover _mocha -- -R spec'));
+
+gulp.task('coveralls', ['coverage'], shell.task('cat coverage/lcov.info | coveralls'));
+
+gulp.task('lint', shell.task('eslint ' + paths.js.join(' ')));
+
+gulp.task('default', ['coverage', 'lint']);
+
+gulp.task('watch', function () {
+    gulp.watch(paths.js, ['default'])
+});
diff --git a/gulp-shell/gulp-shell.d.ts b/gulp-shell/gulp-shell.d.ts
new file mode 100644
index 000000000..d88f27ed6
--- /dev/null
+++ b/gulp-shell/gulp-shell.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for gulp-shell
+// Project: https://github.com/sun-zheng-an/gulp-shell
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "gulp-shell" {
+
+    namespace shell {
+        interface Shell {
+            (commands: string|string[], options?: Option): NodeJS.ReadWriteStream;
+            task(commands: string|string[], options?: Option): () => NodeJS.ReadWriteStream;
+        }
+
+        interface Option {
+            /**
+             * You can add a custom error message for when the command fails. This can be a template which can be
+             * interpolated with the current command, some file info (e.g. file.path) and some error info
+             * (e.g. error.code).
+             * @default 'Command `<%= command %>` failed with exit code <%= error.code %>'
+             */
+            errorMessage?: string;
+            /**
+             * By default, it will emit an error event when the command finishes unsuccessfully.
+             * @default false
+             */
+            ignoreErrors?: boolean;
+            /**
+             * By default, it will print the command output.
+             * @default false
+             */
+            quiet?: boolean;
+            /**
+             * Sets the current working directory for the command.
+             * @default process.cwd()
+             */
+            cwd?: string;
+            /**
+             * The data that can be accessed in template.
+             */
+            templateData?: any;
+            /**
+             * You won't need to set this option unless you encounter a "stdout maxBuffer exceeded" error.
+             * @default 16MB(16 * 1024 * 1024)
+             */
+            maxBuffer?: number;
+            /**
+             * The maximum amount of time in milliseconds the process is allowed to run.
+             * @default
+             */
+            timeout?: number;
+            /**
+             * By default, all the commands will be executed in an environment with all the variables in process.env
+             * and PATH prepended by ./node_modules/.bin (allowing you to run executables in your Node's dependencies).
+             * You can override any environment variables with this option.
+             * For example, setting it to {PATH: process.env.PATH} will reset the PATH
+             * if the default one brings your some troubles.
+             */
+            env?: any;
+        }
+    }
+
+    var shell: shell.Shell;
+
+    export = shell;
+}
+
diff --git a/gulp-sort/gulp-sort-tests.ts b/gulp-sort/gulp-sort-tests.ts
new file mode 100644
index 000000000..12685c085
--- /dev/null
+++ b/gulp-sort/gulp-sort-tests.ts
@@ -0,0 +1,50 @@
+/** Tests taken from https://github.com/pgilad/gulp-sort#usage */
+/// <reference path="../node/node" />
+/// <reference path="../gulp/gulp" />
+/// <reference path="gulp-sort" />
+
+import gulp = require('gulp');
+import sort = require('gulp-sort');
+import gulpUtil = require('gulp-util');
+
+// default sort
+gulp.src('./src/js/**/*.js')
+    .pipe(sort())
+    .pipe(gulp.dest('./build/js'));
+
+// pass in a custom comparator function
+gulp.src('./src/js/**/*.js')
+    .pipe(sort(customComparator))
+    .pipe(gulp.dest('./build/js'));
+
+// sort descending
+gulp.src('./src/js/**/*.js')
+    .pipe(sort({
+        asc: false
+    }))
+    .pipe(gulp.dest('./build/js'));
+
+// sort with a custom comparator
+gulp.src('./src/js/**/*.js')
+    .pipe(sort({
+        comparator: function(file1, file2) {
+            if (file1.path.indexOf('build') > -1) {
+                return 1;
+            }
+            if (file2.path.indexOf('build') > -1) {
+                return -1;
+            }
+            return 0;
+        }
+    }))
+    .pipe(gulp.dest('./build/js'));
+	
+function customComparator(file1: gulpUtil.File, file2: gulpUtil.File) {
+    if (file1.path.indexOf('build') > -1) {
+        return 1;
+    }
+    if (file2.path.indexOf('build') > -1) {
+        return -1;
+    }
+    return 0;
+}
\ No newline at end of file
diff --git a/gulp-sort/gulp-sort.d.ts b/gulp-sort/gulp-sort.d.ts
new file mode 100644
index 000000000..c06b9c3e0
--- /dev/null
+++ b/gulp-sort/gulp-sort.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for gulp-sort
+// Project: https://github.com/pgilad/gulp-sort
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp-util/gulp-util.d.ts" />
+
+/** Sort files in stream by path or any custom sort comparator */
+declare module 'gulp-sort' {
+	
+	import gulpUtil = require('gulp-util');
+	
+	interface IOptions {
+		/** 
+		 * A function to compare two files.
+		 * Returns:
+		 * -1 if file1 should be before file2,
+		 * 0 if file1 is equivalent to file2, and
+		 * 1 if file1 should be after file2
+		 */
+		comparator?: IComparatorFunction;
+		/** Whether to sort in ascending order, default is true */
+		asc?: boolean;
+	}
+	
+	interface IComparatorFunction {
+		/** 
+		 * A function to compare two files.
+		 * Returns:
+		 * -1 if file1 should be before file2,
+		 * 0 if file1 is equivalent to file2, and
+		 * 1 if file1 should be after file2
+		 */
+		(file1: gulpUtil.File, file2: gulpUtil.File): number;
+	}
+	
+	/** Sort files in stream by path or any custom sort comparator */
+	function gulpSort(): NodeJS.ReadWriteStream;
+	function gulpSort(comparator: IComparatorFunction): NodeJS.ReadWriteStream;
+	function gulpSort(options: IOptions): NodeJS.ReadWriteStream;
+	
+	export = gulpSort;
+}
diff --git a/gulp-sourcemaps/gulp-sourcemaps.d.ts b/gulp-sourcemaps/gulp-sourcemaps.d.ts
index 220085367..56cb957e1 100644
--- a/gulp-sourcemaps/gulp-sourcemaps.d.ts
+++ b/gulp-sourcemaps/gulp-sourcemaps.d.ts
@@ -17,12 +17,12 @@ declare module "gulp-sourcemaps" {
 
     interface WriteOptions {
         addComment?: boolean;
-        includeContext?: boolean;
+        includeContent?: boolean;
         sourceRoot?: string | WriteMapper;
         sourceMappingURLPrefix?: string | WriteMapper;
     }
 
     export function init(opts?: InitOptions): NodeJS.ReadWriteStream;
-    export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
     export function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
+    export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
 }
\ No newline at end of file
diff --git a/gulp-svg-sprite/gulp-svg-sprite-tests.ts b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
new file mode 100644
index 000000000..6c1ba71df
--- /dev/null
+++ b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
@@ -0,0 +1,51 @@
+/// <reference path="gulp-svg-sprite.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../svg-sprite/svg-sprite.d.ts" />
+
+import svgSprite = require('gulp-svg-sprite');
+import spriter = require('svg-sprite');
+import gulp = require('gulp')
+
+let config: spriter.Config;
+
+// Basic configuration example
+config                  = {
+    mode                : {
+        css             : {     // Activate the «css» mode
+            render      : {
+                css     : true  // Activate CSS output (with default options)
+            }
+        }
+    }
+};
+
+gulp.src('**/*.svg', {cwd: 'path/to/assets'})
+    .pipe(svgSprite(config))
+    .pipe(gulp.dest('out'));
+
+
+config                  = {
+    shape               : {
+        dimension       : {         // Set maximum dimensions
+            maxWidth    : 32,
+            maxHeight   : 32
+        },
+        spacing         : {         // Add padding
+            padding     : 10
+        },
+        dest            : 'out/intermediate-svg'    // Keep the intermediate files
+    },
+    mode                : {
+        view            : {         // Activate the «view» mode
+            bust        : false,
+            render      : {
+                scss    : true      // Activate Sass output (with default options)
+            }
+        },
+        symbol          : true      // Activate the «symbol» mode
+    }
+};
+
+gulp.src('**/*.svg', {cwd: 'path/to/assets'})
+    .pipe(svgSprite(config))
+    .pipe(gulp.dest('out'));
diff --git a/gulp-svg-sprite/gulp-svg-sprite.d.ts b/gulp-svg-sprite/gulp-svg-sprite.d.ts
new file mode 100644
index 000000000..50aa00362
--- /dev/null
+++ b/gulp-svg-sprite/gulp-svg-sprite.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for gulp-svg-sprite 1.2.9
+// Project: https://github.com/jkphl/gulp-svg-sprite
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../svg-sprite/svg-sprite.d.ts" />
+
+declare module "gulp-svg-sprite" {
+    import spriter = require('svg-sprite');
+
+    namespace svgSprite {
+        interface SvgSprite {
+            (options?: spriter.Config): NodeJS.ReadWriteStream;
+        }
+    }
+
+    var svgSprite: svgSprite.SvgSprite;
+
+    export = svgSprite;
+}
+
diff --git a/gulp-task-listing/gulp-task-listing-tests.ts b/gulp-task-listing/gulp-task-listing-tests.ts
new file mode 100644
index 000000000..7d2c293d3
--- /dev/null
+++ b/gulp-task-listing/gulp-task-listing-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="gulp-task-listing.d.ts" />
+
+import gulp = require('gulp');
+import gulpTaskListing = require('gulp-task-listing');
+
+gulp.task('help-default', gulpTaskListing);
+gulp.task('help-subTaskRegexFilter', gulpTaskListing.withFilters(/\d+/));
+gulp.task('help-subTaskFunctionFilter', gulpTaskListing.withFilters(task => task.length > 3));
+gulp.task('help-excludeRegexFilter', gulpTaskListing.withFilters(null, /\w+/));
+gulp.task('help-excludeFunctionFilter', gulpTaskListing.withFilters(null, task => task.length < 2));
+gulp.task('help-bothFilters1', gulpTaskListing.withFilters(/\d+/, /\w+/));
+gulp.task('help-bothFilters2', gulpTaskListing.withFilters(/\d+/, task => task.length > 3));
+gulp.task('help-bothFilters3', gulpTaskListing.withFilters(task => task.length < 2, /\w+/));
+gulp.task('help-bothFilters4', gulpTaskListing.withFilters(task => task.length < 2, task => task.length > 3));
\ No newline at end of file
diff --git a/gulp-task-listing/gulp-task-listing.d.ts b/gulp-task-listing/gulp-task-listing.d.ts
new file mode 100644
index 000000000..8409f4b80
--- /dev/null
+++ b/gulp-task-listing/gulp-task-listing.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for gulp-task-listing
+// Project: https://github.com/OverZealous/gulp-task-listing
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/** 
+ * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
+ * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
+ * or colon (:) in their name.
+ * 
+ * You can optionally override the Regexp used to determine whether a task is a primary or 
+ * subtask, as well as filter out tasks you don't want to see in the output.
+ */
+declare module 'gulp-task-listing' {
+	
+	/** 
+	 * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
+	 * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
+	 * or colon (:) in their name.
+	 * 
+	 * You can optionally override the Regexp used to determine whether a task is a primary or 
+	 * subtask, as well as filter out tasks you don't want to see in the output.
+	 */
+	interface GulpTaskListing {
+		(cb: Function): void;
+		/**
+		 * Allows for custom filtering of Gulp tasks in the listing
+		 * 
+		 * @param subTaskFilter a RegExp or Function returning whether the given task is a subtask
+		 * @param excludeFilter a RegExp or Function returning whether the given task should be excluded from the listing
+		 */
+		withFilters(subTaskFilter: RegExp | FilterFunction, excludeFilter?: RegExp | FilterFunction): (cb: Function) => void;
+	}
+	
+	type FilterFunction = (task: string) => boolean;
+	
+	var gulpTaskListing: GulpTaskListing;
+	
+	export = gulpTaskListing;
+}
diff --git a/gulp-tsd/gulp-tsd-tests.ts b/gulp-tsd/gulp-tsd-tests.ts
index 9475ace65..a7c20519c 100644
--- a/gulp-tsd/gulp-tsd-tests.ts
+++ b/gulp-tsd/gulp-tsd-tests.ts
@@ -9,7 +9,7 @@ gulp.task("tsd", () => {
         .pipe(tsd());
 });
 
-gulp.task("tsd:options", callback => {
+gulp.task("tsd:options", (callback: any) => {
     tsd({
         command: "reinstall",
         config: "tsd.json"
diff --git a/gulp-tsd/gulp-tsd.d.ts b/gulp-tsd/gulp-tsd.d.ts
index 68a4c6728..816d50d25 100644
--- a/gulp-tsd/gulp-tsd.d.ts
+++ b/gulp-tsd/gulp-tsd.d.ts
@@ -7,6 +7,7 @@
 /// <reference path="../gulp/gulp.d.ts" />
 
 declare module "gulp-tsd" {
+    import gulp = require('gulp');
 
     interface IOptions {
         command?: string;
@@ -15,7 +16,7 @@ declare module "gulp-tsd" {
         opts?: Object;
     }
 
-    function tsd(opts?: IOptions, callback?: gulp.ITaskCallback): NodeJS.ReadWriteStream;
+    function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream;
 
     export = tsd;
 }
diff --git a/gulp-typescript/gulp-typescript.d.ts b/gulp-typescript/gulp-typescript.d.ts
index da517a511..7b16d0a5a 100644
--- a/gulp-typescript/gulp-typescript.d.ts
+++ b/gulp-typescript/gulp-typescript.d.ts
@@ -23,6 +23,7 @@ declare module "gulp-typescript" {
             sourceRoot?: string;
             sortOutput?: boolean;
             target?: string;
+            typescript?: any;
         }
 
         interface Project {
diff --git a/gulp-watch/gulp-watch-tests.ts b/gulp-watch/gulp-watch-tests.ts
index 9d9303ac2..dd237dccc 100644
--- a/gulp-watch/gulp-watch-tests.ts
+++ b/gulp-watch/gulp-watch-tests.ts
@@ -10,7 +10,7 @@ gulp.task('stream', () =>
         .pipe(gulp.dest('build'))
 );
 
-gulp.task('callback', (cb) =>
+gulp.task('callback', (cb: Function) =>
     watch('css/**/*.css', () =>
         gulp.src('css/**/*.css')
             .pipe(watch('css/**/*.css'))
diff --git a/gulp/gulp-tests.ts b/gulp/gulp-tests.ts
index 07a92fc91..d00690881 100644
--- a/gulp/gulp-tests.ts
+++ b/gulp/gulp-tests.ts
@@ -4,8 +4,8 @@
 import gulp = require("gulp");
 import browserSync = require("browser-sync");
 
-var typescript: IGulpPlugin = null; // this would be the TypeScript compiler
-var jasmine: IGulpPlugin = null; // this would be the jasmine test runner
+var typescript: gulp.GulpPlugin = null; // this would be the TypeScript compiler
+var jasmine: gulp.GulpPlugin = null; // this would be the jasmine test runner
 
 gulp.task('compile', function()
 {
@@ -31,6 +31,7 @@ gulp.task('test', ['compile', 'compile2'], function()
 gulp.task('default', ['compile', 'test']);
 
 
+
 var opts = {};
 
 gulp.watch('*.html', 'compile');
@@ -66,3 +67,5 @@ gulp.task('serve', ['compile'], () => {
     var browser = browserSync.create();
     gulp.watch(['*.html', '*.ts'], ['compile', browser.reload]);
 });
+
+gulp.start('test', 'compile');
diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts
index 13c12a811..160ee99ce 100644
--- a/gulp/gulp.d.ts
+++ b/gulp/gulp.d.ts
@@ -4,268 +4,287 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-
-declare module gulp {
-
-    /**
-     * Options to pass to node-glob through glob-stream.
-     * Specifies two options in addition to those used by node-glob:
-     * https://github.com/isaacs/node-glob#options
-     */
-    interface ISrcOptions {
-        /**
-         * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
-         * and not read the file at all.
-         * Default: <code>true</code>.
-         */
-        read?: boolean;
-
-        /**
-         * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
-         * This is useful when working with large files.
-         * Note: Plugins might not implement support for streams.
-         * Default: <code>true</code>.
-         */
-        buffer?: boolean;
-
-        /**
-         * The base path of a glob.
-         *
-         * Default is everything before a glob starts.
-         */
-        base?: string;
-
-        /**
-         * The current working directory in which to search.
-         * Defaults to process.cwd().
-         */
-        cwd?: string;
-
-        /**
-         * The place where patterns starting with / will be mounted onto.
-         * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
-         */
-        root?: string;
-
-        /**
-         * Include .dot files in normal matches and globstar matches.
-         * Note that an explicit dot in a portion of the pattern will always match dot files.
-         */
-        dot?: boolean;
-
-        /**
-         * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
-         * filesystem path is returned. Set this flag to disable that behavior.
-         */
-        nomount?: boolean;
-
-        /**
-         * Add a / character to directory matches. Note that this requires additional stat calls.
-         */
-        mark?: boolean;
-
-        /**
-         * Don't sort the results.
-         */
-        nosort?: boolean;
-
-        /**
-         * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
-         * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
-         * level sooner in the case of cyclical symbolic links.
-         */
-        stat?: boolean;
-
-        /**
-         * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
-         * Set the silent option to true to suppress these warnings.
-         */
-        silent?: boolean;
-
-        /**
-         * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
-         * search of other matches. Set the strict option to raise an error in these cases.
-         */
-        strict?: boolean;
-
-        /**
-         * See cache property above. Pass in a previously generated cache object to save some fs calls.
-         */
-        cache?: boolean;
-
-        /**
-         * A cache of results of filesystem information, to prevent unnecessary stat calls.
-         * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
-         * options object of another, if you know that the filesystem will not change between calls.
-         */
-        statCache?: boolean;
-
-        /**
-         * Perform a synchronous glob search.
-         */
-        sync?: boolean;
-
-        /**
-         * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
-         * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
-         */
-        nounique?: boolean;
-
-        /**
-         * Set to never return an empty set, instead returning a set containing the pattern itself.
-         * This is the default in glob(3).
-         */
-        nonull?: boolean;
-
-        /**
-         * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
-         * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
-         */
-        nocase?: boolean;
-
-        /**
-         * Set to enable debug logging in minimatch and glob.
-         */
-        debug?: boolean;
-
-        /**
-         * Set to enable debug logging in glob, but not minimatch.
-         */
-        globDebug?: boolean;
-    }
-
-    interface IDestOptions {
-        /**
-         * The output folder. Only has an effect if provided output folder is relative.
-         * Default: process.cwd()
-         */
-        cwd?: string;
-
-        /**
-         * Octal permission string specifying mode for any folders that need to be created for output folder.
-         * Default: 0777.
-         */
-        mode?: string;
-    }
-
-    /**
-     * Options that are passed to <code>gaze</code>.
-     * https://github.com/shama/gaze
-     */
-    interface IWatchOptions {
-        /** Interval to pass to fs.watchFile. */
-        interval?: number;
-        /** Delay for events called in succession for the same file/event. */
-        debounceDelay?: number;
-        /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
-        mode?: string;
-        /** The current working directory to base file patterns from. Default is process.cwd().. */
-        cwd?: string;
-    }
-
-    interface IWatchEvent {
-        /** The type of change that occurred, either added, changed or deleted. */
-        type: string;
-        /** The path to the file that triggered the event. */
-        path: string;
-    }
-
-    /**
-     * Callback to be called on each watched file change.
-     */
-    interface IWatchCallback {
-        (event:IWatchEvent): void;
-    }
-
-    interface ITaskCallback {
-        /**
-         * Defines a task.
-         * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
-         * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
-         */
-        (cb?:(err?:any)=>void): any;
-    }
-
-    interface EventEmitter {
-        any: any;
-    }
-
-    interface Gulp {
-        /**
-         * Define a task.
-         *
-         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-         */
-        task(name:string, fn:ITaskCallback): any;
-
-        /**
-         * Define a task.
-         *
-         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-         * @param dep an array of tasks to be executed and completed before your task will run.
-         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-         */
-        task(name:string, dep:string[], fn?:ITaskCallback): any;
-
-
-        /**
-         * Takes a glob and represents a file structure. Can be piped to plugins.
-         * @param glob a glob string, using node-glob syntax
-         * @param opt an optional option object
-         */
-        src(glob:string, opt?:ISrcOptions): NodeJS.ReadWriteStream;
-
-        /**
-         * Takes a glob and represents a file structure. Can be piped to plugins.
-         * @param glob an array of glob strings, using node-glob syntax
-         * @param opt an optional option object
-         */
-        src(glob:string[], opt?:ISrcOptions): NodeJS.ReadWriteStream;
-
-
-        /**
-         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-         * Folders that don't exist will be created.
-         *
-         * @param outFolder the path (output folder) to write files to.
-         * @param opt
-         */
-        dest(outFolder:string, opt?:IDestOptions): NodeJS.ReadWriteStream;
-
-        /**
-         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-         * Folders that don't exist will be created.
-         *
-         * @param outFolder a function that converts a vinyl File instance into an output path
-         * @param opt
-         */
-        dest(outFolder:(file:string)=>string, opt?:IDestOptions): NodeJS.ReadWriteStream;
-
-
-        /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param opt options, that are passed to the gaze library.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with gulp.task().
-         */
-        watch(glob:string, fn:(IWatchCallback|string)): EventEmitter;
-        watch(glob:string, fn:(IWatchCallback|string)[]): EventEmitter;
-        watch(glob:string, opt:IWatchOptions, fn:(IWatchCallback|string)): EventEmitter;
-        watch(glob:string, opt:IWatchOptions, fn:(IWatchCallback|string)[]): EventEmitter;
-        watch(glob:string[], fn:(IWatchCallback|string)): EventEmitter;
-        watch(glob:string[], fn:(IWatchCallback|string)[]): EventEmitter;
-        watch(glob:string[], opt:IWatchOptions, fn:(IWatchCallback|string)): EventEmitter;
-        watch(glob:string[], opt:IWatchOptions, fn:(IWatchCallback|string)[]): EventEmitter;
-    }
-}
+/// <reference path="../orchestrator/orchestrator.d.ts" />
 
 declare module "gulp" {
-    var _tmp:gulp.Gulp;
-    export = _tmp;
-}
+    import Orchestrator = require("orchestrator");
 
-interface IGulpPlugin {
-    (...args: any[]): NodeJS.ReadWriteStream;
+    namespace gulp {
+        interface Gulp extends Orchestrator {
+            /**
+             * Define a task
+             * @param name The name of the task.
+             * @param deps An array of task names to be executed and completed before your task will run.
+             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+             * <ul>
+             *     <li>Take in a callback</li>
+             *     <li>Return a stream or a promise</li>
+             * </ul>
+             */
+            task: Orchestrator.AddMethod;
+            /**
+             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+             * @param glob Glob or array of globs to read.
+             * @param opt Options to pass to node-glob through glob-stream.
+             */
+            src: SrcMethod;
+            /**
+             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+             * Folders that don't exist will be created.
+             *
+             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+             * @param opt
+             */
+            dest: DestMethod;
+            /**
+             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+             *
+             * @param glob a single glob or array of globs that indicate which files to watch for changes.
+             * @param opt options, that are passed to the gaze library.
+             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+             */
+            watch: WatchMethod;
+        }
+
+        interface GulpPlugin {
+            (...args: any[]): NodeJS.ReadWriteStream;
+        }
+
+        interface WatchMethod {
+            /**
+             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+             *
+             * @param glob a single glob or array of globs that indicate which files to watch for changes.
+             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+             */
+            (glob: string|string[], fn: (WatchCallback|string)): NodeJS.EventEmitter;
+            /**
+             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+             *
+             * @param glob a single glob or array of globs that indicate which files to watch for changes.
+             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+             */
+            (glob: string|string[], fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
+            /**
+             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+             *
+             * @param glob a single glob or array of globs that indicate which files to watch for changes.
+             * @param opt options, that are passed to the gaze library.
+             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+             */
+            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)): NodeJS.EventEmitter;
+            /**
+             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+             *
+             * @param glob a single glob or array of globs that indicate which files to watch for changes.
+             * @param opt options, that are passed to the gaze library.
+             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+             */
+            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
+
+        }
+
+        interface DestMethod {
+            /**
+             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+             * Folders that don't exist will be created.
+             *
+             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+             * @param opt
+             */
+            (outFolder: string|((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
+        }
+
+        interface SrcMethod {
+            /**
+             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+             * @param glob Glob or array of globs to read.
+             * @param opt Options to pass to node-glob through glob-stream.
+             */
+            (glob: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+        }
+
+        /**
+         * Options to pass to node-glob through glob-stream.
+         * Specifies two options in addition to those used by node-glob:
+         * https://github.com/isaacs/node-glob#options
+         */
+        interface SrcOptions {
+            /**
+             * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
+             * and not read the file at all.
+             * Default: <code>true</code>.
+             */
+            read?: boolean;
+
+            /**
+             * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
+             * This is useful when working with large files.
+             * Note: Plugins might not implement support for streams.
+             * Default: <code>true</code>.
+             */
+            buffer?: boolean;
+
+            /**
+             * The base path of a glob.
+             *
+             * Default is everything before a glob starts.
+             */
+            base?: string;
+
+            /**
+             * The current working directory in which to search.
+             * Defaults to process.cwd().
+             */
+            cwd?: string;
+
+            /**
+             * The place where patterns starting with / will be mounted onto.
+             * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
+             */
+            root?: string;
+
+            /**
+             * Include .dot files in normal matches and globstar matches.
+             * Note that an explicit dot in a portion of the pattern will always match dot files.
+             */
+            dot?: boolean;
+
+            /**
+             * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
+             * filesystem path is returned. Set this flag to disable that behavior.
+             */
+            nomount?: boolean;
+
+            /**
+             * Add a / character to directory matches. Note that this requires additional stat calls.
+             */
+            mark?: boolean;
+
+            /**
+             * Don't sort the results.
+             */
+            nosort?: boolean;
+
+            /**
+             * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
+             * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
+             * level sooner in the case of cyclical symbolic links.
+             */
+            stat?: boolean;
+
+            /**
+             * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
+             * Set the silent option to true to suppress these warnings.
+             */
+            silent?: boolean;
+
+            /**
+             * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
+             * search of other matches. Set the strict option to raise an error in these cases.
+             */
+            strict?: boolean;
+
+            /**
+             * See cache property above. Pass in a previously generated cache object to save some fs calls.
+             */
+            cache?: boolean;
+
+            /**
+             * A cache of results of filesystem information, to prevent unnecessary stat calls.
+             * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
+             * options object of another, if you know that the filesystem will not change between calls.
+             */
+            statCache?: boolean;
+
+            /**
+             * Perform a synchronous glob search.
+             */
+            sync?: boolean;
+
+            /**
+             * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
+             * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
+             */
+            nounique?: boolean;
+
+            /**
+             * Set to never return an empty set, instead returning a set containing the pattern itself.
+             * This is the default in glob(3).
+             */
+            nonull?: boolean;
+
+            /**
+             * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
+             * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
+             */
+            nocase?: boolean;
+
+            /**
+             * Set to enable debug logging in minimatch and glob.
+             */
+            debug?: boolean;
+
+            /**
+             * Set to enable debug logging in glob, but not minimatch.
+             */
+            globDebug?: boolean;
+        }
+
+        interface DestOptions {
+            /**
+             * The output folder. Only has an effect if provided output folder is relative.
+             * Default: process.cwd()
+             */
+            cwd?: string;
+
+            /**
+             * Octal permission string specifying mode for any folders that need to be created for output folder.
+             * Default: 0777.
+             */
+            mode?: string;
+        }
+
+        /**
+         * Options that are passed to <code>gaze</code>.
+         * https://github.com/shama/gaze
+         */
+        interface WatchOptions {
+            /** Interval to pass to fs.watchFile. */
+            interval?: number;
+            /** Delay for events called in succession for the same file/event. */
+            debounceDelay?: number;
+            /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
+            mode?: string;
+            /** The current working directory to base file patterns from. Default is process.cwd().. */
+            cwd?: string;
+        }
+
+        interface WatchEvent {
+            /** The type of change that occurred, either added, changed or deleted. */
+            type: string;
+            /** The path to the file that triggered the event. */
+            path: string;
+        }
+
+        /**
+         * Callback to be called on each watched file change.
+         */
+        interface WatchCallback {
+            (event: WatchEvent): void;
+        }
+
+        interface TaskCallback {
+            /**
+             * Defines a task.
+             * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
+             * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
+             */
+            (cb?: (err?: any) => void): any;
+        }
+    }
+
+    var gulp: gulp.Gulp;
+
+    export = gulp;
 }
diff --git a/hammerjs/hammerjs-1.1.3-tests.ts b/hammerjs/hammerjs-1.1.3-tests.ts
index 42c5ccea3..5515175af 100644
--- a/hammerjs/hammerjs-1.1.3-tests.ts
+++ b/hammerjs/hammerjs-1.1.3-tests.ts
@@ -43,7 +43,7 @@ $("#element")
    });
 
 $("#container").hammer({
-    prevent_default: false,
-    drag_block_vertical: false
+    preventDefault: false,
+    dragBlockVertical: false
 }).on("hold tap doubletap transformstart transform transformend dragstart drag dragend release swipe", function (ev) {
 });
\ No newline at end of file
diff --git a/hammerjs/hammerjs-commonjs-tests.ts b/hammerjs/hammerjs-commonjs-tests.ts
new file mode 100644
index 000000000..e9f1d209f
--- /dev/null
+++ b/hammerjs/hammerjs-commonjs-tests.ts
@@ -0,0 +1,117 @@
+// Tests based on examples at http://hammerjs.github.io/examples/
+
+/// <reference path="hammerjs.d.ts" />
+
+import Hammer = require("hammerjs");
+
+(() =>
+{
+  var myElement = document.getElementById( 'myElement' );
+
+  // create a simple instance
+  // by default, it only adds horizontal recognizers
+  var mc = new Hammer( myElement );
+
+  // listen to events...
+  mc.on( "panleft panright tap press", function ( ev )
+  {
+    myElement.textContent = ev.type + " gesture detected.";
+  } );
+})();
+
+
+(() =>
+{
+  var myElement = document.getElementById( 'myElement' );
+
+  // create a simple instance
+  // by default, it only adds horizontal recognizers
+  var mc = new Hammer( myElement );
+
+  // let the pan gesture support all directions.
+  // this will block the vertical scrolling on a touch-device while on the element
+  mc.get( 'pan' ).set( {direction: Hammer.DIRECTION_ALL} );
+
+  // listen to events...
+  mc.on( "panleft panright panup pandown tap press", function ( ev:HammerInput )
+  {
+    myElement.textContent = ev.type + " gesture detected.";
+  } );
+})();
+
+
+(() =>
+{
+  var myElement = document.getElementById( 'myElement' );
+
+  var mc = new Hammer.Manager( myElement );
+
+  // create a pinch and rotate recognizer
+  // these require 2 pointers
+  var pinch = new Hammer.Pinch();
+  var rotate = new Hammer.Rotate();
+
+  // we want to detect both the same time
+  pinch.recognizeWith( rotate );
+
+  // add to the Manager
+  mc.add( [pinch, rotate] );
+
+
+  mc.on( "pinch rotate", function ( ev:HammerInput )
+  {
+    myElement.textContent += ev.type + " ";
+  } );
+})();
+
+
+(() =>
+{
+  var myElement = document.getElementById( 'myElement' );
+
+  // We create a manager object, which is the same as Hammer(), but without the presetted recognizers.
+  var mc = new Hammer.Manager( myElement );
+
+  // Default, tap recognizer
+  mc.add( new Hammer.Tap() );
+
+  // Tap recognizer with minimal 4 taps
+  mc.add( new Hammer.Tap( {event: 'quadrupletap', taps: 4} ) );
+
+  // we want to recognize this simulatenous, so a quadrupletap will be detected even while a tap has been recognized.
+  // the tap event will be emitted on every tap
+  mc.get( 'quadrupletap' ).recognizeWith( 'tap' );
+
+
+  mc.on( "tap quadrupletap", function ( ev )
+  {
+    myElement.textContent += ev.type + " ";
+  } );
+})();
+
+
+(() =>
+{
+  var myElement = document.getElementById( 'myElement' );
+
+  // We create a manager object, which is the same as Hammer(), but without the presetted recognizers.
+  var mc = new Hammer.Manager( myElement );
+
+
+  // Tap recognizer with minimal 2 taps
+  mc.add( new Hammer.Tap( {event: 'doubletap', taps: 2} ) );
+  // Single tap recognizer
+  mc.add( new Hammer.Tap( {event: 'singletap'} ) );
+
+
+  // we want to recognize this simulatenous, so a quadrupletap will be detected even while a tap has been recognized.
+  mc.get( 'doubletap' ).recognizeWith( 'singletap' );
+  // we only want to trigger a tap, when we don't have detected a doubletap
+  mc.get( 'singletap' ).requireFailure( 'doubletap' );
+
+
+  mc.on( "singletap doubletap", function ( ev )
+  {
+    myElement.textContent += ev.type + " ";
+  } );
+})();
diff --git a/hammerjs/hammerjs.d.ts b/hammerjs/hammerjs.d.ts
index 84d4f9431..5ea8165b0 100644
--- a/hammerjs/hammerjs.d.ts
+++ b/hammerjs/hammerjs.d.ts
@@ -7,7 +7,7 @@
 
 declare var Hammer:HammerStatic;
 
-declare module "Hammer" {
+declare module "hammerjs" {
     export = Hammer;
 }
 
@@ -302,7 +302,7 @@ interface SwipeRecognizerStatic
   new( options?:any ):SwipeRecognizer;
 }
 
-interface SwipeRecognizer
+interface SwipeRecognizer extends AttrRecognizer
 {
 }
 
diff --git a/handlebars/handlebars-tests.ts b/handlebars/handlebars-tests.ts
index 7ca58ff02..264d70103 100644
--- a/handlebars/handlebars-tests.ts
+++ b/handlebars/handlebars-tests.ts
@@ -80,3 +80,5 @@ Handlebars.registerHelper('fullName', (person: typeof context.author) => {
 });
 
 var escapedExpression = Handlebars.Utils.escapeExpression('<script>alert(\'xss\');</script>');
+
+Handlebars.helpers !== undefined;
diff --git a/handlebars/handlebars.d.ts b/handlebars/handlebars.d.ts
index 652685724..9a0aa510a 100644
--- a/handlebars/handlebars.d.ts
+++ b/handlebars/handlebars.d.ts
@@ -18,6 +18,7 @@ declare module Handlebars {
     export var Utils: typeof hbs.Utils;
     export var logger: Logger;
     export var templates: HandlebarsTemplates;
+    export var helpers: any;
 
     export module AST {
         export var helpers: hbs.AST.helpers;
diff --git a/hapi/hapi-8.2.0.d.ts b/hapi/hapi-8.2.0.d.ts
index 8d3da2620..80fcc4357 100644
--- a/hapi/hapi-8.2.0.d.ts
+++ b/hapi/hapi-8.2.0.d.ts
@@ -390,7 +390,8 @@ declare module "hapi" {
 			'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>;
+			strategies?: string | Array<string>;
+			strategy?: 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.
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 519a0ff27..3fc5dca03 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -1314,6 +1314,7 @@ declare module "hapi" {
 	return reply.continue();
 	});*/
 	export class Response extends Events.EventEmitter {
+		isBoom: boolean;
 		/**  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.*/
diff --git a/heatmap.js/heatmap.d.ts b/heatmap.js/heatmap.d.ts
index 012e3f9d9..b75b88873 100644
--- a/heatmap.js/heatmap.d.ts
+++ b/heatmap.js/heatmap.d.ts
@@ -64,6 +64,11 @@ interface HeatmapConfiguration {
      */
     radius?: number;
 
+    /**
+     * Scales the radius based on map zoom.
+     */
+    scaleRadius?: boolean;
+
     /*
      * Indicate whether the heatmap should use a global extrema or a local
      * extrema (the maximum and minimum of the currently displayed viewport)
diff --git a/highcharts-ng/highcharts-ng-tests.ts b/highcharts-ng/highcharts-ng-tests.ts
new file mode 100644
index 000000000..493d0f94f
--- /dev/null
+++ b/highcharts-ng/highcharts-ng-tests.ts
@@ -0,0 +1,40 @@
+/// <reference path="highcharts-ng.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+
+var app = angular.module('app', ['highcharts-ng']);
+
+class AppController {
+    chartConfig: HighChartsNGConfig = {
+        options: {
+            chart: {
+                type: 'bar'
+            },
+            tooltip: {
+                style: {
+                    padding: 10,
+                    fontWeight: 'bold'
+                }
+            },
+            credits: {
+                enabled: false
+            },
+            plotOptions: {}
+        },
+        series: [{
+            data: [10, 15, 12, 8, 7]
+        }],
+        title: {
+            text: 'My Awesome Chart'
+        },
+        loading: true
+    };
+    constructor($timeout: ng.ITimeoutService) {
+        var vm = this;
+        $timeout(function() {
+            //Some async action
+            vm.chartConfig.loading = false;
+        });
+    }
+}
+
+app.controller("AppController", AppController);
diff --git a/highcharts-ng/highcharts-ng.d.ts b/highcharts-ng/highcharts-ng.d.ts
new file mode 100644
index 000000000..61dfef31d
--- /dev/null
+++ b/highcharts-ng/highcharts-ng.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for highcharts-ng 0.0.8
+// Project: https://github.com/pablojim/highcharts-ng
+// Definitions by: Scott Hatcher <https://github.com/scatcher>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../highcharts/highcharts.d.ts" />
+
+interface HighChartsNGConfig {
+    options: HighchartsOptions;
+    //The below properties are watched separately for changes.
+
+    //Series object (optional) - a list of series using normal highcharts series options.
+    series?: number[]|[number, number][]| HighchartsDataPoint[] | {data:number[];}[];
+    //Title configuration (optional)
+    title?: {
+        text?: string;
+    };
+    //Boolean to control showng loading status on chart (optional)
+    //Could be a string if you want to show specific loading text.
+    loading?: boolean;
+    //Configuration for the xAxis (optional). Currently only one x axis can be dynamically controlled.
+    //properties currentMin and currentMax provied 2-way binding to the chart's maximimum and minimum
+    xAxis?: {
+        currentMin?: number;
+        currentMax?: number;
+        title?: { text?: string }
+    };
+    //Whether to use HighStocks instead of HighCharts (optional). Defaults to false.
+    useHighStocks?: boolean;
+    //size (optional) if left out the chart will default to size of the div or something sensible.
+    size?: {
+        width?: number;
+        height?: number;
+    };
+    //function (optional) - setup some logic for the chart
+    func?: (chart: HighchartsChartObject) => void;
+}
+
+//Instantiated Chart
+interface HighChartsNGChart extends HighChartsNGConfig {
+    //This is a simple way to access all the Highcharts API that is not currently managed by this directive.
+    getHighcharts(): HighchartsChartObject;
+}
diff --git a/highcharts/highcharts-tests.ts b/highcharts/highcharts-tests.ts
index 9918df953..456209a33 100644
--- a/highcharts/highcharts-tests.ts
+++ b/highcharts/highcharts-tests.ts
@@ -112,9 +112,7 @@ var chart2 = new Highcharts.Chart({
 });
 
 chart1.exportChart(null, {
-    chart: {
-        backgroundColor: '#FFFFFF'
-    }
+    backgroundColor: '#FFFFFF'
 });
 
 
@@ -137,3 +135,11 @@ var highChartSettings: HighchartsOptions = {
 var container = $("#container").highcharts(highChartSettings, (chart) => {
     chart.series[0].setVisible(true, true);
 });
+
+
+var singleYAxisOptions: HighchartsOptions = {
+    yAxis: {}
+};
+var multipleYAxisOptions: HighchartsOptions = {
+    yAxis: [{},{}]
+};
\ No newline at end of file
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index ee3a2ce4c..16867937b 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -13,6 +13,7 @@ interface HighchartsPosition {
 }
 
 interface HighchartsDateTimeFormats {
+    millisecond?: string; // '%H:%M:%S.%L'
     second?: string; // '%H:%M:%S'
     minute?: string; // '%H:%M'
     hour?: string; // '%H:%M'
@@ -216,8 +217,11 @@ interface HighchartsChartOptions {
     marginLeft?: number;
     marginRight?: number;
     marginTop?: number;
-    plotBackGroundColor?: string | HighchartsGradient;
-    plotBackGroundImage?: string;
+    panKey?: string;
+    panning?: number;
+    pinchType?: string;
+    plotBackgroundColor?: string | HighchartsGradient;
+    plotBackgroundImage?: string;
     plotBorderColor?: string;
     plotBorderWidth?: number;
     plotShadow?: boolean | HighchartsShadow;
@@ -228,6 +232,7 @@ interface HighchartsChartOptions {
     selectionMarkerFill?: string;
     shadow?: boolean | HighchartsShadow;
     showAxes?: boolean;
+    spacing?: number[];
     spacingBottom?: number;
     spacingLeft?: number;
     spacingRight?: number;
@@ -248,7 +253,7 @@ interface HighchartsCSSObject {
     fontWeight?: string;
     left?: string;
     opacity?: number;
-    padding?: string;
+    padding?: string | number;
     position?: string;
     top?: string;
 }
@@ -351,6 +356,11 @@ interface HighchartsLegendNavigationOptions {
     style?: HighchartsCSSObject;
 }
 
+interface HighchartsLegendTitleOptions {
+    style?: HighchartsCSSObject;
+    text?: string;
+}
+
 interface HighchartsLegendOptions {
     align?: string;
     backgroundColor?: string | HighchartsGradient;
@@ -359,6 +369,7 @@ interface HighchartsLegendOptions {
     borderWidth?: number;
     enabled?: boolean;
     floating?: boolean;
+    itemDistance?: number;
     itemHiddenStyle?: HighchartsCSSObject;
     itemHoverStyle?: HighchartsCSSObject;
     itemMarginBottom?: number;
@@ -367,19 +378,21 @@ interface HighchartsLegendOptions {
     itemWidth?: number;
     labelFormatter?: () => string;
     layout?: string;
-    lineHeight?: string;
+    lineHeight?: number;
     margin?: number;
     maxHeight?: number;
     navigation?: HighchartsLegendNavigationOptions;
     padding?: number;
     reversed?: boolean;
     rtl?: boolean;
-    verticalAlign?: string;
     shadow?: boolean | HighchartsShadow;
     style?: HighchartsCSSObject;
+    symbolHeight?: number;
     symbolPadding?: number;
     symbolWidth?: number;
+    title?: HighchartsLegendTitleOptions;
     useHTML?: boolean;
+    verticalAlign?: string;
     width?: number;
     x?: number;
     y?: number;
@@ -658,7 +671,7 @@ interface HighchartsBarChart {
     };
     pointInterval?: number;
     pointPadding?: number;
-    pointPlacement?: string; // null, "on", "between"
+    pointPlacement?: string | number; // null, "on", "between"
     pointRange?: number;
     pointStart?: number;
     pointWidth?: number;
@@ -863,7 +876,7 @@ interface HighchartsLineChart {
         events: HighchartsPointEvents;
     };
     pointInterval?: number;
-    pointPlacement?: string; // null, "on", "between"
+    pointPlacement?: string | number; // null, "on", "between"
     pointStart?: number;
     selected?: boolean;
     shadow?: boolean | HighchartsShadow;
@@ -887,25 +900,29 @@ interface HighchartsPieChart {
     borderColor?: string;
     borderWidth?: number;
     center?: string[];
-    color?: string;
+    colors?: string[];
     cursor?: string;
     dataLabels?: HighchartsDataLabels;
+    depth?: number;
     enableMouseTracking?: boolean;
+    endAngle?: number;
     events?: HighchartsPlotEvents;
+    getExtremesFromAll?: boolean;
     id?: string;
     ignoreHiddenPoint?: boolean;
     innerSize?: number | string;
     lineWidth?: number;
     marker?: HighchartsMarker;
+    minSize?: number;
     point?: {
         events: HighchartsPointEvents;
     };
-    pointPlacement?: string; // null, "on", "between"
     selected?: boolean;
     shadow?: boolean | HighchartsShadow;
     showInLegend?: boolean;
     size?: number | string;
     slicedOffset?: number;
+    startAngle?: number;
     states?: {
         hover: HighchartsAreaStates;
     };
@@ -941,7 +958,7 @@ interface HighchartsScatterChart {
         events: HighchartsPointEvents;
     };
     pointInterval?: number;
-    pointPlacement?: string; // null, "on", "between"
+    pointPlacement?: string | number; // null, "on", "between"
     pointStart?: number;
     selected?: boolean;
     shadow?: boolean | HighchartsShadow;
@@ -992,7 +1009,7 @@ interface HighchartsSeriesChart {
         events: HighchartsPointEvents;
     };
     pointInterval?: number;
-    pointPlacement?: string; // null, "on", "between"
+    pointPlacement?: string | number; // null, "on", "between"
     pointStart?: number;
     selected?: boolean;
     shadow?: boolean | HighchartsShadow;
@@ -1168,7 +1185,7 @@ interface HighchartsOptions {
     title?: HighchartsTitleOptions;
     tooltip?: HighchartsTooltipOptions;
     xAxis?: HighchartsAxisOptions;
-    yAxis?: HighchartsAxisOptions;
+    yAxis?: HighchartsAxisOptions|HighchartsAxisOptions[];
 }
 
 interface HighchartsGlobalOptions extends HighchartsOptions {
diff --git a/highcharts/highstock.d.ts b/highcharts/highstock.d.ts
index 162d15655..f5133c54a 100644
--- a/highcharts/highstock.d.ts
+++ b/highcharts/highstock.d.ts
@@ -14,7 +14,7 @@ interface HighstockNavigatorOptions {
     baseSeries?: string | number;
     enabled?: boolean;
     handles?: {
-        backgoundColor?: string;
+        backgroundColor?: string;
         borderColor?: string;
     };
     height?: number;
@@ -30,7 +30,7 @@ interface HighstockNavigatorOptions {
 
 interface RangeSelectorButton {
     type: string; //Defines the timespan, can be one of 'millisecond', 'second', 'minute', 'day', 'week', 'month', 'ytd' (year to date), 'year' and 'all'.
-    count: number;
+    count?: number;
     text: string;
     dataGrouping?: any; //not sure how this works
 }
@@ -117,4 +117,4 @@ interface JQuery {
     highcharts(type: string): HighchartsChartObject;
     highcharts(type: string, options: HighchartsOptions): JQuery;
     highcharts(type: string, options: HighchartsOptions, callback: (chart: HighchartsChartObject) => void): JQuery;
-}
\ No newline at end of file
+}
diff --git a/history/history.d.ts b/history/history.d.ts
index 07a31d011..f6a6bf407 100644
--- a/history/history.d.ts
+++ b/history/history.d.ts
@@ -5,23 +5,23 @@
 
 
 interface HistoryAdapter {
-    bind(element: any, event: string, callback: () => void);
-    trigger(element: any, event: string);
-    onDomLoad(callback: () => void);
+    bind(element: any, event: string, callback: () => void): void;
+    trigger(element: any, event: string): void;
+    onDomLoad(callback: () => void): void;
 }
 
-// Since History is defined in lib.d.ts as well 
+// Since History is defined in lib.d.ts as well
 // the name for our interfaces was chosen to be Historyjs
 // However at runtime you would need to do
-// https://github.com/borisyankov/DefinitelyTyped/issues/277 
+// https://github.com/borisyankov/DefinitelyTyped/issues/277
 // var Historyjs: Historyjs = <any>History;
 
 interface Historyjs {
 
     enabled: boolean;
 
-    pushState(data: any, title: string, url: string);
-    replaceState(data: any, title: string, url: string);
+    pushState(data: any, title: string, url: string): void;
+    replaceState(data: any, title: string, url: string): void;
     getState(): HistoryState;
     getStateByIndex(index: number): HistoryState;
     getCurrentIndex(): number;
@@ -58,4 +58,4 @@ interface HistoryOptions {
     delayInit?: number;
 
 
-}
\ No newline at end of file
+}
diff --git a/httperr/httperr-tests.ts b/httperr/httperr-tests.ts
new file mode 100644
index 000000000..131ec4dab
--- /dev/null
+++ b/httperr/httperr-tests.ts
@@ -0,0 +1,90 @@
+/// <reference path="httperr.d.ts" />
+import httperr = require('httperr');
+
+
+// ----------------------------------------
+// Basic usage example from: https://github.com/pluma/httperr/blob/1.0.0/README.md
+var err = httperr[404]('The path "/example" could not be resolved');
+console.log(err);
+/*
+{ [NotFound: The path "/example" could not be resolved]
+  title: 'Not Found',
+  name: 'NotFound',
+  code: 'NOT_FOUND',
+  statusCode: 404,
+  message: 'The path "/example" could not be resolved'
+}
+*/
+throw err;
+/*
+NotFound: The path "/example" could not be resolved
+    at ...
+*/
+
+console.log(httperr.methodNotAllowed({allowed: ['GET', 'POST']}));
+/*
+{ [MethodNotAllowed]
+  title: 'Method Not Allowed',
+  name: 'MethodNotAllowed',
+  code: 'METHOD_NOT_ALLOWED',
+  statusCode: 405,
+  message: '',
+  allowed: ['GET', 'POST']
+}
+*/
+
+err = new httperr.NotFound();
+console.log(err);
+/*
+{ [NotFound]
+  title: 'Not Found',
+  name: 'NotFound',
+  code: 'NOT_FOUND',
+  statusCode: 404,
+  message: 'The path "/example" could not be resolved'
+}
+*/
+
+console.log(err instanceof httperr.NotFound); // true
+console.log(err instanceof httperr.notFound); // true
+console.log(err instanceof httperr['404']); // true
+console.log(err instanceof httperr.MethodNotAllowed); // false
+console.log(err instanceof httperr.HttpError); // true
+console.log(err instanceof Error); // true
+
+
+// ----------------------------------------
+// Advanced usage: creating custom Error subclasses
+var Custom404Error = httperr.createHttpError(404, 'Not Found', config => {
+    this.message = 'The resource was not found';
+    this['some custom property'] = config.parameters['some custom parameter'];
+});
+err = new Custom404Error();
+
+var Custom500Error = httperr.createHttpError(500, 'Something went wrong');
+err = new Custom500Error();
+
+
+// ----------------------------------------
+// Advanced usage: returning a JSON serializable representation of an error
+var err = httperr.notFound('File Not Found');
+console.log(err.toObject());
+/*
+{
+  name: 'NotFound',
+  code: 'NOT_FOUND',
+  title: 'Not Found',
+  statusCode: 404,
+  message: 'File Not Found',
+  stack: '…'
+}
+*/
+console.log(err.toObject('stack', /^title$/));
+/*
+{
+  name: 'NotFound',
+  code: 'NOT_FOUND',
+  statusCode: 404,
+  message: 'File Not Found'
+}
+*/
diff --git a/httperr/httperr.d.ts b/httperr/httperr.d.ts
new file mode 100644
index 000000000..0bc54a650
--- /dev/null
+++ b/httperr/httperr.d.ts
@@ -0,0 +1,292 @@
+// Type definitions for httperr v1.0.0
+// Project: https://github.com/pluma/httperr
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "httperr" {
+
+    /** Overall module shape, expressed as an interface. */
+    interface HttpErr {
+
+        /** The base type for all httperr error types. You probably don't want to use this directly. */
+        HttpError: HttpErrorStatic;
+
+        /**
+         * Creates a new error type for the given HTTP error status.
+         * @param {number} status - The HTTP response status code for the HTTP error.
+         * @param {string} title - A human-readable title for the HTTP error.
+         * @param {Function} init - (optional) A function which will be invoked as a method of the
+         *                          new error with the config argument immediately after the error
+         *                          is created by the factory. Can be used to process additional
+         *                          error-specific configuration parameters.
+         */
+        createHttpError(status: number, title: string, init?: (config: Config) => void): HttpErrorStatic;
+
+        // Error builders by camel-cased name.
+        badRequest: ErrorBuilder;
+        unauthorized: ErrorBuilder;
+        paymentRequired: ErrorBuilder;
+        forbidden: ErrorBuilder;
+        notFound: ErrorBuilder;
+        methodNotAllowed: ErrorBuilder;
+        notAcceptable: ErrorBuilder;
+        proxyAuthenticationRequired: ErrorBuilder;
+        requestTimeout: ErrorBuilder;
+        conflict: ErrorBuilder;
+        gone: ErrorBuilder;
+        lengthRequired: ErrorBuilder;
+        preconditionFailed: ErrorBuilder;
+        requestEntityTooLarge: ErrorBuilder;
+        requestUriTooLong: ErrorBuilder;
+        unsupportedMediaType: ErrorBuilder;
+        requestedRangeNotSatisfiable: ErrorBuilder;
+        expectationFailed: ErrorBuilder;
+        imATeapot: ErrorBuilder;
+        authenticationTimeout: ErrorBuilder;
+        enhanceYourCalm: ErrorBuilder;
+        unprocessableEntity: ErrorBuilder;
+        locked: ErrorBuilder;
+        methodFailure: ErrorBuilder;
+        failedDependency: ErrorBuilder;
+        unorderedCollection: ErrorBuilder;
+        upgradeRequired: ErrorBuilder;
+        preconditionRequired: ErrorBuilder;
+        tooManyRequests: ErrorBuilder;
+        requestHeaderFieldsTooLarge: ErrorBuilder;
+        loginTimeout: ErrorBuilder;
+        noResponse: ErrorBuilder;
+        retryWith: ErrorBuilder;
+        blockedByWindowsParentalControls: ErrorBuilder;
+        redirect: ErrorBuilder;
+        unavailableForLegalReasons: ErrorBuilder;
+        requestHeaderTooLarge: ErrorBuilder;
+        certError: ErrorBuilder;
+        noCert: ErrorBuilder;
+        httpToHttps: ErrorBuilder;
+        clientClosedRequest: ErrorBuilder;
+        internalServerError: ErrorBuilder;
+        notImplemented: ErrorBuilder;
+        badGateway: ErrorBuilder;
+        serviceUnavailable: ErrorBuilder;
+        gatewayTimeout: ErrorBuilder;
+        httpVersionNotSupported: ErrorBuilder;
+        variantAlsoNegotiates: ErrorBuilder;
+        insufficientStorage: ErrorBuilder;
+        loopDetected: ErrorBuilder;
+        bandwidthLimitExceeded: ErrorBuilder;
+        notExtended: ErrorBuilder;
+        networkAuthenticationRequired: ErrorBuilder;
+        originError: ErrorBuilder;
+        connectionTimedOut: ErrorBuilder;
+        proxyDeclinedRequest: ErrorBuilder;
+        aTimeoutOccured: ErrorBuilder;
+        networkReadTimeoutError: ErrorBuilder;
+        networkConnectTimeoutError: ErrorBuilder;
+
+        // Error builders by title-cased name.
+        BadRequest: ErrorBuilder;
+        Unauthorized: ErrorBuilder;
+        PaymentRequired: ErrorBuilder;
+        Forbidden: ErrorBuilder;
+        NotFound: ErrorBuilder;
+        MethodNotAllowed: ErrorBuilder;
+        NotAcceptable: ErrorBuilder;
+        ProxyAuthenticationRequired: ErrorBuilder;
+        RequestTimeout: ErrorBuilder;
+        Conflict: ErrorBuilder;
+        Gone: ErrorBuilder;
+        LengthRequired: ErrorBuilder;
+        PreconditionFailed: ErrorBuilder;
+        RequestEntityTooLarge: ErrorBuilder;
+        RequestUriTooLong: ErrorBuilder;
+        UnsupportedMediaType: ErrorBuilder;
+        RequestedRangeNotSatisfiable: ErrorBuilder;
+        ExpectationFailed: ErrorBuilder;
+        ImATeapot: ErrorBuilder;
+        AuthenticationTimeout: ErrorBuilder;
+        EnhanceYourCalm: ErrorBuilder;
+        UnprocessableEntity: ErrorBuilder;
+        Locked: ErrorBuilder;
+        MethodFailure: ErrorBuilder;
+        FailedDependency: ErrorBuilder;
+        UnorderedCollection: ErrorBuilder;
+        UpgradeRequired: ErrorBuilder;
+        PreconditionRequired: ErrorBuilder;
+        TooManyRequests: ErrorBuilder;
+        RequestHeaderFieldsTooLarge: ErrorBuilder;
+        LoginTimeout: ErrorBuilder;
+        NoResponse: ErrorBuilder;
+        RetryWith: ErrorBuilder;
+        BlockedByWindowsParentalControls: ErrorBuilder;
+        Redirect: ErrorBuilder;
+        UnavailableForLegalReasons: ErrorBuilder;
+        RequestHeaderTooLarge: ErrorBuilder;
+        CertError: ErrorBuilder;
+        NoCert: ErrorBuilder;
+        HttpToHttps: ErrorBuilder;
+        ClientClosedRequest: ErrorBuilder;
+        InternalServerError: ErrorBuilder;
+        NotImplemented: ErrorBuilder;
+        BadGateway: ErrorBuilder;
+        ServiceUnavailable: ErrorBuilder;
+        GatewayTimeout: ErrorBuilder;
+        HttpVersionNotSupported: ErrorBuilder;
+        VariantAlsoNegotiates: ErrorBuilder;
+        InsufficientStorage: ErrorBuilder;
+        LoopDetected: ErrorBuilder;
+        BandwidthLimitExceeded: ErrorBuilder;
+        NotExtended: ErrorBuilder;
+        NetworkAuthenticationRequired: ErrorBuilder;
+        OriginError: ErrorBuilder;
+        ConnectionTimedOut: ErrorBuilder;
+        ProxyDeclinedRequest: ErrorBuilder;
+        ATimeoutOccured: ErrorBuilder;
+        NetworkReadTimeoutError: ErrorBuilder;
+        NetworkConnectTimeoutError: ErrorBuilder;
+
+        // Error builders by statusCode.
+        400: ErrorBuilder;
+        401: ErrorBuilder;
+        402: ErrorBuilder;
+        403: ErrorBuilder;
+        404: ErrorBuilder;
+        405: ErrorBuilder;
+        406: ErrorBuilder;
+        407: ErrorBuilder;
+        408: ErrorBuilder;
+        409: ErrorBuilder;
+        410: ErrorBuilder;
+        411: ErrorBuilder;
+        412: ErrorBuilder;
+        413: ErrorBuilder;
+        414: ErrorBuilder;
+        415: ErrorBuilder;
+        416: ErrorBuilder;
+        417: ErrorBuilder;
+        418: ErrorBuilder;
+        419: ErrorBuilder;
+        420: ErrorBuilder;
+        422: ErrorBuilder;
+        423: ErrorBuilder;
+        424: ErrorBuilder;
+        425: ErrorBuilder;
+        426: ErrorBuilder;
+        428: ErrorBuilder;
+        429: ErrorBuilder;
+        431: ErrorBuilder;
+        440: ErrorBuilder;
+        444: ErrorBuilder;
+        449: ErrorBuilder;
+        450: ErrorBuilder;
+        451: ErrorBuilder;
+        494: ErrorBuilder;
+        495: ErrorBuilder;
+        496: ErrorBuilder;
+        497: ErrorBuilder;
+        499: ErrorBuilder;
+        500: ErrorBuilder;
+        501: ErrorBuilder;
+        502: ErrorBuilder;
+        503: ErrorBuilder;
+        504: ErrorBuilder;
+        505: ErrorBuilder;
+        506: ErrorBuilder;
+        507: ErrorBuilder;
+        508: ErrorBuilder;
+        509: ErrorBuilder;
+        510: ErrorBuilder;
+        511: ErrorBuilder;
+        520: ErrorBuilder;
+        522: ErrorBuilder;
+        523: ErrorBuilder;
+        524: ErrorBuilder;
+        598: ErrorBuilder;
+        599: ErrorBuilder;
+    }
+
+    /** Constructor function for the HttpError class. */
+    interface HttpErrorStatic {
+        new(config?: string | Error | Config, extra?: {}): HttpError;
+    }
+
+
+    /** An instance of the HttpError class. */
+    interface HttpError extends Error {
+
+        /** A human-readable title for the HTTP error. */
+        title: string;
+
+        code: string;
+
+        /** The HTTP response status code for the HTTP error. */
+        statusCode: number;
+
+        toObject(...skip: (string|RegExp)[]): any;
+    }
+
+
+    /** Configuration object for constructing HttpErrors. */
+    interface Config {
+
+        /** A descriptive human-readable title describing the error's cause. */
+        message?: string;
+
+        /** The underlying exception that caused the HTTP error. */
+        cause?: Error;
+
+        /** A detailed human-readable description of the error's cause and possible solutions. */
+        details?: string;
+
+        /**
+         *  The methods allowed for this URL.
+         *  This property is only available for 405 Method Not Allowed errors
+         *  and can be used to populate the Allow header.
+         */
+        allowed?: string[];
+
+        /**
+         *  The minimum delay before the request should be attempted again.
+         *  This property is only available for 429 Too Many Requests and 420 Enhance Your Calm
+         *  (Twitter API) errors and can be used to populate the Retry-After header.
+         */
+        retryAfter?: any;
+
+        /**
+         *  The parameters with which the request should be retried.
+         *  This property is only available for 449 Retry With (Microsoft) errors and can be
+         *  used to populate the response status message.
+         */
+        parameters?: any;
+
+        /**
+         *  The location for which the request should be repeated.
+         *  This property is only available for 451 Redirect (Microsoft) errors and can be
+         *  used to populate the proprietary X-MS-Location response header.
+         */
+        location?: any;
+    }
+
+
+    /** Factory function for creating an Error object. */
+    interface ErrorBuilder {
+
+        /**
+         *  Creates an Error object. The new keyword is optional.
+         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+         *                                           If config is an Error object, it will be treated as config.cause.
+         */
+        (config?: string | Error | Config): HttpError;
+
+        /**
+         *  Creates an Error object. The new keyword is optional.
+         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+         *                                           If config is an Error object, it will be treated as config.cause.
+         */
+        new (config?: string | Error | Config): HttpError;
+    }
+
+
+    // The module value satisfies the HttpErr interface.
+    var _: HttpErr;
+    export = _;
+}
diff --git a/hystrixjs/hystrixjs-tests.ts b/hystrixjs/hystrixjs-tests.ts
new file mode 100644
index 000000000..80f840861
--- /dev/null
+++ b/hystrixjs/hystrixjs-tests.ts
@@ -0,0 +1,86 @@
+/// <reference path="hystrixjs.d.ts" />
+/// <reference path="../q/Q.d.ts"/>
+
+import hystrixjs = require('hystrixjs');
+import q = require('q');
+
+var commandFactory = hystrixjs.commandFactory;
+
+var command = commandFactory
+    .getOrCreate('testCommand', 'testGroup')
+    .circuitBreakerSleepWindowInMilliseconds(5000)
+    .errorHandler((error) => {
+        return false;
+    })
+    .timeout(3000)
+    .circuitBreakerRequestVolumeThreshold(10)
+    .requestVolumeRejectionThreshold(10)
+    .circuitBreakerForceOpened(true)
+    .circuitBreakerForceClosed(false)
+    .statisticalWindowNumberOfBuckets(10)
+    .statisticalWindowLength(10)
+    .percentileWindowNumberOfBuckets(10)
+    .percentileWindowLength(60)
+    .circuitBreakerErrorThresholdPercentage(30)
+    .fallbackTo((error) => {
+        return q.resolve('fallback');
+    })
+    .run((args) => {
+        return q.resolve(args);
+    })
+    .build();
+
+command.execute('something').then((result) => {
+    console.log(result);
+})
+
+commandFactory.resetCache();
+
+var metricsFactory = hystrixjs.metricsFactory;
+
+var metrics = metricsFactory.getOrCreate({
+    commandKey: 'metricsKey',
+    commandGroup: 'metricsGroup'
+})
+metrics.markSuccess();
+metrics.markFailure();
+metrics.markRejected();
+metrics.markTimeout();
+metrics.incrementExecutionCount();
+metrics.decrementExecutionCount();
+metrics.getCurrentExecutionCount();
+metrics.addExecutionTime(3000);
+metrics.getRollingCount("FAILURE");
+var healthcounts = metrics.getHealthCounts();
+console.log(healthcounts.totalCount);
+console.log(healthcounts.errorCount);
+console.log(healthcounts.errorPercentage);
+
+metricsFactory.resetCache();
+
+metricsFactory.getAllMetrics().map((metrics) => {
+    console.log(metrics.getCurrentExecutionCount());
+});
+
+var hystrixConfig = hystrixjs.hystrixConfig;
+console.log(hystrixConfig.metricsPercentileWindowBuckets());
+console.log(hystrixConfig.circuitBreakerForceClosed());
+console.log(hystrixConfig.circuitBreakerForceOpened());
+console.log(hystrixConfig.circuitBreakerSleepWindowInMilliseconds());
+console.log(hystrixConfig.circuitBreakerErrorThresholdPercentage());
+console.log(hystrixConfig.circuitBreakerRequestVolumeThreshold());
+console.log(hystrixConfig.circuitBreakerRequestVolumeThresholdForceOverride());
+console.log(hystrixConfig.circuitBreakerRequestVolumeThresholdOverride());
+console.log(hystrixConfig.executionTimeoutInMilliseconds());
+console.log(hystrixConfig.metricsStatisticalWindowBuckets());
+console.log(hystrixConfig.metricsStatisticalWindowInMilliseconds());
+console.log(hystrixConfig.metricsPercentileWindowInMilliseconds());
+console.log(hystrixConfig.requestVolumeRejectionThreshold());
+console.log(hystrixConfig.resetProperties());
+console.log(hystrixConfig.init({}));
+
+var hystrixSSEStream = hystrixjs.hystrixSSEStream;
+
+hystrixSSEStream.toObservable().subscribe((result) => {
+    console.log(result);
+})
diff --git a/hystrixjs/hystrixjs.d.ts b/hystrixjs/hystrixjs.d.ts
new file mode 100644
index 000000000..1fd55e7e5
--- /dev/null
+++ b/hystrixjs/hystrixjs.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for dragula v2.1.2
+// Project: https://bitbucket.org/igor_sechyn/hystrixjs
+// Definitions by: Igor Sechyn <https://github.com/igorsechyn/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../q/Q.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
+
+declare module HystrixJS {
+
+     interface HystrixProperties {
+        "hystrix.force.circuit.open"?: boolean,
+        "hystrix.force.circuit.closed"?: boolean,
+        "hystrix.circuit.sleepWindowInMilliseconds"?:number,
+        "hystrix.circuit.errorThresholdPercentage"?: number,
+        "hystrix.circuit.volumeThreshold"?:number,
+        "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
+        "hystrix.circuit.volumeThreshold.override"?: number,
+        "hystrix.execution.timeoutInMilliseconds"?: number,
+        "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
+        "hystrix.metrics.statistical.window.bucketsNumber"?: number,
+        "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
+        "hystrix.metrics.percentile.window.bucketsNumber"?: number,
+        "hystrix.request.volume.rejectionThreshold"?: number
+    }
+
+     interface HystrixConfig {
+        metricsPercentileWindowBuckets(): number;
+        circuitBreakerForceClosed(): boolean;
+        circuitBreakerForceOpened(): boolean;
+        circuitBreakerSleepWindowInMilliseconds(): number;
+        circuitBreakerErrorThresholdPercentage(): number;
+        circuitBreakerRequestVolumeThreshold(): number;
+        circuitBreakerRequestVolumeThresholdForceOverride(): boolean;
+        circuitBreakerRequestVolumeThresholdOverride(): number;
+        executionTimeoutInMilliseconds(): number;
+        metricsStatisticalWindowBuckets(): number;
+        metricsStatisticalWindowInMilliseconds(): number;
+        metricsPercentileWindowInMilliseconds(): number;
+        metricsPercentileWindowBuckets(): number;
+        requestVolumeRejectionThreshold(): number;
+        resetProperties(): void;
+        init(properties: HystrixProperties): void;
+    }
+
+     interface Command {
+        execute(...args: any[]): Q.Promise<any>;
+    }
+
+     interface CommandBuilder {
+        circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilder;
+        errorHandler(value: (error: any) => boolean): CommandBuilder;
+        timeout(value: number): CommandBuilder;
+        circuitBreakerRequestVolumeThreshold(value: number): CommandBuilder;
+        requestVolumeRejectionThreshold(value: number): CommandBuilder;
+        circuitBreakerForceOpened(value: boolean): CommandBuilder;
+        circuitBreakerForceClosed(value: boolean): CommandBuilder;
+        statisticalWindowNumberOfBuckets(value: number): CommandBuilder;
+        statisticalWindowLength(value: number): CommandBuilder;
+        percentileWindowNumberOfBuckets(value: number): CommandBuilder;
+        percentileWindowLength(value: number): CommandBuilder;
+        circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
+        run(value: (args: any) => Q.Promise<any>): CommandBuilder;
+        fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
+        context(value: any): CommandBuilder;
+        build(): Command;
+    }
+
+     interface CommandFactory {
+        getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
+        resetCache(): void;
+    }
+
+    interface HealthCounts {
+        totalCount: number;
+        errorCount: number;
+        errorPercentage: number;
+    }
+
+    interface CommandMetrics {
+        markSuccess(): void;
+        markRejected(): void;
+        markFailure(): void;
+        markTimeout(): void;
+        markShortCircuited(): void;
+        incrementExecutionCount(): void;
+        decrementExecutionCount(): void;
+        getCurrentExecutionCount(): number;
+        addExecutionTime(value: number): void;
+        getRollingCount(type: any): number;
+        getExecutionTime(percentile: any): number;
+        getHealthCounts(): HealthCounts;
+        reset(): void;
+    }
+
+    interface MetricsProperties {
+        commandKey: string,
+        commandGroup: string,
+        statisticalWindowTimeInMilliSeconds?: number,
+        statisticalWindowNumberOfBuckets?: number,
+        percentileWindowTimeInMilliSeconds?: number,
+        percentileWindowNumberOfBuckets?: number
+    }
+
+    interface MetricsFactory {
+        getOrCreate(config: MetricsProperties): CommandMetrics;
+        resetCache(): void;
+        getAllMetrics(): Array<CommandMetrics>;
+    }
+
+    interface CirctuiBreakerConfig {
+        circuitBreakerSleepWindowInMilliseconds: number,
+        commandKey: string,
+        circuitBreakerErrorThresholdPercentage: number,
+        circuitBreakerRequestVolumeThreshold: number,
+        commandGroup: string,
+        circuitBreakerForceClosed: boolean,
+        circuitBreakerForceOpened: boolean
+    }
+
+    interface CircuitBreaker {
+        allowRequest(): boolean;
+        allowSingleTest(): boolean;
+        isOpen(): boolean;
+        markSuccess(): void;
+    }
+
+    interface CircuitFactory {
+        getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
+        getCache(): Array<CircuitBreaker>;
+        resetCache(): void;
+    }
+
+    interface HystrixSSEStream {
+        toObservable(): Rx.Observable<any>
+    }
+}
+declare var hystrixjs: {
+    commandFactory: HystrixJS.CommandFactory,
+    metricsFactory: HystrixJS.MetricsFactory,
+    circuitFactory: HystrixJS.CircuitFactory,
+    hystrixSSEStream: HystrixJS.HystrixSSEStream,
+    hystrixConfig: HystrixJS.HystrixConfig
+};
+
+declare module "hystrixjs" {
+    export = hystrixjs;
+}
diff --git a/i18n-node/i18n-node.d.ts b/i18n-node/i18n-node.d.ts
index 348c2f268..79dda8b75 100644
--- a/i18n-node/i18n-node.d.ts
+++ b/i18n-node/i18n-node.d.ts
@@ -22,29 +22,34 @@ declare module i18n {
          */
         directory?: string;
 
-        /** 
+        /**
          * whether to write new locale information to disk
          * @default true
          */
         updateFiles?: boolean;
 
-        /** 
+        /**
          * What to use as the indentation unit
          * @default "\t"
          */
         indent?: string;
 
-        /** 
+        /**
          * Setting extension of json files (you might want to set this to '.js' according to webtranslateit)
          * @default ".json"
          */
         extension?: string;
 
-        /** 
+        /**
          * Enable object notation
          * @default false
          */
         objectNotation?: boolean;
+
+        /**
+         * json files prefix
+         */
+        prefix?: string;
     }
     export interface TranslateOptions {
         phrase: string;
diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts
index 060335af0..38d91b603 100644
--- a/i18next/i18next.d.ts
+++ b/i18next/i18next.d.ts
@@ -17,6 +17,16 @@ interface IResourceStoreKey {
     [key: string]: any;
 }
 
+interface I18nTranslateOptions extends I18nextOptions {
+    defaultValue?: any; // normally a string
+    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+    toAdd?: any;
+    child?: any;
+    sprintf?: any;
+    count?: any;
+    context?: any;
+}
+
 interface I18nextOptions {
     lng?: string;                           // Default value: undefined
     load?: string;                          // Default value: 'all'
@@ -62,6 +72,9 @@ interface I18nextOptions {
     cookieName?: string;                    // Default value: 'i18next'
 
     postProcess?: string;                   // Default value: undefined
+
+    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+    replace?: any;
 }
 
 interface I18nextStatic {
@@ -108,8 +121,8 @@ interface I18nextStatic {
         load: (languages: string[], options: I18nextOptions, callback: (err: Error, store: IResourceStore) => void ) => void;
         postMissing: (language: string, namespace: string, key: string, defaultValue: any, languages: string[]) => void;
     };
-    t(key: string, options?: any): string;
-    translate(key: string, options?: any): string;
+    t(key: string, options?: I18nTranslateOptions): string;
+    translate(key: string, options?: I18nTranslateOptions): string;
     exists(key: string, options?: any): boolean;
 }
 
diff --git a/imagesloaded/imagesloaded-tests.ts b/imagesloaded/imagesloaded-tests.ts
index ad9d3a3db..7ab773822 100644
--- a/imagesloaded/imagesloaded-tests.ts
+++ b/imagesloaded/imagesloaded-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="imagesLoaded.d.ts" />
+/// <reference path="imagesloaded.d.ts" />
 
 function test_ctor() {
   // element
diff --git a/inquirer/inquirer-tests.ts b/inquirer/inquirer-tests.ts
new file mode 100644
index 000000000..dd770e236
--- /dev/null
+++ b/inquirer/inquirer-tests.ts
@@ -0,0 +1,528 @@
+/// <reference path="../node/node.d.ts" />
+/// <reference path="inquirer.d.ts" />
+
+import inquirer = require('inquirer');
+
+
+inquirer.prompt([/* Pass your questions in here */], function( answers: inquirer.Answers ) {
+    // Use user feedback for... whatever!!
+});
+
+//
+// examples/bottom-bar.js
+//
+
+//var BottomBar = require("../lib/ui/bottom-bar");
+var BottomBar = inquirer.ui.BottomBar;
+declare var cmdify: any;
+
+var loader = [
+    "/ Installing",
+    "| Installing",
+    "\\ Installing",
+    "- Installing"
+];
+var i = 4;
+var ui = new BottomBar({ bottomBar: loader[i % 4] });
+
+setInterval(function() {
+    ui.updateBottomBar( loader[i++ % 4] );
+}, 300 );
+
+var spawn = require("child_process").spawn;
+
+var cmd = spawn(cmdify("npm"), [ "-g", "install", "inquirer" ], { stdio: "pipe" });
+cmd.stdout.pipe( ui.log );
+cmd.on( "close", function() {
+    ui.updateBottomBar("Installation done!\n");
+    process.exit();
+});
+
+
+//
+// examples/checkbox.js
+//
+
+/**
+ * Checkbox list examples
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt([
+    {
+        type: "checkbox",
+        message: "Select toppings",
+        name: "toppings",
+        choices: [
+            new inquirer.Separator("The usual:"),
+            {
+                name: "Peperonni"
+            },
+            {
+                name: "Cheese",
+                checked: true
+            },
+            {
+                name: "Mushroom"
+            },
+            new inquirer.Separator("The extras:"),
+            {
+                name: "Pineapple",
+            },
+            {
+                name: "Bacon"
+            },
+            {
+                name: "Olives",
+                disabled: "out of stock"
+            },
+            {
+                name: "Extra cheese"
+            }
+        ],
+        validate: function( answer ) {
+            if ( answer.length < 1 ) {
+                return "You must choose at least one topping.";
+            }
+            return true;
+        }
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+
+//
+// examples/expand.js
+//
+
+/**
+ * Expand list examples
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt([
+    {
+        type: "expand",
+        message: "Conflict on `file.js`: ",
+        name: "overwrite",
+        choices: [
+            {
+                key: "y",
+                name: "Overwrite",
+                value: "overwrite"
+            },
+            {
+                key: "a",
+                name: "Overwrite this one and all next",
+                value: "overwrite_all"
+            },
+            {
+                key: "d",
+                name: "Show diff",
+                value: "diff"
+            },
+            new inquirer.Separator(),
+            {
+                key: "x",
+                name: "Abort",
+                value: "abort"
+            }
+        ]
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+
+//
+// examples/input.js
+//
+
+/**
+ * Input prompt example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+var questions = [
+    {
+        type: "input",
+        name: "first_name",
+        message: "What's your first name"
+    },
+    {
+        type: "input",
+        name: "last_name",
+        message: "What's your last name",
+        default: function () { return "Doe"; }
+    },
+    {
+        type: "input",
+        name: "phone",
+        message: "What's your phone number",
+        validate: function( value: string ): string|boolean {
+            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+            if (pass) {
+                return true;
+            } else {
+                return "Please enter a valid phone number";
+            }
+        }
+    }
+];
+
+inquirer.prompt( questions, function( answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/list.js
+//
+
+
+/**
+ * List prompt example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt([
+    {
+        type: "list",
+        name: "theme",
+        message: "What do you want to do?",
+        choices: [
+            "Order a pizza",
+            "Make a reservation",
+            new inquirer.Separator(),
+            "Ask opening hours",
+            "Talk to the receptionnist"
+        ]
+    },
+    {
+        type: "list",
+        name: "size",
+        message: "What size do you need",
+        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
+        filter: function( val: string ) { return val.toLowerCase(); }
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/long-list.js
+//
+
+/**
+ * Paginated list
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+var choices = Array.apply(0, new Array(26)).map(function(x: number,y: number) {
+    return String.fromCharCode(y + 65);
+});
+choices.push("Multiline option \n  super cool feature");
+choices.push("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.");
+
+inquirer.prompt([
+    {
+        type      : "list",
+        name      : "letter",
+        message   : "What's your favorite letter?",
+        paginated : true,
+        choices   : choices
+    },
+    {
+        type      : "checkbox",
+        name      : "name",
+        message   : "Select the letter contained in your name:",
+        paginated : true,
+        choices   : choices
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/nested-call.js
+//
+
+/**
+ * Nested Inquirer call
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt({
+    type: "list",
+    name: "chocolate",
+    message: "What's your favorite chocolate?",
+    choices: [ "Mars", "Oh Henry", "Hershey" ]
+}, function( answers: inquirer.Answers ) {
+    inquirer.prompt({
+        type: "list",
+        name: "beverage",
+        message: "And your favorite beverage?",
+        choices: [ "Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull" ]
+    });
+});
+
+//
+// examples/password.js
+//
+
+/**
+ * Password prompt example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt([
+    {
+        type: "password",
+        message: "Enter your git password",
+        name: "password"
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/pizza.js
+//
+
+/**
+ * Pizza delivery prompt example
+ * run example by writing `node pizza.js` in your console
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+console.log("Hi, welcome to Node Pizza");
+
+var questions2 = [
+    {
+        type: "confirm",
+        name: "toBeDelivered",
+        message: "Is it for a delivery",
+        default: false
+    },
+    {
+        type: "input",
+        name: "phone",
+        message: "What's your phone number",
+        validate: function( value: string ): string|boolean {
+            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+            if (pass) {
+                return true;
+            } else {
+                return "Please enter a valid phone number";
+            }
+        }
+    },
+    {
+        type: "list",
+        name: "size",
+        message: "What size do you need",
+        choices: [ "Large", "Medium", "Small" ],
+        filter: function( val: string ) { return val.toLowerCase(); }
+    },
+    {
+        type: "input",
+        name: "quantity",
+        message: "How many do you need",
+        validate: function( value: string ) {
+            var valid = !isNaN(parseFloat(value));
+            return valid || "Please enter a number";
+        },
+        filter: Number
+    },
+    {
+        type: "expand",
+        name: "toppings",
+        message: "What about the toping",
+        choices: [
+            {
+                key: "p",
+                name: "Peperonni and chesse",
+                value: "PeperonniChesse"
+            },
+            {
+                key: "a",
+                name: "All dressed",
+                value: "alldressed"
+            },
+            {
+                key: "w",
+                name: "Hawaïan",
+                value: "hawaian"
+            }
+        ]
+    },
+    {
+        type: "rawlist",
+        name: "beverage",
+        message: "You also get a free 2L beverage",
+        choices: [ "Pepsi", "7up", "Coke" ]
+    },
+    {
+        type: "input",
+        name: "comments",
+        message: "Any comments on your purchase experience",
+        default: "Nope, all good!"
+    },
+    {
+        type: "list",
+        name: "prize",
+        message: "For leaving a comments, you get a freebie",
+        choices: [ "cake", "fries" ],
+        when: function( answers: inquirer.Answers ) {
+            return answers['comments'] !== "Nope, all good!";
+        }
+    }
+];
+
+inquirer.prompt( questions, function( answers ) {
+    console.log("\nOrder receipt:");
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/rawlist.js
+//
+
+/**
+ * Raw List prompt example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+inquirer.prompt([
+    {
+        type: "rawlist",
+        name: "theme",
+        message: "What do you want to do?",
+        choices: [
+            "Order a pizza",
+            "Make a reservation",
+            new inquirer.Separator(),
+            "Ask opening hours",
+            "Talk to the receptionnist"
+        ]
+    },
+    {
+        type: "rawlist",
+        name: "size",
+        message: "What size do you need",
+        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
+        filter: function( val: string ) { return val.toLowerCase(); }
+    }
+], function( answers: inquirer.Answers ) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
+
+//
+// examples/recursive.js
+//
+
+/**
+ * Recursive prompt example
+ * Allows user to choose when to exit prompt
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+var output2: (string|boolean)[] = [];
+
+var questions3 = [
+    {
+        type: "input",
+        name: "tvShow",
+        message: "What's your favorite TV show?"
+    },
+    {
+        type: "confirm",
+        name: "askAgain",
+        message: "Want to enter another TV show favorite (just hit enter for YES)?",
+        default: true
+    }
+];
+
+function ask() {
+    inquirer.prompt( questions3, function( answers: inquirer.Answers ) {
+        output2.push( answers['tvShow'] );
+        if ( answers['askAgain'] ) {
+            ask();
+        } else {
+            console.log( "Your favorite TV Shows:", output2.join(", ") );
+        }
+    });
+}
+
+ask();
+
+//
+// examples/when.js
+//
+
+
+/**
+ * When example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+var questions4 = [
+    {
+        type: "confirm",
+        name: "bacon",
+        message: "Do you like bacon?"
+    },
+    {
+        type: "input",
+        name: "favorite",
+        message: "Bacon lover, what is your favorite type of bacon?",
+        when: function ( answers: inquirer.Answers ) {
+            return answers['bacon'];
+        }
+    },
+    {
+        type: "confirm",
+        name: "pizza",
+        message: "Ok... Do you like pizza?",
+        when: function (answers: inquirer.Answers) {
+            return !likesFood( "bacon" )(answers);
+        }
+    },
+    {
+        type: "input",
+        name: "favorite",
+        message: "Whew! What is your favorite type of pizza?",
+        when: likesFood( "pizza" )
+    }
+];
+
+function likesFood ( aFood: string ) {
+    return function ( answers: inquirer.Answers ) {
+        return answers[ aFood ];
+    }
+}
+
+inquirer.prompt(questions, function (answers) {
+    console.log( JSON.stringify(answers, null, "  ") );
+});
diff --git a/inquirer/inquirer.d.ts b/inquirer/inquirer.d.ts
new file mode 100644
index 000000000..0eb89781e
--- /dev/null
+++ b/inquirer/inquirer.d.ts
@@ -0,0 +1,299 @@
+// Type definitions for Inquirer.js
+// Project: https://github.com/SBoudrias/Inquirer.js
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../rx/rx-lite.d.ts" />
+/// <reference path="../through/through.d.ts" />
+
+declare module "inquirer" {
+    import through = require('through');
+
+    namespace inquirer {
+        type Prompts = { [name: string]: PromptModule };
+        type ChoiceType = string|objects.ChoiceOption|objects.Separator;
+        type Questions = Question|Question[]|Rx.Observable<Question>;
+
+        interface Inquirer {
+            restoreDefaultPrompts(): void;
+            /**
+             * Expose helper functions on the top level for easiest usage by common users
+             * @param name
+             * @param prompt
+             */
+            registerPrompt(name: string, prompt: PromptModule): void;
+            /**
+             * Create a new self-contained prompt module.
+             */
+            createPromptModule(): PromptModule;
+            /**
+             * Public CLI helper interface
+             * @param questions Questions settings array
+             * @param cb Callback being passed the user answers
+             * @return
+             */
+            prompt(questions: Questions, cb?: (answers: Answers) => any): ui.Prompt;
+            prompts: Prompts;
+            Separator: objects.SeparatorStatic;
+            ui: {
+                BottomBar: ui.BottomBar;
+                Prompt: ui.Prompt;
+            }
+        }
+
+        interface PromptModule {
+            (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
+            /**
+             * Register a prompt type
+             * @param name Prompt type name
+             * @param prompt Prompt constructor
+             */
+            registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
+            /**
+             * Register the defaults provider prompts
+             */
+            restoreDefaultPrompts(): void;
+        }
+
+        interface Question {
+            /**
+             * Type of the prompt.
+             * Possible values:
+             * <ul>
+             *      <li>input</li>
+             *      <li>confirm</li>
+             *      <li>list</li>
+             *      <li>rawlist</li>
+             *      <li>password</li>
+             * </ul>
+             * @defaults: 'input'
+             */
+            type?: string;
+            /**
+             * The name to use when storing the answer in the anwers hash.
+             */
+            name?: string;
+            /**
+             * The question to print. If defined as a function,
+             * the first parameter will be the current inquirer session answers.
+             */
+            message?: string|((answers: Answers) => string);
+            /**
+             * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
+             * If defined as a function, the first parameter will be the current inquirer session answers.
+             */
+            default?: any|((answers: Answers) => any);
+            /**
+             * Choices array or a function returning a choices array. If defined as a function,
+             * the first parameter will be the current inquirer session answers.
+             * Array values can be simple strings, or objects containing a name (to display) and a value properties
+             * (to save in the answers hash). Values can also be a Separator.
+             */
+            choices?: ChoiceType[]|((answers: Answers) => ChoiceType[]);
+            /**
+             * Receive the user input and should return true if the value is valid, and an error message (String)
+             * otherwise. If false is returned, a default error message is provided.
+             */
+            validate?(input: string): boolean|string;
+            /**
+             * Receive the user input and return the filtered value to be used inside the program.
+             * The value returned will be added to the Answers hash.
+             */
+            filter?(input: string): string;
+            /**
+             * Receive the current user answers hash and should return true or false depending on whether or
+             * not this question should be asked. The value can also be a simple boolean.
+             */
+            when?: boolean|((answers: Answers) => boolean);
+            paginated?: boolean;
+        }
+
+        /**
+         * A key/value hash containing the client answers in each prompt.
+         */
+        interface Answers {
+            [key: string]: string|boolean;
+        }
+
+        namespace ui {
+            /**
+             * Base interface class other can inherits from
+             */
+            interface Prompt extends BaseUI<Prompts> {
+                new(promptModule: Prompts): Prompt;
+                /**
+                 * Once all prompt are over
+                 */
+                onCompletion(): void;
+                processQuestion(question: Question): any;
+                fetchAnswer(question: Question): any;
+                setDefaultType(question: Question): any;
+                filterIfRunnable(question: Question): any;
+            }
+
+            /**
+             * Sticky bottom bar user interface
+             */
+            interface BottomBar extends BaseUI<BottomBarOption> {
+                new(opt?: BottomBarOption): BottomBar;
+                /**
+                 * Render the prompt to screen
+                 * @return self
+                 */
+                render(): BottomBar;
+                /**
+                 * Update the bottom bar content and rerender
+                 * @param bottomBar Bottom bar content
+                 * @return self
+                 */
+                updateBottomBar(bottomBar: string): BottomBar;
+                /**
+                 * Rerender the prompt
+                 * @return self
+                 */
+                writeLog(data: any): BottomBar;
+                /**
+                 * Make sure line end on a line feed
+                 * @param str Input string
+                 * @return The input string with a final line feed
+                 */
+                enforceLF(str: string): string;
+                /**
+                 * Helper for writing message in Prompt
+                 * @param message The message to be output
+                 */
+                write(message: string): void;
+                log: through.ThroughStream;
+            }
+
+            interface BottomBarOption {
+                bottomBar?: string;
+            }
+            /**
+             * Base interface class other can inherits from
+             */
+            interface BaseUI<TOpt> {
+                new(opt: TOpt): void;
+                /**
+                 * Handle the ^C exit
+                 * @return {null}
+                 */
+                onForceClose(): void;
+                /**
+                 * Close the interface and cleanup listeners
+                 */
+                close(): void;
+                /**
+                 * Handle and propagate keypress events
+                 */
+                onKeypress(s: string, key: Key): void;
+            }
+
+            interface Key {
+                sequence: string;
+                name: string;
+                meta: boolean;
+                shift: boolean;
+                ctrl: boolean;
+            }
+        }
+
+        namespace objects {
+            /**
+             * Choice object
+             * Normalize input as choice object
+             * @constructor
+             * @param {String|Object} val  Choice value. If an object is passed, it should contains
+             *                             at least one of `value` or `name` property
+             */
+            interface Choice {
+                new(str: string): Choice;
+                new(separator: Separator): Choice;
+                new(option: ChoiceOption): Choice;
+            }
+
+            interface ChoiceOption {
+                name?: string;
+                value?: string;
+                type?: string;
+                extra?: any;
+                key?: string;
+                checked?: boolean;
+                disabled?: string|((answers: Answers) => any);
+            }
+
+            /**
+             * Choices collection
+             * Collection of multiple `choice` object
+             * @constructor
+             * @param choices  All `choice` to keep in the collection
+             */
+            interface Choices {
+                new(choices: (string|Separator|ChoiceOption)[], answers?: Answers): Choices;
+                choices: Choice[];
+                realChoices: Choice[];
+                length: number;
+                realLength: number;
+                /**
+                 * Get a valid choice from the collection
+                 * @param selector The selected choice index
+                 * @return Return the matched choice or undefined
+                 */
+                getChoice(selector: number): Choice;
+                /**
+                 * Get a raw element from the collection
+                 * @param selector The selected index value
+                 * @return Return the matched choice or undefined
+                 */
+                get(selector: number): Choice;
+                /**
+                 * Match the valid choices against a where clause
+                 * @param whereClause Lodash `where` clause
+                 * @return Matching choices or empty array
+                 */
+                where<U extends {}>(whereClause: U): Choice[];
+                /**
+                 * Pluck a particular key from the choices
+                 * @param propertyName Property name to select
+                 * @return Selected properties
+                 */
+                pluck(propertyName: string): any[];
+                forEach<T>(application: (choice: Choice) => T): T[];
+            }
+
+            interface SeparatorStatic {
+                /**
+                 * @param line Separation line content (facultative)
+                 */
+                new(line?: string): Separator;
+                /**
+                 * Helper function returning false if object is a separator
+                 * @param obj object to test against
+                 * @return `false` if object is a separator
+                 */
+                exclude(obj: any): boolean;
+            }
+
+            /**
+             * Separator object
+             * Used to space/separate choices group
+             * @constructor
+             * @param {String} line   Separation line content (facultative)
+             */
+            interface Separator {
+                type: string;
+                line: string;
+                /**
+                 * Stringify separator
+                 * @return {String} the separator display string
+                 */
+                toString(): string;
+            }
+        }
+    }
+
+    var inquirer: inquirer.Inquirer;
+
+    export = inquirer;
+}
+
diff --git a/ionic/ionic.d.ts b/ionic/ionic.d.ts
index eba0ef6d4..1b2e3265e 100644
--- a/ionic/ionic.d.ts
+++ b/ionic/ionic.d.ts
@@ -16,7 +16,7 @@ declare module ionic {
             cancelText?: string;
             destructiveText?: string;
             cancel?: ()=>any;
-            buttonClicked?: ()=>any;
+            buttonClicked?: (index: any)=>any;
             destructiveButtonClicked?: ()=>any;
             cancelOnStateChange?: boolean;
             cssClass?: string;
@@ -205,7 +205,7 @@ declare module ionic {
             scrollBy(left: number, top: number, shouldAnimate?: boolean): void;
             zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number): void;
             zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number): void;
-            getScrollPosition(): {left: number, top: number};
+            getScrollPosition(): {left: number; top: number};
             anchorScroll(shouldAnimate?: boolean): void;
             freezeScroll(shouldFreeze?: boolean): boolean;
             freezeAllScrolls(shouldFreeze?: boolean): boolean;
diff --git a/jade/jade-tests.ts b/jade/jade-tests.ts
new file mode 100644
index 000000000..8a2b6b48d
--- /dev/null
+++ b/jade/jade-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="jade.d.ts"/>
+
+import jade from 'jade';
+
+jade.compile("b")();
+jade.compileFile("foo.jade", {})();
+jade.compileClient("a")({ a: 1 });
+jade.compileClientWithDependenciesTracked("test").body();
+jade.render("h1",{});
+jade.renderFile("foo.jade");
\ No newline at end of file
diff --git a/jade/jade.d.ts b/jade/jade.d.ts
new file mode 100644
index 000000000..9615fa8c8
--- /dev/null
+++ b/jade/jade.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jade
+// Project: https://github.com/jadejs/jade
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'jade' {
+    module jade {
+        function compile(template: string, options?: any): (locals?: any) => string;
+        function compileFile(path: string, options?: any): (locals?: any) => string;
+        function compileClient(template: string, options?: any): (locals?: any) => string;
+        function compileClientWithDependenciesTracked(template: string, options?: any): {
+            body: (locals?: any) => string;
+            dependencies: string[];
+        };
+        function render(template: string, options?: any): string;
+        function renderFile(path: string, options?: any): string;
+    }
+    export default jade;
+}
diff --git a/jake/jake.d.ts b/jake/jake.d.ts
index 904a8084b..1812b818b 100644
--- a/jake/jake.d.ts
+++ b/jake/jake.d.ts
@@ -122,6 +122,11 @@ declare module jake{
 		 * stop execution on error, default true
 		 */
 		breakOnError?:boolean;
+		
+		/**
+		* 
+		*/
+		windowsVerbatimArguments?: boolean
 	}
 	export function exec(cmds:string[], callback?:()=>void, opts?:ExecOptions):void;
 
diff --git a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts
new file mode 100644
index 000000000..d2917e761
--- /dev/null
+++ b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts
@@ -0,0 +1,21 @@
+/// <reference path="jasmine-es6-promise-matchers.d.ts" />
+
+describe('specs', () => {
+	beforeEach(() => {
+		JasminePromiseMatchers.install
+	});
+	
+	afterEach(() => {
+		JasminePromiseMatchers.uninstall
+	});
+	
+	it('should have correct syntax', (done) => {
+		var foo = {};
+		var bar = {};
+		
+		expect(foo).toBeResolvedWith(bar, done);
+		expect(foo).toBeRejectedWith(bar, done);
+		expect(foo).toBeResolved(done);
+		expect(foo).toBeRejected(done);
+	});
+})
\ No newline at end of file
diff --git a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts
new file mode 100644
index 000000000..1735e51bc
--- /dev/null
+++ b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for jasmine-es6-promise-matchers
+// Project: https://github.com/bvaughn/jasmine-es6-promise-matchers
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jasmine/jasmine.d.ts" />
+
+declare module JasminePromiseMatchers  {
+	export function install():void;
+	export function uninstall():void;
+}
+
+declare module jasmine {
+	
+	interface Matchers {
+		/**
+		 * Verifies that a Promise is (or has been) rejected.
+		 */
+		toBeRejected(done?: () => void): boolean;
+		
+		/**
+		 * Verifies that a Promise is (or has been) rejected with the specified parameter.
+		 */
+		toBeRejectedWith(value: any, done?: () => void): boolean;
+		
+		/**
+		 * Verifies that a Promise is (or has been) resolved.
+		 */
+		toBeResolved(done?: () => void): boolean;
+		
+		/**
+		 * Verifies that a Promise is (or has been) resolved with the specified parameter.
+		 */
+		toBeResolvedWith(value: any, done?: () => void): boolean;
+	}
+}
\ No newline at end of file
diff --git a/jasmine/jasmine.d.ts b/jasmine/jasmine.d.ts
index 581353b34..184875fa2 100644
--- a/jasmine/jasmine.d.ts
+++ b/jasmine/jasmine.d.ts
@@ -58,7 +58,7 @@ declare module jasmine {
     function addMatchers(matchers: CustomMatcherFactories): void;
     function stringMatching(str: string): Any;
     function stringMatching(str: RegExp): Any;
-    
+
     interface Any {
 
         new (expectedClass: any): any;
@@ -72,7 +72,7 @@ declare module jasmine {
         length: number;
         [n: number]: T;
     }
-    
+
     interface ArrayContaining {
         new (sample: any[]): any;
 
@@ -279,21 +279,21 @@ declare module jasmine {
         isNot?: boolean;
         message(): any;
 
-        toBe(expected: any): boolean;
-        toEqual(expected: any): boolean;
-        toMatch(expected: any): boolean;
-        toBeDefined(): boolean;
-        toBeUndefined(): boolean;
-        toBeNull(): boolean;
+        toBe(expected: any, expectationFailOutput?: any): boolean;
+        toEqual(expected: any, expectationFailOutput?: any): boolean;
+        toMatch(expected: any, expectationFailOutput?: any): boolean;
+        toBeDefined(expectationFailOutput?: any): boolean;
+        toBeUndefined(expectationFailOutput?: any): boolean;
+        toBeNull(expectationFailOutput?: any): boolean;
         toBeNaN(): boolean;
-        toBeTruthy(): boolean;
-        toBeFalsy(): boolean;
+        toBeTruthy(expectationFailOutput?: any): boolean;
+        toBeFalsy(expectationFailOutput?: any): boolean;
         toHaveBeenCalled(): boolean;
         toHaveBeenCalledWith(...params: any[]): boolean;
-        toContain(expected: any): boolean;
-        toBeLessThan(expected: any): boolean;
-        toBeGreaterThan(expected: any): boolean;
-        toBeCloseTo(expected: any, precision: any): boolean;
+        toContain(expected: any, expectationFailOutput?: any): boolean;
+        toBeLessThan(expected: any, expectationFailOutput?: any): boolean;
+        toBeGreaterThan(expected: any, expectationFailOutput?: any): boolean;
+        toBeCloseTo(expected: any, precision: any, expectationFailOutput?: any): boolean;
         toContainHtml(expected: string): boolean;
         toContainText(expected: string): boolean;
         toThrow(expected?: any): boolean;
@@ -450,7 +450,7 @@ declare module jasmine {
         /** By chaining the spy with calls.reset(), will clears all tracking for a spy **/
         reset(): void;
     }
-    
+
     interface CallInfo {
         /** The context (the this) for the call */
         object: any;
diff --git a/java/java-tests.ts b/java/java-tests.ts
new file mode 100644
index 000000000..568bd35a8
--- /dev/null
+++ b/java/java-tests.ts
@@ -0,0 +1,34 @@
+///<reference path="java.d.ts"/>
+///<reference path="../bluebird/bluebird.d.ts"/>
+
+import java = require('java');
+import BluePromise = require('bluebird');
+
+java.asyncOptions = {
+  syncSuffix: 'Sync',
+  asyncSuffix: '',
+  promiseSuffix: 'P',
+  promisify: BluePromise.promisify
+};
+
+java.registerClientP((): Promise<void> => {
+  return BluePromise.resolve();
+});
+
+interface ProxyFunctions {
+  [index: string]: Function;
+}
+
+java.ensureJvm()
+  .then(() => {
+
+    // java.d.ts does not declare any Java types.
+    // We can import a  java class, but we don't know the shape of the class here, so must use any
+    var Boolean: any = java.import('java.lang.Boolean');
+
+    var functions: ProxyFunctions = {
+      accept: function(t: any): void { },
+      andThen: function(after: any): any {}
+    };
+    var proxy: any = java.newProxy('java.util.function.Consumer', functions);
+  });
diff --git a/java/java.d.ts b/java/java.d.ts
new file mode 100644
index 000000000..87125355d
--- /dev/null
+++ b/java/java.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for java 0.5.4
+// Project: https://github.com/joeferner/java
+// Definitions by: Jim Lloyd <https://github.com/jimlloyd>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+// This is the core API exposed by https://github.com/joeferner/java.
+// To get the full power of Typescript with Java, see https://github.com/RedSeal-co/ts-java.
+
+declare module 'java' {
+  var NodeJavaCore: NodeJavaCore.NodeAPI;
+  export = NodeJavaCore;
+}
+
+declare module NodeJavaCore {
+  export interface Callback<T> {
+    (err?: Error, result?: T): void;
+  }
+
+  interface Promisify {
+    (funct: Function, receiver?: any): Function;
+  }
+
+  interface AsyncOptions {
+    syncSuffix: string;
+    asyncSuffix?: string;
+    promiseSuffix?: string;
+    promisify?: Promisify;
+  }
+
+  interface ProxyFunctions {
+    [index: string]: Function;
+  }
+
+  // *NodeAPI* declares methods & members exported by the node java module.
+  interface NodeAPI {
+    classpath: string[];
+    asyncOptions: AsyncOptions;
+    callMethod(instance: any, className: string, methodName: string, args: any[], callback: Callback<any>): void;
+    callMethodSync(instance: any, className: string, methodName: string, ...args: any[]): any;
+    callStaticMethodSync(className: string, methodName: string, ...args: any[]): any;
+    instanceOf(javaObject: any, className: string): boolean;
+    registerClient(before: (cb: Callback<void>) => void, after?: (cb: Callback<void>) => void): void;
+    registerClientP(beforeP: () => Promise<void>, afterP?: () => Promise<void>): void;
+    ensureJvm(done: Callback<void>): void;
+    ensureJvm(): Promise<void>;
+
+    newShort(val: number): any;
+    newLong(val: number): any;
+    newFloat(val: number): any;
+    newDouble(val: number): any;
+
+    import(className: string): any;
+    newInstance(className: string, ...args: any[]): void;
+    newInstanceSync(className: string, ...args: any[]): any;
+    newInstanceP(className: string, ...args: any[]): Promise<any>;
+    newArray<T>(className: string, arg: any[]): any;
+    getClassLoader(): any;
+
+    newProxy(interfaceName: string, functions: ProxyFunctions): any;
+  }
+}
diff --git a/johnny-five/johnny-five.d.ts b/johnny-five/johnny-five.d.ts
index 9dd1477eb..e2c2c1c30 100644
--- a/johnny-five/johnny-five.d.ts
+++ b/johnny-five/johnny-five.d.ts
@@ -251,10 +251,12 @@ declare module "johnny-five" {
 
     export interface LCDI2COption extends LCDGeneralOption{
         controller: string;
+        backlight?: number;
     }
 
     export interface LCDParallelOption extends LCDGeneralOption{
         pins: Array<any>;
+        backlight?: number;
     }
 
     export class LCD{
diff --git a/joi/joi-tests.ts b/joi/joi-tests.ts
index fc1f8ef25..9e631e3e3 100644
--- a/joi/joi-tests.ts
+++ b/joi/joi-tests.ts
@@ -107,9 +107,8 @@ whenOpts = {is: schema, otherwise: schema};
 
 var refOpts: Joi.ReferenceOptions = null;
 
-refOpts = {alias: bool};
-refOpts = {multiple: bool};
-refOpts = {override: bool};
+refOpts = {separator: str};
+refOpts = {contextPrefix: str};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
diff --git a/joi/joi.d.ts b/joi/joi.d.ts
index b784ad23d..2e230dcb8 100644
--- a/joi/joi.d.ts
+++ b/joi/joi.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for joi v4.6.0
 // Project: https://github.com/spumko/joi
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>, Christopher Glantschnig <https://github.com/cglantschnig>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 // TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
@@ -8,61 +8,105 @@
 declare module 'joi' {
 
 	export interface ValidationOptions {
-		// when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+		/**
+		 * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+		 */
 		abortEarly?: boolean;
-		// when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+		/**
+		 * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+		 */
 		convert?: boolean;
-		// when true, allows object to contain unknown keys which are ignored. Defaults to false.
+		/**
+		 * when true, allows object to contain unknown keys which are ignored. Defaults to false.
+		 */
 		allowUnknown?: boolean;
-		// when true, ignores unknown keys with a function value. Defaults to false.
+		/**
+		 * when true, ignores unknown keys with a function value. Defaults to false.
+		 */
 		skipFunctions?: boolean;
-		// when true, unknown keys are deleted (only when value is an object). Defaults to false.
+		/**
+		 * when true, unknown keys are deleted (only when value is an object). Defaults to false.
+		 */
 		stripUnknown?: boolean;
-		// overrides individual error messages. Defaults to no override ({}).
+		/**
+		 * overrides individual error messages. Defaults to no override ({}).
+		 */
 		language?: Object;
-		// sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+		/**
+		 * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+		 */
 		presence?: string;
-		// provides an external data set to be used in references
+		/**
+		 * provides an external data set to be used in references
+		 */
 		context?: Object;
 	}
 
 	export interface RenameOptions {
-		// if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+		/**
+		 * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+		 */
 		alias?: boolean;
-		// if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+		/**
+		 * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+		 */
 		multiple?: boolean;
-		// if true, allows renaming a key over an existing key. Defaults to false.
+		/**
+		 * if true, allows renaming a key over an existing key. Defaults to false.
+		 */
 		override?: boolean;
+		/**
+		 * if true, skip renaming of a key if it's undefined. Defaults to false.
+		 */
+		ignoreUndefined?: boolean;
 	}
 
 	export interface EmailOptions {
-		// Numerical threshold at which an email address is considered invalid
+		/**
+		 * Numerical threshold at which an email address is considered invalid
+		 */
 		errorLevel?: number | boolean;
-		// Specifies a list of acceptable TLDs.
+		/**
+		 * Specifies a list of acceptable TLDs.
+		 */
 		tldWhitelist?: string[] | Object;
-		// Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+		/**
+		 * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+		 */
 		minDomainAtoms?: number;
 	}
 
 	export interface IpOptions {
-		// One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+		/**
+		 * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+		 */
 		version ?: string | string[];
-		// Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+		/**
+		 * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+		 */
 		cidr?: string;
 	}
 
 	export interface UriOptions {
-		// Specifies one or more acceptable Schemes, should only include the scheme name.
-		// Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+		/**
+		 * Specifies one or more acceptable Schemes, should only include the scheme name.
+		 * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+		 */
 		scheme ?: string | RegExp | Array<string | RegExp>;
 	}
 
 	export interface WhenOptions {
-		// the required condition joi type.
+		/**
+		 * the required condition joi type.
+		 */
 		is: Schema;
-		// the alternative schema type if the condition is true. Required if otherwise is missing.
+		/**
+		 * the alternative schema type if the condition is true. Required if otherwise is missing.
+		 */
 		then?: Schema;
-		// the alternative schema type if the condition is false. Required if then is missing
+		/**
+		 * the alternative schema type if the condition is false. Required if then is missing
+		 */
 		otherwise?: Schema;
 	}
 
@@ -76,7 +120,7 @@ declare module 'joi' {
 		cidr?: string
 	}
 
-	export interface ValidationError {
+	export interface ValidationError extends Error {
 		message: string;
 		details: ValidationErrorItem[];
 		simple(): string;
diff --git a/jqrangeslider/jqrangeslider.d.ts b/jqrangeslider/jqrangeslider.d.ts
index b41df43c0..58934e776 100644
--- a/jqrangeslider/jqrangeslider.d.ts
+++ b/jqrangeslider/jqrangeslider.d.ts
@@ -70,5 +70,5 @@ interface JQuery {
     dateRangeSlider(method: string): any;
     dateRangeSlider(method: string, value: Date): JQuery;
     dateRangeSlider(method: string, min: Date, max: Date): JQuery
-	dateRangeSlider(options?: JQRangeSliderOptions): JQuery;
+	dateRangeSlider(options?: JQDateRangeSliderOptions): JQuery;
 }
diff --git a/jquery-ajax-chain/jquery-ajax-chain-tests.ts b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
new file mode 100644
index 000000000..8a484fa63
--- /dev/null
+++ b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
@@ -0,0 +1,287 @@
+/// <reference path="../jquery-ajax-chain/jquery-ajax-chain.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../core-js/core-js.d.ts" />
+
+function test_public_methods(): void {
+
+    let ajaxChain: ajaxChain.JQueryAjaxChain,
+        configurationObj1: ajaxChain.AjaxChainConfiguration,
+        configurationObj2: ajaxChain.AjaxChainConfiguration;
+
+    configurationObj1 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/endpoint1'
+
+        }
+
+    };
+
+    configurationObj2 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/endpoint2'
+
+        }
+
+    };
+
+    ajaxChain.enqueue(configurationObj1);
+    ajaxChain.clearQueue();
+    ajaxChain.enqueue([configurationObj1, configurationObj2]);
+    ajaxChain.dequeue().then(doneResult => { console.log(doneResult); },
+                             failResult => { console.log(failResult); },
+                             progressResult => { console.log(progressResult); });
+
+}
+
+function test_optional_parameters(): void {
+
+    let itemsCollectionCache: XMLDocument = null,
+        itemDetailCacheMap: WeakMap<String, XMLDocument> = new WeakMap<String, XMLDocument>(),
+        ajaxChain: ajaxChain.JQueryAjaxChain,
+        configurationObj1: ajaxChain.AjaxChainConfiguration,
+        configurationObj2: ajaxChain.AjaxChainConfiguration,
+        configurationObj3: ajaxChain.AjaxChainConfiguration,
+        configurationObj4: ajaxChain.AjaxChainConfiguration;
+
+    ajaxChain = new $.AjaxChain();
+
+    configurationObj1 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/items',
+            success: function (xmlResponse): void {
+
+                itemsCollectionCache = xmlResponse;
+
+            },
+
+        },
+
+        hasHaltingCapabilities: function (xmlResponse): Boolean {
+
+            let $tempXmlResponse: JQuery;
+
+            $tempXmlResponse = $(xmlResponse);
+
+            if (!$tempXmlResponse.find('item').length) {
+
+                return true;
+
+            }
+
+            return false;
+
+        },
+
+        hasCache: function (xmlResponse): XMLDocument {
+
+            if (itemsCollectionCache) {
+
+                return itemsCollectionCache;
+
+            };
+
+            return null;
+        },
+
+        transform: function (xmlResponse): Object {
+
+            let $tempXmlResponse: JQuery,
+                $tempItems: JQuery,
+                nextCallDataObj: Object;
+
+            $tempXmlResponse = $(xmlResponse);
+            $tempItems = $tempXmlResponse.find('item');
+
+            if ($tempItems.length) {
+
+                nextCallDataObj = {
+
+                    id: $tempItems.first()
+                                  .attr('id')
+
+                };
+
+                return nextCallDataObj;
+
+            }
+
+            return null;
+
+        }
+
+    };
+
+    configurationObj2 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/item',
+            success: function (xmlResponse): void {
+
+                let $tempXmlResponse: JQuery,
+                    itemId: String;
+
+                $tempXmlResponse = $(xmlResponse);
+
+                itemId = $tempXmlResponse.find('id')
+                                         .text();
+
+                if (itemId && !itemDetailCacheMap.has(itemId)) {
+
+                    itemDetailCacheMap.set(itemId, xmlResponse);
+
+                }
+
+            }
+
+        },
+
+        transform: function (xmlResponse): String {
+
+            let $tempXmlResponse: JQuery,
+                tempTrackingCode: String,
+                nextCallDataStr: String = "";
+
+            $tempXmlResponse = $(xmlResponse);
+
+            tempTrackingCode = $tempXmlResponse.find('code')
+                                               .text();
+
+            if (tempTrackingCode) {
+
+                nextCallDataStr = "tracking=" + tempTrackingCode;
+
+            }
+
+            return nextCallDataStr;
+
+        },
+
+        hasCache: function (xmlResponse): XMLDocument {
+            
+            let $tempXmlResponse: JQuery,
+                itemId: String;
+
+            $tempXmlResponse = $(xmlResponse);
+
+            itemId = $tempXmlResponse.find('id')
+                                     .text();
+
+            if (itemDetailCacheMap.has(itemId)) {
+
+                return itemDetailCacheMap.get(itemId);
+
+            }
+
+            return null;
+
+        },
+
+        hasErrors: function (xmlResponse): String {
+
+            var $tempXmlResponse: JQuery,
+                categoryFilter: string = '1';
+
+            $tempXmlResponse = $(xmlResponse);
+
+            if ($tempXmlResponse.find('categoryId')
+                                .text() === categoryFilter) {
+
+                return '[Exception] forbidden category id: ' + categoryFilter;
+
+            }
+
+            return '';
+
+        },
+
+        appendToUrl: function (xmlResponse): String {
+
+            let $tempXmlResponse: JQuery,
+                categoryId: string = '';
+
+            $tempXmlResponse = $(xmlResponse);
+            categoryId = $tempXmlResponse.find('categoryId')
+                                         .text();
+
+            return (categoryId) ? ('/' + categoryId) : '';
+
+        }
+
+    };
+
+    configurationObj3 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/categories'
+
+        },
+
+        isSkippable: function (xmlResponse): Boolean {
+
+            return true;
+
+        },
+
+        transform: function (xmlResponse): Object[] {
+
+            let $tempXmlResponse: JQuery,
+                nextCallDataArr: Object[] = [];
+
+            $tempXmlResponse = $(xmlResponse);
+
+            $tempXmlResponse.find('subCategory').each(function (index, node) {
+
+                let $tempIdNode = $(node).find('id');
+
+                nextCallDataArr.push({
+
+                    name: $tempIdNode.attr('name'),
+                    value: $tempIdNode.text()
+
+                });
+
+            });
+
+            return nextCallDataArr;
+
+        }
+
+    };
+
+    configurationObj4 = {
+
+        ajaxSettings: {
+
+            type: 'GET',
+            dataType: 'xml',
+            url: '/subcategories'
+
+        }
+
+    };
+
+    ajaxChain.enqueue([configurationObj1, configurationObj2, configurationObj3, configurationObj4])
+             .dequeue()
+             .then(doneResult => { console.log(doneResult); },
+                   failResult => { console.log(failResult); },
+                   progressResult => { console.log(progressResult); });
+
+}
diff --git a/jquery-ajax-chain/jquery-ajax-chain.d.ts b/jquery-ajax-chain/jquery-ajax-chain.d.ts
new file mode 100644
index 000000000..3d67e3742
--- /dev/null
+++ b/jquery-ajax-chain/jquery-ajax-chain.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for jquery-ajax-chain v 1.0.4
+// Project: https://github.com/humana-fragilitas/jQuery-Ajax-Chain/
+// Definitions by: Andrea Blasio <https://github.com/humana-fragilitas>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module ajaxChain {
+
+    /**
+     * Static members of JQueryAjaxChain
+     */
+    interface JQueryAjaxChainStatic {
+
+        new (): JQueryAjaxChain
+
+    }
+
+    /**
+     * Instance members of JQueryAjaxChain
+     */
+    interface JQueryAjaxChain extends JQueryPromise<any> {
+
+        /**
+         * Enqueues one or more configuration objects for later processing.
+         */
+        enqueue(confObj: AjaxChainConfiguration | AjaxChainConfiguration[]): JQueryAjaxChain;
+        /**
+         * Sequentially and synchronously dequeues the configuration objects enqueued via enqueue() method
+         * in the order they were added, triggering the related Ajax calls.
+         */
+        dequeue(): JQueryAjaxChain;
+        /**
+         * Clears the currently queued configuration objects.
+         */
+        clearQueue(): JQueryAjaxChain;
+
+    }
+
+    /**
+     * A set of key/value pairs that configure the AjaxChain request; 'ajaxSettings' is mandatory.
+     */
+    interface AjaxChainConfiguration {
+
+        /**
+         * jQuery $.ajax method settings (required).
+         */
+        ajaxSettings: JQueryAjaxSettings;
+        /**
+         * Configuration object label (optional).
+         */
+        label?: String;
+        /**
+         * Returning a truthy value (Object) allows to arbitrarily overwrite the next queued Ajax call
+         * 'data' property value specified in the original jQuery $.ajax method configuration
+         * object ('ajaxSettings') (optional).
+         */
+        transform?: (response: any) => String | Object | Object[];
+        /**
+         * Returning a truthy value (String) allows to append a string to the next queued
+         * Ajax call 'url' property value specified in original jQuery $.ajax method configuration
+         * object ('ajaxSettings') (optional).
+         */
+        appendToUrl?: (response: any) => String;
+        /**
+         * Returning a truthy value determines any registered fail callback(s) to be called immediately,
+         * passing the former as an argument to the latter; the queue is then rejected (optional).
+         */
+        hasErrors?: (response: any) => any;
+        /**
+         * Returning a truthy value allows to prevent the related Ajax call from being executed,
+         * passing the former as a parameter to any registered handler(s); useful to create
+         * caching mechanisms (optional).
+         */
+        hasCache?: (response: any) => any;
+        /**
+         * Returning a truthy value prevents the queue from further progressing to the succeeding
+         * Ajax calls; the queue is then resolved (optional).
+         */
+        hasHaltingCapabilities?: (response: any) => Boolean;
+        /**
+         * Returning a truthy value prevents the queue from being halted in case of Ajax error (optional).
+         */
+        isSkippable?: (response: any) => Boolean;
+
+    }
+
+}
+
+interface JQueryStatic {
+
+    /**
+     * JQueryAjaxChain constructor
+     */
+    AjaxChain: ajaxChain.JQueryAjaxChainStatic; 
+
+}
\ No newline at end of file
diff --git a/jquery-cropbox/jquery-cropbox-tests.ts b/jquery-cropbox/jquery-cropbox-tests.ts
new file mode 100644
index 000000000..e8db3847c
--- /dev/null
+++ b/jquery-cropbox/jquery-cropbox-tests.ts
@@ -0,0 +1,39 @@
+/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="jquery-cropbox.d.ts"/>
+
+var cropboxWithDefaultSettings = $("#element").cropbox();
+
+var cropboxOptions: jQueryCropBox.CropboxOptions = {
+    height: 500,
+    zoom: 5,
+    width: 0.5,
+};
+
+var cropboxWithOptions = $("#element").cropbox(cropboxOptions);
+
+cropboxWithOptions.zoomIn();
+cropboxWithOptions.zoomOut();
+cropboxWithOptions.zoom(50);
+
+var cropDragOption: jQueryCropBox.CropboxDragOptions = {
+    startX: 10,
+    startY: 0,
+    dx: 100,
+    dy: 100
+};
+
+cropboxWithOptions.drag(cropDragOption);
+
+var cropboxSetCropOption: jQueryCropBox.CropboxSetCropOptions = {
+    cropX: 10,
+    cropY: 10,
+    cropW: 50,
+    cropH: 50
+};
+
+cropboxWithOptions.setCrop(cropboxSetCropOption);
+
+cropboxWithOptions.update();
+cropboxWithOptions.getDataURL();
+cropboxWithOptions.getBlob();
+cropboxWithOptions.remove();
diff --git a/jquery-cropbox/jquery-cropbox.d.ts b/jquery-cropbox/jquery-cropbox.d.ts
new file mode 100644
index 000000000..82b550bf3
--- /dev/null
+++ b/jquery-cropbox/jquery-cropbox.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for jQuery cropbox
+// Project: https://github.com/acornejo/jquery-cropbox
+// Definitions by: Per Kastman <https://github.com/PerKastman/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+declare module jQueryCropBox {
+
+    enum ShowControls {
+        never,
+        always,
+        hover,
+        auto
+    }
+
+    interface CropboxArea {
+        cropX: number;
+        cropY: number;
+        cropW: number;
+        cropH: number;
+    }
+
+    interface CropboxOptions {
+        /**
+        * Width in pixels of the cropping window     
+        */
+        width?: number;
+        /**
+         * Height in pixels of the cropping window     
+         */
+        height?: number;
+        /**
+         * Number of incremental zoom steps. With the default of 10, you have to click the zoom-in button 9 times to reach 100%.     
+         */
+        zoom?: number;
+        /**
+         * Maximum zoom value. With the default of 1.0 users can't zoom beyond the maximum image resolution.     
+         */
+        maxZoom?: number;
+        /**
+         * If not null, this is the entire html block that should appear on hover over the image for instructions and/or buttons (could include the zoom in/out buttons for example). If null, the default html block is used which has the text "Click to drag" and the zoom in/out buttons. Use false to disable controls.     
+         */
+        controls?: any;
+        /**
+         * Set the initial cropping area     
+         */
+        result?: CropboxArea;
+        /**
+         * This flag is used to determine when to display the controls. Never, always and hover do exactly what you would expect (never show them, always show them, show them on hover). The auto flag is the same as the hover flag, except that on mobile devices it always shows the controls (since there is no hover event).     
+         */
+        showControls?: ShowControls
+    }
+
+    interface CropboxDragOptions {
+        startX: number,
+        startY: number,
+        dx: number,
+        dy: number
+    }
+
+    interface CropboxSetCropOptions {
+        cropX: number,
+        cropY: number,
+        cropW: number,
+        cropH: number
+    }
+
+    interface Cropbox {
+        /**
+        * Increase image zoom level by one step     
+        */
+        zoomIn(): void;
+        /**
+        * Decrease image zoom level by one step     
+        */
+        zoomOut(): void;    
+        /**
+        * Set zoom leevl to a value between 0 and 1. Need to call update to reflect the changes.      
+        */
+        zoom(percent: number): void;    
+        /**
+         * Simulate image dragging, starting from (startX,startY) and moving a delta of (dx,dy). Need to call update to reflect the changes.      
+         */
+        drag(options: CropboxDragOptions): void;    
+        /**
+         * Set crop window.      
+         */
+        setCrop(options: CropboxSetCropOptions): void;
+        /**
+         * Update the cropped result (must call after zoom and drag).      
+         */
+        update(): void;    
+        /**
+         * Generate a URL for the cropped image on the client (requires HTML5 compliant browser).      
+         */
+        getDataURL(): string;    
+        /**
+         * Generate a Blob with the cropped image (requires HTML5 compliant browser).      
+         */
+        getBlob(): any;
+        /**
+         * Remove the cropbox functionality from the image.      
+         */
+        remove(): void;
+    }
+}
+
+interface JQuery {
+    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
+}
+
+interface JQueryStatic {
+    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
+}
diff --git a/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts b/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts
index de008dc09..fd620ba7f 100644
--- a/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts
+++ b/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts
@@ -6,14 +6,20 @@
 /// <reference path="../jquery/jquery.d.ts" />
 
 interface JsonRpcClientOptions extends JQueryAjaxSettings {
-    ajaxUrl?: string;
+    ajaxUrl: string;
     headers?: {[key:string]: any};
-    sockerUrl?: string;
-    onmessage?: () => void;
-    onopen?: () => void;
-    onclose?: () => void;
-    onerror?: () => void;
+    socketUrl?: string;
+    onmessage?: (ev: MessageEvent) => void;
+    onopen?: (ev: Event) => void;
+    onclose?: (ev: CloseEvent) => void;
+    onerror?: (ev: Event) => void;
     getSockect?: (onmessageCb: () => void) => WebSocket;
+
+    /**
+     * Sets timeout for calls in milliseconds.
+     * Works with WebSocket as well as AJAX.
+     */
+    timeout?: number;
 }
 
 interface JsonRpcClient {
diff --git a/jquery-sortable/jquery-sortable.d.ts b/jquery-sortable/jquery-sortable.d.ts
index 82f4e8aa0..ce47a5900 100644
--- a/jquery-sortable/jquery-sortable.d.ts
+++ b/jquery-sortable/jquery-sortable.d.ts
@@ -88,17 +88,16 @@ declare module JQuerySortable {
 	}
 
 	interface Options extends GroupOptions, ContainerOptions {
+		group?: string;
 	}
 }
 
-
 interface JQuery {
-	sortable(options?: JQuerySortable.Options): JQuery;
-
 	sortable(methodName: 'enable'): JQuery;
 	sortable(methodName: 'disable'): JQuery;
 	sortable(methodName: 'refresh'): JQuery;
 	sortable(methodName: 'destroy'): JQuery;
 	sortable(methodName: 'serialize'): JQuery;
 	sortable(methodName: string): JQuery;
+	sortable(options?: JQuerySortable.Options): JQuery;
 }
diff --git a/jquery-timeentry/jquery-timeentry-tests.ts b/jquery-timeentry/jquery-timeentry-tests.ts
new file mode 100644
index 000000000..b7f541fb1
--- /dev/null
+++ b/jquery-timeentry/jquery-timeentry-tests.ts
@@ -0,0 +1,63 @@
+/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="jquery-timeentry.d.ts"/>
+
+var selector = '#example';
+
+// basic
+$(selector).timeEntry();
+
+var options: ITimeEntryOptions = {};
+options.show24Hours = true;
+options.showSeconds = true;
+options.unlimitedHours = true;
+options.separator = '!';
+options.ampmPrefix = 'x';
+options.ampmNames = ['am','pm'];
+options.appendText = 'foo';
+options.timeSteps = [1,1,1];
+options.initialField = 0;
+options.noSeparatorEntry = false;
+options.tabToExit = true;
+options.useMouseWheel = false;
+
+options.defaultTime = new Date(0, 0, 0, 11, 30, 0);
+options.defaultTime = '11:30AM';
+options.defaultTime= +20;
+options.defaultTime= '!+2h +30m';
+
+options.minTime = new Date(0, 0, 0, 8, 30, 0);
+options.minTime = '08:30AM';
+options.minTime = -15;
+options.minTime = '-1h -10m';
+
+options.maxTime = new Date(0, 0, 0, 17, 30, 0);
+options.maxTime = '05:30pM';
+options.maxTime = +30;
+options.maxTime = '+20h +10s';
+
+options.spinnerImage = 'foo.png';
+options.spinnerSize = [1, 2, 3];
+
+options.spinnerBigImage = 'big.png';
+options.spinnerBigSize = [4, 5, 6];
+
+options.spinnerIncDecOnly = true;
+options.spinnerTexts = ['Now', 'Prev', 'Next', 'incr', 'decr'];
+options.spinnerRepeat = [500, 250];
+
+options.beforeShow = (input: any): void => {
+    console.log(input.id);
+};
+options.beforeSetTime = (oldTime: Date, newTime: Date, minTime: Date, maxTime: Date): Date => {
+    return newTime;
+};
+
+$(selector).timeEntry(options);
+
+// functions by name
+$(selector).timeEntry('option', {show24Hours: true});
+$(selector).timeEntry('option', 'show24Hours', true);
+
+// global settings
+$.timeEntry.setDefaults(options);
+var fr: ITimeEntryRegionalOptions = $.timeEntry.regionalOptions['fr'];
diff --git a/jquery-timeentry/jquery-timeentry.d.ts b/jquery-timeentry/jquery-timeentry.d.ts
new file mode 100644
index 000000000..070fdd68a
--- /dev/null
+++ b/jquery-timeentry/jquery-timeentry.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for jQuery-timeentry.js 2.0.1
+// Project: https://github.com/kbwood/timeentry
+// Definitions by: Mark Nadig <https://github.com/marknadig>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+interface ITimeEntryRegionalOptions {
+    /**
+     * Indicate whether to use 12-hour (false) or 24-hour (true) time. This is one of the regional settings fields.
+     *
+     * default: False
+     */
+    show24Hours?: boolean;
+    /**
+     * The separator between time portions. This is one of the regional settings fields.
+     *
+     * default: ':'
+     */
+    separator?: string;
+    /**
+     * The text that separates the time from the AM and PM indicators. This is one of the regional settings fields.
+     *
+     * default: ''
+     */
+    ampmPrefix?: string;
+    /**
+     * The AM and PM display text. This is one of the regional settings fields.
+     *
+     * default: ['AM','PM']
+     */
+    ampmNames?: string[];
+    /**
+     * The tooltip text for the spinner buttons. This is one of the regional settings fields.
+     *
+     * default: ['Now', 'Previous field', 'Next field', 'Increment', 'Decrement']
+     */
+    spinnerTexts?: string[];
+}
+
+interface ITimeEntryOptions extends ITimeEntryRegionalOptions {
+    /**
+     * Indicate whether or not the seconds part of the time should be displayed.
+     *
+     * default: False
+     */
+    showSeconds?: boolean;
+    /**
+     * Indicate whether to restrict hours to just those in one day (false) or to allow for any value for hours (true).
+     *
+     * default: false
+     */
+    unlimitedHours?: boolean;
+    /**
+     * Add content to display after each time field. This may contain HTML markup.
+     *
+     * default: ''
+     */
+    appendText?: string;
+    /**
+     * The increment/decrement values for each of the time portions - hours, minutes, and seconds.
+     * Use this to constrain the portions, e.g. [1, 15, 0] restricts the times to quarter hours.
+     *
+     * default: [1,1,1]
+     */
+    timeSteps?: number[];
+    /**
+     * The number of the portion of the time field to highlight initially.
+     * Use 0 for hours, 1 for minutes, etc., or null for the user selection.
+     *
+     * default: null
+     */
+    initialField?: number;
+    /**
+     * Set to true to allow direct entry of a time from the keyboard without needing to type separators,
+     * i.e. the field moves on after two digits.
+     *
+     * default: false
+     */
+    noSeparatorEntry?: boolean;
+    /**
+     * true to have the tab key exit this field and move to the next one, or false to have the tab key step
+     * through the date subfields.
+     *
+     * default: false
+     */
+    tabToExit?: boolean;
+    /**
+     * Set to true to use the mouse wheel for increment/decrement if possible, or false to never use it.
+     *
+     * default: true
+     */
+    useMouseWheel?: boolean;
+    /**
+     * The default time to show when no other value has been entered. This may be a Date object
+     * (but the year/month/day values are ignored), a string in the current time format, a numeric
+     * value as seconds offset from now, or a string value indicating a number and units, e.g. '+2h'.
+     * In the latter case, use 'h' for hours, 'm' for minutes, or 's' for seconds. Letters may be upper
+     * or lower case. Multiple offsets may be combined into one setting, e.g. '-2h -20m'. Prefix with '!'
+     * to prevent a wrap around into another day. Leave as null to default to the current time.
+     *
+     * default: null
+     */
+    defaultTime?: Date | number | string;
+    /**
+     * The minimum time that may be selected, or null for no limit. See defaultTime for a description
+     * of the possible formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
+     *
+     * default: null
+     */
+    minTime?: Date | number | number[] | string;
+    /**
+     * The maximum time that may be selected, or null for no limit. See defaultTime for a description of the possible
+     * formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
+     *
+     * Note that the maxTime may be set to less than the minTime in which case the entered time is restricted to
+     * the period between the minimum and the maximum on the "next day".
+     *
+     * default: null
+     */
+    maxTime?: Date | number | number[] | string;
+    /**
+     * The URL for the spinner images to use, or '' for no spinner. The file must contain seven images horizontally
+     * for the normal view, then for each "button" pressed (now, previous, next, increment, and decrement), and,
+     * finally, the disabled view.
+     *
+     * default: 'spinnerDefault.png'
+     */
+    spinnerImage?: string;
+    /**
+     * The dimensions of the spinner image for determining which "button" was clicked. The first two values are the
+     * width and height of the individual images, the third is the size of the central button for setting the current
+     * time, or 0 for no central button.
+     *
+     * default: [20, 20, 8]
+     */
+    spinnerSize?: number[];
+    /**
+     * The URL for an expanded spinner image to use, or '' for no expansion. The layout is the same as for
+     * spinnerImage but should be a larger size. The expanded spinner appears when the user hovers over the
+     * original spinner and disappears when they move off it.
+     *
+     * default: ''
+     */
+    spinnerBigImage?: string;
+    /**
+     * The dimensions of the expanded spinner image for determining which "button" was clicked. The first two values
+     * are the width and height of the individual images, the third is the size of the central button for setting the
+     * current time, or 0 for no central button.
+     *
+     * default: [40, 40, 16]
+     */
+    spinnerBigSize?: number[];
+    /**
+     * Set to true to have only the increment and decrement buttons on the spinner, or false for all the buttons.
+     *
+     * default: false
+     */
+    spinnerIncDecOnly?: boolean;
+    /**
+     * The times in milliseconds for the auto-repeat feature on the increment and decrement spinner buttons.
+     * The first value is the initial delay and the second one is the subsequent delay. Hold the mouse button down
+     * on these spinner buttons to trigger this feature. Use [0, 0] to disable the auto-repeat.
+     *
+     * default: [500, 250]
+     */
+    spinnerRepeat?: number[];
+    /**
+     * A function that accepts an input field and returns a settings object containing new settings for the time
+     * entry for this field. For example, you can use it to set up a time range wherein both fields restrict the
+     * possible values of the other field. this refers to the input field as well. Leave as null for no per-field
+     * customisation.
+     *
+     * default: null
+     */
+    beforeShow?: Function;
+    /**
+     * A function that accepts the old and new times, and minimum and maximum times, and returns an updated time.
+     * This refers to the associated input field. This call is made just before the time is updated into the field
+     * allowing for additional restrictions to be applied. Leave as null for no additional restrictions.
+     *
+     * default: null
+     */
+    beforeSetTime?: Function;
+}
+
+interface ITimeEntry {
+    /**
+     * initialize TimeEntry plugin
+     */
+    (configOrFnName?: ITimeEntryOptions | string, nameOrOption?: any, value?: any): any; // functions accessed with string key :/
+}
+
+interface ITimeEntryLocales {
+    [index: string]: ITimeEntryRegionalOptions;
+}
+
+interface ITimeEntryStatic {
+    regionalOptions: ITimeEntryLocales;
+    setDefaults(settings: ITimeEntryOptions): void;
+}
+
+interface JQuery {
+    /**
+     * initialize TimeEntry plugin
+     */
+    timeEntry: ITimeEntry;
+}
+
+interface JQueryStatic {
+    timeEntry: ITimeEntryStatic;
+}
diff --git a/jquery-urlparam/jquery-urlparam-tests.ts b/jquery-urlparam/jquery-urlparam-tests.ts
new file mode 100644
index 000000000..5ad4d26d5
--- /dev/null
+++ b/jquery-urlparam/jquery-urlparam-tests.ts
@@ -0,0 +1,4 @@
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="jquery-urlparam.d.ts" />
+
+console.log($.urlParam('variable'));
diff --git a/jquery-urlparam/jquery-urlparam.d.ts b/jquery-urlparam/jquery-urlparam.d.ts
new file mode 100644
index 000000000..af37cd036
--- /dev/null
+++ b/jquery-urlparam/jquery-urlparam.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jquery-urlparam
+// Project: https://gist.github.com/stpettersens/e1f4478f299b6f4905c1
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+interface JQueryStatic {
+	urlParam(variable: string): string;
+}
diff --git a/jquery.ajaxfile/jquery.ajaxFile-tests.ts b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
new file mode 100644
index 000000000..e5f82fb00
--- /dev/null
+++ b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
@@ -0,0 +1,54 @@
+/// <reference path="jquery.ajaxFile.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../knockout/knockout.d.ts" />
+
+function testRawApi(){
+	var inputElement:HTMLInputElement = null;
+	var resultPromise = AjaxFile.send<number>({
+		method: 'POST',
+		url: '/',
+		desiredResponseDataType: JQueryAjaxFile.DataType.Json,
+		files: [
+			{ name: 'joeFile', element: inputElement }
+		],
+		data: {
+			name: 'joe'
+		},
+		timeoutInSeconds: 30
+	})
+	.then(result => console.log('Result: ' + result.data), result => console.log('Error: ' + result.error))
+	.done(result => console.log('Result: ' + result.data))
+	.fail(result => console.log('Error: ' + result.error + " " + result.status.code + " " + result.status.text + " " + result.status.isSuccess))
+	.always(result => console.log('end'))
+	.abord();
+}
+
+function testJQuery() {
+    var inputElement: HTMLInputElement = null;
+    var extension: JQueryAjaxFile.IAjaxFileJQueryExtension = $.fn.ajaxWithFile;
+    var option: JQueryAjaxFile.IJQueryOption = {
+        type: 'POST',
+        url: '/',
+        dataType: "json",
+        files: [
+            { name: 'joeFile', element: inputElement }
+        ],
+        data: {
+            name: 'joe'
+        },
+        success(result) { console.log('Result: ' + result); },
+        error(jqXhr, textStatus, errorThrown) { console.log('Error: ' + errorThrown); },
+        complete(jqXhr, textStatus) { console.log('end'); },
+        global: true,
+        timeout: 60
+    };
+    extension.ajaxWithFile<number>(option);
+}
+
+function testKnockoutExtension(){
+	var fileHandler:KnockoutBindingHandler = ko.bindingHandlers.file;
+}
+
+testKnockoutExtension();
+testJQuery();
+testRawApi();
\ No newline at end of file
diff --git a/jquery.ajaxfile/jquery.ajaxFile.d.ts b/jquery.ajaxfile/jquery.ajaxFile.d.ts
new file mode 100644
index 000000000..ff0a18a59
--- /dev/null
+++ b/jquery.ajaxfile/jquery.ajaxFile.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for jquery.ajaxfile v0.2.0
+// Project: https://github.com/fpellet/jquery.ajaxFile
+// Definitions by: Florent PELLET <https://github.com/fpellet/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../knockout/knockout.d.ts" />
+
+declare namespace JQueryAjaxFile {
+	export enum DataType {
+		Json,
+		Xml,
+		Text
+	}
+
+	interface IFileData {
+		name: string;
+		element: HTMLInputElement;
+	}
+
+	interface IOption {
+		method?: string;
+		url?: string;
+
+		data?: any;
+		files?: IFileData[];
+		desiredResponseDataType?: DataType;
+
+		timeoutInSeconds?: number;
+	}
+
+	interface IResponseStatus {
+		code: number;
+		text: string;
+		isSuccess: boolean;
+	}
+
+	interface IAjaxFileResult<T> {
+		error?: any;
+		data?: any;
+		status?: IResponseStatus;
+	}
+
+	interface IAjaxFileResultCallback<T> {
+		(result: IAjaxFileResult<T>): void;
+	}
+
+	interface IAjaxFilePromise<T> {
+		then(success: IAjaxFileResultCallback<T>, error?: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		done(success: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		fail(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		always(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+
+		abord(): void;
+	}
+
+	interface IAjaxFileStatic {
+		DataType: typeof DataType;
+		send<T>(option: IOption): IAjaxFilePromise<T>;
+	}
+	
+	interface IJQueryXHR {
+        readyState: any;
+        status: number;
+        statusText: string;
+        responseXML: Document;
+        responseText: string;
+        statusCode?: { [key: string]: any; };
+
+        abort(statusText?: string): void;
+
+        setRequestHeader(header: string, value: string): void;
+        getAllResponseHeaders(): string;
+        getResponseHeader(header: string): string;
+
+        beforeSend?(jqXHR: IJQueryXHR, settings: JQueryAjaxSettings): any;
+        dataFilter?(data: any, ty: any): any;
+        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
+        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
+        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
+    }
+
+    interface IJQueryOption {
+        type?: string;
+        url?: string;
+
+        data?: any;
+        files?: IFileData[];
+        dataType?: string;
+
+        timeout?: number;
+
+        global?: boolean;
+
+        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
+        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
+        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
+    }
+
+    interface IAjaxFileJQueryExtension {
+        ajaxWithFile<T>(jqueryOption: IJQueryOption): JQueryDeferred<T>;
+    }
+}
+
+declare var AjaxFile: JQueryAjaxFile.IAjaxFileStatic;
+
+declare module 'ajaxfile' {
+    export = AjaxFile;
+}
+
+declare namespace AjaxFileKnockout {
+    interface IFileInputWrapper {
+        getElement(): HTMLInputElement;
+        fileSelected(): boolean;
+    }
+}
+
+interface KnockoutBindingHandlers {
+    file: KnockoutBindingHandler;
+}
diff --git a/jquery.colorpicker/jquery.colorpicker.d.ts b/jquery.colorpicker/jquery.colorpicker.d.ts
index 5c89e4ed0..32f68c1c1 100644
--- a/jquery.colorpicker/jquery.colorpicker.d.ts
+++ b/jquery.colorpicker/jquery.colorpicker.d.ts
@@ -154,11 +154,11 @@ interface JQueryStatic {
 }
 
 interface JQuery {
-    colorpicker(options?: JQueryColorpickerOptions): JQuery;
-    colorpicker(method: string): JQuery;
-    colorpicker(method: string, param: any): JQuery;
     colorpicker(method: "close"): JQuery;
     colorpicker(method: "destroy"): JQuery;
     colorpicker(method: "open"): JQuery;
+    colorpicker(method: string): JQuery;
     colorpicker(method: "setColor", color: any): JQuery;
+    colorpicker(method: string, param: any): JQuery;
+    colorpicker(options?: JQueryColorpickerOptions): JQuery;
 }
diff --git a/jquery.cookie/jquery.cookie-tests.ts b/jquery.cookie/jquery.cookie-tests.ts
index 69a8c0412..ab9b8cb5a 100644
--- a/jquery.cookie/jquery.cookie-tests.ts
+++ b/jquery.cookie/jquery.cookie-tests.ts
@@ -35,3 +35,5 @@ $.cookie("test", testObject, cookieOptions);
 var result = <TestObject>$.cookie("test");
 
 console.log(result.text);
+
+$.cookie.defaults = cookieOptions;
diff --git a/jquery.cookie/jquery.cookie.d.ts b/jquery.cookie/jquery.cookie.d.ts
index 06380f999..be88ca363 100644
--- a/jquery.cookie/jquery.cookie.d.ts
+++ b/jquery.cookie/jquery.cookie.d.ts
@@ -1,34 +1,106 @@
-// Type definitions for jQuery Cookie Plugin 1.3
+// Type definitions for jQuery Cookie Plugin 1.4.1
 // Project: https://github.com/carhartl/jquery-cookie
-// Definitions by: Roy Goode <https://github.com/RoyGoode/>
+// Definitions by: Roy Goode <https://github.com/RoyGoode/>, Ben Lorantfy <https://github.com/BenLorantfy/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path="../jquery/jquery.d.ts" />
 
 
 interface JQueryCookieOptions {
+    /**
+     * Define lifetime of the cookie. Value can be a Number which will be interpreted as days from time of creation or a Date object. If omitted, the cookie becomes a session cookie.
+     */
     expires?: any;
+    /**
+     * Define the path where the cookie is valid. By default the path of the cookie is the path of the page where the cookie was created (standard browser behavior). If you want to make it available for instance across the entire domain use path: '/'. Default: path of page where the cookie was created.
+     */
     path?: string;
+    /**
+     * Define the domain where the cookie is valid. Default: domain of page where the cookie was created.
+     */
     domain?: string;
+    /**
+     * If true, the cookie transmission requires a secure protocol (https). Default: false.
+     */
     secure?: boolean;
 }
-
+//
+// The following jsdoc comments are used to add intellisense to editors that support it. Uses snippets
+// of documentation from the Github repo when possible.
+// 
+// The ordering here matters. For example, the read function with the converter parameter is purposefully after
+// the set function. This is because the intellisense that shows up after you press comma should be the set first,
+// since that is more common, then the conversion function if user starts typing a parameter with a function type
 interface JQueryCookieStatic {
+    /**
+     * By default the cookie value is encoded/decoded when writing/reading, using encodeURIComponent/decodeURIComponent. Bypass this by setting raw to true:
+     */
     raw?: boolean;
+    /**
+     * Turn on automatic storage of JSON objects passed as the cookie value. Assumes JSON.stringify and JSON.parse
+     */
     json?: boolean;
-
+    /**
+     * Cookie attributes can be set globally by setting properties of the $.cookie.defaults object or individually for each call to $.cookie() by passing a plain object to the options argument. Per-call options override the default options.
+     */
+    defaults?: JQueryCookieOptions;
+    /**
+     * Gets an object of cookies as key-value pairs
+     */
     (): {[key:string]:string};
+    /**
+     * Gets a cookie by name
+     * @param name The name of the cookie to get
+     */
     (name: string): any;
-    (name: string, converter: (value: string) => any): any;
+    /**
+     * Sets a cookie
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     */
     (name: string, value: string): void;
+    /**
+     * Gets a cookie by name after applying a conversion function to the value
+     * @param name The name of the cookie to get
+     * @param converter A conversion function to change the cookie's value to a different representation on the fly
+     */
+    (name: string, converter: (value: string) => any): any;
+    /**
+     * Sets a cookie with some options
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     * @param options An object of options that change how the cookie is set
+     */
     (name: string, value: string, options: JQueryCookieOptions): void;
+    /**
+     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     */
     (name: string, value: any): void;
+    /**
+     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     * @param options An object of options that change how the cookie is set
+     */
     (name: string, value: any, options: JQueryCookieOptions): void;
 }
 
 interface JQueryStatic {   
+    /**
+     * A simple, lightweight jQuery plugin for reading, writing and deleting cookies.
+     */
     cookie?: JQueryCookieStatic;
-
+    /**
+     * Deletes a cookie
+     * @param name Name of cookie to delete
+     */
     removeCookie(name: string): boolean;
+    /**
+     * Deletes a cookie
+     * @param name Name of cookie to delete
+     * @param options The same attributes (path, domain) as what the cookie was written with
+     */
     removeCookie(name: string, options: JQueryCookieOptions): boolean;
 }
diff --git a/jquery.dynatree/jquery.dynatree-tests.ts b/jquery.dynatree/jquery.dynatree-tests.ts
new file mode 100644
index 000000000..df1a17f10
--- /dev/null
+++ b/jquery.dynatree/jquery.dynatree-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="jquery.dynatree.d.ts" />
+
+var dynatree = $('element').dynatree();
+
+dynatree.visit((node)=>{
+	return false;
+});
+
+dynatree.visit((node)=>{
+	return false;
+}, true);
+
+var node = dynatree.getActiveNode();
+
+node.select(true);
\ No newline at end of file
diff --git a/jquery.dynatree/jquery.dynatree.d.ts b/jquery.dynatree/jquery.dynatree.d.ts
index c2dc0f928..e8604d2a0 100644
--- a/jquery.dynatree/jquery.dynatree.d.ts
+++ b/jquery.dynatree/jquery.dynatree.d.ts
@@ -41,7 +41,7 @@ interface DynaTree {
     selectKey(key: string, flag: string): DynaTreeNode;
     serializeArray(stopOnParents: boolean): any[];
     toDict(includeRoot?: boolean): any;
-    visit(fn: (node: DynaTreeNode) =>boolean, includeRoot: boolean): void;
+    visit(fn: (node: DynaTreeNode) =>boolean, includeRoot?: boolean): void;
 }
 
 
@@ -54,7 +54,7 @@ interface DynaTreeNode {
     appendAjax(ajaxOptions: JQueryAjaxSettings): void;
     countChildren(): number;
     deactivate(): void;
-    expand(flag: string): void;
+    expand(flag: boolean): void;
     focus(): void;
     getChildren(): DynaTreeNode[];
     getEventTargetType(event: Event): string;
@@ -83,11 +83,11 @@ interface DynaTreeNode {
     removeChildren(): void;
     render(useEffects: boolean, includeInvisible: boolean): void;
     resetLazy(): void;
-    scheduleAction(mode: string, ms: number);
-    select(flag: string): void;
+    scheduleAction(mode: string, ms: number): void;
+    select(flag: boolean): void;
     setLazyNodeStatus(status: number): void;
     setTitle(title: string): void;
-    sortChildren(cmp?: (a: DynaTreeNode, b: DynaTreeNode) =>number, deep?: boolean);
+    sortChildren(cmp?: (a: DynaTreeNode, b: DynaTreeNode) =>number, deep?: boolean): void;
     toDict(recursive: boolean, callback?: (node: any) =>any): any;
     toggleExpand(): void;
     toggleSelect(): void;
diff --git a/jquery.fancytree/jquery.fancytree.d.ts b/jquery.fancytree/jquery.fancytree.d.ts
index 34a9f1422..32b8d2479 100644
--- a/jquery.fancytree/jquery.fancytree.d.ts
+++ b/jquery.fancytree/jquery.fancytree.d.ts
@@ -217,30 +217,6 @@ declare module Fancytree {
         //#endregion
 
         //#region Methods
-        /**
-         * Append (or insert) a single child node. 
-         * 
-         * @param child node to add
-         * @param insertBefore child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: FancytreeNode): FancytreeNode;
-        /**
-         * Append (or insert) a single child node. 
-         * 
-         * @param child node to add
-         * @param insertBefore key of the child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: string): FancytreeNode;
-        /**
-         * Append (or insert) a single child node. 
-         * 
-         * @param child node to add
-         * @param insertBefore index of the child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: number): FancytreeNode;
         /**
          * Append (or insert) a list of child nodes. 
          * 
@@ -265,6 +241,30 @@ declare module Fancytree {
          * @returns The first child added.
          */
         addChildren(children: Fancytree.NodeData[], insertBefore?: number): FancytreeNode;
+        /**
+         * Append (or insert) a single child node. 
+         * 
+         * @param child node to add
+         * @param insertBefore child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: FancytreeNode): FancytreeNode;
+        /**
+         * Append (or insert) a single child node. 
+         * 
+         * @param child node to add
+         * @param insertBefore key of the child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: string): FancytreeNode;
+        /**
+         * Append (or insert) a single child node. 
+         * 
+         * @param child node to add
+         * @param insertBefore index of the child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: number): FancytreeNode;
 
 
         /** Append or prepend a node, or append a child node. This a convenience function that calls addChildren()  
@@ -780,6 +780,7 @@ declare module Fancytree {
     interface NodeData {
         /** node text (may contain HTML tags) */
         title: string;
+        icon?: string;
         /** unique key for this node (auto-generated if omitted) */
         key?: string;
         /** (reserved) */
diff --git a/jquery.fileupload/jquery.fileupload.d.ts b/jquery.fileupload/jquery.fileupload.d.ts
index 3774cb6e1..69821b0ed 100644
--- a/jquery.fileupload/jquery.fileupload.d.ts
+++ b/jquery.fileupload/jquery.fileupload.d.ts
@@ -8,137 +8,193 @@
 // Interface options for the plugin 
 interface JQueryFileInputOptions {
 
-	// The drop target element(s), by the default the complete document.
-    // Set to null to disable drag & drop support:
+    /**
+     * The type of data that is expected back from the server.
+     */
+    dataType?: string;
+
+    /**
+     * The drop target element(s), by the default the complete document.
+     * Set to null to disable drag & drop support:
+     */
     dropZone?: HTMLElement;
 
-    // The paste target element(s), by the default the complete document.
-    // Set to null to disable paste support:
+    /**
+     * The paste target element(s), by the default the complete document.
+     * Set to null to disable paste support:
+     */
     pasteZone?: HTMLElement;
 
-    // The file input field(s), that are listened to for change events.
-    // If undefined, it is set to the file input fields inside
-    // of the widget element on plugin initialization.
-    // Set to null to disable the change listener.
+    /**
+     * The file input field(s), that are listened to for change events.
+     * If undefined, it is set to the file input fields inside
+     * of the widget element on plugin initialization.
+     * Set to null to disable the change listener.
+     */
     fileInput?: HTMLElement;
 
-    // By default, the file input field is replaced with a clone after
-    // each input field change event. This is required for iframe transport
-    // queues and allows change events to be fired for the same file
-    // selection, but can be disabled by setting the following option to false:
+    /**
+     * By default, the file input field is replaced with a clone after
+     * each input field change event. This is required for iframe transport
+     * queues and allows change events to be fired for the same file
+     * selection, but can be disabled by setting the following option to false:
+     */
     replaceFileInput?: boolean;
 
-
-    // The parameter name for the file form data (the request argument name).
-    // If undefined or empty, the name property of the file input field is
-    // used, or "files[]" if the file input name property is also empty,
-    // can be a string or an array of strings:
+    /**
+     * The parameter name for the file form data (the request argument name).
+     * If undefined or empty, the name property of the file input field is
+     * used, or "files[]" if the file input name property is also empty,
+     * can be a string or an array of strings:
+     */
     paramName?: any;
 
-    // By default, each file of a selection is uploaded using an individual
-    // request for XHR type uploads. Set to false to upload file
-    // selections in one request each:
+    /**
+     * By default, each file of a selection is uploaded using an individual
+     * request for XHR type uploads. Set to false to upload file
+     * selections in one request each:
+     */
     singleFileUploads?: boolean;
 
-    // To limit the number of files uploaded with one XHR request,
-    // set the following option to an integer greater than 0:
+    /**
+     * To limit the number of files uploaded with one XHR request,
+     * set the following option to an integer greater than 0:
+     */
     limitMultiFileUploads?: number;
 
-    // The following option limits the number of files uploaded with one
-    // XHR request to keep the request size under or equal to the defined
-    // limit in bytes:
+    /**
+     * The following option limits the number of files uploaded with one
+     * XHR request to keep the request size under or equal to the defined
+     * limit in bytes
+     */
     limitMultiFileUploadSize?: number;
 
-    // Multipart file uploads add a number of bytes to each uploaded file,
-    // therefore the following option adds an overhead for each file used
-    // in the limitMultiFileUploadSize configuration:
+    /**
+     * Multipart file uploads add a number of bytes to each uploaded file,
+     * therefore the following option adds an overhead for each file used
+     * in the limitMultiFileUploadSize configuration:
+     */
     limitMultiFileUploadSizeOverhead?: number;
 
-    // Set the following option to true to issue all file upload requests
-    // in a sequential order:
+    /**
+     * Set the following option to true to issue all file upload requests
+     * in a sequential order:
+     */
     sequentialUploads?: boolean;
 
-    // To limit the number of concurrent uploads,
-    // set the following option to an integer greater than 0:
+    /**
+     * To limit the number of concurrent uploads,
+     * set the following option to an integer greater than 0:
+     */
     limitConcurrentUploads?: number;
 
-    // Set the following option to true to force iframe transport uploads:
+    /**
+     * Set the following option to true to force iframe transport uploads:
+     */
     forceIframeTransport?: boolean;
 
-    // Set the following option to the location of a redirect url on the
-    // origin server, for cross-domain iframe transport uploads:
+    /**
+     * Set the following option to the location of a redirect url on the
+     * origin server, for cross-domain iframe transport uploads:
+     */
     redirect?: string;
 
-    // The parameter name for the redirect url, sent as part of the form
-    // data and set to 'redirect' if this option is empty:
+    /**
+     * The parameter name for the redirect url, sent as part of the form
+     * data and set to 'redirect' if this option is empty:
+     */
     redirectParamName?: string;
 
-    // Set the following option to the location of a postMessage window,
-    // to enable postMessage transport uploads:
+    /**
+     * Set the following option to the location of a postMessage window,
+     * to enable postMessage transport uploads:
+     */
     postMessage?: string;
 
-    // By default, XHR file uploads are sent as multipart/form-data.
-    // The iframe transport is always using multipart/form-data.
-    // Set to false to enable non-multipart XHR uploads:
+    /**
+     * By default, XHR file uploads are sent as multipart/form-data.
+     * The iframe transport is always using multipart/form-data.
+     * Set to false to enable non-multipart XHR uploads:
+     */
     multipart?: boolean;
 
-    // To upload large files in smaller chunks, set the following option
-    // to a preferred maximum chunk size. If set to 0, null or undefined,
-    // or the browser does not support the required Blob API, files will
-    // be uploaded as a whole.
+    /**
+     * To upload large files in smaller chunks, set the following option
+     * to a preferred maximum chunk size. If set to 0, null or undefined,
+     * or the browser does not support the required Blob API, files will
+     * be uploaded as a whole.
+     */
     maxChunkSize?: number;
 
-    // When a non-multipart upload or a chunked multipart upload has been
-    // aborted, this option can be used to resume the upload by setting
-    // it to the size of the already uploaded bytes. This option is most
-    // useful when modifying the options object inside of the "add" or
-    // "send" callbacks, as the options are cloned for each file upload.
+    /**
+     * When a non-multipart upload or a chunked multipart upload has been
+     * aborted, this option can be used to resume the upload by setting
+     * it to the size of the already uploaded bytes. This option is most
+     * useful when modifying the options object inside of the "add" or
+     * "send" callbacks, as the options are cloned for each file upload.
+     */
     uploadedBytes?: number;
 
-    // By default, failed (abort or error) file uploads are removed from the
-    // global progress calculation. Set the following option to false to
-    // prevent recalculating the global progress data:
+    /**
+     * By default, failed (abort or error) file uploads are removed from the
+     * global progress calculation. Set the following option to false to
+     * prevent recalculating the global progress data:
+     */
     recalculateProgress?: boolean;
 
-    // Interval in milliseconds to calculate and trigger progress events:
+    /**
+     * Interval in milliseconds to calculate and trigger progress events:
+     */
     progressInterval?: number;
 
-    // Interval in milliseconds to calculate progress bitrate:
+    /**
+     * Interval in milliseconds to calculate progress bitrate:
+     */
     bitrateInterval?: number;
 
-    // By default, uploads are started automatically when adding files:
+    /**
+     * By default, uploads are started automatically when adding files:
+     */
     autoUpload?: boolean;
 
-    // Error and info messages:
+    /**
+     * Error and info messages:
+     */
     messages?: any;
 
-    // Translation function, gets the message key to be translated
-    // and an object with context specific data as arguments:
+    /**
+     * Translation function, gets the message key to be translated
+     * and an object with context specific data as arguments:
+     */
     i18n?: any;
 
-    // Additional form data to be sent along with the file uploads can be set
-    // using this option, which accepts an array of objects with name and
-    // value properties, a function returning such an array, a FormData
-    // object (for XHR file uploads), or a simple object.
-    // The form of the first fileInput is given as parameter to the function:
+    /**
+     * Additional form data to be sent along with the file uploads can be set
+     * using this option, which accepts an array of objects with name and
+     * value properties, a function returning such an array, a FormData
+     * object (for XHR file uploads), or a simple object.
+     * The form of the first fileInput is given as parameter to the function:
+     */
     formData?: any;
 
-    // The add callback is invoked as soon as files are added to the fileupload
-    // widget (via file input selection, drag & drop, paste or add API call).
-    // If the singleFileUploads option is enabled, this callback will be
-    // called once for each file in the selection for XHR file uploads, else
-    // once for each file selection.
-    //
-    // The upload starts when the submit method is invoked on the data parameter.
-    // The data object contains a files property holding the added files
-    // and allows you to override plugin options as well as define ajax settings.
-    //
-    // Listeners for this callback can also be bound the following way:
-    // .bind('fileuploadadd', func);
-    //
-    // data.submit() returns a Promise object and allows to attach additional
-    // handlers using jQuery's Deferred callbacks:
-    // data.submit().done(func).fail(func).always(func);
+    /**
+     * The add callback is invoked as soon as files are added to the fileupload
+     * widget (via file input selection, drag & drop, paste or add API call).
+     * If the singleFileUploads option is enabled, this callback will be
+     * called once for each file in the selection for XHR file uploads, else
+     * once for each file selection.
+     *
+     * The upload starts when the submit method is invoked on the data parameter.
+     * The data object contains a files property holding the added files
+     * and allows you to override plugin options as well as define ajax settings.
+     *
+     * Listeners for this callback can also be bound the following way:
+     * .bind('fileuploadadd', func);
+     *
+     * data.submit() returns a Promise object and allows to attach additional
+     * handlers using jQuery's Deferred callbacks:
+     * data.submit().done(func).fail(func).always(func);
+     */
     add?: any;
 
     // The plugin options are used as settings object for the ajax calls.
@@ -148,6 +204,35 @@ interface JQueryFileInputOptions {
     contentType?: string;
 
     cache?: boolean;
+    timeout?: number;
+    
+    active?: Function;
+    progress?: Function;
+    send?: Function;
+
+    // Other callbacks:
+    submit?: Function;
+    done?: Function;
+    fail?: Function;
+    always?: Function;
+    progressall?: Function;
+    start?: Function;
+    stop?: Function;
+    change?: Function;
+    paste?: Function;
+    drop?: Function;
+    dragover?: Function;
+    chunksend?: Function;
+    chunkdone?: Function;
+    chunkfail?: Function;
+    chunkalways?: Function;
+
+    // Others 
+    url?: string;
+    files?: any;
+
+    // Cross-site XMLHttpRequest file uploads
+    xhrFields?: any;
 
 }
 
@@ -157,7 +242,9 @@ interface JQueryFileUpload extends JQuery  {
 
 interface JQuery {
     // Interface to the main method of jQuery File Upload
-    fileupload(settings: JQueryFileInputOptions): JQueryFileUpload;
+    fileupload(settings: JQueryFileInputOptions | string): JQueryFileUpload;
+    fileupload(action:string,  settings: JQueryFileInputOptions | string): JQueryFileUpload;
+    fileupload(action: string, message:string, settings: JQueryFileInputOptions | string): JQueryFileUpload;
 }
 
 interface JQuerySupport {
diff --git a/jquery.gridster/gridster-tests.ts b/jquery.gridster/gridster-tests.ts
index 72c90a6f0..3672c9555 100644
--- a/jquery.gridster/gridster-tests.ts
+++ b/jquery.gridster/gridster-tests.ts
@@ -16,7 +16,7 @@ var options: GridsterOptions = {
 	}
 };
 
-var gridster = <Gridster>$('.gridster ul').gridster(options).data('grister');
+var gridster: Gridster = $('.gridster ul').gridster(options).data('gridster');
 gridster.add_widget('<li class="new">The HTML of the widget...</li>', 2, 1);
 gridster.remove_widget($('gridster li').eq(3).get(0));
 var json = gridster.serialize<SerializeData>();
diff --git a/jquery.notifyBar/jquery.notifyBar.d.ts b/jquery.notifyBar/jquery.notifyBar.d.ts
index 22e012673..bbfb59bc3 100644
--- a/jquery.notifyBar/jquery.notifyBar.d.ts
+++ b/jquery.notifyBar/jquery.notifyBar.d.ts
@@ -18,6 +18,13 @@ declare module JQueryNotifyBar {
          */
         delay?: number;
 
+        /**
+         * How long this bar will be slided up and down.
+         *
+         * Default: "normal"
+         */
+        animationSpeed?: string | number;
+
         /**
          * Custom jQuery object for notify bar.
          */
diff --git a/jquery.pjax/jquery.pjax-tests.ts b/jquery.pjax/jquery.pjax-tests.ts
index 0df488130..6af27618e 100644
--- a/jquery.pjax/jquery.pjax-tests.ts
+++ b/jquery.pjax/jquery.pjax-tests.ts
@@ -47,11 +47,15 @@ function test_defauluts() {
         timeout: 650,
         push: true,
         replace: false,
+        maxCacheLength: 20,
+        version: $.noop,
+        scrollTo: 0,
         type: 'GET',
         dataType: 'html',
-        scrollTo: 0,
-        maxCacheLength: 20,
-        version: $.noop
+        container: "#pjax-container",
+        url: "https://jquery.com/",
+        target: <EventTarget>undefined,
+        fragment: "#pjax-response",
     };
 }
 
diff --git a/jquery.pjax/jquery.pjax.d.ts b/jquery.pjax/jquery.pjax.d.ts
index 1bd465b1e..bc7d39209 100644
--- a/jquery.pjax/jquery.pjax.d.ts
+++ b/jquery.pjax/jquery.pjax.d.ts
@@ -36,7 +36,28 @@ interface PjaxSettings extends JQueryAjaxSettings {
     /**
      * How many requests to cache. Defaults to 20.
      */
-     maxCacheLength?: number;
+    maxCacheLength?: number;
+
+    /**
+     * A string or function returning the current pjax version
+     */
+    version?: string | (() => string);
+
+    /**
+     * Vertical position to scroll to after navigation.
+     * To avoid changing scroll position, pass false.
+     */
+    scrollTo?: number | boolean;
+
+    /**
+     * Eventually the relatedTarget value for pjax events.
+     */
+    target?: EventTarget;
+
+    /**
+     * CSS selector for the fragment to extract from ajax response.
+     */
+    fragment?: string;
 }
 
 interface JQuery {
diff --git a/jquery.soap/jquery.soap-tests.ts b/jquery.soap/jquery.soap-tests.ts
new file mode 100644
index 000000000..acef40d8c
--- /dev/null
+++ b/jquery.soap/jquery.soap-tests.ts
@@ -0,0 +1,296 @@
+/// <reference path="jquery.soap.d.ts"/>
+
+$.soap({
+    url: 'http://my.server.com/soapservices/',
+    method: 'helloWorld',
+
+    data: {
+        name: 'Remy Blom',
+        msg: 'Hi!'
+    },
+
+    success: function(soapResponse) {
+        // do stuff with soapResponse
+        // if you want to have the response as JSON use soapResponse.toJSON();
+        // or soapResponse.toString() to get XML string
+        // or soapResponse.toXML() to get XML DOM
+    },
+    error: function(SOAPResponse) {
+        // show error
+    }
+});
+
+$.soap({
+    url: 'http://my.server.com/soapservices/',      //endpoint address for the service
+    method: 'helloWorld',                           // service operation name
+    // 1) will be appended to url if appendMethodToURL=true
+    // 2) will be used for request element name when building xml from JSON 'params' (unless 'elementName' is provided)
+    // 3) will be used to set SOAPAction request header if no SOAPAction is specified
+    appendMethodToURL: true,                        // method name will be appended to URL defaults to true
+    SOAPAction: 'action',                           // manually set the Request Header 'SOAPAction', defaults to the method specified above (optional)
+    soap12: false,                                  // use SOAP 1.2 namespace and HTTP headers - default to false
+    context: document.body,                          // Used to set this in beforeSend, success, error and data callback functions
+
+    // addional headers and namespaces
+    envAttributes: {                                // additional attributes (like namespaces) for the Envelope:
+        'xmlns:another': 'http://anotherNamespace.com/'
+    },
+    HTTPHeaders: {                                  // additional http headers send with the $.ajax call, will be given to $.ajax({ headers: })
+        'Authorization': 'Basic ' + btoa('user:pass')
+    },
+
+    //data can be XML DOM, XML String, JSON or a function
+    data: {                                         // JSON structure used to build request XML - SHOULD be coupled with ('namespaceQualifier' AND 'namespaceURL') AND ('method' OR 'elementName')
+        name: 'Remy Blom',
+        msg: 'Hi!'
+    },
+
+    //these options ONLY apply when the request XML is going to be built from JSON 'params'
+    namespaceQualifier: 'myns',                     // used as namespace prefix for all elements in request (optional)
+    namespaceURL: 'urn://service.my.server.com',    // namespace url added to parent request element (optional)
+    noPrefix: false,                                // set to true if you don't want the namespaceQualifier to be the prefix for the nodes in params. defaults to false (optional)
+    elementName: 'requestElementName',              // override 'method' as outer element (optional)
+
+    //callback functions
+    beforeSend: function(SOAPEnvelope) { },        // callback function - SOAPEnvelope object is passed back prior to ajax call (optional)
+    success: function(SOAPResponse) { },            // callback function to handle successful return (optional)
+    error: function(SOAPResponse) { },            // callback function to handle fault return (optional)
+    statusCode: {                                   // callback functions based on statusCode
+        404: function() {
+            console.log('404 Not Found')
+        },
+        200: function() {
+            console.log('200 OK')
+        }
+    },
+
+    // WS-Security
+    wss: {
+        username: 'user',
+        password: 'pass',
+        nonce: 'w08370jf7340qephufqp3r4',
+        created: new Date().getTime()
+    },
+
+    // debugging
+    enableLogging: false                            // to enable the local log function set to true, defaults to false (optional)
+})
+
+$.soap({
+
+}).done(function(data, textStatus, jqXHR) {
+    // do stuff on success here...
+}).fail(function(jqXHR, textStatus, errorThrown) {
+    // do stuff on error here...
+})
+
+$.soap({
+    url: 'http://my.server.com/soapservices/',
+    namespaceQualifier: 'myns',
+    namespaceURL: 'urn://service.my.server.com',
+    error: function(soapResponse) {
+        // show error
+    }
+});
+
+$.soap({
+    method: 'helloWorld',
+    data: {
+        name: 'Remy Blom',
+        msg: 'Hi!'
+    },
+    success: function(soapResponse) {
+        // do stuff with soapResponse
+    }
+});
+
+$.soap({
+    method: 'doSomethingElse',
+    data: {},
+    success: function(soapResponse) {
+        // do stuff with soapResponse
+    }
+});
+
+$.soap({
+    url: 'http://another.server.com/anotherService',
+    method: 'helloWorld',
+    data: {
+        name: 'Remy Blom',
+        msg: 'Hi!'
+    },
+    success: function(soapResponse) {
+        // do stuff with soapResponse
+    },
+    error: function(soapResponse) {
+        alert('that other server might be down...')
+    }
+});
+
+$.soap({
+    // other parameters..
+
+    // WS-Security
+    wss: {
+        username: 'user',
+        password: 'pass',
+        nonce: 'w08370jf7340qephufqp3r4',
+        created: new Date().getTime()
+    }
+});
+
+var username = 'foo';
+var password = 'bar';
+
+$.soap({
+    // other parameters...
+
+    HTTPHeaders: {
+        Authorization: 'Basic ' + btoa(username + ':' + password)
+    }
+});
+
+// jquery.soap/doc/options.md
+
+$.soap({
+    url: 'http://server.com/webServices/',
+    method: 'getItem',
+    appendMethodToURL: false
+})
+
+$.soap({
+    beforeSend: function(SOAPEnvelope) {
+        console.log(SOAPEnvelope.toString());
+    }
+});
+
+$.soap({
+    context: document.body,
+    success: function(SOAPResponse) {
+        console.log(this);
+    }
+});
+
+var xml =
+    ['<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope/">',
+        '<soap:Body>',
+        '<requestNode>',
+        '</requestNode>',
+        '</soap:Body>',
+        '</soap:Envelope>'];
+
+$.soap({
+    data: xml.join('')
+});
+
+$.soap({
+    method: 'requestNode',
+    data: {
+        name: 'Remy Blom',
+        msg: 'Hi!'
+    }
+});
+
+$.soap({
+    envAttributes: {
+        'xmlns:another': 'http://anotherNamespace.com/'
+    }
+})
+
+$.soap({
+    method: 'helloWorld',
+    elementName: 'requestNode'
+})
+
+$.soap({
+    enableLogging: true
+})
+
+$.soap({
+    error: function(SOAPResponse) {
+        console.log(SOAPResponse.toString())
+    }
+})
+
+$.soap({
+    HTTPHeaders: {
+        'Authorization': 'Basic ' + btoa('user:pass')
+    }
+})
+
+$.soap({
+    url: 'http://server.com/webServices/',
+    method: 'getItem'
+})
+
+$.soap({
+    method: 'helloWorld',
+    namespaceQualifier: 'myns',
+    namespaceURL: 'urn://service.my.server.com'
+})
+
+$.soap({
+    method: 'helloWorld',
+    namespaceQualifier: 'myns',
+    namespaceURL: 'urn://service.my.server.com'
+})
+
+$.soap({
+    method: 'helloWorld',
+    namespaceQualifier: 'myns',
+    namespaceURL: 'urn://service.my.server.com',
+    noPrefix: true
+})
+
+$.soap({
+    request: function(SOAPEnvelope) {
+        console.log(SOAPEnvelope.toString());
+    }
+})
+
+$.soap({
+    soap12: true
+})
+
+$.soap({
+    url: 'http://server.com/webServices/',
+    method: 'getItem',
+    SOAPAction: 'getAnItem'
+})
+
+$.soap({
+    SOAPHeader: {
+        test: [1, 2, 3]
+    }
+})
+
+$.soap({
+    statusCode: {
+        404: function() {
+            console.log('404 Not Found')
+        },
+        200: function() {
+            console.log('200 OK')
+        }
+    }
+})
+
+$.soap({
+    success: function(SOAPResponse) {
+        console.log(SOAPResponse.toString());
+    }
+})
+
+$.soap({
+    url: 'http://server.com/webServices/',
+    method: 'getItem'
+})
+
+$.soap({
+    wss: {
+        username: 'user',
+        password: 'pass',
+        nonce: 'w08370jf7340qephufqp3r4',
+        created: new Date().getTime()
+    }
+})
\ No newline at end of file
diff --git a/jquery.soap/jquery.soap.d.ts b/jquery.soap/jquery.soap.d.ts
new file mode 100644
index 000000000..7b7eeedbb
--- /dev/null
+++ b/jquery.soap/jquery.soap.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for jQuery.SOAP 1.6.7
+// Project: https://github.com/doedje/jquery.soap
+// Definitions by: Roland Greim <https://github.com/tigerxy>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped/
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+declare module JQuerySOAP {
+    interface SOAPEnvelope {
+        attributes: Object
+        bodies: Array<SOAPObject>
+        headers: Array<SOAPObject>
+        prefix: string
+        soapConfig: any
+        typeOf: string
+        addAttribute(name: String, value: string): void
+        addAttribute(name: String, value: number): void
+        addBody(soapObject: SOAPObject): void
+        addHeader(soapObject: SOAPObject): void
+        addNamespace(name: String, uri: string): void
+        toString(): string
+        send(options: Options): void
+    }
+    interface SOAPResponse {
+        toJSON(): any
+        toString(): String
+        toXML(): XMLDocument
+    }
+
+    interface SOAPObject {
+        attributes: Object
+        children: Array<SOAPObject>
+        name: string
+        ns: Object
+        _parent: SOAPObject
+        value: any
+        typeOf: string
+        addNamespace(name: String, url: string): void
+        addParameter(name: String, value: string): void
+        addParameter(name: String, value: number): void
+        appendChild(soapObject: SOAPObject): SOAPObject
+        attr(name: string, value: string): Object
+        attr(name: string, value: number): Object
+        end(): SOAPObject
+        find(name: string): SOAPObject
+        hasChildren(): boolean
+        newChild(name: string): SOAPObject
+        parent(): SOAPObject
+        toString(): string
+        val(value: string): SOAPObject
+        val(value: number): SOAPObject
+    }
+    interface Options {
+        appendMethodToURL?: boolean;
+        async?: boolean;
+        beforeSend?: (SOAPEnvelope: SOAPEnvelope) => void;
+        context?: any;
+        data?: Object;
+        envAttributes?: any;
+        elementName?: string;
+        enableLogging?: boolean;
+        error?: (SOAPResponse: SOAPResponse) => void;
+        HTTPHeaders?: Object;
+        method?: string;
+        namespaceQualifier?: string;
+        namespaceURL?: string;
+        noPrefix?: boolean;
+        request?: (SOAPEnvelope: SOAPEnvelope) => void;
+        soap12?: boolean;
+        SOAPAction?: string;
+        SOAPHeader?: Object;
+        statusCode?: Object;
+        success?: (SOAPResponse: SOAPResponse) => void;
+        url?: string;
+        wss?: Object;
+    }
+    interface SOAP {
+        (options?: Options): JQueryXHR;
+    }
+}
+interface JQueryStatic {
+    soap: JQuerySOAP.SOAP;
+}
diff --git a/jquery.timepicker/jquery.timepicker.d.ts b/jquery.timepicker/jquery.timepicker.d.ts
index 13a6d2e69..398813b9e 100644
--- a/jquery.timepicker/jquery.timepicker.d.ts
+++ b/jquery.timepicker/jquery.timepicker.d.ts
@@ -7,68 +7,90 @@
 /// <reference path="../jqueryui/jqueryui.d.ts"/>
 
 interface TimePickerHour {
-    starts?: number;                   // first displayed hour
-    ends?: number;                     // last displayed hour
+    /** first displayed hour */
    starts?: number;
+    /** last displayed hour */
    ends?: number;
 }
 
 interface TimePickerMinutes {
-    starts?: number;                  // first displayed minute
-    ends?: number;                  // last displayed minute
-    interval?: number;                 // interval of displayed minutes
+    /** first displayed minute */
    starts?: number;
+    /** last displayed minute */
    ends?: number;
+    /** interval of displayed minutes */
    interval?: number;
 }
 
 interface TimePickerOptions {
-    showOn?: string;   // 'focus' for popup on focus,
-    // 'button' for trigger button, or 'both' for either (not yet implemented)
-    button?: string;                   // 'button' element that will trigger the timepicker
-    showAnim?: string;             // Name of jQuery animation for popup
-    showOptions?: any;                // Options for enhanced animations
-    appendText?: string;               // Display text following the input box, e.g. showing the format
+    /** 'focus' for popup on focus, */
    showOn?: string;
+    
+    /**
     * 'button' element that will trigger the timepicker.
     *
     * "button" for trigger button, or "both" for either (not yet implemented).
     */
    button?: string;
+
+    // Localization
+
+    /** Define the locale text for "Hours" */
+    hourText?: string;
+
+    /** Define the locale text for "Minute" */
+    minuteText?: string;
+
+    /** Define the locale text for periods. */
+    amPmText?: [string, string];
+
+    /** Name of jQuery animation for popup */
    showAnim?: string;
+    /** Options for enhanced animations */
    showOptions?: any;
+    /** Display text following the input box, e.g. showing the format */
    appendText?: string;
 
-    beforeShow?: () => any;                          // Define a callback function executed before the timepicker is shown
-    onSelect?: (timeText: string, inst: any) => any; // Define a callback function when a hour / minutes is selected
-    onClose?: (timeText: string, inst: any) => any;  // Define a callback function when the timepicker is closed
+    /** Define a callback function executed before the timepicker is shown */
    beforeShow?: () => any;
+    /** Define a callback function when a hour / minutes is selected */
    onSelect?: (timeText: string, inst: any) => any;
+    /** Define a callback function when the timepicker is closed */
    onClose?: (timeText: string, inst: any) => any;
+
+    /** The character to use to separate hours and minutes. */
    timeSeparator?: string;
+    /** The character to use to separate the time from the time period. */
    periodSeparator?: string;
+    /** Define whether or not to show AM/PM with selected time */
    showPeriod?: boolean;
+    /** Show the AM/PM labels on the left of the time picker */
    showPeriodLabels?: boolean;
+    /** Define whether or not to show a leading zero for hours < 10. [true/false] */
    showLeadingZero?: boolean;
+    /** Define whether or not to show a leading zero for minutes < 10. */
    showMinutesLeadingZero?: boolean;
+    /** Selector for an alternate field to store selected time into */
    altField?: string;
+    /**
     * Used as default time when input field is empty or for inline timePicker
     * (set to 'now' for the current time, '' for no highlighted time)
     **/
    defaultTime?: string;
+    /**
     * Position of the dialog relative to the input.
     *
     * See the position utility for more info : http://jqueryui.com/demos/position/
     */
    myPosition?: string;
+    /**
     * Position of the input element to match
     *
     * Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
     * See the position utility for more info : http://jqueryui.com/demos/position/
     */
    atPosition?: string;
 
-    timeSeparator?: string;               // The character to use to separate hours and minutes.
-    periodSeparator?: string;           // The character to use to separate the time from the time period.
-    showPeriod?: boolean;                 // Define whether or not to show AM/PM with selected time
-    showPeriodLabels?: boolean;        // Show the AM/PM labels on the left of the time picker
-    showLeadingZero?: boolean;            // Define whether or not to show a leading zero for hours < 10. [true/false]
-    showMinutesLeadingZero?: boolean;      // Define whether or not to show a leading zero for minutes < 10.
-    altField?: string;                     // Selector for an alternate field to store selected time into
-    defaultTime?: string;              // Used as default time when input field is empty or for inline timePicker
-    // (set to 'now' for the current time, '' for no highlighted time)
-    myPosition?: string;           // Position of the dialog relative to the input.
-    // see the position utility for more info : http://jqueryui.com/demos/position/
-    atPosition?: string;       // Position of the input element to match
-    // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
     //NEW: 2011-02-03
-    onHourShow?: () => any;   		    // callback for enabling / disabling on selectable hours  ex : function(hour) { return true; }
-    onMinuteShow?: () => any;                // callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; }
+    /** callback for enabling / disabling on selectable hours  ex : function(hour) { return true; } */
    onHourShow?: () => any;
+    /** callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; } */
    onMinuteShow?: () => any;
 
     hours?: TimePickerHour;
     minutes?: TimePickerMinutes;
-    rows?: number;                        // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
+
+    /** number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2 */
    rows?: number;
     // 2011-08-05 0.2.4
-    showHours?: boolean;                // display the hours section of the dialog
-    showMinutes?: boolean;              // display the minute section of the dialog
-    optionalMinutes?: boolean;        // optionally parse inputs of whole hours with minutes omitted
+    /** display the hours section of the dialog */
    showHours?: boolean;
+    /** display the minute section of the dialog */
    showMinutes?: boolean;
+    /** optionally parse inputs of whole hours with minutes omitted */
    optionalMinutes?: boolean;
 
     // buttons
-    showCloseButton?: boolean;       // shows an OK button to confirm the edit
-    showNowButton?: boolean;          // Shows the 'now' button
-    showDeselectButton?: boolean;       // Shows the deselect time button
+    /** shows an OK button to confirm the edit */
    showCloseButton?: boolean;
+
+    /** Text for the confirmation button (ok button).*/
+    closeButtonText?: string;
+
+    /** Shows the 'now' button */
    showNowButton?: boolean;
+
+    /** Text for the 'now' button.*/
+    nowButtonText?: string;
+
+    /** Shows the deselect time button */
    showDeselectButton?: boolean;
+
+    /** Text for the deselect button */
+    deselectButtonText?: string;
 }
 
 
 interface JQuery {
     timepicker(): JQuery;
-    timepicker(options: TimePickerOptions): JQuery;
-    timepicker(methodName: string): any;
     timepicker(methodName: 'getTime'): string;
     timepicker(methodName: 'getTimeAsDate'): Date;
     timepicker(methodName: 'getHour'): number;
     timepicker(methodName: 'getMinute'): number;
+    timepicker(methodName: string): any;
     timepicker(methodName: string, methodParameter: any): any;
     timepicker(optionLiteral: string, optionName: string): any;
+    timepicker(options: TimePickerOptions): JQuery;
 }
diff --git a/jquery.uniform/jquery.uniform.d.ts b/jquery.uniform/jquery.uniform.d.ts
index 4b3ff0d0d..d5eee3e47 100644
--- a/jquery.uniform/jquery.uniform.d.ts
+++ b/jquery.uniform/jquery.uniform.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../jquery/jquery.d.ts" />
 
-interface UniformOptions {
+interface UniformCoreOptions {
     activeClass?: string;
     autoHide?: boolean;
     buttonClass?: string;
@@ -22,6 +22,7 @@ interface UniformOptions {
     hoverClass?: string;
     idPrefix?: string;
     inputAddTypeAsClass?: boolean;
+    inputClass?: string;
     radioClass?: string;
     resetDefaultHtml?: string;
     resetSelector?: any;
@@ -33,12 +34,17 @@ interface UniformOptions {
     useID?: boolean;
     wrapperClass?: string;
 }
+
+interface UniformOptions extends UniformCoreOptions {
+    [option: string]: any;
+}
+
 interface Uniform {
     (options?: UniformOptions): JQuery;
     update(elemOrSelector?: any): void;
     restore(elemOrSelector?: any): void;
     elements: JQuery[];
-	defaults: UniformOptions;
+    defaults: UniformOptions;
 }
 interface JQueryStatic {
     uniform: Uniform;
diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts
index 1a9a6dd26..0ba33c193 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -1136,6 +1136,13 @@ function test_jQuery_removeData() {
     $("span:eq(3)").text("" + jQuery.data(div, "test2"));
 }
 
+function test_removeDataAll() {
+    var el = $("div");
+    el.data("test1", "VALUE-1");
+    el.data("test2", "VALUE-2");
+    el.removeData();
+}
+
 function test_dblclick() {
     $('#target').dblclick(function () {
         alert('Handler for .dblclick() called.');
@@ -3359,7 +3366,7 @@ function test_promise_then_change_type() {
 		var def = $.Deferred<any>();
 		var promise = def.promise(null);
 
-		def.rejectWith(this, new Error());
+		def.rejectWith(this, [new Error()]);
 
 		return promise;
 	}
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index dc5c4ebb6..5beb4e4af 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -185,6 +185,10 @@ interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
      * Property containing the parsed response if the response Content-Type is json
      */
     responseJSON?: any;
+    /**
+     * A function to be called if the request fails.
+     */
+    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
 }
 
 /**
@@ -237,7 +241,7 @@ interface JQueryCallback {
      * @param context A reference to the context in which the callbacks in the list should be fired.
      * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
      */
-    fireWith(context?: any, ...args: any[]): JQueryCallback;
+    fireWith(context?: any, args?: any[]): JQueryCallback;
 
     /**
      * Determine whether a supplied callback is in a list
@@ -391,7 +395,7 @@ interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
      * @param context Context passed to the progressCallbacks as the this object.
      * @param args Optional arguments that are passed to the progressCallbacks.
      */
-    notifyWith(context: any, value?: any, ...args: any[]): JQueryDeferred<T>;
+    notifyWith(context: any, value?: any[]): JQueryDeferred<T>;
 
     /**
      * Reject a Deferred object and call any failCallbacks with the given args.
@@ -405,7 +409,7 @@ interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
      * @param context Context passed to the failCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the failCallbacks.
      */
-    rejectWith(context: any, value?: any, ...args: any[]): JQueryDeferred<T>;
+    rejectWith(context: any, value?: any[]): JQueryDeferred<T>;
 
     /**
      * Resolve a Deferred object and call any doneCallbacks with the given args.
@@ -421,7 +425,7 @@ interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
      * @param context Context passed to the doneCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the doneCallbacks.
      */
-    resolveWith(context: any, value?: T, ...args: any[]): JQueryDeferred<T>;
+    resolveWith(context: any, value?: T[]): JQueryDeferred<T>;
 
     /**
      * Return a Deferred's Promise object.
@@ -1541,18 +1545,18 @@ interface JQuery {
      * @param value The new data value; it can be any Javascript type including Array or Object.
      */
     data(key: string, value: any): JQuery;
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param obj An object of key-value pairs of data to update.
-     */
-    data(obj: { [key: string]: any; }): JQuery;
     /**
      * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
      *
      * @param key Name of the data stored.
      */
     data(key: string): any;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     */
+    data(obj: { [key: string]: any; }): JQuery;
     /**
      * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
      */
@@ -1577,6 +1581,10 @@ interface JQuery {
      * @param list An array of strings naming the pieces of data to delete.
      */
     removeData(list: string[]): JQuery;
+    /**
+     * Remove all previously-stored piece of data.
+     */
+    removeData(): JQuery;
 
     /**
      * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
@@ -1994,6 +2002,10 @@ interface JQuery {
      */
     focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
 
+    /**
+     * Trigger the "focusin" event on an element.
+     */
+    focusin(): JQuery;
     /**
      * Bind an event handler to the "focusin" JavaScript event
      *
@@ -2008,6 +2020,10 @@ interface JQuery {
      */
     focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
 
+    /**
+     * Trigger the "focusout" event on an element.
+     */
+    focusout(): JQuery;
     /**
      * Bind an event handler to the "focusout" JavaScript event
      *
diff --git a/jquerymobile/jquerymobile.d.ts b/jquerymobile/jquerymobile.d.ts
index f07c73fc3..ad722fdb1 100644
--- a/jquerymobile/jquerymobile.d.ts
+++ b/jquerymobile/jquerymobile.d.ts
@@ -161,7 +161,7 @@ interface CheckboxRadioOptions {
 }
 
 interface CheckboxRadioEvents {
-    createp?: JQueryMobileEvent;
+    create?: JQueryMobileEvent;
 }
 
 interface SelectMenuOptions {
@@ -171,6 +171,7 @@ interface SelectMenuOptions {
     iconshadow?: boolean;
     initSelector?: string;
     inline?: boolean;
+    hidePlaceholderMenuItems: boolean;
     mini?: boolean;
     nativeMenu?: boolean;
     overlayTheme?: string;
@@ -184,7 +185,11 @@ interface SelectMenuEvents {
 }
 
 interface ListViewOptions {
+    autodividers?: boolean;
+    autodividersSelector?: (jq?: JQuery) => string;
     countTheme?: string;
+    defaults?: boolean;
+    disabled?: boolean;
     dividerTheme?: string;
     filter?: boolean;
     filterCallback?: Function;
@@ -459,8 +464,8 @@ interface JQuery {
     selectmenu(): JQuery;
     selectmenu(command: string): JQuery;
     selectmenu(command: string, update: boolean): JQuery;
-    selectmenu(options: CheckboxRadioOptions): JQuery;
-    selectmenu(events: CheckboxRadioEvents): JQuery;
+    selectmenu(options: SelectMenuOptions): JQuery;
+    selectmenu(events: SelectMenuEvents): JQuery;
 
     listview(): JQuery;
     listview(command: string): JQuery;
diff --git a/jqueryui/jqueryui-tests.ts b/jqueryui/jqueryui-tests.ts
index ef02b40d6..bc84cb475 100644
--- a/jqueryui/jqueryui-tests.ts
+++ b/jqueryui/jqueryui-tests.ts
@@ -769,13 +769,7 @@ function test_autocomplete() {
             $("#project-icon").attr("src", "images/" + ui.item.icon);
             return false;
         }
-    })
-    .data("autocomplete")._renderItem = (ul, item) => {
-        return $("<li>")
-            .data("item.autocomplete", item)
-            .append("<a>" + item.label + "<br>" + item.desc + "</a>")
-            .appendTo(ul);
-    };
+    });
 
     $("#developer").autocomplete({
         source: (request, response) => {
@@ -1425,12 +1419,13 @@ function test_dialog() {
         height: 300,
         width: 350,
         modal: true,
-        buttons: {},
-        Cancel: function () {
-            $(this).dialog("close");
-        },
-        close: function () {
-		    var $el = $(this).dialog("destroy");
+        buttons: {
+            Cancel: function () {
+                $(this).dialog("close");
+            },
+            close: function () {
+                var $el = $(this).dialog("destroy");
+            }
         }
     });
     $("#dialog-message").dialog({
@@ -1443,6 +1438,7 @@ function test_dialog() {
     });
     $(".selector").dialog({ autoOpen: false });
     $(".selector").dialog({ buttons: { Ok: function () { $(this).dialog("close"); } } });
+    $(".selector").dialog({ buttons: [ { text: "Ok", click: function () { $(this).dialog("close"); } } ] } );
     $(".selector").dialog({ closeOnEscape: false });
     $(".selector").dialog({ closeText: "hide" });
     $(".selector").dialog({ dialogClass: "alert" });
@@ -1581,7 +1577,7 @@ function test_spinner() {
         min: 5,
         max: 2500,
         step: 25,
-        start: 1000,
+        start: function () { return; },
         numberFormat: "C"
     });
     $("#spinner").spinner({
@@ -1595,8 +1591,8 @@ function test_spinner() {
     });
     $("#lat, #lng").spinner({
         step: .001,
-        change: 123,
-        stop: 321
+        change() { },
+        stop() { },
     });
     $("#spinner").spinner({
         spin: function (event, ui) {
@@ -1647,11 +1643,11 @@ function test_tabs() {
     });
     $("#tabs").tabs({
         beforeLoad: function (event, ui) {
-            ui.jqXHR.error(function () {
+            ui.jqXHR.error = function () {
                 ui.panel.html(
                     "Couldn't load this tab. We'll try to fix this as soon as possible. " +
                     "If this wouldn't be a demo.");
-            });
+            };
         }
     });
     $("#tabs").tabs({
@@ -1764,7 +1760,6 @@ function test_effects() {
         of: $("#parent"),
         my: $("#my_horizontal").val() + " " + $("#my_vertical").val(),
         at: $("#at_horizontal").val() + " " + $("#at_vertical").val(),
-        offset: $("#offset").val(),
         collision: $("#collision_horizontal").val() + " " + $("#collision_vertical").val()
     });
     $("#toggle").toggle({ effect: "scale", direction: "horizontal" });
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index 10a4e7159..a49a779e2 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -9,7 +9,7 @@
 declare module JQueryUI {
     // Accordion //////////////////////////////////////////////////
 
-    interface AccordionOptions {
+    interface AccordionOptions extends AccordionEvents {
         active?: any; // boolean or number
         animate?: any; // boolean, number, string or object
         collapsible?: boolean;
@@ -37,13 +37,13 @@ declare module JQueryUI {
         create?: AccordionEvent;
     }
 
-    interface Accordion extends Widget, AccordionOptions, AccordionEvents {
+    interface Accordion extends Widget, AccordionOptions {
     }
 
 
     // Autocomplete //////////////////////////////////////////////////
 
-    interface AutocompleteOptions {
+    interface AutocompleteOptions extends AutocompleteEvents {
         appendTo?: any; //Selector;
         autoFocus?: boolean;
         delay?: number;
@@ -54,7 +54,10 @@ declare module JQueryUI {
     }
 
     interface AutocompleteUIParams {
-
+        /**
+         * The item selected from the menu, if any. Otherwise the property is null
+         */
+        item?: any;
     }
 
     interface AutocompleteEvent {
@@ -72,7 +75,7 @@ declare module JQueryUI {
         select?: AutocompleteEvent;
     }
 
-    interface Autocomplete extends Widget, AutocompleteOptions, AutocompleteEvents {
+    interface Autocomplete extends Widget, AutocompleteOptions {
         escapeRegex: (value: string) => string;
     }
 
@@ -83,7 +86,8 @@ declare module JQueryUI {
         disabled?: boolean;
         icons?: any;
         label?: string;
-        text?: boolean;
+        text?: string|boolean;
+        click?: (event?: Event) => void;
     }
 
     interface Button extends Widget, ButtonOptions {
@@ -336,15 +340,16 @@ declare module JQueryUI {
 
     // Dialog //////////////////////////////////////////////////
 
-    interface DialogOptions {
+    interface DialogOptions extends DialogEvents {
         autoOpen?: boolean;
-        buttons?: any; // object or []
+        buttons?: { [buttonText: string]: (event?: Event) => void } | DialogButtonOptions[];
         closeOnEscape?: boolean;
         closeText?: string;
         dialogClass?: string;
         disabled?: boolean;
         draggable?: boolean;
-        height?: any; // number or string
+        height?: number | string;
+        hide?: boolean | number | string | DialogShowHideOptions;
         maxHeight?: number;
         maxWidth?: number;
         minHeight?: number;
@@ -352,7 +357,7 @@ declare module JQueryUI {
         modal?: boolean;
         position?: any; // object, string or []
         resizable?: boolean;
-        show?: any; // number, string or object
+        show?: boolean | number | string | DialogShowHideOptions;
         stack?: boolean;
         title?: string;
         width?: any; // number or string
@@ -361,6 +366,21 @@ declare module JQueryUI {
         close?: DialogEvent;
     }
 
+    interface DialogButtonOptions {
+        icons?: any;
+        showText?: string | boolean;
+        text?: string;
+        click?: (eventObject: JQueryEventObject) => any;
+        [attr: string]: any; // attributes for the <button> element
+    }
+
+    interface DialogShowHideOptions {
+        effect: string;
+        delay?: number;
+        duration?: number;
+        easing?: string;
+    }
+
     interface DialogUIParams {
     }
 
@@ -382,7 +402,7 @@ declare module JQueryUI {
         resizeStop?: DialogEvent;
     }
 
-    interface Dialog extends Widget, DialogOptions, DialogEvents {
+    interface Dialog extends Widget, DialogOptions {
     }
 
 
@@ -398,7 +418,7 @@ declare module JQueryUI {
         (event: Event, ui: DraggableEventUIParams): void;
     }
 
-    interface DraggableOptions {
+    interface DraggableOptions extends DraggableEvents {
         disabled?: boolean;
         addClasses?: boolean;
         appendTo?: any;
@@ -453,7 +473,7 @@ declare module JQueryUI {
         (event: Event, ui: DroppableEventUIParam): void;
     }
 
-    interface DroppableOptions {
+    interface DroppableOptions extends DroppableEvents {
         disabled?: boolean;
         accept?: any;
         activeClass?: string;
@@ -472,7 +492,7 @@ declare module JQueryUI {
         drop?: DroppableEvent;
     }
 
-    interface Droppable extends Widget, DroppableOptions, DroppableEvents {
+    interface Droppable extends Widget, DroppableOptions {
     }
 
     // Menu //////////////////////////////////////////////////
@@ -505,9 +525,10 @@ declare module JQueryUI {
 
     // Progressbar //////////////////////////////////////////////////
 
-    interface ProgressbarOptions {
+    interface ProgressbarOptions extends ProgressbarEvents {
         disabled?: boolean;
         value?: number | boolean;
+        max?: number;
     }
 
     interface ProgressbarUIParams {
@@ -523,13 +544,13 @@ declare module JQueryUI {
         create?: ProgressbarEvent;
     }
 
-    interface Progressbar extends Widget, ProgressbarOptions, ProgressbarEvents {
+    interface Progressbar extends Widget, ProgressbarOptions {
     }
 
 
     // Resizable //////////////////////////////////////////////////
 
-    interface ResizableOptions {
+    interface ResizableOptions extends ResizableEvents {
         alsoResize?: any; // Selector, JQuery or Element
         animate?: boolean;
         animateDuration?: any; // number or string
@@ -571,13 +592,13 @@ declare module JQueryUI {
         stop?: ResizableEvent;
     }
 
-    interface Resizable extends Widget, ResizableOptions, ResizableEvents {
+    interface Resizable extends Widget, ResizableOptions {
     }
 
 
     // Selectable //////////////////////////////////////////////////
 
-    interface SelectableOptions {
+    interface SelectableOptions extends SelectableEvents {
         autoRefresh?: boolean;
         cancel?: string;
         delay?: number;
@@ -596,12 +617,12 @@ declare module JQueryUI {
         unselecting? (event: Event, ui: { unselecting: Element; }): void;
     }
 
-    interface Selectable extends Widget, SelectableOptions, SelectableEvents {
+    interface Selectable extends Widget, SelectableOptions {
     }
 
     // Slider //////////////////////////////////////////////////
 
-    interface SliderOptions {
+    interface SliderOptions extends SliderEvents {
         animate?: any; // boolean, string or number
         disabled?: boolean;
         max?: number;
@@ -631,7 +652,7 @@ declare module JQueryUI {
         stop?: SliderEvent;
     }
 
-    interface Slider extends Widget, SliderOptions, SliderEvents {
+    interface Slider extends Widget, SliderOptions {
     }
 
 
@@ -652,6 +673,7 @@ declare module JQueryUI {
         forceHelperSize?: boolean;
         forcePlaceholderSize?: boolean;
         grid?: number[];
+        helper?: string | ((event: Event, element: Sortable) => Element);
         handle?: any; // Selector or Element
         items?: any; // Selector
         opacity?: number;
@@ -699,7 +721,7 @@ declare module JQueryUI {
 
     // Spinner //////////////////////////////////////////////////
 
-    interface SpinnerOptions {
+    interface SpinnerOptions extends SpinnerEvents {
         culture?: string;
         disabled?: boolean;
         icons?: any;
@@ -711,26 +733,29 @@ declare module JQueryUI {
         step?: any; // number or string
     }
 
-    interface SpinnerUIParams {
+    interface SpinnerUIParam {
+        value: number;
     }
 
-    interface SpinnerEvent {
-        (event: Event, ui: SpinnerUIParams): void;
+    interface SpinnerEvent<T> {
+        (event: Event, ui: T): void;
     }
 
     interface SpinnerEvents {
-        spin?: SpinnerEvent;
-        start?: SpinnerEvent;
-        stop?: SpinnerEvent;
+        change?: SpinnerEvent<{}>;
+        create?: SpinnerEvent<{}>;
+        spin?: SpinnerEvent<SpinnerUIParam>;
+        start?: SpinnerEvent<{}>;
+        stop?: SpinnerEvent<{}>;
     }
 
-    interface Spinner extends Widget, SpinnerOptions, SpinnerEvents {
+    interface Spinner extends Widget, SpinnerOptions {
     }
 
 
     // Tabs //////////////////////////////////////////////////
 
-    interface TabsOptions {
+    interface TabsOptions extends TabsEvents {
         active?: any; // boolean or number
         collapsible?: boolean;
         disabled?: any; // boolean or []
@@ -738,35 +763,46 @@ declare module JQueryUI {
         heightStyle?: string;
         hide?: any; // boolean, number, string or object
         show?: any; // boolean, number, string or object
-
-        activate?: TabsEvent;
     }
 
-    interface TabsUIParams {
+    interface TabsActivationUIParams {
         newTab: JQuery;
         oldTab: JQuery;
         newPanel: JQuery;
         oldPanel: JQuery;
     }
 
-    interface TabsEvent {
-        (event: Event, ui: TabsUIParams): void;
+    interface TabsBeforeLoadUIParams {
+        tab: JQuery;
+        panel: JQuery;
+        jqXHR: JQueryXHR;
+        ajaxSettings: any;
+    }
+
+    interface TabsCreateOrLoadUIParams {
+        tab: JQuery;
+        panel: JQuery;
+    }
+
+    interface TabsEvent<UI> {
+        (event: Event, ui: UI): void;
     }
 
     interface TabsEvents {
-        activate?: TabsEvent;
-        beforeActivate?: TabsEvent;
-        beforeLoad?: TabsEvent;
-        load?: TabsEvent;
+        activate?: TabsEvent<TabsActivationUIParams>;
+        beforeActivate?: TabsEvent<TabsActivationUIParams>;
+        beforeLoad?: TabsEvent<TabsBeforeLoadUIParams>;
+        load?: TabsEvent<TabsCreateOrLoadUIParams>;
+        create?: TabsEvent<TabsCreateOrLoadUIParams>;
     }
 
-    interface Tabs extends Widget, TabsOptions, TabsEvents {
+    interface Tabs extends Widget, TabsOptions {
     }
 
 
     // Tooltip //////////////////////////////////////////////////
 
-    interface TooltipOptions {
+    interface TooltipOptions extends TooltipEvents {
         content?: any; // () or string
         disabled?: boolean;
         hide?: any; // boolean, number, string or object
@@ -789,7 +825,7 @@ declare module JQueryUI {
         open?: TooltipEvent;
     }
 
-    interface Tooltip extends Widget, TooltipOptions, TooltipEvents {
+    interface Tooltip extends Widget, TooltipOptions {
     }
 
 
@@ -798,7 +834,7 @@ declare module JQueryUI {
     interface EffectOptions {
         effect: string;
         easing?: string;
-        duration: any;
+        duration?: number;
         complete: Function;
     }
 
@@ -1569,29 +1605,32 @@ interface JQuery {
     droppable(optionLiteral: string, options: JQueryUI.DraggableOptions): any;
     droppable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
 
-    menu(): JQuery;
-    menu(methodName: 'blur'): void;
-    menu(methodName: 'collapse', event?: JQueryEventObject): void;
-    menu(methodName: 'collapseAll', event?: JQueryEventObject, all?: boolean): void;
-    menu(methodName: 'destroy'): void;
-    menu(methodName: 'disable'): void;
-    menu(methodName: 'enable'): void;
-    menu(methodName: string, event: JQueryEventObject, item: JQuery): void;
-    menu(methodName: 'focus', event: JQueryEventObject, item: JQuery): void;
-    menu(methodName: 'isFirstItem'): boolean;
-    menu(methodName: 'isLastItem'): boolean;
-    menu(methodName: 'next', event?: JQueryEventObject): void;
-    menu(methodName: 'nextPage', event?: JQueryEventObject): void;
-    menu(methodName: 'previous', event?: JQueryEventObject): void;
-    menu(methodName: 'previousPage', event?: JQueryEventObject): void;
-    menu(methodName: 'refresh'): void;
-    menu(methodName: 'select', event?: JQueryEventObject): void;
-    menu(methodName: 'widget'): JQuery;
-    menu(methodName: string): JQuery;
-    menu(options: JQueryUI.MenuOptions): JQuery;
-    menu(optionLiteral: string, optionName: string): any;
-    menu(optionLiteral: string, options: JQueryUI.MenuOptions): any;
-    menu(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+    menu: {
+        (): JQuery;
+        (methodName: 'blur'): void;
+        (methodName: 'collapse', event?: JQueryEventObject): void;
+        (methodName: 'collapseAll', event?: JQueryEventObject, all?: boolean): void;
+        (methodName: 'destroy'): void;
+        (methodName: 'disable'): void;
+        (methodName: 'enable'): void;
+        (methodName: string, event: JQueryEventObject, item: JQuery): void;
+        (methodName: 'focus', event: JQueryEventObject, item: JQuery): void;
+        (methodName: 'isFirstItem'): boolean;
+        (methodName: 'isLastItem'): boolean;
+        (methodName: 'next', event?: JQueryEventObject): void;
+        (methodName: 'nextPage', event?: JQueryEventObject): void;
+        (methodName: 'previous', event?: JQueryEventObject): void;
+        (methodName: 'previousPage', event?: JQueryEventObject): void;
+        (methodName: 'refresh'): void;
+        (methodName: 'select', event?: JQueryEventObject): void;
+        (methodName: 'widget'): JQuery;
+        (methodName: string): JQuery;
+        (options: JQueryUI.MenuOptions): JQuery;
+        (optionLiteral: string, optionName: string): any;
+        (optionLiteral: string, options: JQueryUI.MenuOptions): any;
+        (optionLiteral: string, optionName: string, optionValue: any): JQuery;
+        active: boolean;
+    }
 
     progressbar(): JQuery;
     progressbar(methodName: 'destroy'): void;
@@ -1659,6 +1698,7 @@ interface JQuery {
     sortable(methodName: string): JQuery;
     sortable(options: JQueryUI.SortableOptions): JQuery;
     sortable(optionLiteral: string, optionName: string): any;
+    sortable(methodName: 'serialize', options: { key?: string; attribute?: string; expression?: RegExp }): string;
     sortable(optionLiteral: string, options: JQueryUI.SortableOptions): any;
     sortable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
 
diff --git a/js-beautify/js-beautify.d.ts b/js-beautify/js-beautify.d.ts
index e52614ad8..fc581ea90 100644
--- a/js-beautify/js-beautify.d.ts
+++ b/js-beautify/js-beautify.d.ts
@@ -9,7 +9,7 @@ declare var js_beautify: {
         indent_char?: string;
         eol?: string;
         indent_level?: number;
-        indent_width_tabs?: boolean;
+        indent_with_tabs?: boolean;
         preserve_newlines?: boolean;
         max_preserve_newlines?: number;
         jslint_happy: boolean;
diff --git a/js-cookie/js-cookie.d.ts b/js-cookie/js-cookie.d.ts
index fc3e95c02..7fc1a5125 100644
--- a/js-cookie/js-cookie.d.ts
+++ b/js-cookie/js-cookie.d.ts
@@ -90,3 +90,7 @@ declare module Cookies {
 }
 
 declare var Cookies: Cookies.CookiesStatic;
+
+declare module 'js-cookie' {
+    export = Cookies;
+}
diff --git a/js-data-http/js-data-http-tests.ts b/js-data-http/js-data-http-tests.ts
index d7c07d654..00457d714 100644
--- a/js-data-http/js-data-http-tests.ts
+++ b/js-data-http/js-data-http-tests.ts
@@ -28,7 +28,7 @@ ADocument.inject({ id: 5, author: 'John' });
 ADocument.inject({ id: 6, author: 'John' });
 
 // bypass the data store
-adapter.updateAll(ADocument, { author: 'Johnny' }, { author: 'John' }).then(function (documents) {
+adapter.updateAll<{ id?: number; author: string; }>(ADocument, { author: 'Johnny' }, { author: 'John' }).then(function (documents) {
     documents[0]; // { id: 5, author: 'Johnny' }
 
     // The updated documents have NOT been injected into the data store because we bypassed the data store
@@ -37,7 +37,7 @@ adapter.updateAll(ADocument, { author: 'Johnny' }, { author: 'John' }).then(func
 });
 
 // Normally you would just go through the data store
-ADocument.updateAll({ author: 'Johnny' }, { author: 'John' }).then(function (documents) {
+ADocument.updateAll<{ id?: number; author: string; }>({ author: 'Johnny' }, { author: 'John' }).then(function (documents) {
     documents[0]; // { id: 5, author: 'Johnny' }
 
     // the updated documents have been injected into the data store
@@ -164,4 +164,4 @@ ADocument.create({ author: 'John' }).then(function (document:any) {
 
     // the new document has been injected into the data store
     ADocument.get(document.id); // { id: 5, author: 'John' }
-});
\ No newline at end of file
+});
diff --git a/js-data/js-data.d.ts b/js-data/js-data.d.ts
index bec41d331..604b70e6c 100644
--- a/js-data/js-data.d.ts
+++ b/js-data/js-data.d.ts
@@ -115,7 +115,17 @@ declare module JSData {
     }
 
     interface DSAdapterOperationConfiguration extends DSConfiguration {
-        adapter?: string
+        adapter?: string;
+        bypassCache?: boolean;
+        cacheResponse?: boolean;
+        findStrategy?: string;
+        findFallbackAdapters?: string[];
+        strategy?: string;
+        fallbackAdapters?: string[];
+
+        params: {
+            [paramName: string]: string | number | boolean;
+        };
     }
 
     interface DSSaveConfiguration extends DSAdapterOperationConfiguration {
@@ -143,7 +153,7 @@ declare module JSData {
         findAll<T>(params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
         loadRelations<T>(idOrInstance:string | number | Object, relations:string | Array<string>, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
         update<T>(id:string | number, attrs:Object, options?:DSSaveConfiguration):JSDataPromise<T>;
-        updateAll<T>(attrs:Object, params?:DSFilterParams, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
+        updateAll<T>(attrs:Object, params?:DSFilterParams & T, options?:DSAdapterOperationConfiguration):JSDataPromise<Array<T>>;
         reap(resourceNametions?:DSConfiguration):JSDataPromise<any>;
         refresh<T>(id:string | number, options?:DSAdapterOperationConfiguration):JSDataPromise<T>;
         save<T>(id:string | number, options?:DSSaveConfiguration):JSDataPromise<T>;
@@ -156,7 +166,8 @@ declare module JSData {
         digest():void;
         eject<T>(id:string | number, options?:DSConfiguration):T;
         ejectAll<T>(params:DSFilterParams, options?:DSConfiguration):Array<T>;
-        filter<T>(params:DSFilterParams, options?:DSConfiguration):Array<T>;
+        filter<T>(params: DSFilterParams, options?: DSConfiguration): Array<T>;
+        filter<T>(params: DSFilterParamsForAllowSimpleWhere, options?: DSConfiguration): Array<T>;
         get<T>(id:string | number, options?:DSConfiguration):T;
         getAll<T>(ids?:Array<string | number>):Array<T>;
         hasChanges(id:string | number):boolean;
@@ -184,6 +195,10 @@ declare module JSData {
         sort?: string | Array<string> | Array<Array<string>>;
     }
 
+    interface DSFilterParamsForAllowSimpleWhere {
+        [key: string]: string | number;
+    }
+
     interface IDSResourceLifecycleValidateEventHandlers {
         beforeValidate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
         validate?: (resourceName:string, data:any, cb:(err:any, data?:any)=>void)=>void;
@@ -268,7 +283,7 @@ declare module JSData {
 
         update<T>(config:DSResourceDefinition<T>, id:string | number, attrs:Object, options?:DSConfiguration):JSDataPromise<T>;
 
-        updateAll<T>(config:DSResourceDefinition<T>, attrs:Object, params?:DSFilterParams, options?:DSConfiguration):JSDataPromise<T>;
+        updateAll<T>(config:DSResourceDefinition<T>, attrs:Object, params?:DSFilterParams & T, options?:DSConfiguration):JSDataPromise<T[]>;
     }
 }
 
@@ -282,4 +297,4 @@ declare var JSData:{
 declare module 'js-data' {
 
     export = JSData;
-}
\ No newline at end of file
+}
diff --git a/js-md5/md5-tests.ts b/js-md5/md5-tests.ts
new file mode 100644
index 000000000..a536773aa
--- /dev/null
+++ b/js-md5/md5-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="md5.d.ts" />
+
+md5('Message to hash');
+md5('');
+md5('中文');
+md5([]);
+md5(new Uint8Array([]));
+
+$.md5('message');
+$.md5('Message to hash');
+$.md5('');
+$.md5('中文');
+$.md5([]);
+$.md5(new Uint8Array([]));
+
+'message'.md5('Message to hash');
+'message'.md5('');
+'message'.md5('中文');
+'message'.md5([]);
+'message'.md5(new Uint8Array([]));
\ No newline at end of file
diff --git a/js-md5/md5.d.ts b/js-md5/md5.d.ts
new file mode 100644
index 000000000..b944b134f
--- /dev/null
+++ b/js-md5/md5.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for js-md5 v0.3.0
+// Project: https://github.com/emn178/js-md5
+// Definitions by: Roland Greim <https://github.com/tigerxy>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped/
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+interface JQuery {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+interface JQueryStatic {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+interface md5 {
+    (value: string): string;
+    (value: Array<any>): string;
+    (value: Uint8Array): string;
+}
+
+interface String {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+declare var md5: md5;
diff --git a/jsdeferred/jsdeferred.d.ts b/jsdeferred/jsdeferred.d.ts
index 27a4fb65a..7d7b6ce96 100644
--- a/jsdeferred/jsdeferred.d.ts
+++ b/jsdeferred/jsdeferred.d.ts
@@ -24,8 +24,8 @@ interface RetryOption {
 
 interface DeferredizedFunction { (...arg: any[]): Deferred; }
 interface DeferredizedFunctionWithNumber { (n: number): Deferred; }
-interface FunctionWithNumber { (i: number, o?: any);  }
-interface ErrorCallback { (d: Deferred, ...args: any[]); }
+interface FunctionWithNumber { (i: number, o?: any): any;  }
+interface ErrorCallback { (d: Deferred, ...args: any[]): any; }
 
 declare class Deferred {
 
diff --git a/jsdom/jsdom-tests.ts b/jsdom/jsdom-tests.ts
index 504f1f064..1f0d04a0b 100644
--- a/jsdom/jsdom-tests.ts
+++ b/jsdom/jsdom-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./jsdom.d.ts" />
+
 import jsdom = require("jsdom");
 
 jsdom.defaultDocumentFeatures.FetchExternalResources = ["img"];
diff --git a/jsdom/jsdom.d.ts b/jsdom/jsdom.d.ts
index b9864b3b7..1a8bb23ab 100644
--- a/jsdom/jsdom.d.ts
+++ b/jsdom/jsdom.d.ts
@@ -3,7 +3,13 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path='../node/node.d.ts' />
+/// <reference path='../jquery/jquery.d.ts' />
+
 declare module "jsdom" {
+
+    import EventEmitter = NodeJS.EventEmitter;
+
 	/**
 	 * The do-what-I-mean API.
 	 *
@@ -26,6 +32,51 @@ declare module "jsdom" {
 	export function env(urlOrHtml: string, config: Config, callback?: Callback): void;
 	export function env(config: Config, callback?: Callback): void;
 
+	export function serializeDocument(doc: Document): string;
+
+	export interface VirtualConsole extends EventEmitter {
+		sendTo(console: Console): VirtualConsole;
+	}
+	
+	export interface VirtualConsoleOptions {
+	}
+	
+	export interface WindowProperties {
+		parsingMode?: string; // html, xml, auto, undefined
+		contentType?: string;
+		parser?: any;
+		url?: string;
+		referrer?: string;
+		cookieJar?: CookieJar;
+		cookie?: string;
+		resourceLoader?: any;
+		deferClose?: boolean;
+		concurrentNodeIterators?: number;
+		virtualConsole?: VirtualConsole;
+		created?: (something: any, window: Window) => any;
+		features?: FeatureOptions;
+		top?: Window;
+	}
+
+    // tough-cookie
+    export interface CookieJar {
+        
+    }
+
+	export function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
+	export function getVirtualConsole(window: Window): VirtualConsole;
+	export function createCookieJar(): CookieJar;
+	export function nodeLocation(node: Node): any;
+	export function reconfigureWindow(window: Window, newProps: WindowProperties): void;
+	
+	export function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
+	
+	export var debugMode: boolean;
+	
+	export interface DocumentWithParentWindow extends Document {
+		parentWindow: Window;
+	}
+
 	/**
 	 * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
 	 * separately supply script that it will inject and execute. It just gives you back a document object,
@@ -37,12 +88,14 @@ declare module "jsdom" {
 	 *					equivalent to what a browser will give if you open up an empty .html file.
 	 * @param options	see the explanation of the config object above.
 	 */
-	export function jsdom(markup: string, config?: Config): Document;
+	export function jsdom(markup: string, config?: Config): DocumentWithParentWindow;
 
 	/**
 	 * Before creating any documents, you can modify the defaults for all future documents:
 	 */
-	export var defaultDocumentFeatures: FeatureOptions;
+	export var availableDocumentFeatures: FeatureOptions;
+ 	export var defaultDocumentFeatures: FeatureOptions;
+	export var applyDocumentFeatures: FeatureOptions;
 
     export interface Callback {
         (errors: Error[], window: Window): any;
@@ -54,7 +107,7 @@ declare module "jsdom" {
 		 * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
 		 * Default for jsdom.env: false
 		 */
-		FetchExternalResources?: any;
+		FetchExternalResources?: string[] | boolean;
 
 		/**
 		 * Enables/disables JavaScript execution
@@ -62,7 +115,7 @@ declare module "jsdom" {
 		 * Allowed: ["script"] or false, 
 		 * Default for jsdom.env: false
 		 */
-		ProcessExternalResources?: any;
+		ProcessExternalResources?: string[] | boolean;
 
 		/**
 		 * Filters resource downloading and processing to disallow those matching the given regular expression
@@ -70,7 +123,7 @@ declare module "jsdom" {
 		 * Allowed: /url to be skipped/ or false
 		 * Example: /http:\/\/example.org/js/bad\.js/
 		 */
-		SkipExternalResources?: any;
+		SkipExternalResources?: string | boolean;
 	}
 
 	export interface EnvDocument {
@@ -112,7 +165,7 @@ declare module "jsdom" {
 		/**
 		 * a custom cookie jar, if desired; see mikeal/request documentation.
 		 */
-		jar?: any;
+		jar?: CookieJar;
 		/**
 		 *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
 		 */
@@ -123,6 +176,8 @@ declare module "jsdom" {
 		 */
 		features?: FeatureOptions;
 		
+		virtualConsole?: VirtualConsole;
+		
 		/**
 		 * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
 		 * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
@@ -140,4 +195,4 @@ declare module "jsdom" {
 		 */
 		created?: (error: Error, window: Window) => void;
     }
-}
\ No newline at end of file
+}
diff --git a/json-stable-stringify/json-stable-stringify-tests.ts b/json-stable-stringify/json-stable-stringify-tests.ts
new file mode 100644
index 000000000..f28fb88e6
--- /dev/null
+++ b/json-stable-stringify/json-stable-stringify-tests.ts
@@ -0,0 +1,49 @@
+///<reference path="json-stable-stringify.d.ts"/>
+
+import stringify = require('json-stable-stringify');
+
+var obj = { c: 8, b: [{z:6,y:5,x:4},7], a: 3 };
+
+{
+  console.log(stringify(obj));
+}
+
+{
+  // Second arg can be a stringify.Comparator function.
+  var s: string = stringify(obj, (a: stringify.Element, b: stringify.Element): number => a.key < b.key ? 1 : -1);
+  console.log(s);
+}
+
+{
+  // Can specify Comparator in an Options object.
+  function reverse(a: stringify.Element, b: stringify.Element): number {
+    return a.value < b.value ? 1 : -1;
+  }
+  var opts: stringify.Options = { cmp: reverse };
+  var s: string = stringify(obj, opts);
+  console.log(s);
+}
+
+{
+  // Space can be a string.
+  var s: string = stringify(obj, { space: '  ' });
+  console.log(s);
+}
+
+{
+  // Space can be an integer.
+  var s: string = stringify(obj, { space: 2 });
+  console.log(s);
+}
+
+{
+  // The replacer option can remove or modify values.
+  function removeStrings(key: string, value: any): any {
+    if (typeof value === "string") {
+      return undefined;
+    }
+    return value;
+  }
+  var s: string = stringify(obj, { replacer: removeStrings });
+  console.log(s);
+}
diff --git a/json-stable-stringify/json-stable-stringify.d.ts b/json-stable-stringify/json-stable-stringify.d.ts
new file mode 100644
index 000000000..faeb7c074
--- /dev/null
+++ b/json-stable-stringify/json-stable-stringify.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for json-stable-stringify 1.0.0
+// Project: https://github.com/substack/json-stable-stringify
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'json-stable-stringify' {
+
+  function stringify(obj: any, opts?: stringify.Comparator | stringify.Options): string;
+
+  module stringify {
+
+    interface Element {
+      key: string;
+      value: any;
+    }
+
+    interface Comparator {
+      (a: Element, b: Element): number;
+    }
+
+    interface Replacer {
+      (key: string, value: any): any;
+    }
+
+    interface Options {
+      cmp?: Comparator;
+      space?: number | string;
+      replacer?: Replacer;
+    }
+  }
+
+  export = stringify;
+}
diff --git a/jsonwebtoken/jsonwebtoken.d.ts b/jsonwebtoken/jsonwebtoken.d.ts
index 9f0baef2b..205970f6a 100644
--- a/jsonwebtoken/jsonwebtoken.d.ts
+++ b/jsonwebtoken/jsonwebtoken.d.ts
@@ -27,6 +27,7 @@ declare module "jsonwebtoken" {
         audience?: string;
         subject?: string;
         issuer?: string;
+        noTimestamp?: boolean;
     }
 
     export interface VerifyOptions {
diff --git a/jug/jug-tests.ts b/jug/jug-tests.ts
new file mode 100644
index 000000000..7353428e0
--- /dev/null
+++ b/jug/jug-tests.ts
@@ -0,0 +1,121 @@
+/// <reference path='./jug.d.ts' />
+import jug = require('jug');
+
+/*
+Example 1.
+ */
+var root = jug.init();
+
+root
+    .seed()
+    .seed();
+
+root.data({
+    interest: {
+        genre: 'Action',
+        year: 2014,
+        stars: [ 'Eva Green', 'Duck Dogers' ]
+    }
+});
+
+root.edge( 0 ).data({
+    info: {
+        name: '300: Rise of an Empire',
+        genre: 'Action',
+        stars: [ 'Eva Green', 'Duck Dogers' ],
+        year: 2014
+    }
+});
+
+root.edge( 1 ).data({
+    info: {
+        name: 'Man of Steel',
+        genre: 'Action',
+        stars: [ 'Henry Cavill' ],
+        year: 2013
+    }
+});
+
+root.edge(1).seed({
+    test: {
+        some: 'value'
+    }
+});
+
+var distance = root.proximity('interest', 'info');
+var close = distance.indexOf( 0 );
+var nodeData = root.edge( close ).data();
+
+/*
+Example 2.
+ */
+var wire = jug.init({
+    interest: {
+        cloth: 't-shirt',
+        color: 'red',
+        size: 'medium'
+    }
+});
+
+/*
+ Seed node
+ */
+wire.seed();
+
+/*
+ Seed node with data.
+ */
+wire.seed({
+    info: {
+        cloth: 't-shirt',
+        color: 'red',
+        size: 'medium'
+    }
+});
+
+/*
+ Access node.
+ */
+wire.edge(0);
+
+/*
+ Get distance between nodes
+ */
+// first argument is 'from' object
+// second argument is 'to' object
+root.proximity('interest', 'info');
+
+/*
+ Find a node.
+ */
+wire.find('info', { color: 'red' });
+
+/*
+ Verify the level.
+ */
+wire.edge(0).level();
+
+/*
+ Verify if the current node is the root
+ */
+wire.isRoot();
+
+/*
+ Getting childs of an specified edge
+ */
+wire.getChildsOf(0);
+
+/*
+ Getting parents of an specified level and edge.
+ */
+wire.getParentsFrom(1, 0);
+
+/*
+ Getting the length of childs of an specified edge.
+ */
+wire.getScopeOf(0);
+
+/*
+ Getting siblings of current level, excluding the index indicated.
+ */
+wire.getSiblingsOf(1);
diff --git a/jug/jug.d.ts b/jug/jug.d.ts
new file mode 100644
index 000000000..5c7fe4010
--- /dev/null
+++ b/jug/jug.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for jug
+// Project: https://github.com/kaiquewdev/Graph
+// Definitions by: yevt <https://github.com/yevt>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "jug" {
+    /**
+     * Internal structure of a vertex
+     */
+    interface VertexStructure {
+        level: number;
+        edge: Array<Vertex>,
+        data: VertexData,
+        parent: Vertex
+    }
+
+    /**
+     * User data of a vertex.
+     */
+    type VertexData = Object;
+
+    /**
+     * Graph constructor function.
+     */
+    interface GraphConstructor {
+        new():Graph;
+    }
+
+    /**
+     * Creates root node of a graph.
+     */
+    interface Graph {
+        vertex:VertexConstructor;
+        init(data?:VertexData):Vertex;
+    }
+
+    /**
+     * Vertex constructor function.
+     */
+    interface VertexConstructor {
+        new(obj?:VertexData):Vertex;
+    }
+
+    /**
+     * Represents one node of a graph.
+     */
+    interface Vertex {
+
+        /**
+         * Initial vertex data.
+         */
+        internal: VertexStructure;
+
+        /**
+         * Verify the level.
+         */
+        level(): number;
+
+        /**
+         * Get edge count.
+         */
+        edge(): number;
+
+        /**
+         * Access node.
+         * @param index - edge index.
+         */
+        edge(index:number): Vertex;
+
+        /**
+         * Seed node.
+         * @param [data] - created vertex UserData.
+         */
+        seed(data?:VertexData): Vertex;
+
+        /**
+         * Verify if the current node is the root.
+         */
+        isRoot(): boolean;
+
+        /**
+         * Set node data.
+         * @param obj - data to be set.
+         */
+        data(obj:VertexData): Vertex;
+
+        /**
+         * Get node data.
+         */
+        data(): VertexData;
+
+        /**
+         * Get distance between nodes.
+         * @param from
+         * @param to
+         */
+        proximity(from:string, to:string): Array<number>;
+
+        /**
+         * Find a node.
+         * @param {string} type - object type.
+         * @param {Object} query - _.where query object.
+         */
+        find(type:string|void, query:Object): Array<VertexData>;
+
+        /**
+         * Get siblings of specified edge.
+         * @param {number} index - edge index.
+         */
+        getSiblingsOf(index:number): Array<VertexData>;
+
+        /**
+         * Getting childs of an specified edge.
+         * @param egde - target vertex;
+         */
+        getChildsOf(egde:number): Array<VertexData>;
+
+        /**
+         * Getting parents of an specified level and edge.
+         * @param {number} level - max level.
+         * @param {number} edge - edge index.
+         */
+        getParentsFrom(level:number, edge:number): Array<VertexData>;
+
+        /**
+         * Getting the length of childs of an specified edge.
+         * @param {number} edge - edge index.
+         */
+        getScopeOf(edge:number): number;
+    }
+
+    var jug:Graph;
+
+    export = jug;
+}
diff --git a/karma/karma-0.12.d.ts b/karma/karma-0.12.d.ts
new file mode 100644
index 000000000..c66e6fe06
--- /dev/null
+++ b/karma/karma-0.12.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/karma/karma-tests-0.12.ts b/karma/karma-tests-0.12.ts
new file mode 100644
index 000000000..b402c0804
--- /dev/null
+++ b/karma/karma-tests-0.12.ts
@@ -0,0 +1,26 @@
+/// <reference path="karma-0.12.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: number) => {
+  console.log('Karma has exited with ' + exitCode);
+  process.exit(exitCode);
+});
+
+
+karma.runner.run({port: 9876}, (exitCode: number) => {
+  console.log('Karma has exited with ' + exitCode);
+  process.exit(exitCode);
+});
diff --git a/karma/karma-tests.ts b/karma/karma-tests.ts
index b70e7273b..dd571f8ae 100644
--- a/karma/karma-tests.ts
+++ b/karma/karma-tests.ts
@@ -4,23 +4,51 @@
 import gulp = require('gulp');
 import karma = require('karma');
 
+
 function runKarma(singleRun: boolean): void {
-  karma.server.start({
-    configFile: __dirname + '/karma.conf.js',
-    singleRun: singleRun
-  });
+    // MEMO: `start` method is deprecated since 0.13. It will be removed in 0.14.
+    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) => {
+
+karma.server.start({port: 9876}, (exitCode: number) => {
   console.log('Karma has exited with ' + exitCode);
   process.exit(exitCode);
 });
 
 
-karma.runner.run({port: 9876}, (exitCode) => {
+karma.runner.run({port: 9876}, (exitCode: number) => {
   console.log('Karma has exited with ' + exitCode);
   process.exit(exitCode);
 });
+
+
+var Server = require('karma').Server;
+var server = new Server({port: 9876}, function(exitCode: number) {
+    console.log('Karma has exited with ' + exitCode);
+    process.exit(exitCode);
+});
+
+server.start();
+
+server.refreshFiles();
+
+server.on('browser_register', function (browser: any) {
+    console.log('A new browser was registered');
+});
+
+var runner = require('karma').runner;
+runner.run({port: 9876}, function(exitCode: number) {
+    console.log('Karma has exited with ' + exitCode);
+    process.exit(exitCode);
+});
+
+//
+
+var captured: boolean = karma.launcher.areAllCaptured();
diff --git a/karma/karma.d.ts b/karma/karma.d.ts
index c66e6fe06..cad9eb6ba 100644
--- a/karma/karma.d.ts
+++ b/karma/karma.d.ts
@@ -1,24 +1,368 @@
-// Type definitions for karma v0.12.37
+// Type definitions for karma v0.13.9
 // Project: https://github.com/karma-runner/karma
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../log4js/log4js.d.ts" />
+
 declare module 'karma' {
     // See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
+    import Promise = require('bluebird');
+    import https = require('https');
+    import log4js = require('log4js');
 
-    interface IKarmaServer {
-        start(options?: any, callback?: (exitCode: number) => void): void;
+    namespace karma {
+        interface Karma {
+            /**
+             * `start` method is deprecated since 0.13. It will be removed in 0.14.
+             * Please use
+             * <code>
+             *     server = new Server(config, [done])
+             *     server.start()
+             * </code>
+             * instead.
+             */
+            server: DeprecatedServer;
+            Server: Server;
+            runner: Runner;
+            launcher: Launcher;
+            VERSION: string;
+        }
+
+        interface LauncherStatic {
+            generateId(): string;
+            //TODO: injector should be of type `di.Injector`
+            new(emitter: NodeJS.EventEmitter, injector: any): Launcher;
+        }
+
+        interface Launcher {
+            Launcher: LauncherStatic;
+            //TODO: Can this return value ever be typified?
+            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+            kill(id: string, callback: Function): boolean;
+            restart(id: string): boolean;
+            killAll(callback: Function): void;
+            areAllCaptured(): boolean;
+            markCaptured(id: string): void;
+        }
+
+        interface DeprecatedServer {
+            start(options?: any, callback?: ServerCallback): void;
+        }
+
+        interface Runner {
+            run(options?: Config, callback?: ServerCallback): void;
+        }
+
+        interface Server extends NodeJS.EventEmitter {
+            new(options?: Config, callback?: ServerCallback): Server;
+            /**
+             * Start the server
+             */
+            start(): void;
+            /**
+             * Get properties from the injector
+             * @param token
+             */
+            get(token: string): any;
+            /**
+             * Force a refresh of the file list
+             */
+            refreshFiles(): Promise<any>;
+
+            ///**
+            // * Backward-compatibility with karma-intellij bundled with WebStorm.
+            // * Deprecated since version 0.13, to be removed in 0.14
+            // */
+            //static start(): void;
+        }
+
+        interface ServerCallback {
+            (exitCode: number): void;
+        }
+
+        interface Config {
+            /**
+             * @description Enable or disable watching files and executing the tests whenever one of these files changes.
+             * @default true
+             */
+            autoWatch?: boolean;
+            /**
+             * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
+             * so that the test runner doesn't try to start and restart running tests more than it should.
+             * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
+             * before starting the test process again.
+             * @default 250
+             */
+            autoWatchBatchDelay?: number;
+            /**
+             * @default ''
+             * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
+             * If the basePath configuration is a relative path then it will be resolved to
+             * the <code>__dirname</code> of the configuration file.
+             */
+            basePath?: string;
+            /**
+             * @default 2000
+             * @description How long does Karma wait for a browser to reconnect (in ms).
+             * <p>
+             * With a flaky connection it is pretty common that the browser disconnects,
+             * but the actual test execution is still running without any problems. Karma does not treat a disconnection
+             * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
+             * If the browser reconnects during that time, everything is fine.
+             * </p>
+             */
+            browserDisconnectTimeout?: number;
+            /**
+             * @default 0
+             * @description The number of disconnections tolerated.
+             * <p>
+             * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
+             * in the case of a disconnection. Usually any disconnection is considered a failure,
+             * but this option allows you to define a tolerance level when there is a flaky network link between
+             * the Karma server and the browsers.
+             * </p>
+             */
+            browserDisconnectTolerance?: number;
+            /**
+             * @default 10000
+             * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
+             * <p>
+             * If, during test execution, Karma does not receive any message from a browser within
+             * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
+             * </p>
+             */
+            browserNoActivityTimeout?: number;
+            /**
+             * @default []
+             * Possible Values:
+             * <ul>
+             *     <li>Chrome (launcher comes installed with Karma)</li>
+             *     <li>ChromeCanary (launcher comes installed with Karma)</li>
+             *     <li>PhantomJS (launcher comes installed with Karma)</li>
+             *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
+             *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
+             *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
+             *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
+             * </ul>
+             * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
+             * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
+             * You can capture any browser manually by opening the browser and visiting the URL where
+             * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
+             */
+            browsers?: string[];
+            /**
+             * @default 60000
+             * @description Timeout for capturing a browser (in ms).
+             * <p>
+             * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
+             * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
+             * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
+             * </p>
+             */
+            captureTimeout?: number;
+            client?: ClientConfig;
+            /**
+             * @default true
+             * @description Enable or disable colors in the output (reporters and logs).
+             */
+            colors?: boolean;
+            /**
+             * @default []
+             * @description List of files/patterns to exclude from loaded files.
+             */
+            exclude?: string[];
+            /**
+             * @default []
+             * @description List of files/patterns to load in the browser.
+             */
+            files?: (FilePattern|string)[];
+            /**
+             * @default []
+             * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
+             * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
+             */
+            frameworks?: string[];
+            /**
+             * @default 'localhost'
+             * @description Hostname to be used when capturing browsers.
+             */
+            hostname?: string;
+            /**
+             * @default {}
+             * @description Options object to be used by Node's https class.
+             * Object description can be found in the
+             * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
+             */
+            httpsServerOptions?: https.ServerOptions;
+            /**
+             * @default config.LOG_INFO
+             * Possible values:
+             * <ul>
+             *   <li>config.LOG_DISABLE</li>
+             *   <li>config.LOG_ERROR</li>
+             *   <li>config.LOG_WARN</li>
+             *   <li>config.LOG_INFO</li>
+             *   <li>config.LOG_DEBUG</li>
+             * </ul>
+             * @description Level of logging.
+             */
+            logLevel?: string;
+            /**
+             * @default [{type: 'console'}]
+             * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
+             */
+            loggers?: log4js.AppenderConfigBase[];
+            /**
+             * @default ['karma-*']
+             * @description List of plugins to load. A plugin can be a string (in which case it will be required
+             * by Karma) or an inlined plugin - Object.
+             * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
+             * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
+             */
+            plugins?: any[];
+            /**
+             * @default 9876
+             * @description The port where the web server will be listening.
+             */
+            port?: number;
+            /**
+             * @default {'**\/*.coffee': 'coffee'}
+             * @description A map of preprocessors to use.
+             *
+             * Preprocessors can be loaded through [plugins].
+             *
+             * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
+             * require an additional library to be installed (via NPM).
+             *
+             * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
+             * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
+             * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
+             * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
+             * but your interactive debugging does not.
+             *
+             */
+            preprocessors?: { [name: string]: string|string[] }
+            /**
+             * @default 'http:'
+             * Possible Values:
+             * <ul>
+             *   <li>http:</li>
+             *   <li>https:</li>
+             * </ul>
+             * @description Protocol used for running the Karma webserver.
+             * Determines the use of the Node http or https class.
+             * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
+             */
+            protocol?: string;
+            /**
+             * @default {}
+             * @description A map of path-proxy pairs.
+             */
+            proxies?: { [path: string]: string }
+            /**
+             * @default true
+             * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
+             */
+            proxyValidateSSL?: boolean;
+            /**
+             * @default 0
+             * @description Karma will report all the tests that are slower than given time limit (in ms).
+             * This is disabled by default (since the default value is 0).
+             */
+            reportSlowerThan?: number;
+            /**
+             * @default ['progress']
+             * Possible Values:
+             * <ul>
+             *   <li>dots</li>
+             *   <li>progress</li>
+             * </ul>
+             * @description A list of reporters to use.
+             * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
+             * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
+             */
+            reporters?: string[];
+            /**
+             * @default false
+             * @description Continuous Integration mode.
+             * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
+             * on whether all tests passed or any tests failed.
+             */
+            singleRun?: boolean;
+            /**
+             * @default ['polling', 'websocket']
+             * @description An array of allowed transport methods between the browser and testing server. This configuration setting
+             * is handed off to [socket.io](http://socket.io/) (which manages the communication
+             * between browsers and the testing server).
+             */
+            transports?: string[];
+            /**
+             * @default '/'
+             * @description The base url, where Karma runs.
+             * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
+             * sometimes you might want to proxy a url that is already taken by Karma.
+             */
+            urlRoot?: string;
+        }
+
+        interface ClientConfig {
+            /**
+             * @default undefined
+             * @description When karma run is passed additional arguments on the command-line, they
+             * are passed through to the test adapter as karma.config.args (an array of strings).
+             * The client.args option allows you to set this value for actions other than run.
+             * How this value is used is up to your test adapter - you should check your adapter's
+             * documentation to see how (and if) it uses this value.
+             */
+            args?: string[];
+            /**
+             * @default true
+             * @description Run the tests inside an iFrame or a new window
+             * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
+             * iFrame and may need a new window to run.
+             */
+            useIframe?: boolean;
+            /**
+             * @default true
+             * @description Capture all console output and pipe it to the terminal.
+             */
+            captureConsole?: boolean;
+        }
+
+        interface FilePattern {
+            /**
+             * The pattern to use for matching. This property is mandatory.
+             */
+            pattern: string;
+            /**
+             * @default true
+             * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
+             * for changes.
+             */
+            watched?: boolean;
+            /**
+             * @default true
+             * @description Should the files be included in the browser using <script> tag? Use false if you want to
+             * load them manually, eg. using Require.js.
+             */
+            included?: boolean;
+            /**
+             * @default true
+             * @description Should the files be served by Karma's webserver?
+             */
+            served?: boolean;
+            /**
+             * @default false
+             * @description Should the files be served from disk on each request by Karma's webserver?
+             */
+            nocache?: boolean;
+        }
     }
 
-    interface IKarmaRunner {
-        run(options?: any, callback?: (exitCode: number) => void): void;
-    }
+    var karma: karma.Karma;
 
-    interface IKarma {
-        server: IKarmaServer;
-        runner: IKarmaRunner;
-    }
-
-    var karma: IKarma;
     export = karma;
 }
diff --git a/kefir/kefir-tests.ts b/kefir/kefir-tests.ts
new file mode 100644
index 000000000..a0d0a9618
--- /dev/null
+++ b/kefir/kefir-tests.ts
@@ -0,0 +1,222 @@
+/// <reference path="./kefir.d.ts" />
+
+import * as Kefir from 'kefir';
+import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'kefir';
+
+//Create a stream
+{
+	let stream01: Stream<void, void> = Kefir.never();
+	let stream02: Stream<number, void> = Kefir.later(1000, 1);
+	let stream03: Stream<number, void> = Kefir.interval(1000, 1);
+	let stream04: Stream<number, void> = Kefir.sequentially(1000, [1, 2, 3]);
+	{
+		let start = +new Date();
+		let stream05: Stream<number, void> = Kefir.fromPoll(1000, () => +new Date() - start);
+	}
+	{
+		let start = +new Date();
+		let stream06: Stream<number, void> = Kefir.withInterval<number, void>(1000, function(emitter) {
+			var time = +new Date() - start;
+			if (time < 4000) {
+				emitter.emit(time);
+			} else {
+				emitter.end();
+			}
+		});
+	}
+	let stream07: Stream<number, void> = Kefir.fromCallback<number>(callback => setTimeout(() => callback(1), 1000));
+	let stream08: Stream<number, void> = Kefir.fromNodeCallback<number, void>(callback => setTimeout(() => callback(null, 1), 1000));
+	let stream09: Stream<MouseEvent, void> = Kefir.fromEvents<MouseEvent, void>(document.body, 'click');
+	let stream10: Stream<number, void> = Kefir.stream<number, void>(emitter => {
+		let count = 0;
+		emitter.emit(count);
+	
+		let intervalId = setInterval(() => {
+			count++;
+			if (count < 4) {
+				emitter.emit(count);
+			} else {
+				emitter.end();
+			}
+		}, 1000);
+	
+		return () => clearInterval(intervalId);
+	});
+}
+
+// Create a property
+{
+	let property01: Property<number, void> = Kefir.constant(1);
+	let property02: Property<void, number> = Kefir.constantError(1);
+	//let property03: Property<number, void> = Kefir.fromPromise<number, void>(new Promise<number>(fulfill => fulfill(1)));
+}
+
+// Convert observables
+{
+	let property: Property<number, void> = Kefir.sequentially(100, [1, 2, 3]).toProperty(() => 0);
+	let stream: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).toProperty(() => 0).changes();
+}
+
+// Subscribe / add side effects
+{
+	Kefir.sequentially(1000, [1, 2]).onValue(x => console.log('value:', x));
+	Kefir.sequentially(1000, [1, 2]).offValue(x => console.log('value:', x));
+	Kefir.sequentially(1000, [1, 2]).valuesToErrors().onValue(x => console.log('error:', x));
+	Kefir.sequentially(1000, [1, 2]).valuesToErrors().offValue(x => console.log('error:', x));
+	Kefir.sequentially(1000, [1, 2]).onEnd(() => console.log('stream ended'));
+	Kefir.sequentially(1000, [1, 2]).offEnd(() => console.log('stream ended'));
+	Kefir.sequentially(1000, [1, 2]).onAny(event => console.log('event:', event));
+	Kefir.sequentially(1000, [1, 2]).offAny(event => console.log('event:', event));
+	Kefir.sequentially(1000, [1, 2]).log('my stream');
+	Kefir.sequentially(1000, [1, 2]).offLog('my stream');
+	Kefir.sequentially(1000, [1, 2]).toPromise().then((x: number) => console.log('fulfilled with:', x));
+}
+
+// Modify an observable
+{
+	let observable01: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).map(x => x + 1);
+	let observable02: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).filter(x => x > 1);
+	let observable03: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).take(2);
+	let observable04: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).takeWhile(x => x < 3);
+	let observable05: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).last();
+	let observable06: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).skip(2);
+	let observable07: Stream<number, void> = Kefir.sequentially(100, [1, 3, 2]).skipWhile(x => x < 3);
+	let observable08: Stream<number, void> = Kefir.sequentially(100, [1, 2, 2, 3, 1]).skipDuplicates();
+	let observable09: Stream<number, void> = Kefir.sequentially(100, [1, 2, 2.1, 3, 1]).skipDuplicates((a, b) => Math.round(a) === Math.round(b));
+	let observable10: Stream<number, void> = Kefir.sequentially(100, [1, 2, 2, 3]).diff((prev, next) => next - prev, 0);
+	let observable11: Stream<number, void> = Kefir.sequentially(100, [1, 2, 2, 3]).scan((prev, next) => next + prev, 0);
+	let observable12: Stream<number, void> = Kefir.sequentially(100, [[1], [], [2,3]]).flatten<number>();
+	let observable13: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3, 4]).flatten<number>(x => x % 2 === 0 ? [x * 10] : []);
+	let observable14: Stream<number, void> = Kefir.sequentially(200, [1, 2, 3]).delay(100);
+	let observable15: Stream<number, void> = Kefir.sequentially(750, [1, 2, 3, 4, 5, 6, 7, 8, 9, 0]).throttle(2500);
+	let observable16: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3, 0, 0, 0, 4, 5, 6]).filter(x => x > 0).debounce(250);
+	let observable17: Stream<void, number> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors<number>(x => {
+		return {convert: x < 0, error: x * 2};
+	});
+	let observable18: Stream<number, void> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors<number>().errorsToValues<number>((x: number) => {
+		return {convert: x >= 0, value: x * 2};
+	});
+	let observable19: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors<number>().mapErrors((x: number) => x * 2);
+	let observable20: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors<number>().filterErrors((x: number) => (x % 2) === 0);
+	let observable21: Stream<void, number> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors(x => {
+		return {convert: x < 0, error: x};
+	}).endOnError();
+	let observable22: Stream<void, number> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors(x => {
+		return {convert: x < 0, error: x};
+	}).skipValues();
+	let observable23: Stream<void, void> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors(x => {
+		return {convert: x < 0, error: x};
+	}).skipErrors();
+	let observable24: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).skipEnd();
+	let ovservable25: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).beforeEnd(() => 0);
+	let observable26: Stream<number[], void> = Kefir.sequentially(100, [1, 2, 3, 4, 5]).slidingWindow(3, 2)
+	let observable27: Stream<number[], void> = Kefir.sequentially(100, [1, 2, 3, 4, 5]).bufferWhile(x => x !== 3);
+	{
+		var myTransducer: any;
+		let observable28: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3, 4, 5, 6]).transduce<number>(myTransducer);
+	}
+	let observable28: Stream<number | string, void> =  Kefir.sequentially(100, [0, 1, 2, 3]).withHandler<number | string, void>((emitter: Emitter<string | number, void>, event: Event<number>) => {
+		if (event.type === 'end') {
+			emitter.emit('bye');
+			emitter.end();
+		}
+		if (event.type === 'value') {
+			for (var i = 0; i < event.value; i++) {
+				emitter.emit(event.value);
+			}
+		}
+	});
+}
+
+// Combine observables
+{
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [1, 3]);
+		let b: Stream<number, void> = Kefir.sequentially(100, [2, 4]).delay(40);
+		let observable01: Observable<number, void> = Kefir.combine<number, void, number>([a, b], (a, b) => a + b);
+	}
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [1, 3]);
+		let b: Stream<number, void> = Kefir.sequentially(100, [2, 4]).delay(40);
+		let c: Stream<number, void> = Kefir.sequentially(60, [5, 6, 7]);
+		let observable02: Observable<number, void> = Kefir.combine<number, void, number>([a, b], [c], (a, b, c) => a + b + c);
+	}
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2, 3]);
+		let b: Stream<number, void> = Kefir.sequentially(160, [4, 5, 6]);
+		let c: Property<number, void> = Kefir.sequentially(100, [8, 9]).delay(260).toProperty(() => 7);
+		let observable03: Observable<number, void> = Kefir.zip<number, void, number>([a, b, c]);
+	}
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]);
+		let b: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]).delay(30);
+		let c: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]).delay(60);
+		let abc: Observable<number, void> = Kefir.merge<number, void>([a, b, c]);
+	}
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]);
+		let b: Stream<number, void> = Kefir.sequentially(100, [3, 4, 5]);
+		let abc: Observable<number, void> = Kefir.concat<number, void>([a, b]);
+	}
+	{
+		let a: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]);
+		let b: Stream<number, void> = Kefir.sequentially(100, [0, 1, 2]).delay(30);
+		let c: Observable<number, void> = Kefir.sequentially(100, [0, 1, 2]).delay(60);
+		let pool: ObservablePool<number, void> = Kefir.pool<number, void>();
+		pool.plug(a);
+		pool.plug(b);
+		pool.plug(c);
+	}
+	let observable04: Observable<number, void> = Kefir.repeat<number, void>(i => {
+		if (i < 3) {
+			return Kefir.sequentially(100, [i, i]);
+		} else {
+			return false;
+		}
+	});
+	let observable05: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).flatMap(x => Kefir.interval(40, x).take(4));
+	let observable06: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).flatMapLatest(x => Kefir.interval(40, x).take(4));
+	let observable07: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).flatMapFirst(x => Kefir.interval(40, x).take(4));
+	let observable08: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).flatMapConcat(x => Kefir.interval(40, x).take(4));
+	let observable09: Stream<number, void> = Kefir.sequentially(100, [1, 2, 3]).flatMapConcurLimit(x => Kefir.interval(40, x).take(6), 2);
+	let observable10: Stream<number, void> = Kefir.sequentially(100, [1, 2]).valuesToErrors().flatMapErrors(x => Kefir.interval(40, x).take(2));
+}
+
+// Combine two observables
+{
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3, 4, 5, 6, 7, 8]);
+		let bar: Property<boolean, void>  = Kefir.sequentially(200, [false, true, false]).delay(40).toProperty(() => true);
+		let observable01: Stream<number, void> = foo.filterBy<void>(bar);
+	}
+	{
+		let a: Property<number, void>  = Kefir.sequentially(200, [2, 3]).toProperty(() => 1);
+		let b: Stream<number, void>  = Kefir.interval(100, 0).delay(40).take(5);
+		let observable02: Property<number, void> = a.sampledBy<number, void, number>(b)
+	}
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3, 4]);
+		let bar: Stream<number, void>  = Kefir.later(250, 0);
+		let observable03: Stream<number, void> = foo.skipUntilBy<number, void>(bar);
+	}
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3, 4]);
+		let bar: Stream<number, void>  = Kefir.later(250, 0);
+		let observable04: Stream<number, void> = foo.takeUntilBy<number, void>(bar);
+	}
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3, 4, 5, 6, 7, 8]).delay(40);
+		let bar: Stream<number, void>  = Kefir.sequentially(300, [1, 2])
+		let observable05: Stream<number[], void> = foo.bufferBy<number, void>(bar);
+	}
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3, 4, 5, 6, 7, 8]);
+		let bar: Stream<boolean, void>  = Kefir.sequentially(200, [false, true, false]).delay(40);
+		let observable06: Stream<number[], void> = foo.bufferWhileBy<void>(bar);
+	}
+	{
+		let foo: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3]);
+		let bar: Stream<number, void>  = Kefir.sequentially(100, [1, 2, 3]).delay(40);
+		let observable07: Stream<boolean, void> = foo.awaiting<number, void>(bar);
+	}
+}
diff --git a/kefir/kefir.d.ts b/kefir/kefir.d.ts
new file mode 100644
index 000000000..9e3303f01
--- /dev/null
+++ b/kefir/kefir.d.ts
@@ -0,0 +1,176 @@
+// Type definitions for Kefir 2.8.1
+// Project: http://rpominov.github.io/kefir/
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "kefir" {
+	
+	export interface Observable<T, S> {
+		// Subscribe / add side effects
+		onValue(callback: (value: T) => void): void;
+		offValue(callback: (value: T) => void): void;
+		onError(callback: (error: S) => void): void;
+		offError(callback: (error: S) => void): void;
+		onEnd(callback: () => void): void;
+		offEnd(callback: () => void): void;
+		onAny(callback: (event: Event<T | S>) => void): void;
+		offAny(callback: (event: Event<T | S>) => void): void;
+		log(name?: string): void;
+		offLog(name?: string): void;
+		toPromise(PromiseConstructor?: any): any;
+	}
+	
+	export interface Stream<T, S> extends Observable<T, S> {
+		toProperty(getCurrent?: () => T): Property<T, S>;
+		
+		// Modify an stream
+		map<U>(fn: (value: T) => U): Stream<U, S>;
+		filter(predicate?: (value: T) => boolean): Stream<T, S>;
+		take(n: number): Stream<T, S>;
+		takeWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+		last(): Stream<T, S>;
+		skip(n: number): Stream<T, S>;
+		skipWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+		skipDuplicates(comparator?: (a: T, b: T) => boolean): Stream<T, S>;
+		diff(fn?: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+		scan(fn: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+		flatten<U>(transformer?: (value: T) => U[]): Stream<U, S>;
+		delay(wait: number): Stream<T, S>;
+		throttle(wait: number, options?: {leading: boolean, trailing: boolean}): Stream<T, S>;
+		debounce(wait: number, options?: {immediate: boolean}): Stream<T, S>;
+		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Stream<void, S | U>;
+		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Stream<T | U, void>;
+		mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
+		filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
+		endOnError(): Stream<T, S>;
+		skipValues(): Stream<void, S>;
+		skipErrors(): Stream<T, void>;
+		skipEnd(): Stream<T, S>;
+		beforeEnd<U>(fn: () => U): Stream<T | U, S>;
+		slidingWindow(max: number, mix?: number): Stream<T[], S>;
+		bufferWhile(predicate: (value: T) => boolean): Stream<T[], S>;
+		transduce<U>(transducer: any): Stream<U, S>;
+		withHandler<U, V>(handler: (emitter: Emitter<U, S>, event: Event<T | S>) => void): Stream<U, S>;
+		
+		// Combine streams
+		combine<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+		zip<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+		merge<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+		concat<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+		flatMap<U, V>(transform: (value: T) => Stream<U, V>): Stream<U, V>;
+		flatMapLatest<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+		flatMapFirst<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+		flatMapConcat<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+		flatMapConcurLimit<U, V>(fn: (value: T) => Stream<U, V>, limit: number): Stream<U, V>;
+		flatMapErrors<U, V>(transform: (error: S) => Stream<U, V>): Stream<U, V>;
+		
+		// Combine two streams
+		filterBy<U>(otherObs: Observable<boolean, U>): Stream<T, S>;
+		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Stream<W, S>;
+		skipUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+		takeUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Stream<T[], S>;
+		bufferWhileBy<U>(otherObs: Observable<boolean, U>): Stream<T[], S>;
+		awaiting<U, V>(otherObs: Observable<U, V>): Stream<boolean, S>;
+	}
+	
+	export interface Property<T, S> extends Observable<T, S> {
+		changes(): Stream<T, S>;
+		
+		// Modify an property
+		map<U>(fn: (value: T) => U): Property<U, S>;
+		filter(predicate?: (value: T) => boolean): Property<T, S>;
+		take(n: number): Property<T, S>;
+		takeWhile(predicate?: (value: T) => boolean): Property<T, S>;
+		last(): Property<T, S>;
+		skip(n: number): Property<T, S>;
+		skipWhile(predicate?: (value: T) => boolean): Property<T, S>;
+		skipDuplicates(comparator?: (a: T, b: T) => boolean): Property<T, S>;
+		diff(fn?: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+		scan(fn: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+		flatten<U>(transformer?: (value: T) => U[]): Property<U, S>;
+		delay(wait: number): Property<T, S>;
+		throttle(wait: number, options?: {leading: boolean, trailing: boolean}): Property<T, S>;
+		debounce(wait: number, options?: {immediate: boolean}): Property<T, S>;
+		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Property<void, S | U>;
+		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Property<T | U, void>;
+		mapErrors<U>(fn: (error: S) => U): Property<T, U>;
+		filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
+		endOnError(): Property<T, S>;
+		skipValues(): Property<void, S>;
+		skipErrors(): Property<T, void>;
+		skipEnd(): Property<T, S>;
+		beforeEnd<U>(fn: () => U): Property<T | U, S>;
+		slidingWindow(max: number, mix?: number): Property<T[], S>;
+		bufferWhile(predicate: (value: T) => boolean): Property<T[], S>;
+		transduce<U>(transducer: any): Property<U, S>;
+		withHandler<U, V>(handler: (emitter: Emitter<T, S>, event: Event<T | S>) => void): Property<U, S>;
+		
+		// Combine properties
+		combine<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+		zip<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+		merge<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+		concat<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+		flatMap<U, V>(transform: (value: T) => Property<U, V>): Property<U, V>;
+		flatMapLatest<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+		flatMapFirst<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+		flatMapConcat<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+		flatMapConcurLimit<U, V>(fn: (value: T) => Property<U, V>, limit: number): Property<U, V>;
+		flatMapErrors<U, V>(transform: (error: S) => Property<U, V>): Property<U, V>;
+		
+		// Combine two properties
+		filterBy<U>(otherObs: Observable<boolean, U>): Property<T, S>;
+		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Property<W, S>;
+		skipUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+		takeUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Property<T[], S>;
+		bufferWhileBy<U>(otherObs: Observable<boolean, U>): Property<T[], S>;
+		awaiting<U, V>(otherObs: Observable<U, V>): Property<boolean, S>;
+	}
+	
+	export interface ObservablePool<T, S> extends Observable<T, S> {
+		plug(obs: Observable<T, S>): void;
+		unPlug(obs: Observable<T, S>): void;
+	}
+	
+	export interface Event<T> {
+		type: string;
+		value: T;
+		current: boolean;
+	}
+	
+	export interface Emitter<T, S> {
+		emit(value: T): void;
+		error(error: S): void;
+		end(): void;
+		emitEvent(event: {type: string, value: T | S}): void;
+	}
+	
+	// Create a stream
+	export function never(): Stream<void, void>;
+	export function later<T>(wait: number, value: T): Stream<T, void>;
+	export function interval<T>(interval: number, value: T): Stream<T, void>;
+	export function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
+	export function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
+	export function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
+	export function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
+	export function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
+	export function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
+	export function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
+	
+	// Create a property
+	export function constant<T>(value: T): Property<T, void>;
+	export function constantError<T>(error: T): Property<void, T>;
+	export function fromPromise<T, S>(promise: any): Property<T, S>;
+	
+	// Combine observables
+	export function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+	export function combine<T, S, U>(obss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+	export function zip<T, S, U>(obss: Observable<T, S>[], passiveObss?: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+	export function merge<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+	export function concat<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+	export function pool<T, S>(): ObservablePool<T, S>;
+	export function repeat<T, S>(generator: (i: number) => Observable<T, S> | boolean): Observable<T, S>;
+}
diff --git a/knex/knex-test.ts b/knex/knex-test.ts
index d15786736..081f98867 100644
--- a/knex/knex-test.ts
+++ b/knex/knex-test.ts
@@ -353,6 +353,7 @@ knex.transaction(function(trx) {
 knex.schema.createTable('users', function (table) {
   table.increments();
   table.string('name');
+  table.enu('favorite_color', ['red', 'blue', 'green']);
   table.timestamps();
 });
 
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
index 82dda6bf2..82c26cfec 100644
--- a/knex/knex.d.ts
+++ b/knex/knex.d.ts
@@ -326,8 +326,8 @@ declare module "knex" {
       timestamp(columnName: string): ColumnBuilder;
       timestamps(): ColumnBuilder;
       binary(columnName: string): ColumnBuilder;
-      enum(columnName: string): ColumnBuilder;
-      enu(columnName: string): ColumnBuilder;
+      enum(columnName: string, values: Value[]): ColumnBuilder;
+      enu(columnName: string, values: Value[]): ColumnBuilder;
       json(columnName: string): ColumnBuilder;
       uuid(columnName: string): ColumnBuilder;
       comment(val: string): TableBuilder;
diff --git a/knockout.validation/knockout.validation.d.ts b/knockout.validation/knockout.validation.d.ts
index 3ce139a99..5581261d3 100644
--- a/knockout.validation/knockout.validation.d.ts
+++ b/knockout.validation/knockout.validation.d.ts
@@ -17,7 +17,7 @@ interface KnockoutValidationConfiguration {
     insertMessages?: boolean;
     parseInputAttributes?: boolean;
     writeInputAttributes?: boolean;
-    decorateElement?: boolean;
+    decorateInputElement?: boolean;
     errorClass?: string;
     errorElementClass?: string;
     errorMessageClass?: string;
diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index 94964950c..edb510b6d 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -5,13 +5,18 @@
 
 
 interface KnockoutSubscribableFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
+    
 	notifySubscribers(valueToWrite?: T, event?: string): void;
 }
 
 interface KnockoutComputedFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
 }
 
 interface KnockoutObservableFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
+    
 	equalityComparer(a: any, b: any): boolean;
 }
 
@@ -30,6 +35,8 @@ interface KnockoutObservableArrayFunctions<T> {
     sort(compareFunction: (left: T, right: T) => number): void;
 
     // Ko specific
+    [key: string]: KnockoutBindingHandler;
+    
     replace(oldItem: T, newItem: T): void;
 
     remove(item: T): T[];
@@ -261,7 +268,7 @@ interface KnockoutUtils {
 
     compareArrays<T>(a: T[], b: T[]): Array<KnockoutArrayChange<T>>;
 
-    arrayForEach<T>(array: T[], action: (item: T) => void): void;
+    arrayForEach<T>(array: T[], action: (item: T, index: number) => void): void;
 
     arrayIndexOf<T>(array: T[], item: T): number;
 
diff --git a/knockout/knockoutamd-tests.ts b/knockout/knockoutamd-tests.ts
index dd2124b70..447da840e 100644
--- a/knockout/knockoutamd-tests.ts
+++ b/knockout/knockoutamd-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./knockout.d.ts" />
+
 import ko = require("knockout");
 
 var myArray = ko.observableArray([1, 2, 3]);
@@ -6,4 +8,4 @@ class MyViewModel {
 	name = ko.observable("Jeff");
 }
 
-ko.applyBindings(new MyViewModel());
\ No newline at end of file
+ko.applyBindings(new MyViewModel());
diff --git a/ko.plus/ko.plus-tests.ts b/ko.plus/ko.plus-tests.ts
index 992332e2b..7dd1053b2 100644
--- a/ko.plus/ko.plus-tests.ts
+++ b/ko.plus/ko.plus-tests.ts
@@ -43,6 +43,8 @@ function CommandTests() {
         action: () => { return "Hello cmd4"; }
     });
 
+    // initialize command with action with typed argument
+    var cmd5 = ko.command((message: string) => { return message; });
 
     // test execute the command
     cmd1();
diff --git a/ko.plus/ko.plus.d.ts b/ko.plus/ko.plus.d.ts
index 65301aa7c..dacf6121f 100644
--- a/ko.plus/ko.plus.d.ts
+++ b/ko.plus/ko.plus.d.ts
@@ -23,7 +23,7 @@
 //
 interface KnockoutStatic {
     // create a command - two overloads
-    command: (param: KoPlus.Callback | KoPlus.CommandOptions) => KoPlus.Command;
+    command: (param: Function | KoPlus.CommandOptions) => KoPlus.Command;
 
     editable: KoPlus.EditableStatic;
     editableArray: KoPlus.EditableArrayStatic;
@@ -60,8 +60,6 @@ interface KnockoutBindingHandlers {
 // namespace for ko.plus types
 //
 declare module KoPlus {
-    // predefine a callback type
-    export type Callback = () => void;
 
     //#region Command types
 
@@ -91,9 +89,9 @@ declare module KoPlus {
 
         fail: (callback: (error: string) => void) => Command;
 
-        always: (callback: Callback) => Command;
+        always: (callback: Function) => Command;
 
-        then: (resolve: Callback, reject: Callback) => Command;
+        then: (resolve: Function, reject: Function) => Command;
     }
 
     //
@@ -102,7 +100,7 @@ declare module KoPlus {
     //
     export interface CommandOptions {
         // [required] sets the command action method
-        action: Callback;
+        action: Function;
 
         // [optional] function to determine if command can be executed
         canExecute?: () => boolean;
diff --git a/leaflet-label/leaflet-label.d.ts b/leaflet-label/leaflet-label.d.ts
index 38bb43d7a..a77def73c 100644
--- a/leaflet-label/leaflet-label.d.ts
+++ b/leaflet-label/leaflet-label.d.ts
@@ -6,9 +6,13 @@
 /// <reference path="../leaflet/leaflet.d.ts" />
 
 declare module L {
-	export interface IconOptions {
-		labelAnchor?: Point;
-	}
+    export interface IconOptions {
+        labelAnchor?: Point;
+    }
+
+    export interface PathOptions {
+        labelAnchor?: Point;
+    }
 
 	export interface CircleMarkerOptions {
 		labelAnchor?: Point;
diff --git a/leaflet/leaflet-tests.ts b/leaflet/leaflet-tests.ts
index 4c8fd4d73..0ea66d32e 100755
--- a/leaflet/leaflet-tests.ts
+++ b/leaflet/leaflet-tests.ts
@@ -6,38 +6,38 @@ var div = document.getElementById('map');
 
 var map : L.Map = L.map(div, {
     center: L.latLng([51.505, -0.09]),
-	zoom: 13,
-	minZoom: 3,
-	maxZoom: 8,
-	maxBounds: L.latLngBounds([L.latLng(-60, -60), L.latLng(60, 60)]),
-	dragging: true,
-	touchZoom: true,
-	scrollWheelZoom: true,
-	boxZoom: true,
-	tap: true,
+    zoom: 13,
+    minZoom: 3,
+    maxZoom: 8,
+    maxBounds: L.latLngBounds([L.latLng(-60, -60), L.latLng(60, 60)]),
+    dragging: true,
+    touchZoom: true,
+    scrollWheelZoom: true,
+    boxZoom: true,
+    tap: true,
 
-	tapTolerance: 30,
-	trackResize: true,
-	worldCopyJump: false,
-	closePopupOnClick: true,
-	bounceAtZoomLimits: true,
+    tapTolerance: 30,
+    trackResize: true,
+    worldCopyJump: false,
+    closePopupOnClick: true,
+    bounceAtZoomLimits: true,
 
-	keyboard: true,
-	keyboardPanOffset: 80,
-	keyboardZoomOffset: 1,
+    keyboard: true,
+    keyboardPanOffset: 80,
+    keyboardZoomOffset: 1,
 
-	inertia: true,
-	inertiaDeceleration: 3000,
-	inertiaMaxSpeed: 1500,
-	inertiaThreshold: 32,
+    inertia: true,
+    inertiaDeceleration: 3000,
+    inertiaMaxSpeed: 1500,
+    inertiaThreshold: 32,
 
-	zoomControl: true,
-	attributionControl: true,
+    zoomControl: true,
+    attributionControl: true,
 
-	fadeAnimation: true,
-	zoomAnimation: true,
-	zoomAnimationThreshold: 4,
-	markerZoomAnimation: true
+    fadeAnimation: true,
+    zoomAnimation: true,
+    zoomAnimationThreshold: 4,
+    markerZoomAnimation: true
 
 });
 
@@ -53,16 +53,16 @@ map.setView(L.latLng(42, 51));
 
 map.setView(L.latLng(42, 51), 12);
 map.setView(L.latLng(42, 51), 12, {
-	reset: true,
-	pan: {
-		animate: true,
-		duration: 0.25,
-		easeLinearity: 0.25,
-		noMoveStart: false
-	},
-	zoom: {
-		animate: true
-	}
+    reset: true,
+    pan: {
+        animate: true,
+        duration: 0.25,
+        easeLinearity: 0.25,
+        noMoveStart: false
+    },
+    zoom: {
+        animate: true
+    }
 });
 
 map.setZoom(50);
@@ -81,21 +81,21 @@ map.setZoomAround(L.latLng(42, 51), 8, { animate: false });
 
 map.fitBounds(L.latLngBounds(L.latLng(10, 10), L.latLng(20, 20)));
 map.fitBounds(L.latLngBounds(L.latLng(10, 10), L.latLng(20, 20)), {
-	paddingTopLeft: L.point(20, 20),
-	paddingBottomRight: L.point(20, 20),
-	padding: L.point(0, 0),
-	maxZoom: null
+    paddingTopLeft: L.point(20, 20),
+    paddingBottomRight: L.point(20, 20),
+    padding: L.point(0, 0),
+    maxZoom: null
 });
 
 map.fitWorld();
 
 map.fitWorld({
-	animate: false
+    animate: false
 });
 
 map.panTo(L.latLng(42, 42));
 map.panTo(L.latLng(42, 42), {
-	animate: true
+    animate: true
 });
 
 map.invalidateSize(true);
@@ -105,12 +105,12 @@ map.setMaxBounds(L.latLngBounds(L.latLng(10, 10), L.latLng(20, 20)));
 
 map.locate();
 map.locate({
-	watch: false,
-	setView: false,
-	maxZoom: 18,
-	timeout: 10000,
-	maximumAge: 0,
-	enableHighAccuracy: false
+    watch: false,
+    setView: false,
+    maxZoom: 18,
+    timeout: 10000,
+    maximumAge: 0,
+    enableHighAccuracy: false
 });
 
 map.stopLocate();
@@ -138,7 +138,7 @@ map.hasLayer(layer);
 map.openPopup("canard", L.latLng(42, 51));
 
 var popup = L.popup({
-	autoPan: true
+    autoPan: true
 });
 
 map.openPopup(popup);
@@ -148,6 +148,11 @@ map.closePopup();
 map.addControl(L.control.attribution({position: 'bottomright'}));
 map.removeControl(L.control.attribution({ position: 'bottomright' }));
 
+L.control.layers({'Base': layer}).addTo(map);
+map.on('baseLayerChange', function(e: L.LeafletLayersControlEvent) { 
+  alert(e.name); 
+});
+
 map.latLngToLayerPoint(map.layerPointToLatLng(L.point(0, 0)));
 map.latLngToContainerPoint(map.containerPointToLatLng(L.point(0, 0)));
 map.containerPointToLayerPoint(L.point(0, 0));
@@ -171,51 +176,51 @@ map.getPanes().shadowPane.classList.add('roger');
 map.getPanes().tilePane.classList.add('roger');
 
 map.whenReady((m: L.Map) => {
-	m.zoomOut();
+    m.zoomOut();
 });
 
 map.on('click', () => {
-	map.zoomOut();
+    map.zoomOut();
 });
 
 map.off('dblclick', L.Util.falseFn);
 
 map.once('contextmenu', (e: L.LeafletMouseEvent) => {
-	map.openPopup('contextmenu', e.latlng);
+    map.openPopup('contextmenu', e.latlng);
 });
 
 var marker = L.marker(L.latLng(42, 51), {
-	icon: L.icon({
-		iconURl: 'roger.png',
-		iconRetinaUrl: 'roger-retina.png',
-		iconSize: L.point(40, 40),
-		iconAnchor: L.point(20, 0),
-		shadowUrl: 'roger-shadow.png',
-		shadowRetinaUrl: 'roger-shadow-retina.png',
-		shadowSize: L.point(44, 44),
-		shadowAnchor: L.point(22, 0),
-		popupAnchor: L.point(0, 0),
-		className: 'roger-icon'
-	}),
-	clickable: true,
-	draggable: false,
-	keyboard: true,
-	title: 'this is an icon',
-	alt: '',
-	zIndexOffset: 0,
-	opacity: 1.0,
-	riseOnHover: false,
-	riseOffset: 250
+    icon: L.icon({
+        iconUrl: 'roger.png',
+        iconRetinaUrl: 'roger-retina.png',
+        iconSize: L.point(40, 40),
+        iconAnchor: L.point(20, 0),
+        shadowUrl: 'roger-shadow.png',
+        shadowRetinaUrl: 'roger-shadow-retina.png',
+        shadowSize: L.point(44, 44),
+        shadowAnchor: L.point(22, 0),
+        popupAnchor: L.point(0, 0),
+        className: 'roger-icon'
+    }),
+    clickable: true,
+    draggable: false,
+    keyboard: true,
+    title: 'this is an icon',
+    alt: '',
+    zIndexOffset: 0,
+    opacity: 1.0,
+    riseOnHover: false,
+    riseOffset: 250
 });
 
 marker.addTo(map);
 
 marker.on('click', (e: L.LeafletMouseEvent) => {
-	map.setView(e.latlng);
+    map.setView(e.latlng);
 });
 
 marker.once('mouseover', () => {
-	marker.openPopup();
+    marker.openPopup();
 })
 
 marker.setLatLng(marker.getLatLng());
@@ -228,7 +233,7 @@ marker.setOpacity(0.8);
 marker.bindPopup(popup);
 marker.unbindPopup();
 marker.bindPopup('hello', {
-	closeOnClick: true
+    closeOnClick: true
 });
 
 marker.openPopup();
@@ -244,19 +249,19 @@ marker.toGeoJSON();
 marker.dragging.enable();
 
 popup = L.popup({
-	maxWidth: 300,
-	minWidth: 50,
-	maxHeight: null,
-	autoPan: true,
-	keepInView: false,
-	closeButton: true,
-	offset: L.point(0, 6),
-	autoPanPaddingTopLeft: null,
-	autoPanPaddingBottomRight: L.point(20, 20),
-	autoPanPadding: L.point(5, 5),
-	zoomAnimation: true,
-	closeOnClick: null,
-	className: 'roger'
+    maxWidth: 300,
+    minWidth: 50,
+    maxHeight: null,
+    autoPan: true,
+    keepInView: false,
+    closeButton: true,
+    offset: L.point(0, 6),
+    autoPanPaddingTopLeft: null,
+    autoPanPaddingBottomRight: L.point(20, 20),
+    autoPanPadding: L.point(5, 5),
+    zoomAnimation: true,
+    closeOnClick: null,
+    className: 'roger'
 });
 
 popup.setLatLng(L.latLng(12, 54)).setContent('this is nice popup').openOn(map);
@@ -264,66 +269,65 @@ popup.setLatLng(L.latLng(12, 54)).setContent('this is nice popup').openOn(map);
 popup.update();
 
 var tileLayer = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png?{foo}', {
-	foo: 'bar',
-	minZoom: 0,
-	maxZoom: 18,
-	maxNativeZoom: 17,
-	tileSize: 256,
-	subdomains: ['a','b','c'],
-	errorTileUrl: '',
-	attribution: '',
-	tms: false,
-	continuousWorld: false,
-	noWrap: false,
-	zoomOffset: 0,
-	zoomReverse: false,
-	opacity: 1.0,
-	zIndex: null,
-	unloadInvisibleTiles: false,
-	updateWhenIdle: false,
-	detectRetina: true,
-	reuseTiles: true,
-	bounds: null
+    minZoom: 0,
+    maxZoom: 18,
+    maxNativeZoom: 17,
+    tileSize: 256,
+    subdomains: ['a','b','c'],
+    errorTileUrl: '',
+    attribution: '',
+    tms: false,
+    continuousWorld: false,
+    noWrap: false,
+    zoomOffset: 0,
+    zoomReverse: false,
+    opacity: 1.0,
+    zIndex: null,
+    unloadInvisibleTiles: false,
+    updateWhenIdle: false,
+    detectRetina: true,
+    reuseTiles: true,
+    bounds: null
 });
 
 tileLayer.on('loading', L.Util.falseFn)
-	.off('loading', L.Util.falseFn)
-	.once('tileload', L.Util.falseFn);
+    .off('loading', L.Util.falseFn)
+    .once('tileload', L.Util.falseFn);
 
 tileLayer.addTo(map);
 
 tileLayer.bringToBack()
-	.bringToFront()
-	.setOpacity(0.7)
-	.setZIndex(9)
-	.redraw()
-	.setUrl('http://perdu.com')
-	.getContainer();
+    .bringToFront()
+    .setOpacity(0.7)
+    .setZIndex(9)
+    .redraw()
+    .setUrl('http://perdu.com')
+    .getContainer();
 
 module CustomControl {
-	export interface Options {
-		title: string;
-		position?: string;
-	}
+    export interface Options {
+        title: string;
+        position?: string;
+    }
 }
 interface CustomControl extends L.Control {
-	getTitle(): string;
-	setTitle(title: string): CustomControl;
+    getTitle(): string;
+    setTitle(title: string): CustomControl;
 }
 var CustomControl: { new(options: CustomControl.Options): CustomControl };
 CustomControl = L.Control.extend<CustomControl.Options, CustomControl>({
-	initialize: function(options: CustomControl.Options) {
-		L.Control.prototype.initialize.call(this, {
-			position: options.position || 'bottomleft',
-		});
-		this.title = options.title;
-	},
-	getTitle: function() {
-		return this.title;
-	},
-	setTitle: function(title: string) {
-		this.title = title;
-	},
+    initialize: function(options: CustomControl.Options) {
+        L.Control.prototype.initialize.call(this, {
+            position: options.position || 'bottomleft',
+        });
+        this.title = options.title;
+    },
+    getTitle: function() {
+        return this.title;
+    },
+    setTitle: function(title: string) {
+        this.title = title;
+    },
 });
 
 // Different latLng and latLngBounds expressions
@@ -414,3 +418,9 @@ polyline.addLatLng(latLngObjectLiteral);
 var popup: L.Popup = L.popup();
 popup.setLatLng(latLngLiteral);
 popup.setLatLng(latLngObjectLiteral);
+
+var zoomCtrl = L.control.zoom({
+    position: "topleft",
+    zoomInText: '+',
+    zoomOutText: '-'
+});
diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index 92aed79b7..110bdd6f7 100755
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -264,6 +264,11 @@ declare module L {
 
 declare module L {
     export interface ClassExtendOptions {
+        /**
+          * Your class's constructor function, meaning that it gets called when you do 'new MyClass(...)'.
+          */
+        initialize?: Function;
+
         /**
           * options is a special property that unlike other objects that you pass
           * to extend will be merged with the parent one instead of overriding it
@@ -286,6 +291,8 @@ declare module L {
           * constants.
           */
         static?: any;
+
+        [prop: string]: any;
     }
 
     export interface ClassStatic {
@@ -375,17 +382,55 @@ declare module L {
         onRemove(map: Map): void;
     }
 
-    module Control {
+    namespace Control {
         export interface ZoomStatic extends ClassStatic {
             /**
               * Creates a zoom control.
               */
-            new(options?: ZoomOptions): Zoom;
+            new (options?: ZoomOptions): Zoom;
         }
 
         export interface Zoom extends L.Control {
         }
 
+        export interface ZoomOptions {
+            /**
+              * The position of the control (one of the map corners).
+              * Can be 'topleft', 'topright', 'bottomleft', or 'bottomright'.
+              *
+              * Default value: 'topright'.
+              */
+            position?: string; // 'topleft' | 'topright' | 'bottomleft' | 'bottomright'
+
+            /**
+             * The text set on the zoom in button.
+             *
+             * Default value: '+'
+             */
+            zoomInText?: string;
+
+            /**
+             * The text set on the zoom out button.
+             *
+             * Default value: '-'
+             */
+            zoomOutText?: string;
+
+            /**
+             * The title set on the zoom in button.
+             *
+             * Default value: 'Zoom in'
+             */
+            zoomInTitle?: string;
+
+            /**
+             * The title set on the zoom out button.
+             *
+             * Default value: 'Zoom out'
+             */
+            zoomOutTitle?: string;
+        }
+
         export interface AttributionStatic extends ClassStatic {
             /**
               * Creates an attribution control.
@@ -471,12 +516,12 @@ declare module L {
         function (options?: ControlOptions): Control;
     }
 
-    module control {
+    namespace control {
 
         /**
           * Creates a zoom control.
           */
-        export function zoom(options?: ZoomOptions): L.Control.Zoom;
+        export function zoom(options?: Control.ZoomOptions): L.Control.Zoom;
 
         /**
           * Creates an attribution control.
@@ -496,7 +541,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ControlOptions {
 
@@ -510,9 +555,9 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
-    module CRS {
+    namespace CRS {
 
         /**
           * The most common CRS for online maps, used by almost all free and commercial
@@ -542,7 +587,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a div icon instance with the given options.
@@ -561,7 +606,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface DivIconOptions {
 
@@ -595,7 +640,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface DomEvent {
 
@@ -656,9 +701,9 @@ declare module L {
     export var DomEvent: DomEvent;
 }
 
-declare module L {
+declare namespace L {
 
-    module DomUtil {
+    namespace DomUtil {
 
         /**
           * Returns an element with the given id if a string was passed, or just returns
@@ -759,7 +804,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a Draggable object for moving the given element when you start dragging
@@ -809,7 +854,7 @@ declare module L {
 
 
 
-declare module L {
+declare namespace L {
 
     /**
       * Create a layer group, optionally given an initial set of layers.
@@ -887,44 +932,7 @@ declare module L {
     }
 }
 
-declare module L {
-
-    export interface FitBoundsOptions extends ZoomPanOptions {
-
-        /**
-          * Sets the amount of padding in the top left corner of a map container that
-          * shouldn't be accounted for when setting the view to fit bounds. Useful if
-          * you have some control overlays on the map like a sidebar and you don't
-          * want them to obscure objects you're zooming to.
-          *
-          * Default value: [0, 0].
-          */
-        paddingTopLeft?: Point;
-
-        /**
-          * The same for bottom right corner of the map.
-          *
-          * Default value: [0, 0].
-          */
-        paddingBottomRight?: Point;
-
-        /**
-          * Equivalent of setting both top left and bottom right padding to the same value.
-          *
-          * Default value: [0, 0].
-          */
-        padding?: Point;
-
-        /**
-          * The maximum possible zoom to use.
-          *
-          * Default value: null
-          */
-        maxZoom?: number;
-    }
-}
-
-declare module L {
+declare namespace L {
 
     /**
       * Creates a GeoJSON layer. Optionally accepts an object in GeoJSON format
@@ -987,7 +995,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
     export interface GeoJSONOptions {
         /**
           * Function that will be used for creating layers for GeoJSON points (if not
@@ -1024,7 +1032,7 @@ declare module L {
 
 
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates an icon instance with the given options.
@@ -1051,7 +1059,7 @@ declare module L {
     export interface Icon {
     }
 
-    module Icon {
+    namespace Icon {
         /**
           * L.Icon.Default extends L.Icon and is the blue icon Leaflet uses
           * for markers by default.
@@ -1061,7 +1069,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IconOptions {
 
@@ -1126,7 +1134,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IControl {
 
@@ -1146,7 +1154,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ICRS {
 
@@ -1198,7 +1206,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IEventPowered<T> {
 
@@ -1278,7 +1286,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IHandler {
 
@@ -1303,7 +1311,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ILayer {
 
@@ -1322,8 +1330,8 @@ declare module L {
     }
 }
 
-declare module L {
-    module Mixin {
+declare namespace L {
+    namespace Mixin {
         export interface LeafletMixinEvents extends IEventPowered<LeafletMixinEvents> {
         }
 
@@ -1331,7 +1339,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates an image overlay object given the URL of the image and the geographical
@@ -1391,7 +1399,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ImageOverlayOptions {
 
@@ -1402,7 +1410,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IProjection {
 
@@ -1418,7 +1426,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
     * A constant that represents the Leaflet version in use.
@@ -1432,7 +1440,7 @@ declare module L {
     export function noConflict(): typeof L;
 }
 
-declare module L {
+declare namespace L {
     /**
       * Creates an object representing a geographical point with the given latitude
       * and longitude.
@@ -1517,7 +1525,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a LatLngBounds object by defining south-west and north-east corners
@@ -1643,7 +1651,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Create a layer group, optionally given an initial set of layers.
@@ -1729,7 +1737,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface LayersOptions {
 
@@ -1759,7 +1767,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletErrorEvent extends LeafletEvent {
 
@@ -1775,7 +1783,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletEvent {
 
@@ -1791,7 +1799,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletGeoJSONEvent extends LeafletEvent {
 
@@ -1817,7 +1825,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletLayerEvent extends LeafletEvent {
 
@@ -1828,6 +1836,22 @@ declare module L {
     }
 }
 
+declare namespace L {
+
+    export interface LeafletLayersControlEvent extends LeafletEvent {
+
+        /**
+          * The layer that was added or removed.
+          */
+        layer: ILayer;
+
+        /**
+          * The name of the layer that was added or removed.
+          */
+        name: string;
+    }
+}
+
 declare module L {
 
     export interface LeafletLocationEvent extends LeafletEvent {
@@ -1876,7 +1900,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletMouseEvent extends LeafletEvent {
 
@@ -1904,7 +1928,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletPopupEvent extends LeafletEvent {
 
@@ -1915,7 +1939,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletDragEndEvent extends LeafletEvent {
 
@@ -1926,7 +1950,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletResizeEvent extends LeafletEvent {
 
@@ -1942,7 +1966,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletTileEvent extends LeafletEvent {
 
@@ -1958,9 +1982,9 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
-    module LineUtil {
+    namespace LineUtil {
 
         /**
           * Dramatically reduces the number of points in a polyline while retaining
@@ -1992,7 +2016,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LocateOptions {
 
@@ -2045,19 +2069,19 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a map object given a div element and optionally an
       * object literal with map options described below.
       */
-    function map(id: HTMLElement, options?: MapOptions): Map;
+    function map(id: HTMLElement, options?: Map.MapOptions): Map;
 
     /**
       * Instantiates a map object given a div element id and optionally an
       * object literal with map options described below.
       */
-    function map(id: string, options?: MapOptions): Map;
+    function map(id: string, options?: Map.MapOptions): Map;
 
 
     export interface MapStatic extends ClassStatic {
@@ -2067,7 +2091,7 @@ declare module L {
           *
           * @constructor
           */
-        new(id: HTMLElement, options?: MapOptions): Map;
+        new(id: HTMLElement, options?: Map.MapOptions): Map;
 
         /**
           * Instantiates a map object given a div element id and optionally an
@@ -2075,7 +2099,7 @@ declare module L {
           *
           * @constructor
           */
-        new(id: string, options?: MapOptions): Map;
+        new(id: string, options?: Map.MapOptions): Map;
     }
     export var Map: MapStatic;
 
@@ -2086,40 +2110,40 @@ declare module L {
           * Sets the view of the map (geographical center and zoom) with the given
           * animation options.
           */
-        setView(center: LatLngExpression, zoom?: number, options?: ZoomPanOptions): Map;
+        setView(center: LatLngExpression, zoom?: number, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Sets the zoom of the map.
           */
-        setZoom(zoom: number, options?: ZoomOptions): Map;
+        setZoom(zoom: number, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Increases the zoom of the map by delta (1 by default).
           */
-        zoomIn(delta?: number, options?: ZoomOptions): Map;
+        zoomIn(delta?: number, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Decreases the zoom of the map by delta (1 by default).
           */
-        zoomOut(delta?: number, options?: ZoomOptions): Map;
+        zoomOut(delta?: number, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Zooms the map while keeping a specified point on the map stationary
           * (e.g. used internally for scroll zoom and double-click zoom).
           */
-        setZoomAround(latlng: LatLngExpression, zoom: number, options?: ZoomOptions): Map;
+        setZoomAround(latlng: LatLngExpression, zoom: number, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Sets a map view that contains the given geographical bounds with the maximum
           * zoom level possible.
           */
-        fitBounds(bounds: LatLngBounds, options?: FitBoundsOptions): Map;
+        fitBounds(bounds: LatLngBounds, options?: Map.FitBoundsOptions): Map;
 
         /**
           * Sets a map view that mostly contains the whole world with the maximum zoom
           * level possible.
           */
-        fitWorld(options?: FitBoundsOptions): Map;
+        fitWorld(options?: Map.FitBoundsOptions): Map;
 
         /**
           * Pans the map to a given center. Makes an animated pan if new center is not more
@@ -2143,7 +2167,7 @@ declare module L {
           * after you've changed the map size dynamically, also animating pan by default.
           * If options.pan is false, panning will not occur.
           */
-        invalidateSize(options: ZoomPanOptions): Map;
+        invalidateSize(options: Map.ZoomPanOptions): Map;
 
         /**
           * Checks if the map container size changed and updates the map if so — call it
@@ -2155,7 +2179,7 @@ declare module L {
           * Restricts the map view to the given bounds (see map maxBounds option),
           * passing the given animation options through to `setView`, if required.
           */
-        setMaxBounds(bounds: LatLngBounds, options?: ZoomPanOptions): Map;
+        setMaxBounds(bounds: LatLngBounds, options?: Map.ZoomPanOptions): Map;
 
         /**
           * Tries to locate the user using Geolocation API, firing locationfound event
@@ -2415,7 +2439,7 @@ declare module L {
         /**
           * Map state options
           */
-        options: MapOptions;
+        options: Map.MapOptions;
 
         ////////////////
         ////////////////
@@ -2435,7 +2459,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L.Map {
 
     export interface MapOptions {
 
@@ -2673,9 +2697,82 @@ declare module L {
          */
         bounceAtZoomLimits?: boolean;
     }
+
+    export interface ZoomOptions {
+        /**
+          * If not specified, zoom animation will happen if the zoom origin is inside the current view.
+          * If true, the map will attempt animating zoom disregarding where zoom origin is.
+          * Setting false will make it always reset the view completely without animation.
+          */
+        animate?: boolean;
+    }
+
+    export interface ZoomPanOptions {
+
+        /**
+          * If true, the map view will be completely reset (without any animations).
+          *
+          * Default value: false.
+          */
+        reset?: boolean;
+
+        /**
+          * Sets the options for the panning (without the zoom change) if it occurs.
+          */
+        pan?: PanOptions;
+
+        /**
+          * Sets the options for the zoom change if it occurs.
+          */
+        zoom?: ZoomOptions;
+
+        /**
+          * An equivalent of passing animate to both zoom and pan options (see below).
+          */
+        animate?: boolean;
+
+        /**
+         * If true, it will delay moveend event so that it doesn't happen many times in a row.
+         */
+        debounceMoveend?: boolean;
+    }
+
+    export interface FitBoundsOptions extends ZoomPanOptions {
+
+        /**
+          * Sets the amount of padding in the top left corner of a map container that
+          * shouldn't be accounted for when setting the view to fit bounds. Useful if
+          * you have some control overlays on the map like a sidebar and you don't
+          * want them to obscure objects you're zooming to.
+          *
+          * Default value: [0, 0].
+          */
+        paddingTopLeft?: Point;
+
+        /**
+          * The same for bottom right corner of the map.
+          *
+          * Default value: [0, 0].
+          */
+        paddingBottomRight?: Point;
+
+        /**
+          * Equivalent of setting both top left and bottom right padding to the same value.
+          *
+          * Default value: [0, 0].
+          */
+        padding?: Point;
+
+        /**
+          * The maximum possible zoom to use.
+          *
+          * Default value: null
+          */
+        maxZoom?: number;
+    }
 }
 
-declare module L {
+declare namespace L {
 
     export interface MapPanes {
 
@@ -2716,7 +2813,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a Marker object given a geographical point and optionally
@@ -2866,7 +2963,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface MarkerOptions {
 
@@ -2946,7 +3043,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a multi-polyline object given an array of latlngs arrays (one
@@ -2989,7 +3086,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a multi-polyline object given an array of arrays of geographical
@@ -3030,7 +3127,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PanOptions {
 
@@ -3066,7 +3163,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface Path extends ILayer, IEventPowered<Path> {
 
@@ -3164,7 +3261,7 @@ declare module L {
         off(eventMap?: any, context?: any): Path;
     }
 
-    module Path {
+    namespace Path {
         /**
           * True if SVG is used for vector rendering (true for most modern browsers).
           */
@@ -3194,7 +3291,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PathOptions {
 
@@ -3290,7 +3387,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a Point object with the given x and y coordinates. If optional round
@@ -3366,7 +3463,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a polygon object given an array of geographical points and
@@ -3394,7 +3491,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a polyline object given an array of geographical points and
@@ -3446,7 +3543,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PolylineOptions extends PathOptions {
 
@@ -3467,9 +3564,9 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
-    module PolyUtil {
+    namespace PolyUtil {
 
         /**
           * Clips the polygon geometry defined by the given points by rectangular bounds.
@@ -3481,7 +3578,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a Popup object given an optional options object that describes
@@ -3560,7 +3657,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PopupOptions {
 
@@ -3592,6 +3689,11 @@ declare module L {
           */
         autoPan?: boolean;
 
+        /**
+          * Set it to true if you want to prevent users from panning the popup off of the screen while it is open.
+          */
+        keepInView?: boolean;
+
         /**
           * Controls the presense of a close button in the popup.
           *
@@ -3645,10 +3747,15 @@ declare module L {
           * option).
           */
         closeOnClick?: boolean;
+
+        /**
+          * A custom class name to assign to the popup.
+          */
+        className?: string;
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PosAnimationStatic extends ClassStatic {
         /**
@@ -3685,9 +3792,9 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
-    module Projection {
+    namespace Projection {
 
         /**
           * Spherical Mercator projection — the most common projection for online maps,
@@ -3713,7 +3820,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a rectangle object with the given geographical bounds and
@@ -3739,7 +3846,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface ScaleOptions {
 
@@ -3777,7 +3884,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface TileLayerStatic extends ClassStatic {
         /**
@@ -3877,7 +3984,7 @@ declare module L {
         off(eventMap?: any, context?: any): TileLayer;
     }
 
-    module TileLayer {
+    namespace TileLayer {
         export interface WMS extends TileLayer {
             /**
               * Merges an object with the new parameters and re-requests tiles on the current
@@ -3925,7 +4032,7 @@ declare module L {
     export var tileLayer: TileLayerFactory;
 }
 
-declare module L {
+declare namespace L {
 
     export interface TileLayerOptions {
 
@@ -4064,10 +4171,15 @@ declare module L {
           * Default value: false.
           */
         reuseTiles?: boolean;
+
+        /**
+          * When this option is set, the TileLayer only loads tiles that are in the given geographical bounds.
+          */
+        bounds?: LatLngBounds;
     }
 }
 
-declare module L {
+declare namespace L {
     export interface TransformationStatic extends ClassStatic {
         /**
           * Creates a transformation object with the given coefficients.
@@ -4091,9 +4203,9 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
-    module Util {
+    namespace Util {
 
         /**
           * Merges the properties of the src object (or multiple objects) into dest object
@@ -4175,7 +4287,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface WMSOptions {
 
@@ -4215,53 +4327,6 @@ declare module L {
     }
 }
 
-
-declare module L {
-
-    export interface ZoomOptions {
-
-        /**
-          * The position of the control (one of the map corners). See control positions.
-          *
-          * Default value: 'topright'.
-          */
-        position?: string;
-    }
-}
-
-declare module L {
-
-    export interface ZoomPanOptions {
-
-        /**
-          * If true, the map view will be completely reset (without any animations).
-          *
-          * Default value: false.
-          */
-        reset?: boolean;
-
-        /**
-          * Sets the options for the panning (without the zoom change) if it occurs.
-          */
-        pan?: PanOptions;
-
-        /**
-          * Sets the options for the zoom change if it occurs.
-          */
-        zoom?: ZoomOptions;
-
-        /**
-          * An equivalent of passing animate to both zoom and pan options (see below).
-          */
-        animate?: boolean;
-
-        /**
-         * If true, it will delay moveend event so that it doesn't happen many times in a row.
-         */
-        debounceMoveend?: boolean;
-    }
-}
-
 /**
   * Forces Leaflet to use the Canvas back-end (if available) for vector layers
   * instead of SVG. This can increase performance considerably in some cases
diff --git a/leapmotionTS/LeapMotionTS-tests.ts b/leapmotionTS/LeapMotionTS-tests.ts
index c6db49c3e..ac392941e 100755
--- a/leapmotionTS/LeapMotionTS-tests.ts
+++ b/leapmotionTS/LeapMotionTS-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="LeapMotionTS.d.ts" />
-
-import Leap = require('LeapMotionTS');
+import Leap = require('./LeapMotionTS');
 
 var controller: Leap.Controller = new Leap.Controller();
 controller.addEventListener(Leap.LeapEvent.LEAPMOTION_FRAME, (event: Leap.LeapEvent) => {
diff --git a/level-sublevel/level-sublevel-tests.ts b/level-sublevel/level-sublevel-tests.ts
new file mode 100644
index 000000000..9887dd70c
--- /dev/null
+++ b/level-sublevel/level-sublevel-tests.ts
@@ -0,0 +1,28 @@
+/// <reference path="level-sublevel.d.ts" />
+
+import levelup = require('levelup');
+import sublevel = require('level-sublevel');
+
+var db = sublevel(levelup('./tmp/sublevel-example'));
+var sub = db.sublevel('stuff');
+
+db.put('foo', 'bar', err => {});
+
+sub.put('foo', 'bar', err => {});
+
+db.pre((ch, add) => {
+	add({
+		key: ''+Date.now(),
+		value: ch.key,
+		type: 'put',
+		prefix: sub
+	})
+});
+
+var sub1 = db.sublevel('SUB_1');
+var sub2 = db.sublevel('SUM_2');
+
+sub1.batch([
+	{ key: 'key', value: 'Value', type: 'put' },
+	{ key: 'key', value: 'Value', type: 'put', prefix: sub2 }
+], err => {	if (err) throw err; });
\ No newline at end of file
diff --git a/level-sublevel/level-sublevel.d.ts b/level-sublevel/level-sublevel.d.ts
new file mode 100644
index 000000000..969ada963
--- /dev/null
+++ b/level-sublevel/level-sublevel.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for level-sublevel
+// Project: https://github.com/dominictarr/level-sublevel
+// Definitions by: Bas Pennings <https://github.com/basp/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../levelup/levelup.d.ts" />
+
+interface Hook {
+	(ch: any, add: (op: Batch|boolean) => void): void;
+}
+
+interface Batch {
+	prefix?: Sublevel;
+}
+
+interface Sublevel extends LevelUp {
+	sublevel(key: string): Sublevel;
+	pre(hook: Hook): Function;
+}
+
+declare module "level-sublevel" {
+	function sublevel(levelup: LevelUp): Sublevel;
+	export = sublevel;		
+}
\ No newline at end of file
diff --git a/levelup/levelup.d.ts b/levelup/levelup.d.ts
index bb5af38be..d6f62f184 100644
--- a/levelup/levelup.d.ts
+++ b/levelup/levelup.d.ts
@@ -22,8 +22,8 @@ interface LevelUp {
     del(key: any, options ?: { keyEncoding?: string; sync?: boolean }, callback ?: (error: any) => any): void;
 
 
-    batch(array: Batch[], options?: { keyEncoding?: string; valueEncoding?: string; sync?: boolean }, callback?: (error?: any)=>any);
-    batch(array: Batch[], callback?: (error?: any)=>any);
+    batch(array: Batch[], options?: { keyEncoding?: string; valueEncoding?: string; sync?: boolean }, callback?: (error?: any)=>any): void;
+    batch(array: Batch[], callback?: (error?: any)=>any): void;
     batch():LevelUpChain;
     isOpen():boolean;
     isClosed():boolean;
diff --git a/libxmljs/libxmljs-tests.ts b/libxmljs/libxmljs-tests.ts
index bf73a6d98..fbc862818 100644
--- a/libxmljs/libxmljs-tests.ts
+++ b/libxmljs/libxmljs-tests.ts
@@ -10,7 +10,7 @@ var xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
                '<sibling>with content!</sibling>' +
            '</root>';
 
-var xmlDoc = libxmljs.parseXmlString(xml);
+var xmlDoc = libxmljs.parseXml(xml);
 
 // xpath queries
 var gchild = xmlDoc.get('//grandchild');
diff --git a/libxmljs/libxmljs.d.ts b/libxmljs/libxmljs.d.ts
index bb0f5ba29..42f1df935 100644
--- a/libxmljs/libxmljs.d.ts
+++ b/libxmljs/libxmljs.d.ts
@@ -1,9 +1,16 @@
-// Type definitions for Libxmljs
+// Type definitions for Libxmljs v0.14.2
 // Project: https://github.com/polotek/libxmljs
 // Definitions by: François de Campredon <https://github.com/fdecampredon>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../node/node.d.ts"/>
+
 declare module "libxmljs" {
+
+    import events = require('events');
+
+    export function parseXml(source:string):XMLDocument;
+    export function parseHtml(source:string):HTMLDocument;
     export function parseXmlString(source:string):XMLDocument;
     export function parseHtmlString(source:string):HTMLDocument;
  
@@ -20,6 +27,8 @@ declare module "libxmljs" {
         node(name:string, content:string):Element;
         root():Element;
         toString():string;
+        validate(xsdDoc:XMLDocument): boolean;
+        validationErrors: XmlError[];
         version():Number;
     }
  
@@ -33,26 +42,27 @@ declare module "libxmljs" {
         name():string;
         name(newName:string):void;
         text():string;
-        attr(name:string):string;
-        attr(attr:Attribute);
+        attr(name:string):Attribute;
+        attr(attr:Attribute):void;
         attr(attrObject:{[key:string]:string;}):void;
         attrs():Attribute[];
         parent():Element;
         doc():XMLDocument;
         child(idx:number):Element;
         childNodes():Element[];
-        addChild(child:Element);
+        addChild(child:Element):Element;
         nextSibling():Element;
         nextElement():Element;
         addNextSibling(siblingNode:Element):Element;
         prevSibling():Element;
         prevElement():Element;
-        addPrevSibling(siblingNode:Element);
+        addPrevSibling(siblingNode:Element):Element;
         find(xpath:string):Element[];
         find(xpath:string, ns_uri:string):Element[];
-        get(xpath:string, ns_uri:string):Element;
         find(xpath:string, namespaces:{[key:string]:string;}):Element[];
-        get(xpath, ns_uri:{[key:string]:string;}):Element;
+        get(xpath:string):Element;
+        get(xpath:string, ns_uri:string):Element;
+        get(xpath:string, ns_uri:{[key:string]:string;}):Element;
         defineNamespace(href:string):Namespace;
         defineNamespace(prefix:string, href:string):Namespace;
         namespace():Namespace;
@@ -84,28 +94,22 @@ declare module "libxmljs" {
         prefix():string;
     }
  
-    export class SaxParser {
+    export class SaxParser extends events.EventEmitter {
         parseString(source:string):boolean;
-        addListener(event: string, listener: Function);
-        on(event: string, listener: Function): any;
-        once(event: string, listener: Function): void;
-        removeListener(event: string, listener: Function): void;
-        removeAllListener(event: string): void;
-        setMaxListeners(n: number): void;
-        listeners(event: string): { Function; }[];
-        emit(event: string, arg1?: any, arg2?: any): void;
     }
  
  
-    export class SaxPushParser {
+    export class SaxPushParser extends events.EventEmitter {
         push(source:string):boolean;
-        addListener(event: string, listener: Function);
-        on(event: string, listener: Function): any;
-        once(event: string, listener: Function): void;
-        removeListener(event: string, listener: Function): void;
-        removeAllListener(event: string): void;
-        setMaxListeners(n: number): void;
-        listeners(event: string): { Function; }[];
-        emit(event: string, arg1?: any, arg2?: any): void;
     }
-}
\ No newline at end of file
+
+    export interface XmlError {
+        domain: number;
+        code: number;
+        message: string;
+        level: number;
+        file?: string;
+        column: number;
+        line: number;
+    }
+}
diff --git a/localForage/localForage-tests.ts b/localForage/localForage-tests.ts
index 15638c1cb..59e429a76 100644
--- a/localForage/localForage-tests.ts
+++ b/localForage/localForage-tests.ts
@@ -1,13 +1,6 @@
 /// <reference path="localForage.d.ts" />
 
-declare var localForage: lf.ILocalForage<string>;
-declare var callback: lf.ICallback<string>;
-declare var iterateCallback: lf.IIterateCallback<string>;
-declare var errorCallback: lf.IErrorCallback;
-declare var keyCallback: lf.IKeyCallback;
-declare var keysCallback: lf.IKeysCallback;
-declare var numberCallback: lf.INumberCallback;
-declare var promise: lf.IPromise<string>;
+declare var localForage: LocalForage;
 
 () => {
     localForage.clear((err: any) => {
@@ -25,7 +18,7 @@ declare var promise: lf.IPromise<string>;
         var newNumber: number = num;
     });
 
-    localForage.key(0,(err: any, value: string) => {
+    localForage.key(0, (err: any, value: string) => {
         var newError: any = err;
         var newValue: string = value;
     });
@@ -40,9 +33,8 @@ declare var promise: lf.IPromise<string>;
         var newStr: string = str
     });
 
-    localForage.getItem("key").then((err: any, str: string) => {
-        var newError: any = err;
-        var newStr: string = str
+    localForage.getItem<string>("key").then((str: string) => {
+        var newStr: string = str;
     });
   
     localForage.setItem("key", "value",(err: any, str: string) => {
@@ -50,8 +42,7 @@ declare var promise: lf.IPromise<string>;
         var newStr: string = str
     });
 
-    localForage.setItem("key", "value").then((err: any, str: string) => {
-        var newError: any = err;
+    localForage.setItem("key", "value").then((str: string) => {
         var newStr: string = str;
     });
   
@@ -59,10 +50,6 @@ declare var promise: lf.IPromise<string>;
         var newError: any = err;
     });
 
-    localForage.removeItem("key").then((err: any, str: string) => {
-        var newError: any = err;
-        var newStr: string = str
+    localForage.removeItem("key").then(() => {
     });
-  
-    promise.then(callback);
 }
diff --git a/localForage/localForage.d.ts b/localForage/localForage.d.ts
index b5c40dd61..d169d01e3 100644
--- a/localForage/localForage.d.ts
+++ b/localForage/localForage.d.ts
@@ -3,71 +3,79 @@
 // Definitions by: yuichi david pichsenmeister <https://github.com/3x14159265>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module lf {
-    interface ILocalForage<T> {
-        /**
-         * Removes every key from the database, returning it to a blank slate.
-         */
-        clear(callback: IErrorCallback): void
-        /**
-         * Iterate over all value/key pairs in datastore.
-         */
-        iterate(iterateCallback: IIterateCallback<T>): void
-        /**
-         * Get the name of a key based on its ID.
-         */
-        key(keyIndex: number, callback: IKeyCallback): void
-        /**
-         * Get the list of all keys in the datastore.
-         */
-        keys(callback: IKeysCallback): void;
-        /**
-         * Gets the number of keys in the offline store (i.e. its “length”).
-         */
-        length(callback: INumberCallback): void
-        /**
-         * Gets an item from the storage library and supplies the result to a callback.
-         * If the key does not exist, getItem() will return null.
-         */
-        getItem(key: string, callback: ICallback<T>): void
-        getItem(key: string): IPromise<T>
-        /**
-         * Saves data to an offline store.
-         */
-        setItem(key: string, value: T, callback: ICallback<T>): void
-        setItem(key: string, value: T): IPromise<T>
-        /**
-         * Removes the value of a key from the offline store.
-         */
-        removeItem(key: string, callback: IErrorCallback): void
-        removeItem(key: string): IPromise<T>
-    }
+/// <reference path="../es6-promise/es6-promise.d.ts" />
 
-    interface ICallback<T> {
-        (err: any, value: T): void
-    }
+interface LocalForageOptions {
+    driver?: LocalForageDriver | LocalForageDriver[];
+    
+    name?: string;
+    
+    size?: number;
+    
+    storeName?: string;
+    
+    version?: string;
+    
+    description?: string;
+}
 
-    interface IIterateCallback<T> {
-        (value: T, key: string, iterationNumber: number): void
-    }
+interface LocalForageDriver {
+    _driver: string;
+    
+    _initStorage(options: LocalForageOptions): void;
+    
+    _support: boolean | Promise<boolean>;
+    
+    clear(callback: (err: any) => void): void;
+    
+    getItem(key: string, callback: (err: any, value: any) => void): void;
+    
+    key(keyIndex: number, callback: (err: any, key: string) => void): void;
+    
+    keys(callback: (err: any, keys: string[]) => void): void;
+    
+    length(callback: (err: any, numberOfKeys: number) => void): void;
+    
+    removeItem(key: string, callback: (err: any) => void): void;
+    
+    setItem(key: string, value: any, callback: (err: any, value: any) => void): void;
+}
 
-    interface IErrorCallback {
-        (err: any): void
-    }
-
-    interface IKeyCallback {
-        (err: any, keyName: string): void
-    }
-
-    interface IKeysCallback {
-        (err: any, keys: Array<string>): void
-    }
-
-    interface INumberCallback {
-        (err: any, numberOfKeys: number): void
-    }
-
-    interface IPromise<T> {
-        then(callback: ICallback<T>): void
-    }
-}
\ No newline at end of file
+interface LocalForage {
+    LOCALSTORAGE: string;
+    WEBSQL: string;
+    INDEXEDDB: string;
+    
+    config(options: LocalForageOptions): void;
+    
+    driver(): LocalForageDriver;
+    setDriver(driver: string | string[]): Promise<void>;
+    setDriver(driver: string | string[], callback: () => void, errorCallback: (error: any) => void): void;
+    defineDriver(driver: LocalForageDriver): Promise<void>;
+    defineDriver(driver: LocalForageDriver, callback: () => void, errorCallback: (error: any) => void): void;
+    
+    getItem<T>(key: string): Promise<T>;
+    getItem<T>(key: string, callback: (err: any, value: T) => void): void;
+    
+    setItem<T>(key: string, value: T): Promise<T>;
+    setItem<T>(key: string, value: T, callback: (err: any, value: T) => void): void;
+    
+    removeItem(key: string): Promise<void>;
+    removeItem(key: string, callback: (err: any) => void): void;
+    
+    clear(): Promise<void>;
+    clear(callback: (err: any) => void): void;
+    
+    length(): Promise<number>;
+    length(callback: (err: any, numberOfKeys: number) => void): void;
+    
+    key(keyIndex: number): Promise<string>;
+    key(keyIndex: number, callback: (err: any, key: string) => void): void;
+    
+    keys(): Promise<string[]>;
+    keys(callback: (err: any, keys: string[]) => void): void;
+    
+    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any): Promise<any>;
+    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any,
+            callback: (err: any, result: any) => void): void;
+}
diff --git a/lodash-decorators/lodash-decorators-tests.ts b/lodash-decorators/lodash-decorators-tests.ts
new file mode 100644
index 000000000..60a659c8d
--- /dev/null
+++ b/lodash-decorators/lodash-decorators-tests.ts
@@ -0,0 +1,370 @@
+/// <reference path="lodash-decorators.d.ts" />
+/// <reference path="../lodash/lodash.d.ts" />
+
+//
+// With Arguments
+//
+
+import { after, debounce, memoize, curry } from 'lodash-decorators'
+
+class Person {
+    firstName: string;
+    lastName: string;
+    constructor(firstName: string, lastName: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    @after(3)
+    @debounce(100)
+    getFullName(): string {
+        return `${this.firstName} ${this.lastName}`
+    }
+
+    @curry(2)
+    @memoize()
+    doSomeHeavyProcessing(arg1: any, arg2: any) {
+    }
+}
+
+//
+// Without Arguments
+//
+
+import { tap } from 'lodash-decorators'
+
+class Person2 {
+    firstName: string;
+    lastName: string;
+    constructor(firstName?: string, lastName?: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    @once
+    getFullName(): string {
+        return `${this.firstName} ${this.lastName}`
+    }
+
+    @tap
+    popIt(list: number[]): void {
+        list.pop();
+    }
+}
+
+const person2 = new Person2();
+
+person2.popIt([1, 2, 3]); //=> [1, 2]
+
+//
+// Partials
+//
+
+import { partial, wrap } from 'lodash-decorators'
+
+class Person3 {
+    firstName: string;
+    lastName: string;
+    constructor(firstName?: string, lastName?: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    getName(type: string) {
+        return type === 'firstName' ? this.firstName : this.lastName
+    }
+
+    @partial('getName', 'firstName')
+    getFirstName(): string { return null; }
+
+    @partial('getName', null)
+    getLastName(): string { return null; }
+
+    @wrap('getName')
+    getUpperCaseName(fn: () => string): string {
+        return fn().toUpperCase();
+    }
+}
+
+//by .d.ts author: a workaround to ensure type
+interface Person3Ex extends Person3 {
+    getUpperCaseName(): string;
+}
+
+const person3 = new Person3('Joe', 'Smith') as Person3Ex;
+
+person3.getFirstName(); // 'Joe'
+person3.getLastName(); // 'Smith'
+person3.getUpperCaseName(); // JOE SMITH
+
+//
+// Composition
+//
+
+//import { kebabCase } from 'lodash';
+import * as _ from 'lodash';
+
+class Person4 {
+    firstName: string;
+    lastName: string;
+    constructor(firstName?: string, lastName?: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    getName(): string {
+        return `${this.firstName} ${this.lastName}`;
+    }
+
+    @compose(_.kebabCase, 'getName')
+    logName(name: string): void {
+        console.log(name);
+    }
+}
+
+//by .d.ts author: a workaround to ensure type
+interface Person4Ex extends Person4 {
+    logName(): void;
+}
+
+const person4 = new Person4('Joe', 'Smith') as Person4Ex;
+
+person4.logName(); // joe-smith
+
+//
+// Instance Decorators
+//
+
+class Person5 {
+
+    @curry(2) // <= prototype decorator
+    @debounce(100) // <= instance decorator
+    getName() {} //=> Throws an error. (╯°□°）╯︵ ┻━┻
+
+    @debounce(100) // <= instance decorator
+    @curry(2) // <= prototype decorator
+    getName2() {} //=> All is well :)
+}
+
+//
+// Getters and Setters
+//
+
+import { once, compose } from 'lodash-decorators'
+
+function alwaysArray(value: string|string[]): string[] {
+    return Array.isArray(value) ? value : _.isUndefined(value) ? [] : [value];
+}
+
+class Person6 {
+    constructor() {}
+    private nameList: string[];
+
+    //TODO: So far, TypeScript doesn't allow to put multiple decoratoes on set/get accessors.
+    // see https://github.com/Microsoft/TypeScript/issues/2249#issuecomment-141684146
+    //@once.get
+    get names(): string[] {
+        //MEMO: Resolve type inconsistency
+        return [this.nameList.join(' ')];
+        //MEMO: Original expression in repo
+        //return this.nameList.join(' ');
+    }
+
+    @compose.set(alwaysArray)
+    set names(names: string[]) {
+        this.nameList = names;
+    }
+}
+
+//by .d.ts author: a workaround to ensure type
+interface Person6Alt {
+    names: string[]|string;
+}
+
+const person6 = new Person6();
+
+// nameList will always be an array.
+person6.names = undefined; //=> []
+(person6 as Person6Alt).names = 'Joe'; //=> ['Joe']
+person6.names = ['Jim']; //=> ['Jim']
+
+//
+// Bind
+//
+
+import { bind } from 'lodash-decorators'
+
+class Person7 {
+    firstName: string;
+    lastName: string;
+    constructor(firstName: string, lastName: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    @bind()
+    getName(): string {
+        return `${this.firstName} ${this.lastName}`;
+    }
+
+    // It can also function as a partial
+    @bind('Joe')
+    getUpperCaseName(name: string): string {
+        return name.toUpperCase();
+    }
+}
+
+//by .d.ts author: a workaround to ensure type
+interface Person7Ex extends Person7 {
+    getUpperCaseName(): string;
+}
+
+const person7 = new Person7('Joe', 'Smith') as Person7Ex;
+
+person7.getName.call(null); // Joe Smith
+person7.getUpperCaseName(); // JOE
+
+
+import { bindAll } from 'lodash-decorators'
+
+@bindAll()
+class Person8 {
+    firstName: string;
+    lastName: string;
+    constructor(firstName: string, lastName: string) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    getName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+}
+
+const person8 = new Person8('Joe', 'Smith');
+
+person8.getName.call(null); // Joe Smith
+
+//
+// Forcing Decorator on Prototype
+//
+
+import { throttle } from 'lodash-decorators';
+
+class Person9 {
+    @throttle(1000)
+    doStuff() {}
+
+    @throttle.proto(1000)
+    doStuffMore() {}
+}
+
+const person9_1 = new Person9();
+const person9_2 = new Person9();
+
+person9_1.doStuff(); //=> Both are called
+person9_2.doStuff();
+
+person9_1.doStuffMore();
+person9_2.doStuffMore();
+
+// Only one of these methods is actual invoked because throttle is applied to the prototype method
+// and not the instance method.
+
+//
+// Extensions
+//
+
+import { deprecated } from 'lodash-decorators/extensions'
+
+// This is applied globally.
+deprecated.methodAction = fn => console.log(`Don't use ${fn.name}!`);
+
+@deprecated
+class Person10 {
+    constructor() {}
+}
+
+class OtherPerson {
+    @deprecated
+    fn() {}
+}
+
+let person10 = new Person10(); //=> Warning!
+
+let otherPerson = new OtherPerson();
+otherPerson.fn(); //=> Don't use fn!
+
+
+//
+// https://github.com/steelsojka/lodash-decorators/tree/master/src/extensions
+//
+
+import { Writable, ReturnsArg } from 'lodash-decorators/extensions';
+
+class Person11 {
+    constructor() {}
+
+    @Writable(false)
+    getName() {}
+
+    @ReturnsArg(1)
+    doSomething(x: any, y: any, z: any) {
+        // Do something here
+    }
+}
+
+//
+// https://github.com/steelsojka/lodash-decorators/tree/master/src/validate
+//
+
+import { Validate } from 'lodash-decorators/validate';
+
+class Person12 {
+    name: string;
+    constructor() {}
+
+    @Validate(_.isString)
+    setName(name: any) {
+        this.name = name as string;
+    }
+}
+
+class Person13 {
+    name: string;
+    age: number;
+    constructor() {}
+
+    @Validate(
+        _.isString,
+        [_.isNumber, _.partial(_.lt, 10) as ((_: any) => boolean)]
+    )
+    setData(name: any, age: any) {
+        this.name = name as string;
+        this.age = age as number;
+    }
+}
+
+const person13 = new Person13();
+
+person13.setData('test', 5); //=> TypeError
+person13.setData('test', 12); //=> Valid
+
+
+//
+// Additional typings
+//
+
+import { validateReturn } from 'lodash-decorators/validate';
+
+class Calc {
+    @validateReturn((c: number) => c > 0)
+    add(a: number, b: number): number {
+        return a + b;
+    }
+
+    @validateReturn<number>([c => c > 0])
+    mul(a: number, b: number): number {
+        return a + b;
+    }
+}
diff --git a/lodash-decorators/lodash-decorators-tests.ts.tscparams b/lodash-decorators/lodash-decorators-tests.ts.tscparams
new file mode 100644
index 000000000..3f0863ac6
--- /dev/null
+++ b/lodash-decorators/lodash-decorators-tests.ts.tscparams
@@ -0,0 +1 @@
+--experimentalDecorators --noImplicitAny --target ES5
diff --git a/lodash-decorators/lodash-decorators.d.ts b/lodash-decorators/lodash-decorators.d.ts
new file mode 100644
index 000000000..ac01c5cf6
--- /dev/null
+++ b/lodash-decorators/lodash-decorators.d.ts
@@ -0,0 +1,272 @@
+// Type definitions for lodash-decorators 1.0.5
+// Project: https://github.com/steelsojka/lodash-decorators
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../lodash/lodash.d.ts"/>
+
+
+declare module "lodash-decorators" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface TypedMethodDecorator<TFunction extends Function> {
+        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
+    }
+
+    export interface MethodDecoratorWithAccessor extends MethodDecorator, Accessor<MethodDecorator> {
+    }
+
+    export interface Accessor<T> {
+        set: T;
+        get: T;
+        proto: T;
+    }
+
+    export interface DebounceDecorator {
+        (wait: number, options?: _.DebounceSettings): MethodDecorator;
+    }
+    export interface ThrottleDecorator {
+        (wait: number, options?: _.ThrottleSettings): MethodDecorator;
+    }
+    export interface MemoizeDecorator {
+        (resolver?: Function): MethodDecorator;
+    }
+    export interface AfterDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface BeforeDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface AryDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface CurryDecorator {
+        (arity?: number): MethodDecorator;
+    }
+    export interface CurryRightDecorator {
+        (arity?: number): MethodDecorator;
+    }
+    export interface RestParamDecorator {
+        (start?: number): MethodDecorator;
+    }
+    export interface PartialDecorator {
+        (func: Function|string, ...args: any[]): MethodDecorator;
+    }
+    export interface WrapDecorator {
+        (wrapper: ((func: Function, ...args: any[]) => any)|string): MethodDecorator;
+    }
+    export interface ComposeDecorator {
+        (...funcs: (Function|string)[]): MethodDecorator;
+    }
+    export interface DelayDecorator {
+        (wait: number, ...args: any[]): MethodDecorator;
+    }
+    export interface DeferDecorator {
+        (...args: any[]): MethodDecorator;
+    }
+    export interface BindDecorator {
+        (): TypedMethodDecorator<(<R>() => R)>;
+        <T1>(param1?: T1):
+            TypedMethodDecorator<(<R>(param1: T1) => R)>;
+        <T1, T2>(param1?: T1, param2?: T2):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
+        <T1, T2, T3>(param1?: T1, param2?: T2, param3?: T3):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
+        <T1, T2, T3, T4>(param1?: T1, param2?: T2, param3?: T3, param4?: T4):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
+        <T1, T2, T3, T4, T5>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
+        <T1, T2, T3, T4, T5, T6>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5, param6?: T6):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
+    }
+    export interface BindAllDecorator {
+        (...methodNames: string[]): ClassDecorator;
+    }
+    export interface ModArgsDecorator {
+        (...transforms: Function[]): MethodDecorator;
+    }
+
+    export const debounce: DebounceDecorator & Accessor<DebounceDecorator>;
+    export const Debounce: DebounceDecorator & Accessor<DebounceDecorator>;
+
+    export const throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
+    export const Throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
+
+    export const memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
+    export const Memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
+
+    export const after: AfterDecorator & Accessor<AfterDecorator>;
+    export const After: AfterDecorator & Accessor<AfterDecorator>;
+
+    export const before: BeforeDecorator & Accessor<BeforeDecorator>;
+    export const Before: BeforeDecorator & Accessor<BeforeDecorator>;
+
+    export const ary: AryDecorator & Accessor<AryDecorator>;
+    export const Ary: AryDecorator & Accessor<AryDecorator>;
+
+    export const curry: CurryDecorator & Accessor<CurryDecorator>;
+    export const Curry: CurryDecorator & Accessor<CurryDecorator>;
+
+    export const curryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
+    export const CurryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
+
+    export const restParam: RestParamDecorator & Accessor<RestParamDecorator>;
+    export const RestParam: RestParamDecorator & Accessor<RestParamDecorator>;
+
+    export const partial: PartialDecorator & Accessor<PartialDecorator>;
+    export const Partial: PartialDecorator & Accessor<PartialDecorator>;
+
+    export const partialRight: PartialDecorator & Accessor<PartialDecorator>;
+    export const PartialRight: PartialDecorator & Accessor<PartialDecorator>;
+
+    export const wrap: WrapDecorator & Accessor<WrapDecorator>;
+    export const Wrap: WrapDecorator & Accessor<WrapDecorator>;
+
+    export const compose: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Compose: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const flow: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Flow: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const flowRight: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const FlowRight: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const backflow: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Backflow: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const delay: DelayDecorator & Accessor<DelayDecorator>;
+    export const Delay: DelayDecorator & Accessor<DelayDecorator>;
+
+    export const defer: DeferDecorator & Accessor<DeferDecorator>;
+    export const Defer: DeferDecorator & Accessor<DeferDecorator>;
+
+    export const bind: BindDecorator & Accessor<BindDecorator>;
+    export const Bind: BindDecorator & Accessor<BindDecorator>;
+
+    export const bindAll: BindAllDecorator;
+    export const BindAll: BindAllDecorator;
+
+    export const modArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
+    export const ModArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
+
+    export const once: MethodDecoratorWithAccessor;
+    export const Once: MethodDecoratorWithAccessor;
+
+    export const spread: MethodDecoratorWithAccessor;
+    export const Spread: MethodDecoratorWithAccessor;
+
+    export const rearg: MethodDecoratorWithAccessor;
+    export const Rearg: MethodDecoratorWithAccessor;
+
+    export const negate: MethodDecoratorWithAccessor;
+    export const Negate: MethodDecoratorWithAccessor;
+
+    export const tap: MethodDecoratorWithAccessor;
+    export const Tap: MethodDecoratorWithAccessor;
+}
+
+declare module "lodash-decorators/extensions" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface DeprecatedDecorator extends MethodDecorator, ClassDecorator {
+        methodAction(fn: Function & { name: string }): void;
+    }
+
+    export const deprecated: DeprecatedDecorator;
+    export const Deprecated: DeprecatedDecorator;
+
+    export const writable: (writable?: boolean) => MethodDecorator;
+    export const Writable: (writable?: boolean) => MethodDecorator;
+
+    export const configurable: (configurable?: boolean) => MethodDecorator;
+    export const Configurable: (configurable?: boolean) => MethodDecorator;
+
+    export const returnsArg: (index?: number) => MethodDecorator;
+    export const ReturnsArg: (index?: number) => MethodDecorator;
+
+    export const enumerable: (enumerable?: boolean) => MethodDecorator;
+    export const Enumerable: (enumerable?: boolean) => MethodDecorator;
+
+    export const nonenumerable: MethodDecorator;
+    export const Nonenumerable: MethodDecorator;
+
+    export const nonconfigurable: MethodDecorator;
+    export const Nonconfigurable: MethodDecorator;
+
+    export const readonly: MethodDecorator;
+    export const Readonly: MethodDecorator;
+}
+
+declare module "lodash-decorators/validate" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface TypedMethodDecorator<TFunction extends Function> {
+        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
+    }
+
+    export interface Predicate<T> {
+        (t: T): boolean;
+    }
+    type Predicates<T> = Predicate<T>|Predicate<T>[];
+
+    export interface ValidateDecorator {
+        <T1>(p1: Predicates<T1>):
+            TypedMethodDecorator<(<R>(param1: T1) => R)>;
+        <T1, T2>(p1: Predicates<T1>, p2?: Predicates<T2>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
+        <T1, T2, T3>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
+        <T1, T2, T3, T4>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
+        <T1, T2, T3, T4, T5>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
+        <T1, T2, T3, T4, T5, T6>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>, p6?: Predicates<T6>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
+    }
+
+    export interface ValidateReturnDecorator {
+        <R>(p1: Predicates<R>): TypedMethodDecorator<((...args: any[]) => R)>;
+    }
+
+    export const validate: ValidateDecorator;
+    export const Validate: ValidateDecorator;
+
+    export const validateReturn: ValidateReturnDecorator;
+    export const ValidateReturn: ValidateReturnDecorator;
+}
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 2cbec6853..db15ebc4a 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -91,6 +91,12 @@ var result: any;
 
 var any: any;
 
+interface TResult {
+    a: number;
+    b: string;
+    c: boolean;
+}
+
 // _.MapCache
 var testMapCache: _.MapCache;
 result = <(key: string) => boolean>testMapCache.delete;
@@ -123,13 +129,12 @@ result = <_.LoDashObjectWrapper<_.Dictionary<string>>>_(<{ [index: string]: stri
 
 //Wrapped array shortcut methods
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).concat(5, 6);
+result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).concat([5, 6]);
 result = <string>_([1, 2, 3, 4]).join(',');
 result = <number>_([1, 2, 3, 4]).pop();
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).push(5, 6, 7);
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).reverse();
 result = <number>_([1, 2, 3, 4]).shift();
-result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).slice(1, 2);
-result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).slice(2);
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).sort((a, b) => 1);
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).splice(1);
 result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4]).splice(1, 2, 5, 6);
@@ -150,23 +155,126 @@ result = <number[]>_([1, 2, 3]).run();
 result = <_.Dictionary<string>>_(<{ [index: string]: string; }>{ 'key1': 'test1', 'key2': 'test2' }).toJSON();
 result = <_.Dictionary<number>>_({ a: 1, b: 2}).mapValues(function(num: number) { return num * 2; }).valueOf();
 
-// /*************
-//  * Arrays *
-//  *************/
-result = <any[][]>_.chunk([1, '2', '3', false]);
-result = <_.LoDashArrayWrapper<any[]>>_([1, '2', '3', false]).chunk();
-result = <any[][]>_.chunk([1, '2', '3', false], 2);
-result = <_.LoDashArrayWrapper<any[]>>_([1, '2', '3', false]).chunk(2);
-result = <number[][]>_.chunk([1, 2, 3, 4]);
-result = <_.LoDashArrayWrapper<number[]>>_([1, 2, 3, 4]).chunk();
-result = <number[][]>_.chunk([1, 2, 3, 4], 2);
-result = <_.LoDashArrayWrapper<number[]>>_([1, 2, 3, 4]).chunk(2);
+/*********
+ * Array *
+ *********/
 
-result = <any[]>_.compact([0, 1, false, 2, '', 3]);
-result = <_.LoDashArrayWrapper<any>>_([0, 1, false, 2, '', 3]).compact();
+// _.chunk
+module TestChunk {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult[][];
+    result = _.chunk<TResult>(array);
+    result = _.chunk<TResult>(array, 42);
+    result = _.chunk<TResult>(list);
+    result = _.chunk<TResult>(list, 42);
+    result = _(array).chunk().value();
+    result = _(array).chunk(42).value();
+    result = _(list).chunk<TResult>().value();
+    result = _(list).chunk<TResult>(42).value();
+}
 
-result = <number[]>_.difference([1, 2, 3, 4, 5], [5, 2, 10]);
-result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4, 5]).difference([5, 2, 10]);
+// _.compact
+module TestCompact {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult[];
+
+    result = _.compact<TResult>();
+    result = _.compact<TResult>(array);
+    result = _.compact<TResult>(list);
+    result = _<TResult>(array).compact().value();
+    result = _(list).compact<TResult>().value();
+}
+
+// _.difference
+{
+    let testDifferenceArray: TResult[];
+    let testDifferenceList: _.List<TResult>;
+    let result: TResult[];
+    result = _.difference<TResult>(testDifferenceArray);
+    result = _.difference<TResult>(testDifferenceArray, testDifferenceArray);
+    result = _.difference<TResult>(testDifferenceArray, testDifferenceList, testDifferenceArray);
+    result = _.difference<TResult>(testDifferenceArray, testDifferenceArray, testDifferenceList, testDifferenceArray);
+    result = _.difference<TResult>(testDifferenceList);
+    result = _.difference<TResult>(testDifferenceList, testDifferenceList);
+    result = _.difference<TResult>(testDifferenceList, testDifferenceArray, testDifferenceList);
+    result = _.difference<TResult>(testDifferenceList, testDifferenceList, testDifferenceArray, testDifferenceList);
+    result = _(testDifferenceArray).difference().value();
+    result = _(testDifferenceArray).difference(testDifferenceArray).value();
+    result = _(testDifferenceArray).difference(testDifferenceList, testDifferenceArray).value();
+    result = _(testDifferenceArray).difference(testDifferenceArray, testDifferenceList, testDifferenceArray).value();
+    result = _(testDifferenceList).difference<TResult>().value();
+    result = _(testDifferenceList).difference<TResult>(testDifferenceList).value();
+    result = _(testDifferenceList).difference<TResult>(testDifferenceArray, testDifferenceList).value();
+    result = _(testDifferenceList).difference<TResult>(testDifferenceList, testDifferenceArray, testDifferenceList).value();
+}
+
+// _.drop
+{
+    let testDropArray: TResult[];
+    let testDropList: _.List<TResult>;
+    let result: TResult[];
+    result = _.drop<TResult>(testDropArray);
+    result = _.drop<TResult>(testDropArray, 42);
+    result = _.drop<TResult>(testDropList);
+    result = _.drop<TResult>(testDropList, 42);
+    result = _(testDropArray).drop().value();
+    result = _(testDropArray).drop(42).value();
+    result = _(testDropList).drop<TResult>().value();
+    result = _(testDropList).drop<TResult>(42).value();
+}
+
+// _.dropRight
+module TestDropRight {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult[];
+    result = _.dropRight<TResult>(array);
+    result = _.dropRight<TResult>(array, 42);
+    result = _.dropRight<TResult>(list);
+    result = _.dropRight<TResult>(list, 42);
+    result = _(array).dropRight().value();
+    result = _(array).dropRight(42).value();
+    result = _(list).dropRight<TResult>().value();
+    result = _(list).dropRight<TResult>(42).value();
+}
+
+// _.dropWhile
+module TestDropWhile {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index: number, collection: _.List<TResult>) => boolean;
+    let result: TResult[];
+
+    result = _.dropWhile<TResult>(array);
+    result = _.dropWhile<TResult>(array, predicateFn);
+    result = _.dropWhile<TResult>(array, predicateFn, any);
+    result = _.dropWhile<TResult>(array, '')
+    result = _.dropWhile<TResult>(array, '', any);
+    result = _.dropWhile<{a: number;}, TResult>(array, {a: 42});
+
+    result = _.dropWhile<TResult>(list);
+    result = _.dropWhile<TResult>(list, predicateFn);
+    result = _.dropWhile<TResult>(list, predicateFn, any);
+    result = _.dropWhile<TResult>(list, '')
+    result = _.dropWhile<TResult>(list, '', any);
+    result = _.dropWhile<{a: number;}, TResult>(list, {a: 42});
+
+    result = _(array).dropWhile().value();
+    result = _(array).dropWhile(predicateFn).value();
+    result = _(array).dropWhile(predicateFn, any).value();
+    result = _(array).dropWhile('').value();
+    result = _(array).dropWhile('', any).value();
+    result = _(array).dropWhile<{a: number;}>({a: 42}).value();
+
+    result = _(list).dropWhile<TResult>().value();
+    result = _(list).dropWhile<TResult>(predicateFn).value();
+    result = _(list).dropWhile<TResult>(predicateFn, any).value();
+    result = _(list).dropWhile<TResult>('').value();
+    result = _(list).dropWhile<TResult>('', any).value();
+    result = _(list).dropWhile<{a: number;}, TResult>({a: 42}).value();
+}
 
 result = <number[]>_.rest([1, 2, 3]);
 result = <number[]>_.rest([1, 2, 3], 2);
@@ -174,12 +282,6 @@ result = <number[]>_.rest([1, 2, 3], (num) => num < 3)
 result = <IFoodOrganic[]>_.rest(foodsOrganic, 'test');
 result = <IFoodType[]>_.rest(foodsType, { 'type': 'value' });
 
-result = <number[]>_.drop([1, 2, 3]);
-result = <number[]>_.drop([1, 2, 3], 2);
-result = <number[]>_.drop([1, 2, 3], (num) => num < 3)
-result = <IFoodOrganic[]>_.drop(foodsOrganic, 'test');
-result = <IFoodType[]>_.drop(foodsType, { 'type': 'value' });
-
 result = <number[]>_.tail([1, 2, 3])
 result = <number[]>_.tail([1, 2, 3], 2)
 result = <number[]>_.tail([1, 2, 3], (num) => num < 3)
@@ -195,64 +297,88 @@ result = <_.List<string>>_.fill<string>(testFillList, 'a', 0, 3);
 result = <number[]>_(testFillArray).fill<number>(0, 0, 3).value();
 result = <_.List<number>>_(testFillList).fill<number>(0, 0, 3).value();
 
+// _.findIndex
+module TestFindIndex {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index?: number, collection?: _.List<TResult>) => boolean;
+    let result: number;
 
-result = <number>_.findIndex(['apple', 'banana', 'beet'], function (f) {
-    return /^b/.test(f);
-});
-result = <number>_.findIndex(['apple', 'banana', 'beet'], 'apple');
-result = <number>_.findIndex([{ food: 'apple' }, { food: 'banana' }, { food: 'beet' }], { food: 'apple' });
+    result = _.findIndex<TResult>(array);
+    result = _.findIndex<TResult>(array, predicateFn);
+    result = _.findIndex<TResult>(array, predicateFn, any);
+    result = _.findIndex<TResult>(array, '');
+    result = _.findIndex<TResult>(array, '', any);
+    result = _.findIndex<{a: number}, TResult>(array, {a: 42});
 
-result = <number>_.findLastIndex(['apple', 'banana', 'beet'], function (f: string) {
-    return /^b/.test(f);
-});
-result = <number>_.findLastIndex(['apple', 'banana', 'beet'], 'apple');
-result = <number>_.findLastIndex([{ food: 'apple' }, { food: 'banana' }, { food: 'beet' }], { food: 'apple' });
+    result = _.findIndex<TResult>(list);
+    result = _.findIndex<TResult>(list, predicateFn);
+    result = _.findIndex<TResult>(list, predicateFn, any);
+    result = _.findIndex<TResult>(list, '');
+    result = _.findIndex<TResult>(list, '', any);
+    result = _.findIndex<{a: number}, TResult>(list, {a: 42});
 
-result = <number>_.first([1, 2, 3]);
-result = <number[]>_.first([1, 2, 3], 2);
-result = <number[]>_.first([1, 2, 3], function (num) {
-    return num < 3;
-});
-result = <IFoodOrganic[]>_.first(foodsOrganic, 'organic');
-result = <IFoodType[]>_.first(foodsType, { 'type': 'fruit' });
+    result = _<TResult>(array).findIndex();
+    result = _<TResult>(array).findIndex(predicateFn);
+    result = _<TResult>(array).findIndex(predicateFn, any);
+    result = _<TResult>(array).findIndex('');
+    result = _<TResult>(array).findIndex('', any);
+    result = _<TResult>(array).findIndex<{a: number}>({a: 42});
 
-result = <number>_([1, 2, 3]).first();
-result = <number[]>_([1, 2, 3]).first(2).value();
-result = <number[]>_([1, 2, 3]).first(function (num) {
-    return num < 3;
-}).value();
-result = <IFoodOrganic[]>_(foodsOrganic).first('organic').value();
-result = <IFoodType[]>_(foodsType).first({ 'type': 'fruit' }).value();
+    result = _(list).findIndex();
+    result = _(list).findIndex<TResult>(predicateFn);
+    result = _(list).findIndex<TResult>(predicateFn, any);
+    result = _(list).findIndex('');
+    result = _(list).findIndex('', any);
+    result = _(list).findIndex<{a: number}>({a: 42});
+}
 
-result = <number>_.head([1, 2, 3]);
-result = <number[]>_.head([1, 2, 3], 2);
-result = <number[]>_.head([1, 2, 3], function (num) {
-    return num < 3;
-});
-result = <IFoodOrganic[]>_.head(foodsOrganic, 'organic');
-result = <IFoodType[]>_.head(foodsType, { 'type': 'fruit' });
+// _.findLastIndex
+module TestFindLastIndex {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index?: number, collection?: _.List<TResult>) => boolean;
+    let result: number;
 
-result = <number>_([1, 2, 3]).head();
-result = <number[]>_([1, 2, 3]).head(2).value();
-result = <number[]>_([1, 2, 3]).head(function (num) {
-    return num < 3;
-}).value();
-result = <IFoodOrganic[]>_(foodsOrganic).head('organic').value();
-result = <IFoodType[]>_(foodsType).head({ 'type': 'fruit' }).value();
+    result = _.findLastIndex<TResult>(array);
+    result = _.findLastIndex<TResult>(array, predicateFn);
+    result = _.findLastIndex<TResult>(array, predicateFn, any);
+    result = _.findLastIndex<TResult>(array, '');
+    result = _.findLastIndex<TResult>(array, '', any);
+    result = _.findLastIndex<{a: number}, TResult>(array, {a: 42});
 
-result = <number[]>_.take([1, 2, 3]);
-result = <number[]>_.take([1, 2, 3], 2);
-result = <number[]>_.takeWhile([1, 2, 3], (num) => num < 3);
-result = <boolean[]>_.takeWhile(foodsOrganic, 'organic');
-result = <IFoodType[]>_.takeWhile(foodsType, { 'type': 'fruit' });
+    result = _.findLastIndex<TResult>(list);
+    result = _.findLastIndex<TResult>(list, predicateFn);
+    result = _.findLastIndex<TResult>(list, predicateFn, any);
+    result = _.findLastIndex<TResult>(list, '');
+    result = _.findLastIndex<TResult>(list, '', any);
+    result = _.findLastIndex<{a: number}, TResult>(list, {a: 42});
 
-result = <number[]>_([1, 2, 3]).take().value();
-result = <number[]>_([1, 2, 3]).take(2).value();
-result = <number[]>_([1, 2, 3]).takeWhile(function (num) {
-    return num < 3;
-}).value();
-result = <boolean[]>_(foodsType).takeWhile('organic').value();
-result = <IFoodType[]>_(foodsType).takeWhile({ 'type': 'fruit' }).value();
+    result = _<TResult>(array).findLastIndex();
+    result = _<TResult>(array).findLastIndex(predicateFn);
+    result = _<TResult>(array).findLastIndex(predicateFn, any);
+    result = _<TResult>(array).findLastIndex('');
+    result = _<TResult>(array).findLastIndex('', any);
+    result = _<TResult>(array).findLastIndex<{a: number}>({a: 42});
+
+    result = _(list).findLastIndex();
+    result = _(list).findLastIndex<TResult>(predicateFn);
+    result = _(list).findLastIndex<TResult>(predicateFn, any);
+    result = _(list).findLastIndex('');
+    result = _(list).findLastIndex('', any);
+    result = _(list).findLastIndex<{a: number}>({a: 42});
+}
+
+// _.first
+module TestFirst {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult;
+    result = _.first<TResult>(array);
+    result = _.first<TResult>(list);
+    result = _(array).first();
+    result = _(list).first<TResult>();
+}
 
 result = <Array<number>>_.flatten([[1, 2], [3, 4]]);
 result = <Array<number>>_.flatten([[1, 2], [3, 4], 5, 6]);
@@ -271,25 +397,147 @@ result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flatten(true);
 
 result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flattenDeep();
 
-result = <number>_.indexOf([1, 2, 3, 1, 2, 3], 2);
-result = <number>_.indexOf([1, 2, 3, 1, 2, 3], 2, 3);
-result = <number>_.indexOf([1, 1, 2, 2, 3, 3], 2, true);
+// _.head
+module TestHead {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult;
+    result = _.head<TResult>(array);
+    result = _.head<TResult>(list);
+    result = _(array).head();
+    result = _(list).head<TResult>();
+}
 
-result = <number[]>_.initial([1, 2, 3]);
-result = <number[]>_.initial([1, 2, 3], 2);
-result = <number[]>_.initial([1, 2, 3], function (num) {
-    return num > 1;
-});
-result = <IFoodOrganic[]>_.initial(foodsOrganic, 'organic');
-result = <IFoodType[]>_.initial(foodsType, { 'type': 'vegetable' });
+// _.indexOf
+module TestIndexOf {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let value: TResult;
+    let result: number;
+    result = _.indexOf<TResult>(array, value);
+    result = _.indexOf<TResult>(array, value, true);
+    result = _.indexOf<TResult>(array, value, 42);
+    result = _.indexOf<TResult>(list, value);
+    result = _.indexOf<TResult>(list, value, true);
+    result = _.indexOf<TResult>(list, value, 42);
+    result = _(array).indexOf(value);
+    result = _(array).indexOf(value, true);
+    result = _(array).indexOf(value, 42);
+    result = _(list).indexOf<TResult>(value);
+    result = _(list).indexOf<TResult>(value, true);
+    result = _(list).indexOf<TResult>(value, 42);
+}
 
-result = <number[]>_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
+//_.initial
+{
+    let testInitalArray: TResult[];
+    let testInitalList: _.List<TResult>;
+    let result: TResult[];
+    result = _.initial<TResult>(testInitalArray);
+    result = _.initial<TResult>(testInitalList);
+    result = _(testInitalArray).initial().value();
+    result = _(testInitalList).initial<TResult>().value();
+}
 
-result = <number>_.last([1, 2, 3]);
-result = <number>_([1, 2, 3]).last();
+// _.intersection
+{
+    let testIntersectionArray: TResult[];
+    let testIntersectionList: _.List<TResult>;
+    let result: TResult[];
+    result = _.intersection<TResult>(testIntersectionArray, testIntersectionList);
+    result = _.intersection<TResult>(testIntersectionList, testIntersectionArray, testIntersectionList);
+    result = _(testIntersectionArray).intersection<TResult>(testIntersectionArray).value();
+    result = _(testIntersectionArray).intersection<TResult>(testIntersectionList, testIntersectionArray).value();
+    result = _(testIntersectionList).intersection<TResult>(testIntersectionArray).value();
+    result = _(testIntersectionList).intersection<TResult>(testIntersectionList, testIntersectionArray).value();
+}
 
-result = <number>_.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
-result = <number>_.lastIndexOf([1, 2, 3, 1, 2, 3], 2, 3);
+// _.last
+module TestLast {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult;
+
+    result = _.last<TResult>(array);
+    result = _.last<TResult>(list);
+    result = _<TResult>(array).last();
+    result = _(list).last<TResult>();
+}
+
+// _.lastIndexOf
+module TestLastIndexOf {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let value: TResult;
+    let result: number;
+
+    result = _.lastIndexOf<TResult>(array, value);
+    result = _.lastIndexOf<TResult>(array, value, true);
+    result = _.lastIndexOf<TResult>(array, value, 42);
+
+    result = _.lastIndexOf<TResult>(list, value);
+    result = _.lastIndexOf<TResult>(list, value, true);
+    result = _.lastIndexOf<TResult>(list, value, 42);
+
+    result = _(array).lastIndexOf(value);
+    result = _(array).lastIndexOf(value, true);
+    result = _(array).lastIndexOf(value, 42);
+
+    result = _(list).lastIndexOf<TResult>(value);
+    result = _(list).lastIndexOf<TResult>(value, true);
+    result = _(list).lastIndexOf<TResult>(value, 42);
+}
+
+// _.pull
+{
+    let testPullArray: TResult[];
+    let testPullValue: TResult;
+    let result: TResult[];
+    result = _.pull<TResult>(testPullArray);
+    result = _.pull<TResult>(testPullArray, testPullValue);
+    result = _.pull<TResult>(testPullArray, testPullValue, testPullValue);
+    result = _.pull<TResult>(testPullArray, testPullValue, testPullValue, testPullValue);
+    result = _(testPullArray).pull().value();
+    result = _(testPullArray).pull(testPullValue).value();
+    result = _(testPullArray).pull(testPullValue, testPullValue).value();
+    result = _(testPullArray).pull(testPullValue, testPullValue, testPullValue).value();
+}
+{
+    let testPullList: _.List<TResult>;
+    let testPullValue: TResult;
+    let result: _.List<TResult>;
+    result = _.pull<TResult>(testPullList);
+    result = _.pull<TResult>(testPullList, testPullValue);
+    result = _.pull<TResult>(testPullList, testPullValue, testPullValue);
+    result = _.pull<TResult>(testPullList, testPullValue, testPullValue, testPullValue);
+    result = _(testPullList).pull<TResult>().value();
+    result = _(testPullList).pull<TResult>(testPullValue).value();
+    result = _(testPullList).pull<TResult>(testPullValue, testPullValue).value();
+    result = _(testPullList).pull<TResult>(testPullValue, testPullValue, testPullValue).value();
+}
+
+// _.pullAt
+{
+    let testPullAtArray: TResult[];
+    let testPullAtList: _.List<TResult>;
+    let result: TResult[];
+    result = _.pullAt<TResult>(testPullAtArray);
+    result = _.pullAt<TResult>(testPullAtArray, 1);
+    result = _.pullAt<TResult>(testPullAtArray, [2, 3], 1);
+    result = _.pullAt<TResult>(testPullAtArray, 4, [2, 3], 1);
+    result = _.pullAt<TResult>(testPullAtList);
+    result = _.pullAt<TResult>(testPullAtList, 1);
+    result = _.pullAt<TResult>(testPullAtList, [2, 3], 1);
+    result = _.pullAt<TResult>(testPullAtList, 4, [2, 3], 1);
+    result = _(testPullAtArray).pullAt().value();
+    result = _(testPullAtArray).pullAt(1).value();
+    result = _(testPullAtArray).pullAt([2, 3], 1).value();
+    result = _(testPullAtArray).pullAt(4, [2, 3], 1).value();
+    result = _(testPullAtList).pullAt<TResult>().value();
+    result = _(testPullAtList).pullAt<TResult>(1).value();
+    result = _(testPullAtList).pullAt<TResult>([2, 3], 1).value();
+    result = _(testPullAtList).pullAt<TResult>(4, [2, 3], 1).value();
+}
 
 result = <_.Dictionary<any>>_.zipObject(['moe', 'larry'], [30, 40]);
 result = <_.LoDashObjectWrapper<_.Dictionary<any>>>_(['moe', 'larry']).zipObject([30, 40]);
@@ -300,13 +548,53 @@ result = <_.LoDashObjectWrapper<_.Dictionary<any>>>_([['moe', 30], ['larry', 40]
 result = <_.Dictionary<any>>_.object([['moe', 30], ['larry', 40]]);
 result = <_.LoDashObjectWrapper<_.Dictionary<any>>>_([['moe', 30], ['larry', 40]]).object();
 
-result = <number[]>_.pull([1, 2, 3, 1, 2, 3], 2, 3);
-result = <number[]>_.pullAt([1, 2, 3, 1, 2, 3], 2, 3);
+// _.remove
+module TestRemove {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index?: number, collection?: _.List<TResult>) => boolean;
+    let result: TResult[];
 
-result = <number[]>_.remove([1, 2, 3, 4, 5, 6], function (num: number) { return num % 2 == 0; });
-result = <IFoodOrganic[]>_.remove(foodsOrganic, 'organic');
-result = <IFoodType[]>_.remove(foodsType, { 'type': 'vegetable' });
-var typedResult: IFoodType[] = _.remove([ <IFoodType>{ name: 'apple' }, <IFoodType>{ name: 'orange' }], <IFoodType>{ name: 'orange' });
+    result = _.remove<TResult>(array);
+    result = _.remove<TResult>(array, predicateFn);
+    result = _.remove<TResult>(array, predicateFn, any);
+    result = _.remove<TResult>(array, '');
+    result = _.remove<TResult>(array, '', any);
+    result = _.remove<{a: number}, TResult>(array, {a: 42});
+
+    result = _.remove<TResult>(list);
+    result = _.remove<TResult>(list, predicateFn);
+    result = _.remove<TResult>(list, predicateFn, any);
+    result = _.remove<TResult>(list, '');
+    result = _.remove<TResult>(list, '', any);
+    result = _.remove<{a: number}, TResult>(list, {a: 42});
+
+    result = _<TResult>(array).remove().value();
+    result = _<TResult>(array).remove(predicateFn).value();
+    result = _<TResult>(array).remove(predicateFn, any).value();
+    result = _<TResult>(array).remove('').value();
+    result = _<TResult>(array).remove('', any).value();
+    result = _<TResult>(array).remove<{a: number}>({a: 42}).value();
+
+    result = _(list).remove<TResult>().value();
+    result = _(list).remove<TResult>(predicateFn).value();
+    result = _(list).remove<TResult>(predicateFn, any).value();
+    result = _(list).remove<TResult>('').value();
+    result = _(list).remove<TResult>('', any).value();
+    result = _(list).remove<{a: number}, TResult>({a: 42}).value();
+}
+
+// _.slice
+{
+    let testSliceArray: TResult[];
+    let result: TResult[];
+    result = _.slice(testSliceArray);
+    result = _.slice(testSliceArray, 42);
+    result = _.slice(testSliceArray, 42, 42);
+    result = _(testSliceArray).slice().value();
+    result = _(testSliceArray).slice(42).value();
+    result = _(testSliceArray).slice(42, 42).value();
+}
 
 result = <number>_.sortedIndex([20, 30, 50], 40);
 result = <number>_.sortedIndex([{ 'x': 20 }, { 'x': 30 }, { 'x': 50 }], { 'x': 40 }, 'x');
@@ -320,6 +608,108 @@ result = <number>_.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function
     return this.wordToNumber[word];
 }, sortedIndexDict);
 
+// _.take
+module TestTake {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult[];
+    result = _.take<TResult>(array);
+    result = _.take<TResult>(array, 42);
+    result = _.take<TResult>(list);
+    result = _.take<TResult>(list, 42);
+    result = _(array).take().value();
+    result = _(array).take(42).value();
+    result = _(list).take<TResult>().value();
+    result = _(list).take<TResult>(42).value();
+}
+
+// _.takeRight
+{
+    let testTakeRightArray: TResult[];
+    let testTakeRightList: _.List<TResult>;
+    let result: TResult[];
+    result = _.takeRight<TResult>(testTakeRightArray);
+    result = _.takeRight<TResult>(testTakeRightArray, 42);
+    result = _.takeRight<TResult>(testTakeRightList);
+    result = _.takeRight<TResult>(testTakeRightList, 42);
+    result = _(testTakeRightArray).takeRight().value();
+    result = _(testTakeRightArray).takeRight(42).value();
+    result = _(testTakeRightList).takeRight<TResult>().value();
+    result = _(testTakeRightList).takeRight<TResult>(42).value();
+}
+
+// _.takeRightWhile
+module TestTakeRightWhile {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index: number, collection: _.List<TResult>) => boolean;
+    let result: TResult[];
+
+    result = _.takeRightWhile<TResult>(array);
+    result = _.takeRightWhile<TResult>(array, predicateFn);
+    result = _.takeRightWhile<TResult>(array, predicateFn, any);
+    result = _.takeRightWhile<TResult>(array, '')
+    result = _.takeRightWhile<TResult>(array, '', any);
+    result = _.takeRightWhile<{a: number;}, TResult>(array, {a: 42});
+
+    result = _.takeRightWhile<TResult>(list);
+    result = _.takeRightWhile<TResult>(list, predicateFn);
+    result = _.takeRightWhile<TResult>(list, predicateFn, any);
+    result = _.takeRightWhile<TResult>(list, '')
+    result = _.takeRightWhile<TResult>(list, '', any);
+    result = _.takeRightWhile<{a: number;}, TResult>(list, {a: 42});
+
+    result = _(array).takeRightWhile().value();
+    result = _(array).takeRightWhile(predicateFn).value();
+    result = _(array).takeRightWhile(predicateFn, any).value();
+    result = _(array).takeRightWhile('').value();
+    result = _(array).takeRightWhile('', any).value();
+    result = _(array).takeRightWhile<{a: number;}>({a: 42}).value();
+
+    result = _(list).takeRightWhile<TResult>().value();
+    result = _(list).takeRightWhile<TResult>(predicateFn).value();
+    result = _(list).takeRightWhile<TResult>(predicateFn, any).value();
+    result = _(list).takeRightWhile<TResult>('').value();
+    result = _(list).takeRightWhile<TResult>('', any).value();
+    result = _(list).takeRightWhile<{a: number;}, TResult>({a: 42}).value();
+}
+
+// _.takeWhile
+module TestTakeWhile {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let predicateFn: (value: TResult, index: number, collection: _.List<TResult>) => boolean;
+    let result: TResult[];
+
+    result = _.takeWhile<TResult>(array);
+    result = _.takeWhile<TResult>(array, predicateFn);
+    result = _.takeWhile<TResult>(array, predicateFn, any);
+    result = _.takeWhile<TResult>(array, '')
+    result = _.takeWhile<TResult>(array, '', any);
+    result = _.takeWhile<{a: number;}, TResult>(array, {a: 42});
+
+    result = _.takeWhile<TResult>(list);
+    result = _.takeWhile<TResult>(list, predicateFn);
+    result = _.takeWhile<TResult>(list, predicateFn, any);
+    result = _.takeWhile<TResult>(list, '')
+    result = _.takeWhile<TResult>(list, '', any);
+    result = _.takeWhile<{a: number;}, TResult>(list, {a: 42});
+
+    result = _(array).takeWhile().value();
+    result = _(array).takeWhile(predicateFn).value();
+    result = _(array).takeWhile(predicateFn, any).value();
+    result = _(array).takeWhile('').value();
+    result = _(array).takeWhile('', any).value();
+    result = _(array).takeWhile<{a: number;}>({a: 42}).value();
+
+    result = _(list).takeWhile<TResult>().value();
+    result = _(list).takeWhile<TResult>(predicateFn).value();
+    result = _(list).takeWhile<TResult>(predicateFn, any).value();
+    result = _(list).takeWhile<TResult>('').value();
+    result = _(list).takeWhile<TResult>('', any).value();
+    result = _(list).takeWhile<{a: number;}, TResult>({a: 42}).value();
+}
+
 result = <number[]>_.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 
 result = <number[]>_([1, 2, 3]).union([101, 2, 1, 10], [2, 1]).value();
@@ -356,24 +746,71 @@ result = <string[]>_(['A', 'b', 'C', 'a', 'B', 'c']).unique(function (letter) {
 result = <number[]>_([1, 2.5, 3, 1.5, 2, 3.5]).unique(function (num) { return this.floor(num); }, Math).value();
 result = <{ x: number; }[]>_([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }]).unique('x').value();
 
-result = <number[]>_.without([1, 2, 1, 0, 3, 1, 4], 0, 1);
+// _.unzipWith
+{
+    let testUnzipWithArray: (number[]|_.List<number>)[];
+    let testUnzipWithList: _.List<number[]|_.List<number>>;
+    let testUnzipWithIterator: {(prev: TResult, curr: number, index?: number, list?: number[]): TResult};
+    let result: TResult[];
+    result = _.unzipWith<number, TResult>(testUnzipWithArray);
+    result = _.unzipWith<number, TResult>(testUnzipWithArray, testUnzipWithIterator);
+    result = _.unzipWith<number, TResult>(testUnzipWithArray, testUnzipWithIterator, any);
+    result = _.unzipWith<number, TResult>(testUnzipWithList);
+    result = _.unzipWith<number, TResult>(testUnzipWithList, testUnzipWithIterator);
+    result = _.unzipWith<number, TResult>(testUnzipWithList, testUnzipWithIterator, any);
+    result = _(testUnzipWithArray).unzipWith<number, TResult>(testUnzipWithIterator).value();
+    result = _(testUnzipWithArray).unzipWith<number, TResult>(testUnzipWithIterator, any).value();
+    result = _(testUnzipWithList).unzipWith<number, TResult>(testUnzipWithIterator).value();
+    result = _(testUnzipWithList).unzipWith<number, TResult>(testUnzipWithIterator, any).value();
+}
+
+// _.without
+{
+    let testWithoutArray: number[];
+    let testWithoutList: _.List<number>;
+    let result: number[];
+    result = _.without<number>(testWithoutArray);
+    result = _.without<number>(testWithoutArray, 1);
+    result = _.without<number>(testWithoutArray, 1, 2);
+    result = _.without<number>(testWithoutArray, 1, 2, 3);
+    result = _.without<number>(testWithoutList);
+    result = _.without<number>(testWithoutList, 1);
+    result = _.without<number>(testWithoutList, 1, 2);
+    result = _.without<number>(testWithoutList, 1, 2, 3);
+    result = _(testWithoutArray).without().value();
+    result = _(testWithoutArray).without(1).value();
+    result = _(testWithoutArray).without(1, 2).value();
+    result = _(testWithoutArray).without(1, 2, 3).value();
+    result = _(testWithoutList).without<number>().value();
+    result = _(testWithoutList).without<number>(1).value();
+    result = _(testWithoutList).without<number>(1, 2).value();
+    result = _(testWithoutList).without<number>(1, 2, 3).value();
+}
 
 // _.xor
-var testXorArray: number[];
-var testXorList: _.List<number>;
-result = <number[]>_.xor<number>();
-result = <number[]>_.xor<number>(testXorArray);
-result = <number[]>_.xor<number>(testXorArray, testXorArray);
-result = <number[]>_.xor<number>(testXorArray, testXorArray, testXorArray);
-result = <number[]>_.xor<number>(testXorList);
-result = <number[]>_.xor<number>(testXorList, testXorList);
-result = <number[]>_.xor<number>(testXorList, testXorList, testXorList);
-result = <number[]>(_(testXorArray).xor().value());
-result = <number[]>(_(testXorArray).xor(testXorArray).value());
-result = <number[]>(_(testXorArray).xor(testXorArray, testXorArray).value());
-result = <number[]>(_(testXorList).xor().value());
-result = <number[]>(_(testXorList).xor(testXorList).value());
-result = <number[]>(_(testXorList).xor(testXorList, testXorList).value());
+module TestXor {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let result: TResult[];
+
+    result = _.xor<TResult>();
+
+    result = _.xor<TResult>(array);
+    result = _.xor<TResult>(array, list);
+    result = _.xor<TResult>(array, list, array);
+
+    result = _.xor<TResult>(list);
+    result = _.xor<TResult>(list, array);
+    result = _.xor<TResult>(list, array, list);
+
+    result = _(array).xor().value();
+    result = _(array).xor(list).value();
+    result = _(array).xor(list, array).value();
+
+    result = _(list).xor<TResult>().value();
+    result = _(list).xor<TResult>(array).value();
+    result = _(list).xor<TResult>(array, list).value();
+}
 
 result = <any[][]>_.zip(['moe', 'larry'], [30, 40], [true, false]);
 result = <any[][]>_.unzip(['moe', 'larry'], [30, 40], [true, false]);
@@ -396,12 +833,192 @@ result = <number[]>_([1, 2]).zipWith<number>(testZipWithFn, any).value();
 result = <number[]>_([1, 2]).zipWith<number>([1, 2], testZipWithFn, any).value();
 result = <number[]>_([1, 2]).zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn, any).value();
 
-// /* *************
-//  * Collections *
-//  ************* */
+/*********
+ * Chain *
+ *********/
 
-result = <string[]>_.at(['a', 'b', 'c', 'd', 'e'], [0, 2, 4]);
-result = <string[]>_.at(['moe', 'larry', 'curly'], 0, 2);
+// _.thru
+{
+    let result: number;
+    result = _.thru<number, number>(1, (value: number) => value);
+    result = _.thru<number, number>(1, (value: number) => value, any);
+}
+{
+    let result: _.LoDashWrapper<number>;
+    result = _(1).thru<number>((value: number) => value);
+    result = _(1).thru<number>((value: number) => value, any);
+}
+{
+    let result: _.LoDashWrapper<string>;
+    result = _('').thru<string>((value: string) => value);
+    result = _('').thru<string>((value: string) => value, any);
+}
+{
+    let result: _.LoDashWrapper<boolean>;
+    result = _(true).thru<boolean>((value: boolean) => value);
+    result = _(true).thru<boolean>((value: boolean) => value, any);
+}
+{
+    let result: _.LoDashObjectWrapper<any>;
+    result = _({}).thru<Object>((value: Object) => value);
+    result = _({}).thru<Object>((value: Object) => value, any);
+}
+{
+    let result: _.LoDashArrayWrapper<number>;
+    result = _([1, 2, 3]).thru<number>((value: number[]) => value);
+    result = _([1, 2, 3]).thru<number>((value: number[]) => value, any);
+}
+
+// _.prototype.commit
+{
+    let result: _.LoDashWrapper<number>;
+    result = _(42).commit();
+}
+{
+    let result: _.LoDashArrayWrapper<any>;
+    result = _<any>([]).commit();
+}
+{
+    let result: _.LoDashObjectWrapper<any>;
+    result = _({}).commit();
+}
+
+// _.prototype.plant
+{
+    let result: _.LoDashWrapper<number>;
+    result = _(any).plant(42);
+}
+{
+    let result: _.LoDashStringWrapper;
+    result = _(any).plant('');
+}
+{
+    let result: _.LoDashWrapper<boolean>;
+    result = _(any).plant(true);
+}
+{
+    let result: _.LoDashNumberArrayWrapper;
+    result = _(any).plant([42]);
+}
+{
+    let result: _.LoDashArrayWrapper<any>;
+    result = _(any).plant<any>([]);
+}
+{
+    let result: _.LoDashObjectWrapper<{}>;
+    result = _(any).plant<{}>({});
+}
+
+/**************
+ * Collection *
+ **************/
+
+// _.all
+module TestAll {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
+
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => boolean;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => boolean;
+
+    let result: boolean;
+
+    result = _.all<TResult>(array);
+    result = _.all<TResult>(array, listIterator);
+    result = _.all<TResult>(array, listIterator, any);
+    result = _.all<TResult>(array, '');
+    result = _.all<{a: number}, TResult>(array, {a: 42});
+
+    result = _.all<TResult>(list);
+    result = _.all<TResult>(list, listIterator);
+    result = _.all<TResult>(list, listIterator, any);
+    result = _.all<TResult>(list, '');
+    result = _.all<{a: number}, TResult>(list, {a: 42});
+
+    result = _.all<TResult>(dictionary);
+    result = _.all<TResult>(dictionary, dictionaryIterator);
+    result = _.all<TResult>(dictionary, dictionaryIterator, any);
+    result = _.all<TResult>(dictionary, '');
+    result = _.all<{a: number}, TResult>(dictionary, {a: 42});
+
+    result = _(array).all();
+    result = _(array).all(listIterator);
+    result = _(array).all(listIterator, any);
+    result = _(array).all('');
+    result = _(array).all<{a: number}>({a: 42});
+
+    result = _(list).all<TResult>();
+    result = _(list).all<TResult>(listIterator);
+    result = _(list).all<TResult>(listIterator, any);
+    result = _(list).all('');
+    result = _(list).all<{a: number}>({a: 42});
+
+    result = _(dictionary).all<TResult>();
+    result = _(dictionary).all<TResult>(dictionaryIterator);
+    result = _(dictionary).all<TResult>(dictionaryIterator, any);
+    result = _(dictionary).all('');
+    result = _(dictionary).all<{a: number}>({a: 42});
+}
+
+// _.at
+{
+    let testAtArray: TResult[];
+    let testAtList: _.List<TResult>;
+    let testAtDictionary: _.Dictionary<TResult>;
+    let result: TResult[];
+    result = _.at<TResult>(testAtArray, 0, '1', [2], ['3'], [4, '5']);
+    result = _.at<TResult>(testAtList, 0, '1', [2], ['3'], [4, '5']);
+    result = _.at<TResult>(testAtDictionary, 0, '1', [2], ['3'], [4, '5']);
+    result = _(testAtArray).at(0, '1', [2], ['3'], [4, '5']).value();
+    result = _(testAtList).at<TResult>(0, '1', [2], ['3'], [4, '5']).value();
+    result = _(testAtDictionary).at<TResult>(0, '1', [2], ['3'], [4, '5']).value();
+}
+
+// _.collect
+module TestCollect {
+    let array: number[];
+    let list: _.List<number>;
+    let dictionary: _.Dictionary<number>;
+    let listIterator: {(value: number, index: number, collection: _.List<number>): TResult};
+    let dictionaryIterator: {(value: number, key: string, collection: _.Dictionary<number>): TResult};
+    {
+        let result: TResult[];
+        result = _.collect<number, TResult>(array);
+        result = _.collect<number, TResult>(array, listIterator);
+        result = _.collect<number, TResult>(array, listIterator, any);
+        result = _.collect<number, TResult>(array, '');
+        result = _.collect<number, TResult>(list);
+        result = _.collect<number, TResult>(list, listIterator);
+        result = _.collect<number, TResult>(list, listIterator, any);
+        result = _.collect<number, TResult>(list, '');
+        result = _.collect<number, TResult>(dictionary);
+        result = _.collect<number, TResult>(dictionary, dictionaryIterator);
+        result = _.collect<number, TResult>(dictionary, dictionaryIterator, any);
+        result = _.collect<number, TResult>(dictionary, '');
+        result = _<number>(array).collect<TResult>().value();
+        result = _<number>(array).collect<TResult>(listIterator).value();
+        result = _<number>(array).collect<TResult>(listIterator, any).value();
+        result = _<number>(array).collect<TResult>('').value();
+        result = _(list).collect<number, TResult>().value();
+        result = _(list).collect<number, TResult>(listIterator).value();
+        result = _(list).collect<number, TResult>(listIterator, any).value();
+        result = _(list).collect<number, TResult>('').value();
+        result = _(dictionary).collect<number, TResult>().value();
+        result = _(dictionary).collect<number, TResult>(dictionaryIterator).value();
+        result = _(dictionary).collect<number, TResult>(dictionaryIterator, any).value();
+        result = _(dictionary).collect<number, TResult>('').value();
+    }
+    {
+        let result: boolean[];
+        result = _.collect<number, {}>(array, {});
+        result = _.collect<number, {}>(list, {});
+        result = _.collect<number, {}>(dictionary, {});
+        result = _<number>(array).collect<{}>({}).value();
+        result = _(list).collect<{}>({}).value();
+        result = _(dictionary).collect<{}>({}).value();
+    }
+}
 
 result = <boolean>_.contains([1, 2, 3], 1);
 result = <boolean>_.contains([1, 2, 3], 1, 2);
@@ -441,13 +1058,53 @@ result = <_.LoDashObjectWrapper<_.Dictionary<number>>>_([4.3, 6.1, 6.4]).countBy
 result = <_.LoDashObjectWrapper<_.Dictionary<number>>>_([4.3, 6.1, 6.4]).countBy(function (num) { return this.floor(num); }, Math);
 result = <_.LoDashObjectWrapper<_.Dictionary<number>>>_(['one', 'two', 'three']).countBy('length');
 
-result = <boolean>_.every([true, 1, null, 'yes'], Boolean);
-result = <boolean>_.every(stoogesAges, 'age');
-result = <boolean>_.every(stoogesAges, { 'age': 50 });
+// _.every
+module TestEvery {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
 
-result = <boolean>_.all([true, 1, null, 'yes'], Boolean);
-result = <boolean>_.all(stoogesAges, 'age');
-result = <boolean>_.all(stoogesAges, { 'age': 50 });
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => boolean;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => boolean;
+
+    let result: boolean;
+
+    result = _.every<TResult>(array);
+    result = _.every<TResult>(array, listIterator);
+    result = _.every<TResult>(array, listIterator, any);
+    result = _.every<TResult>(array, '');
+    result = _.every<{a: number}, TResult>(array, {a: 42});
+
+    result = _.every<TResult>(list);
+    result = _.every<TResult>(list, listIterator);
+    result = _.every<TResult>(list, listIterator, any);
+    result = _.every<TResult>(list, '');
+    result = _.every<{a: number}, TResult>(list, {a: 42});
+
+    result = _.every<TResult>(dictionary);
+    result = _.every<TResult>(dictionary, dictionaryIterator);
+    result = _.every<TResult>(dictionary, dictionaryIterator, any);
+    result = _.every<TResult>(dictionary, '');
+    result = _.every<{a: number}, TResult>(dictionary, {a: 42});
+
+    result = _(array).every();
+    result = _(array).every(listIterator);
+    result = _(array).every(listIterator, any);
+    result = _(array).every('');
+    result = _(array).every<{a: number}>({a: 42});
+
+    result = _(list).every<TResult>();
+    result = _(list).every<TResult>(listIterator);
+    result = _(list).every<TResult>(listIterator, any);
+    result = _(list).every('');
+    result = _(list).every<{a: number}>({a: 42});
+
+    result = _(dictionary).every<TResult>();
+    result = _(dictionary).every<TResult>(dictionaryIterator);
+    result = _(dictionary).every<TResult>(dictionaryIterator, any);
+    result = _(dictionary).every('');
+    result = _(dictionary).every<{a: number}>({a: 42});
+}
 
 result = <number[]>_.filter([1, 2, 3, 4, 5, 6]);
 result = <number[]>_.filter([1, 2, 3, 4, 5, 6], function (num) { return num % 2 == 0; });
@@ -548,21 +1205,60 @@ result = <_.Dictionary<IKey>>_.indexBy(keys, function (key) { this.fromCharCode(
 result = <number[][]>_.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
 result = <string[][]>_.invoke([123, 456], String.prototype.split, '');
 
-result = <number[]>_.map([1, 2, 3], function (num) { return num * 3; });
-result = <number[]>_.map({ 'one': 1, 'two': 2, 'three': 3 }, function (num) { return num * 3; });
-result = <IStoogesAge[]>_.map(stoogesAges, 'name');
+// _.map
+module TestMap {
+    let array: number[];
+    let list: _.List<number>;
+    let dictionary: _.Dictionary<number>;
 
-result = <number[]>_([1, 2, 3]).map(function (num) { return num * 3; }).value();
-result = <number[]>_({ 'one': 1, 'two': 2, 'three': 3 }).map(function (num: number) { return num * 3; }).value();
-result = <IStoogesAge[]>_(stoogesAges).map('name').value();
+    let listIterator: (value: number, index: number, collection: _.List<number>) => TResult;
+    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => TResult;
 
-result = <number[]>_.collect([1, 2, 3], function (num) { return num * 3; });
-result = <number[]>_.collect({ 'one': 1, 'two': 2, 'three': 3 }, function (num) { return num * 3; });
-result = <IStoogesAge[]>_.collect(stoogesAges, 'name');
+    {
+        let result: TResult[];
 
-result = <number[]>_([1, 2, 3]).collect(function (num) { return num * 3; }).value();
-result = <number[]>_({ 'one': 1, 'two': 2, 'three': 3 }).collect(function (num: number) { return num * 3; }).value();
-result = <IStoogesAge[]>_(stoogesAges).collect('name').value();
+        result = _.map<number, TResult>(array);
+        result = _.map<number, TResult>(array, listIterator);
+        result = _.map<number, TResult>(array, listIterator, any);
+        result = _.map<number, TResult>(array, '');
+
+        result = _.map<number, TResult>(list);
+        result = _.map<number, TResult>(list, listIterator);
+        result = _.map<number, TResult>(list, listIterator, any);
+        result = _.map<number, TResult>(list, '');
+
+        result = _.map<number, TResult>(dictionary);
+        result = _.map<number, TResult>(dictionary, dictionaryIterator);
+        result = _.map<number, TResult>(dictionary, dictionaryIterator, any);
+        result = _.map<number, TResult>(dictionary, '');
+
+        result = _<number>(array).map<TResult>().value();
+        result = _<number>(array).map<TResult>(listIterator).value();
+        result = _<number>(array).map<TResult>(listIterator, any).value();
+        result = _<number>(array).map<TResult>('').value();
+
+        result = _(list).map<number, TResult>().value();
+        result = _(list).map<number, TResult>(listIterator).value();
+        result = _(list).map<number, TResult>(listIterator, any).value();
+        result = _(list).map<number, TResult>('').value();
+
+        result = _(dictionary).map<number, TResult>().value();
+        result = _(dictionary).map<number, TResult>(dictionaryIterator).value();
+        result = _(dictionary).map<number, TResult>(dictionaryIterator, any).value();
+        result = _(dictionary).map<number, TResult>('').value();
+    }
+    {
+        let result: boolean[];
+
+        result = _.map<number, {}>(array, {});
+        result = _.map<number, {}>(list, {});
+        result = _.map<number, {}>(dictionary, {});
+
+        result = _<number>(array).map<{}>({}).value();
+        result = _(list).map<{}>({}).value();
+        result = _(dictionary).map<{}>({}).value();
+    }
+}
 
 // _.ceil
 result = <number>_.ceil(4.006);
@@ -639,6 +1335,7 @@ result = <number>_(stoogesAgesDict).sum('age');
 
 result = <string[]>_.pluck(stoogesAges, 'name');
 result = <string[]>_(stoogesAges).pluck('name').value();
+result = <string[]>_.pluck(stoogesAges, ['name']);
 
 // _.partition
 result = <string[][]>_.partition<string>('abcd', (n) => n < 'c');
@@ -1091,41 +1788,89 @@ helloWrap2();
  * Lang *
  ********/
 
-// _.cloneDeep
-interface TestCloneDeepFn {
+// _.clone
+interface TestCloneCustomizerFn {
     (value: any): any;
 }
-var testCloneDeepFn: TestCloneDeepFn;
-result = <number>_.cloneDeep<number>(1);
-result = <number>_.cloneDeep<number>(1, testCloneDeepFn);
-result = <number>_.cloneDeep<number>(1, testCloneDeepFn, any);
-result = <string>_.cloneDeep<string>('a');
-result = <string>_.cloneDeep<string>('a', testCloneDeepFn);
-result = <string>_.cloneDeep<string>('a', testCloneDeepFn, any);
-result = <boolean>_.cloneDeep<boolean>(true);
-result = <boolean>_.cloneDeep<boolean>(true, testCloneDeepFn);
-result = <boolean>_.cloneDeep<boolean>(true, testCloneDeepFn, any);
-result = <number[]>_.cloneDeep<number[]>([1, 2]);
-result = <number[]>_.cloneDeep<number[]>([1, 2], testCloneDeepFn);
-result = <number[]>_.cloneDeep<number[]>([1, 2], testCloneDeepFn, any);
-result = <{a: {b: number;}}>_.cloneDeep<{a: {b: number;}}>({a: {b: 2}});
-result = <{a: {b: number;}}>_.cloneDeep<{a: {b: number;}}>({a: {b: 2}}, testCloneDeepFn);
-result = <{a: {b: number;}}>_.cloneDeep<{a: {b: number;}}>({a: {b: 2}}, testCloneDeepFn, any);
-result = <number>_(1).cloneDeep();
-result = <number>_(1).cloneDeep(testCloneDeepFn);
-result = <number>_(1).cloneDeep(testCloneDeepFn, any);
-result = <string>_('a').cloneDeep();
-result = <string>_('a').cloneDeep(testCloneDeepFn);
-result = <string>_('a').cloneDeep(testCloneDeepFn, any);
-result = <boolean>_(true).cloneDeep();
-result = <boolean>_(true).cloneDeep(testCloneDeepFn);
-result = <boolean>_(true).cloneDeep(testCloneDeepFn, any);
-result = <number[]>_([1, 2]).cloneDeep();
-result = <number[]>_([1, 2]).cloneDeep(testCloneDeepFn);
-result = <number[]>_([1, 2]).cloneDeep(testCloneDeepFn, any);
-result = <{a: {b: number;}}>_({a: {b: 2}}).cloneDeep();
-result = <{a: {b: number;}}>_({a: {b: 2}}).cloneDeep(testCloneDeepFn);
-result = <{a: {b: number;}}>_({a: {b: 2}}).cloneDeep(testCloneDeepFn, any);
+var testCloneCustomizerFn: TestCloneCustomizerFn;
+{
+    let result: number;
+    result = _.clone<number>(42);
+    result = _.clone<number>(42, false);
+    result = _.clone<number>(42, false, testCloneCustomizerFn);
+    result = _.clone<number>(42, false, testCloneCustomizerFn, any);
+    result = _.clone<number>(42, testCloneCustomizerFn);
+    result = _.clone<number>(42, testCloneCustomizerFn, any);
+    result = _(42).clone();
+    result = _(42).clone(false);
+    result = _(42).clone(false, testCloneCustomizerFn);
+    result = _(42).clone(false, testCloneCustomizerFn, any);
+    result = _(42).clone(testCloneCustomizerFn);
+    result = _(42).clone(testCloneCustomizerFn, any);
+}
+{
+    let result: string[];
+    result = _.clone<string[]>([]);
+    result = _.clone<string[]>([], false);
+    result = _.clone<string[]>([], false, testCloneCustomizerFn);
+    result = _.clone<string[]>([], false, testCloneCustomizerFn, any);
+    result = _.clone<string[]>([], testCloneCustomizerFn);
+    result = _.clone<string[]>([], testCloneCustomizerFn, any);
+    result = _<string>([]).clone();
+    result = _<string>([]).clone(false);
+    result = _<string>([]).clone(false, testCloneCustomizerFn);
+    result = _<string>([]).clone(false, testCloneCustomizerFn, any);
+    result = _<string>([]).clone(testCloneCustomizerFn);
+    result = _<string>([]).clone(testCloneCustomizerFn, any);
+}
+{
+    let result: {a: {b: number;}};
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}});
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}}, false);
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}}, false, testCloneCustomizerFn);
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}}, false, testCloneCustomizerFn, any);
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}}, testCloneCustomizerFn);
+    result = _.clone<{a: {b: number;}}>({a: {b: 2}}, testCloneCustomizerFn, any);
+    result = _({a: {b: 2}}).clone();
+    result = _({a: {b: 2}}).clone(false);
+    result = _({a: {b: 2}}).clone(false, testCloneCustomizerFn);
+    result = _({a: {b: 2}}).clone(false, testCloneCustomizerFn, any);
+    result = _({a: {b: 2}}).clone(testCloneCustomizerFn);
+    result = _({a: {b: 2}}).clone(testCloneCustomizerFn, any);
+}
+
+// _.cloneDeep
+interface TestCloneDeepCustomizerFn {
+    (value: any): any;
+}
+var testCloneDeepCustomizerFn: TestCloneDeepCustomizerFn;
+{
+    let result: number;
+    result = _.cloneDeep<number>(42);
+    result = _.cloneDeep<number>(42, testCloneDeepCustomizerFn);
+    result = _.cloneDeep<number>(42, testCloneDeepCustomizerFn, any);
+    result = _(42).cloneDeep();
+    result = _(42).cloneDeep(testCloneDeepCustomizerFn);
+    result = _(42).cloneDeep(testCloneDeepCustomizerFn, any);
+}
+{
+    let result: string[];
+    result = _.cloneDeep<string[]>([]);
+    result = _.cloneDeep<string[]>([], testCloneDeepCustomizerFn);
+    result = _.cloneDeep<string[]>([], testCloneDeepCustomizerFn, any);
+    result = _<string>([]).cloneDeep();
+    result = _<string>([]).cloneDeep(testCloneDeepCustomizerFn);
+    result = _<string>([]).cloneDeep(testCloneDeepCustomizerFn, any);
+}
+{
+    let result: {a: {b: number;}};
+    result = _.cloneDeep<{a: {b: number;}}>({a: {b: 2}});
+    result = _.cloneDeep<{a: {b: number;}}>({a: {b: 2}}, testCloneDeepCustomizerFn);
+    result = _.cloneDeep<{a: {b: number;}}>({a: {b: 2}}, testCloneDeepCustomizerFn, any);
+    result = _({a: {b: 2}}).cloneDeep();
+    result = _({a: {b: 2}}).cloneDeep(testCloneDeepCustomizerFn);
+    result = _({a: {b: 2}}).cloneDeep(testCloneDeepCustomizerFn, any);
+}
 
 // _.gt
 result = <boolean>_.gt(1, 2);
@@ -1139,6 +1884,36 @@ result = <boolean>_(1).gte(2);
 result = <boolean>_([]).gte(2);
 result = <boolean>_({}).gte(2);
 
+// _.isArguments
+result = <boolean>_.isArguments(any);
+result = <boolean>_(1).isArguments();
+result = <boolean>_<any>([]).isArguments();
+result = <boolean>_({}).isArguments();
+
+// _.isArray
+result = <boolean>_.isArray(any);
+result = <boolean>_(1).isArray();
+result = <boolean>_<any>([]).isArray();
+result = <boolean>_({}).isArray();
+
+// _.isBoolean
+result = <boolean>_.isBoolean(any);
+result = <boolean>_(1).isBoolean();
+result = <boolean>_<any>([]).isBoolean();
+result = <boolean>_({}).isBoolean();
+
+// _.isDate
+result = <boolean>_.isDate(any);
+result = <boolean>_(42).isDate();
+result = <boolean>_<any>([]).isDate();
+result = <boolean>_({}).isDate();
+
+// _.isElement
+result = <boolean>_.isElement(any);
+result = <boolean>_(42).isElement();
+result = <boolean>_<any>([]).isElement();
+result = <boolean>_({}).isElement();
+
 // _.isEmpty
 result = <boolean>_.isEmpty([1, 2, 3]);
 result = <boolean>_.isEmpty({});
@@ -1147,6 +1922,24 @@ result = <boolean>_([1, 2, 3]).isEmpty();
 result = <boolean>_({}).isEmpty();
 result = <boolean>_('').isEmpty();
 
+// _.isError
+result = <boolean>_.isError(any);
+result = <boolean>_(1).isError();
+result = <boolean>_<any>([]).isError();
+result = <boolean>_({}).isError();
+
+// _.isFinite
+result = <boolean>_.isFinite(any);
+result = <boolean>_(1).isFinite();
+result = <boolean>_<any>([]).isFinite();
+result = <boolean>_({}).isFinite();
+
+// _.isFunction
+result = <boolean>_.isFunction(any);
+result = <boolean>_(1).isFunction();
+result = <boolean>_<any>([]).isFunction();
+result = <boolean>_({}).isFunction();
+
 // _.isMatch
 var testIsMatchCustiomizerFn: (value: any, other: any, indexOrKey: number|string) => boolean;
 result = <boolean>_.isMatch({}, {});
@@ -1168,10 +1961,52 @@ result = <boolean>_(undefined).isNaN();
 result = <boolean>_.isNative(Array.prototype.push);
 result = <boolean>_(Array.prototype.push).isNative();
 
+// _.isNull
+result = <boolean>_.isNull(any);
+result = <boolean>_(1).isNull();
+result = <boolean>_<any>([]).isNull();
+result = <boolean>_({}).isNull();
+
+// _.isNumber
+result = <boolean>_.isNumber(any);
+result = <boolean>_(1).isNumber();
+result = <boolean>_<any>([]).isNumber();
+result = <boolean>_({}).isNumber();
+
+// _.isObject
+result = <boolean>_.isObject(any);
+result = <boolean>_(1).isObject();
+result = <boolean>_<any>([]).isObject();
+result = <boolean>_({}).isObject();
+
+// _.isPlainObject
+result = <boolean>_.isPlainObject(any);
+result = <boolean>_(1).isPlainObject();
+result = <boolean>_<any>([]).isPlainObject();
+result = <boolean>_({}).isPlainObject();
+
+// _.isRegExp
+result = <boolean>_.isRegExp(any);
+result = <boolean>_(1).isRegExp();
+result = <boolean>_<any>([]).isRegExp();
+result = <boolean>_({}).isRegExp();
+
+// _.isString
+result = <boolean>_.isString(any);
+result = <boolean>_(1).isString();
+result = <boolean>_<any>([]).isString();
+result = <boolean>_({}).isString();
+
 // _.isTypedArray
 result = <boolean>_.isTypedArray([]);
 result = <boolean>_([]).isTypedArray();
 
+// _.isUndefined
+result = <boolean>_.isUndefined(any);
+result = <boolean>_(1).isUndefined();
+result = <boolean>_<any>([]).isUndefined();
+result = <boolean>_({}).isUndefined();
+
 // _.lt
 result = <boolean>_.lt(1, 2);
 result = <boolean>_(1).lt(2);
@@ -1262,12 +2097,6 @@ result = <{}>_(testCreateProto).create(testCreateProps).value();
 result = <TestCreateProto>_(testCreateProto).create<TestCreateProto>().value();
 result = <TestCreateTResult>_(testCreateProto).create<TestCreateTResult>(testCreateProps).value();
 
-result = <IStoogesAge[]>_.clone(stoogesAges);
-result = <IStoogesAge[]>_.clone(stoogesAges, true);
-result = <any>_.clone(stoogesAges, true, function (value) {
-    return _.isElement(value) ? value.cloneNode(false) : undefined;
-});
-
 interface Food {
     name: string;
     type: string;
@@ -1288,9 +2117,46 @@ var TestDefaultsDeepSource = {'user': {'name': 'fred', 'age': 36}};
 result = <DefaultsDeepResult>_.defaultsDeep(TestDefaultsDeepObject, TestDefaultsDeepSource);
 result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep<DefaultsDeepResult>(TestDefaultsDeepSource).value();
 
-result = <string>_.findKey({ 'a': 1, 'b': 2, 'c': 3, 'd': 4 }, function (num) {
-    return num % 2 == 0;
-});
+// _.findKey
+module TestFindKey {
+    let result: string;
+
+    {
+        let predicateFn: (value: any, key?: string, object?: {}) => boolean;
+
+        result = _.findKey<{a: string;}>({a: ''});
+
+        result = _.findKey<{a: string;}>({a: ''}, predicateFn);
+        result = _.findKey<{a: string;}>({a: ''}, predicateFn, any);
+
+
+        result = _.findKey<{a: string;}>({a: ''}, '');
+        result = _.findKey<{a: string;}>({a: ''}, '', any);
+
+        result = _.findKey<{a: number;}, {a: string;}>({a: ''}, {a: 42});
+
+        result = _<{a: string;}>({a: ''}).findKey();
+
+        result = _<{a: string;}>({a: ''}).findKey(predicateFn);
+        result = _<{a: string;}>({a: ''}).findKey(predicateFn, any);
+
+
+        result = _<{a: string;}>({a: ''}).findKey('');
+        result = _<{a: string;}>({a: ''}).findKey('', any);
+
+        result = _<{a: string;}>({a: ''}).findKey<{a: number;}>({a: 42});
+    }
+
+    {
+        let predicateFn: (value: string, key?: string, collection?: _.Dictionary<string>) => boolean;
+
+        result = _.findKey<string, {a: string;}>({a: ''}, predicateFn);
+        result = _.findKey<string, {a: string;}>({a: ''}, predicateFn, any);
+
+        result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn);
+        result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn, any);
+    }
+}
 
 result = <string>_.findLastKey({ 'a': 1, 'b': 2, 'c': 3, 'd': 4 }, function (num) {
     return num % 2 == 1;
@@ -1342,37 +2208,37 @@ result = <_.LoDashArrayWrapper<string>>_(_).methods();
 
 // _.get
 result = <number>_.get<number>({ 'a': [{ 'b': { 'c': 3 } }] }, 'a[0].b.c');
-// → 3
-result = <number>_.get<number>({ 'a': [{ 'b': { 'c': 3 } }] }, ['a', '0', 'b', 'c']);
-// → 3
-result = <string>_.get<string>({ 'a': [{ 'b': { 'c': 3 } }] }, 'a.b.c', 'default');
-// → 'default'
 
-result = <number>_({ 'a': [{ 'b': { 'c': 3 } }] }).get<number>('a[0].b.c');
-// → 3
-result = <number>_({ 'a': [{ 'b': { 'c': 3 } }] }).get<number>(['a', '0', 'b', 'c']);
-// → 3
-result = <string>_({ 'a': [{ 'b': { 'c': 3 } }] }).get<string>('a.b.c', 'default');
-// → 'default'
-
-result = <boolean>_.has({ 'a': 1, 'b': 2, 'c': 3 }, 'b');
-
-interface FirstSecond {
-    first: string;
-    second: string;
+{
+    let result: TResult;
+    result = _.get<TResult>({}, '');
+    result = _.get<TResult>({}, 42);
+    result = _.get<TResult>({}, true);
+    result = _.get<TResult>({}, ['', 42, true]);
+    result = _({}).get<TResult>('');
+    result = _({}).get<TResult>(42);
+    result = _({}).get<TResult>(true);
+    result = _({}).get<TResult>(['', 42, true]);
 }
-result = <FirstSecond>_.invert({ 'first': 'moe', 'second': 'larry' });
 
-(function (...args: any[]) { return <boolean>_.isArguments(arguments); })(1, 2, 3);
+// _.has
+result = <boolean>_.has({}, '');
+result = <boolean>_.has({}, 42);
+result = <boolean>_.has({}, true);
+result = <boolean>_.has({}, ['', 42, true]);
+result = <boolean>_({}).has('');
+result = <boolean>_({}).has(42);
+result = <boolean>_({}).has(true);
+result = <boolean>_({}).has(['', 42, true]);
 
-(function () { return <boolean>_.isArray(arguments); })();
-result = <boolean>_.isArray([1, 2, 3]);
-
-result = <boolean>_.isBoolean(null);
-
-result = <boolean>_.isDate(new Date());
-
-result = <boolean>_.isElement(document.body);
+// _.invert
+{
+    let result: TResult;
+    result = _.invert<Object, TResult>({});
+    result = _.invert<Object, TResult>({}, true);
+    result = _({}).invert<TResult>().value();
+    result = _({}).invert<TResult>(true).value();
+}
 
 // _.isEqual (alias: _.eq)
 result = <boolean>_.isEqual(1, 1);
@@ -1399,23 +2265,6 @@ result = <boolean>_(testEqArray).isEqual(testEqOtherArray, testEqCustomizerFn);
 result = <boolean>_.eq(testEqArray, testEqOtherArray, testEqCustomizerFn);
 result = <boolean>_(testEqArray).eq(testEqOtherArray, testEqCustomizerFn);
 
-result = <boolean>_.isFinite(-101);
-result = <boolean>_.isFinite('10');
-result = <boolean>_.isFinite(true);
-result = <boolean>_.isFinite('');
-result = <boolean>_.isFinite(Infinity);
-
-result = <boolean>_.isFunction(_);
-
-result = <boolean>_.isNull(null);
-result = <boolean>_.isNull(undefined);
-
-result = <boolean>_.isNumber(8.4 * 5);
-
-result = <boolean>_.isObject({});
-result = <boolean>_.isObject([1, 2, 3]);
-result = <boolean>_.isObject(1);
-
 class Stooge {
     constructor(
         public name: string,
@@ -1423,22 +2272,60 @@ class Stooge {
         ) { }
 }
 
-result = <boolean>_.isPlainObject(new Stooge('moe', 40));
-result = <boolean>_.isPlainObject([1, 2, 3]);
-result = <boolean>_.isPlainObject({ 'name': 'moe', 'age': 40 });
-
-result = <boolean>_.isRegExp(/moe/);
-
-result = <boolean>_.isString('moe');
-
-result = <boolean>_.isUndefined(void 0);
-
 result = <string[]>_.keys({ 'one': 1, 'two': 2, 'three': 3 });
 result = <string[]>_({ 'one': 1, 'two': 2, 'three': 3 }).keys().value();
 
 result = <string[]>_.keysIn({ 'one': 1, 'two': 2, 'three': 3 });
 result = <string[]>_({ 'one': 1, 'two': 2, 'three': 3 }).keysIn().value();
 
+// _.mapKeys
+module TestMapKeys {
+    let array: TResult[];
+    let list: _.List<TResult>;
+    let dictionary: _.Dictionary<TResult>;
+
+    let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => string;
+    let dictionaryIterator: (value: TResult, key: string, collection: _.Dictionary<TResult>) => string;
+
+    let result: _.Dictionary<TResult>;
+
+    result = _.mapKeys<TResult, string>(array);
+    result = _.mapKeys<TResult, string>(array, listIterator);
+    result = _.mapKeys<TResult, string>(array, listIterator, any);
+    result = _.mapKeys<TResult>(array, '');
+    result = _.mapKeys<TResult, {}>(array, {});
+
+    result = _.mapKeys<TResult, string>(list);
+    result = _.mapKeys<TResult, string>(list, listIterator);
+    result = _.mapKeys<TResult, string>(list, listIterator, any);
+    result = _.mapKeys<TResult>(list, '');
+    result = _.mapKeys<TResult, {}>(list, {});
+
+    result = _.mapKeys<TResult, string>(dictionary);
+    result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator);
+    result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator, any);
+    result = _.mapKeys<TResult>(dictionary, '');
+    result = _.mapKeys<TResult, {}>(dictionary, {});
+
+    result = _(array).mapKeys<string>().value();
+    result = _(array).mapKeys<string>(listIterator).value();
+    result = _(array).mapKeys<string>(listIterator, any).value();
+    result = _(array).mapKeys('').value();
+    result = _(array).mapKeys<{}>({}).value();
+
+    result = _(list).mapKeys<TResult, string>().value();
+    result = _(list).mapKeys<TResult, string>(listIterator).value();
+    result = _(list).mapKeys<TResult, string>(listIterator, any).value();
+    result = _(list).mapKeys<TResult>('').value();
+    result = _(list).mapKeys<TResult, {}>({}).value();
+
+    result = _(dictionary).mapKeys<TResult, string>().value();
+    result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator).value();
+    result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator, any).value();
+    result = _(dictionary).mapKeys<TResult>('').value();
+    result = _(dictionary).mapKeys<TResult, {}>({}).value();
+}
+
 var mergeNames = {
     'stooges': [
         { 'name': 'moe' },
@@ -1492,27 +2379,108 @@ result = <HasName>_({ 'name': 'moe', 'age': 40 }).omit(function (value) {
 result = <any[][]>_.pairs({ 'moe': 30, 'larry': 40 });
 result = <any[][]>_({ 'moe': 30, 'larry': 40 }).pairs().value();
 
-result = <HasName>_.pick({ 'name': 'moe', '_userid': 'moe1' }, 'name');
-result = <HasName>_.pick({ 'name': 'moe', '_userid': 'moe1' }, ['name']);
-result = <HasName>_.pick({ 'name': 'moe', '_userid': 'moe1' }, function (value, key) {
-    return key.charAt(0) != '_';
-});
+// _.pick
+interface TestPickFn {
+    (element: any, key: string, collection: any): boolean;
+}
+{
+    let testPickFn: TestPickFn;
+    let result: TResult;
+    result = _.pick<TResult, Object>({}, 0, '1', true, [2], ['3'], [true], [4, '5', true]);
+    result = _.pick<TResult, Object>({}, testPickFn);
+    result = _.pick<TResult, Object>({}, testPickFn, any);
+    result = _({}).pick<TResult>(0, '1', true, [2], ['3'], [true], [4, '5', true]).value();
+    result = _({}).pick<TResult>(testPickFn).value();
+    result = _({}).pick<TResult>(testPickFn, any).value();
+}
+
+// _.result
+{
+    let testResultPath: number|string|boolean|Array<number|string|boolean>;
+    let testResultDefaultValue: TResult;
+    let result: TResult;
+    result = _.result<{}, TResult>({}, testResultPath);
+    result = _.result<{}, TResult>({}, testResultPath, testResultDefaultValue);
+    result = _({}).result<TResult>(testResultPath);
+    result = _({}).result<TResult>(testResultPath, testResultDefaultValue);
+}
 
 // _.set
-result = <{ a: { b: { c: number; }}[]}>_.set({ 'a': [{ 'b': { 'c': 3 } }] }, 'a[0].b.c', 4);
-result = <{ a: { b: { c: number; }}[]}>_({ 'a': [{ 'b': { 'c': 3 } }] }).set('a[0].b.c', 4).value();
+{
+    let testSetObject: TResult;
+    let testSetPath: {toSting(): string};
+    let result: TResult;
+    result = _.set(testSetObject, testSetPath, any);
+    result = _.set(testSetObject, [testSetPath], any);
+    result = _(testSetObject).set(testSetPath, any).value();
+    result = _(testSetObject).set([testSetPath], any).value();
+}
 
-result = <number[]>_.transform([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], function (r: number[], num: number) {
-    num *= num;
-    if (num % 2) {
-        return r.push(num) < 3;
+// _.transform
+module TestTransform {
+    let array: number[];
+    let dictionary: _.Dictionary<number>;
+
+    {
+        let iterator: (acc: TResult[], curr: number, index?: number, arr?: number[]) => void;
+        let accumulator: TResult[];
+        let result: TResult[];
+
+        result = _.transform<number, TResult>(array);
+        result = _.transform<number, TResult>(array, iterator);
+        result = _.transform<number, TResult>(array, iterator, accumulator);
+        result = _.transform<number, TResult>(array, iterator, accumulator, any);
+
+        result = _<number>(array).transform<TResult>().value();
+        result = _<number>(array).transform<TResult>(iterator).value();
+        result = _<number>(array).transform<TResult>(iterator, accumulator).value();
+        result = _<number>(array).transform<TResult>(iterator, accumulator, any).value();
     }
-});
-// → [1, 9, 25]
 
-result = <{ a: number; b: number; c: number; }>_.transform(<{ [index: string]: number; }>{ 'a': 1, 'b': 2, 'c': 3 }, function (r: any, num: number, key: string) {
-    r[key] = num * 3;
-});
+    {
+        let iterator: (acc: _.Dictionary<TResult>, curr: number, index?: number, arr?: number[]) => void;
+        let accumulator: _.Dictionary<TResult>;
+        let result: _.Dictionary<TResult>;
+
+        result = _.transform<number, TResult>(array, iterator);
+        result = _.transform<number, TResult>(array, iterator, accumulator);
+        result = _.transform<number, TResult>(array, iterator, accumulator, any);
+
+        result = _<number>(array).transform<TResult>(iterator).value();
+        result = _<number>(array).transform<TResult>(iterator, accumulator).value();
+        result = _<number>(array).transform<TResult>(iterator, accumulator, any).value();
+    }
+
+    {
+        let iterator: (acc: _.Dictionary<TResult>, curr: number, key?: string, dict?: _.Dictionary<number>) => void;
+        let accumulator: _.Dictionary<TResult>;
+        let result: _.Dictionary<TResult>;
+
+        result = _.transform<number, TResult>(dictionary);
+        result = _.transform<number, TResult>(dictionary, iterator);
+        result = _.transform<number, TResult>(dictionary, iterator, accumulator);
+        result = _.transform<number, TResult>(dictionary, iterator, accumulator, any);
+
+        result = _(dictionary).transform<number, TResult>().value();
+        result = _(dictionary).transform<number, TResult>(iterator).value();
+        result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
+        result = _(dictionary).transform<number, TResult>(iterator, accumulator, any).value();
+    }
+
+    {
+        let iterator: (acc: TResult[], curr: number, key?: string, dict?: _.Dictionary<number>) => void;
+        let accumulator: TResult[];
+        let result: TResult[];
+
+        result = _.transform<number, TResult>(dictionary, iterator);
+        result = _.transform<number, TResult>(dictionary, iterator, accumulator);
+        result = _.transform<number, TResult>(dictionary, iterator, accumulator, any);
+
+        result = _(dictionary).transform<number, TResult>(iterator).value();
+        result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
+        result = _(dictionary).transform<number, TResult>(iterator, accumulator, any).value();
+    }
+}
 
 // _.values
 class TestValues {
@@ -1539,18 +2507,16 @@ result = <number[]>_(new TestValueIn()).valuesIn<number>().value();
 // → [1, 2, 3]
 
 /**********
-* Utilities *
+* Utility *
 ***********/
 
-result = <{ name: string }>_.identity({ 'name': 'moe' });
-
-_.mixin({
-    'capitalize': function (string) {
-        return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
-    }
-});
-
-var lodash = <typeof _>_.noConflict();
+// _.attempt
+interface TestAttemptFn {
+    (): TResult;
+}
+var testAttempFn: TestAttemptFn;
+result = <TResult|Error>_.attempt<TResult>(testAttempFn);
+result = <TResult|Error>_(testAttempFn).attempt<TResult>();
 
 result = <number>_.random(0, 5);
 result = <number>_.random(5);
@@ -1569,19 +2535,6 @@ result = <void>_<string>([]).noop(true, 'a', 1);
 result = <void>_({}).noop(true, 'a', 1);
 result = <void>_(any).noop(true, 'a', 1);
 
-var object = {
-    'cheese': 'crumpets',
-    'stuff': function () {
-        return 'nonsense';
-    }
-};
-
-result = <string>_.result(object, 'cheese');
-result = <string>_.result(object, 'stuff');
-
-var tempObject = {};
-result = <typeof _>_.runInContext(tempObject);
-
 // _.property
 interface TestPropertyObject {
     a: {
@@ -1613,21 +2566,6 @@ result = <number[]>_(10).range().value();
 result = <number[]>_(1).range(11).value();
 result = <number[]>_(0).range(30, 5).value();
 
-result = <_.TemplateExecutor>_.template('hello <%= name %>');
-result = <string>_.template('<b><%- value %></b>', { 'value': '<script>' });
-
-var listTemplate = '<% _.forEach(people, function(name) { %><li><%- name %></li><% }); %>';
-result = <string>_.template(listTemplate, { 'people': ['moe', 'larry'] });
-result = <string>_.template('hello ${ name }', { 'name': 'curly' });
-result = <string>_.template('<% print("hello " + name); %>!', { 'name': 'larry' });
-
-var listTemplate = '<% $.each(people, function(name) { %><li><%- name %></li><% }); %>';
-result = <string>_.template(listTemplate, { 'people': ['moe', 'larry'] }, { 'imports': { '$': jQuery } });
-result = <_.TemplateExecutor>_.template('hello <%= name %>', null, /*sourceURL:*/ '/basic/greeting.jst');
-
-result = <_.TemplateExecutor>_.template('hi <%= data.name %>!', null, { 'variable': 'data' });
-result = <string>(<_.TemplateExecutor>result).source;
-
 class Mage {
     public castSpell(n: number) {
         return n;
@@ -1638,22 +2576,27 @@ class Mage {
     }
 }
 
-var mage = new Mage();
-result = _.times(3, <() => number>_.partial(_.random, 1, 6));
-result = _.times(3, function (n: number) { mage.castSpell(n); });
-result = _.times(3, function (n: number) { this.cast(n); }, mage);
-
-result = <string>_.uniqueId('contact_');
-result = <string>_.uniqueId();
-
 /*********
 * String
 *********/
 
+// _.camelCase
 result = <string>_.camelCase('Foo Bar');
+result = <string>_('Foo Bar').camelCase();
+
+// _.capitalize
 result = <string>_.capitalize('fred');
+result = <string>_('fred').capitalize();
+
+// _.deburr
 result = <string>_.deburr('déjà vu');
+result = <string>_('déjà vu').deburr();
+
+// _.endsWith
 result = <boolean>_.endsWith('abc', 'c');
+result = <boolean>_.endsWith('abc', 'c', 1);
+result = <boolean>_('abc').endsWith('c');
+result = <boolean>_('abc').endsWith('c', 1);
 
 // _.escape
 result = <string>_.escape('fred, barney, & pebbles');
@@ -1663,14 +2606,33 @@ result = <string>_('fred, barney, & pebbles').escape();
 result = <string>_.escapeRegExp('[lodash](https://lodash.com/)');
 result = <string>_('[lodash](https://lodash.com/)').escapeRegExp();
 
+// _.kebabCase
 result = <string>_.kebabCase('Foo Bar');
+result = <string>_('Foo Bar').kebabCase();
+
+// _.pad
+result = <string>_.pad('abd');
 result = <string>_.pad('abc', 8);
 result = <string>_.pad('abc', 8, '_-');
+result = <string>_('abc').pad();
+result = <string>_('abc').pad(8);
+result = <string>_('abc').pad(8, '_-');
+
+// _.padLeft
+result = <string>_.padLeft('abc');
 result = <string>_.padLeft('abc', 6);
 result = <string>_.padLeft('abc', 6, '_-');
+result = <string>_('abc').padLeft();
+result = <string>_('abc').padLeft(6);
+result = <string>_('abc').padLeft(6, '_-');
+
+// _.padRight
+result = <string>_.padRight('abc');
 result = <string>_.padRight('abc', 6);
 result = <string>_.padRight('abc', 6, '_-');
-result = <string>_.repeat('*', 3);
+result = <string>_('abc').padRight();
+result = <string>_('abc').padRight(6);
+result = <string>_('abc').padRight(6, '_-');
 
 // _.parseInt
 result = <number>_.parseInt('08');
@@ -1678,12 +2640,44 @@ result = <number>_.parseInt('08', 10);
 result = <number>_('08').parseInt();
 result = <number>_('08').parseInt(10);
 
+// _.repeat
+result = <string>_.repeat('*', 3);
+result = <string>_('*').repeat(3);
+
 // _.snakeCase
 result = <string>_.snakeCase('Foo Bar');
 result = <string>_('Foo Bar').snakeCase();
 
+// _.startCase
 result = <string>_.startCase('--foo-bar');
+result = <string>_('--foo-bar').startCase();
+
+// _.startsWith
 result = <boolean>_.startsWith('abc', 'a');
+result = <boolean>_.startsWith('abc', 'a', 1);
+result = <boolean>_('abc').startsWith('a');
+result = <boolean>_('abc').startsWith('a', 1);
+
+// _.template
+interface TestTemplateOptions {
+    escape?: RegExp;
+    evaluate?: RegExp;
+    imports?: _.Dictionary<any>;
+    interpolate?: RegExp;
+    variable?: string;
+}
+interface TestTemplateExecutor {
+    (obj?: Object): string;
+    source: string;
+}
+{
+    let testTemplateOptions: TestTemplateOptions
+    let result: TestTemplateExecutor;
+    result = _.template('');
+    result = _.template('', testTemplateOptions);
+    result = _('').template();
+    result = _('').template(testTemplateOptions);
+}
 
 // _.trim
 result = <string>_.trim();
@@ -1706,22 +2700,54 @@ result = <string>_.trimRight('-_-abc-_-', '_-');
 result = <string>_('-_-abc-_-').trimRight();
 result = <string>_('-_-abc-_-').trimRight('_-');
 
+// _.trunc
 result = <string>_.trunc('hi-diddly-ho there, neighborino');
 result = <string>_.trunc('hi-diddly-ho there, neighborino', 24);
 result = <string>_.trunc('hi-diddly-ho there, neighborino', { 'length': 24, 'separator': ' ' });
 result = <string>_.trunc('hi-diddly-ho there, neighborino', { 'length': 24, 'separator': /,? +/ });
 result = <string>_.trunc('hi-diddly-ho there, neighborino', { 'omission': ' […]' });
+result = <string>_('hi-diddly-ho there, neighborino').trunc();
+result = <string>_('hi-diddly-ho there, neighborino').trunc(24);
+result = <string>_('hi-diddly-ho there, neighborino').trunc({ 'length': 24, 'separator': ' ' });
+result = <string>_('hi-diddly-ho there, neighborino').trunc({ 'length': 24, 'separator': /,? +/ });
+result = <string>_('hi-diddly-ho there, neighborino').trunc({ 'omission': ' […]' });
 
 // _.unescape
 result = <string>_.unescape('fred, barney, &amp; pebbles');
 result = <string>_('fred, barney, &amp; pebbles').unescape();
 
+// _.words
 result = <string[]>_.words('fred, barney, & pebbles');
 result = <string[]>_.words('fred, barney, & pebbles', /[^, ]+/g);
+result = <string[]>_('fred, barney, & pebbles').words();
+result = <string[]>_('fred, barney, & pebbles').words(/[^, ]+/g);
 
-/**********
-* Utilities *
-***********/
+/***********
+ * Utility *
+ ***********/
+
+// _.callback
+{
+    let result: (...args: any[]) => TResult;
+    result = _.callback<TResult>(Function);
+    result = _.callback<TResult>(Function, any);
+    result = _(Function).callback<TResult>().value();
+    result = _(Function).callback<TResult>(any).value();
+}
+{
+    let result: (object: any) => TResult;
+    result = _.callback<TResult>('');
+    result = _.callback<TResult>('', any);
+    result = _('').callback<TResult>().value();
+    result = _('').callback<TResult>(any).value();
+}
+{
+    let result: (object: any) => boolean;
+    result = _.callback({});
+    result = _.callback({}, any);
+    result = _({}).callback().value();
+    result = _({}).callback(any).value();
+}
 
 // _.constant
 result = <() => number>_.constant<number>(1);
@@ -1735,6 +2761,80 @@ result = <() => boolean>_(true).constant<boolean>();
 result = <() => any[]>_(['a']).constant<any[]>();
 result = <() => {}>_({}).constant<{}>();
 
+// _.identity
+{
+    let testIdentityValue: TResult;
+    let result: TResult;
+    result = _.identity<TResult>(testIdentityValue);
+    result = _(testIdentityValue).identity();
+}
+{
+    let result: number;
+    result = _(42).identity();
+}
+{
+    let result: boolean[];
+    result = _<boolean>([]).identity();
+}
+
+// _.iteratee
+{
+    let result: (...args: any[]) => TResult;
+    result = _.iteratee<TResult>(Function);
+    result = _.iteratee<TResult>(Function, any);
+    result = _(Function).iteratee<TResult>().value();
+    result = _(Function).iteratee<TResult>(any).value();
+}
+{
+    let result: (object: any) => TResult;
+    result = _.iteratee<TResult>('');
+    result = _.iteratee<TResult>('', any);
+    result = _('').iteratee<TResult>().value();
+    result = _('').iteratee<TResult>(any).value();
+}
+{
+    let result: (object: any) => boolean;
+    result = _.iteratee({});
+    result = _.iteratee({}, any);
+    result = _({}).iteratee().value();
+    result = _({}).iteratee(any).value();
+}
+
+// _.matches
+module TestMatches {
+    let source: TResult;
+
+    {
+        let result: (value: any) => boolean;
+        result = _.matches<TResult>(source);
+        result = _(source).matches().value();
+    }
+
+    {
+        let result: (value: TResult) => boolean;
+        result = _.matches<TResult, TResult>(source);
+        result = _(source).matches<TResult>().value();
+    }
+}
+
+// _.matchesProperty
+module TestMatches {
+    let path: {toString(): string;}|{toString(): string;}[];
+    let source: TResult;
+
+    {
+        let result: (value: any) => boolean;
+        result = _.matchesProperty<TResult>(path, source);
+        result = _(path).matchesProperty<TResult>(source).value();
+    }
+
+    {
+        let result: (value: TResult) => boolean;
+        result = _.matchesProperty<TResult, TResult>(path, source);
+        result = _(path).matchesProperty<TResult, TResult>(source).value();
+    }
+}
+
 // _.method
 class TestMethod {
     a = {
@@ -1759,6 +2859,58 @@ result = <number>(_.methodOf<number>(TestMethodOfObject, 1, 2))(['a', '0']);
 result = <number>(_(TestMethodOfObject).methodOf<number>(1, 2).value())('a[0]');
 result = <number>(_(TestMethodOfObject).methodOf<number>(1, 2).value())(['a', '0']);
 
+// _.mixin
+{
+    let testMixinSource: _.Dictionary<Function>;
+    let testMixinOptions: {chain?: boolean;}
+    let result: TResult;
+    result = _.mixin<TResult, Object>({}, testMixinSource);
+    result = _.mixin<TResult, Object>({}, testMixinSource, testMixinOptions);
+    result = _.mixin<TResult>(testMixinSource);
+    result = _.mixin<TResult>(testMixinSource, testMixinOptions);
+    result = _({}).mixin<TResult>(testMixinSource).value();
+    result = _({}).mixin<TResult>(testMixinSource, testMixinOptions).value();
+    result = _(testMixinSource).mixin<TResult>().value();
+    result = _(testMixinSource).mixin<TResult>(testMixinOptions).value();
+}
+
+// _.noConflict
+{
+    let result: typeof _;
+    result = _.noConflict();
+    result = _(42).noConflict();
+    result = _<any>([]).noConflict();
+    result = _({}).noConflict();
+}
+
+// _.runInContext
+{
+    let result: typeof _;
+    result = _.runInContext();
+    result = _.runInContext({});
+    result = _({}).runInContext();
+}
+
+// _.uniqueId
+result = <string>_.uniqueId();
+result = <string>_.uniqueId('');
+result = <string>_('').uniqueId();
+
 result = <string>_.VERSION;
 result = <_.Support>_.support;
 result = <_.TemplateSettings>_.templateSettings;
+
+// _.times
+{
+    let result: number[];
+    result = _.times(42);
+    result = _(42).times().value();
+}
+{
+    let testTimesFn: (num: number) => TResult;
+    let result: TResult[];
+    result = _.times(42, testTimesFn);
+    result = _.times(42, testTimesFn, any);
+    result = _(42).times(testTimesFn).value();
+    result = _(42).times(testTimesFn, any).value();
+}
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index c088f5459..5a3e0df9e 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -252,13 +252,12 @@ declare module _ {
     interface LoDashObjectWrapper<T> extends LoDashWrapperBase<T, LoDashObjectWrapper<T>> { }
 
     interface LoDashArrayWrapper<T> extends LoDashWrapperBase<T[], LoDashArrayWrapper<T>> {
-        concat(...items: T[]): LoDashArrayWrapper<T>;
+        concat(...items: Array<T|Array<T>>): LoDashArrayWrapper<T>;
         join(seperator?: string): string;
         pop(): T;
         push(...items: T[]): LoDashArrayWrapper<T>;
         reverse(): LoDashArrayWrapper<T>;
         shift(): T;
-        slice(start: number, end?: number): LoDashArrayWrapper<T>;
         sort(compareFn?: (a: T, b: T) => number): LoDashArrayWrapper<T>;
         splice(start: number): LoDashArrayWrapper<T>;
         splice(start: number, deleteCount: number, ...items: any[]): LoDashArrayWrapper<T>;
@@ -314,509 +313,456 @@ declare module _ {
     }
 
     /*********
-    * Arrays *
-    **********/
+     * Array *
+     *********/
 
     //_.chunk
     interface LoDashStatic {
         /**
-        * Creates an array of elements split into groups the length of size. If collection can't be
-        * split evenly, the final chunk will be the remaining elements.
-        * @param array The array to process.
-        * @param size The length of each chunk.
-        * @return Returns the new array containing chunks.
-        **/
-        chunk<T>(array: Array<T>, size?: number): T[][];
-
-        /**
-        * @see _.chunk
-        **/
-        chunk<T>(array: List<T>, size?: number): T[][];
+         * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+         * final chunk will be the remaining elements.
+         *
+         * @param array The array to process.
+         * @param size The length of each chunk.
+         * @return Returns the new array containing chunks.
+         */
+        chunk<T>(
+            array: List<T>,
+            size?: number
+        ): T[][];
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.chunk
-        **/
+         * @see _.chunk
+         */
         chunk(size?: number): LoDashArrayWrapper<T[]>;
     }
 
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.chunk
+         */
+        chunk<TResult>(size?: number): LoDashArrayWrapper<TResult[]>;
+    }
+
     //_.compact
     interface LoDashStatic {
         /**
-        * Returns a copy of the array with all falsy values removed. In JavaScript, false, null, 0, "",
-        * undefined and NaN are all falsy.
-        * @param array Array to compact.
-        * @return (Array) Returns a new array of filtered values.
-        **/
-        compact<T>(array?: Array<T>): T[];
-
-        /**
-        * @see _.compact
-        **/
+         * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
+         * falsey.
+         *
+         * @param array The array to compact.
+         * @return (Array) Returns the new array of filtered values.
+         */
         compact<T>(array?: List<T>): T[];
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.compact
-        **/
+         * @see _.compact
+         */
         compact(): LoDashArrayWrapper<T>;
     }
 
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.compact
+         */
+        compact<TResult>(): LoDashArrayWrapper<TResult>;
+    }
+
     //_.difference
     interface LoDashStatic {
         /**
-        * Creates an array excluding all values of the provided arrays using strict equality for comparisons
-        * , i.e. ===.
-        * @param array The array to process
-        * @param others The arrays of values to exclude.
-        * @return Returns a new array of filtered values.
-        **/
+         * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param array The array to inspect.
+         * @param values The arrays of values to exclude.
+         * @return Returns the new array of filtered values.
+         */
         difference<T>(
-            array?: Array<T>,
-            ...others: Array<T>[]): T[];
-        /**
-        * @see _.difference
-        **/
-        difference<T>(
-            array?: List<T>,
-            ...others: List<T>[]): T[];
+            array: T[]|List<T>,
+            ...values: (T[]|List<T>)[]
+        ): T[];
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.difference
-        **/
-        difference(
-            ...others: Array<T>[]): LoDashArrayWrapper<T>;
+         * @see _.difference
+         */
+        difference(...values: (T[]|List<T>)[]): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
         /**
-        * @see _.difference
-        **/
-        difference(
-            ...others: List<T>[]): LoDashArrayWrapper<T>;
+         * @see _.difference
+         */
+        difference<TValue>(...values: (TValue[]|List<TValue>)[]): LoDashArrayWrapper<TValue>;
+    }
+
+    //_.drop
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        drop<T>(array: T[]|List<T>, n?: number): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop(n?: number): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop<TResult>(n?: number): LoDashArrayWrapper<TResult>;
+    }
+
+    //_.dropRight
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        dropRight<T>(
+            array: List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight(n?: number): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight<TResult>(n?: number): LoDashArrayWrapper<TResult>;
+    }
+
+    //_.dropWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        dropWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<TValue>;
     }
 
     //_.findIndex
     interface LoDashStatic {
         /**
-        * This method is like _.find except that it returns the index of the first element that passes
-        * the callback check, instead of the element itself.
-        * @param array The array to search.
-        * @param {(Function|Object|string)} callback The function called per iteration. If a property name or object is provided it will be
-        * used to create a ".pluck" or ".where" style callback, respectively.
-        * @param thisArg The this binding of callback.
-        * @return Returns the index of the found element, else -1.
-        **/
-        findIndex<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): number;
-
-        /**
-        * @see _.findIndex
-        **/
+         * This method is like _.find except that it returns the index of the first element predicate returns truthy
+         * for instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the index of the found element, else -1.
+         */
         findIndex<T>(
             array: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): number;
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.findIndex
-        **/
-        findIndex<T>(
-            array: Array<T>,
-            pluckValue: string): number;
-
-        /**
-        * @see _.findIndex
-        **/
+         * @see _.findIndex
+         */
         findIndex<T>(
             array: List<T>,
-            pluckValue: string): number;
+            predicate?: string,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.findIndex
-        **/
-        findIndex<W, T>(
-            array: Array<T>,
-            whereDictionary: W): number;
-
-        /**
-        * @see _.findIndex
-        **/
+         * @see _.findIndex
+         */
         findIndex<W, T>(
             array: List<T>,
-            whereDictionary: W): number;
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): number;
     }
 
     //_.findLastIndex
     interface LoDashStatic {
         /**
-        * This method is like _.findIndex except that it iterates over elements of a collection from right to left.
-        * @param array The array to search.
-        * @param {(Function|Object|string)} callback The function called per iteration. If a property name or object is provided it will be
-        * used to create a ".pluck" or ".where" style callback, respectively.
-        * @param thisArg The this binding of callback.
-        * @return Returns the index of the found element, else -1.
-        **/
-        findLastIndex<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): number;
-
-        /**
-        * @see _.findLastIndex
-        **/
+         * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The function invoked per iteration.
+         * @return Returns the index of the found element, else -1.
+         */
         findLastIndex<T>(
             array: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): number;
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.findLastIndex
-        **/
-        findLastIndex<T>(
-            array: Array<T>,
-            pluckValue: string): number;
-
-        /**
-        * @see _.findLastIndex
-        **/
+         * @see _.findLastIndex
+         */
         findLastIndex<T>(
             array: List<T>,
-            pluckValue: string): number;
+            predicate?: string,
+            thisArg?: any
+        ): number;
 
         /**
-        * @see _.findLastIndex
-        **/
-        findLastIndex<T>(
-            array: Array<T>,
-            whereDictionary: Dictionary<any>): number;
-
-        /**
-        * @see _.findLastIndex
-        **/
-        findLastIndex<T>(
+         * @see _.findLastIndex
+         */
+        findLastIndex<W, T>(
             array: List<T>,
-            whereDictionary: Dictionary<any>): number;
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string,
+            thisArg?: any
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): number;
     }
 
     //_.first
     interface LoDashStatic {
         /**
-        * Gets the first element or first n elements of an array. If a callback is provided
-        * elements at the beginning of the array are returned as long as the callback returns
-        * truey. 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 Retrieves the first element of this array.
-        * @return Returns the first element of `array`.
-        **/
-        first<T>(array?: Array<T>): T;
-
-        /**
-        * @see _.first
-        **/
-        first<T>(array?: List<T>): T;
-
-        /**
-        * @see _.first
-        * @param n The number of elements to return.
-        **/
-        first<T>(
-            array: Array<T>,
-            n: number): T[];
-
-        /**
-        * @see _.first
-        * @param n The number of elements to return.
-        **/
-        first<T>(
-            array: List<T>,
-            n: number): T[];
-
-        /**
-        * @see _.first
-        * @param callback The function called per element.
-        * @param [thisArg] The this binding of callback.
-        **/
-        first<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.first
-        * @param callback The function called per element.
-        * @param [thisArg] The this binding of callback.
-        **/
-        first<T>(
-            array: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.first
-        * @param pluckValue "_.pluck" style callback value
-        **/
-        first<T>(
-            array: Array<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.first
-        * @param pluckValue "_.pluck" style callback value
-        **/
-        first<T>(
-            array: List<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.first
-        * @param whereValue "_.where" style callback value
-        **/
-        first<W, T>(
-            array: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.first
-        * @param whereValue "_.where" style callback value
-        **/
-        first<W, T>(
-            array: List<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(array: Array<T>): T;
-
-        /**
-        * @see _.first
-        **/
-        head<T>(array: List<T>): T;
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: Array<T>,
-            n: number): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: List<T>,
-            n: number): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: Array<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<T>(
-            array: List<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<W, T>(
-            array: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.first
-        **/
-        head<W, T>(
-            array: List<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.first
-        **/
-        take<T>(array: Array<T>): T[];
-
-        /**
-        * @see _.first
-        **/
-        take<T>(array: List<T>): T[];
-
-        /**
-        * @see _.first
-        **/
-        take<T>(
-            array: Array<T>,
-            n: number): T[];
-
-        /**
-        * @see _.first
-        **/
-        take<T>(
-            array: List<T>,
-            n: number): T[];
-
-        /**
-         * Takes the first items from an array or list based on a predicate
-         * @param array The array or list of items on which the result set will be based
-         * @param predicate A predicate function to determine whether a value will be taken. Optional; defaults to identity.
-         * @param [thisArg] The this binding of predicate.
+         * Gets the first element of array.
+         *
+         * @alias _.head
+         *
+         * @param array The array to query.
+         * @return Returns the first element of array.
          */
-        takeWhile<T>(
-            array: (Array<T>|List<T>),
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any 
-        ): T[];
-        
-        /**
-         * Takes the first items from an array or list based on a predicate
-         * @param array The array or list of items on which the result set will be based
-         * @param pluckValue Uses a _.property style callback to return the property value of the given element
-         */
-        takeWhile<T>(
-            array: (Array<T>|List<T>),
-            pluckValue: string
-        ): any[];
-        
-        /**
-         * Takes the first items from an array or list based on a predicate
-         * @param array The array or list of items on which the result set will be based
-         * @param whereValue Uses a _.matches style callback to return the first elements that match the given value
-         */
-        takeWhile<W, T>(
-            array: (Array<T>|List<T>),
-            whereValue: W
-        ): T[];
+        first<T>(array: List<T>): T;
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.first
-        **/
+         * @see _.first
+         */
         first(): T;
+    }
 
+    interface LoDashObjectWrapper<T> {
         /**
-        * @see _.first
-        * @param n The number of elements to return.
-        **/
-        first(n: number): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param callback The function called per element.
-        * @param [thisArg] The this binding of callback.
-        **/
-        first(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param pluckValue "_.pluck" style callback value
-        **/
-        first(pluckValue: string): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param whereValue "_.where" style callback value
-        **/
-        first<W>(whereValue: W): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        **/
-        head(): T;
-
-        /**
-        * @see _.first
-        * @param n The number of elements to return.
-        **/
-        head(n: number): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param callback The function called per element.
-        * @param [thisArg] The this binding of callback.
-        **/
-        head(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param pluckValue "_.pluck" style callback value
-        **/
-        head(pluckValue: string): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param whereValue "_.where" style callback value
-        **/
-        head<W>(whereValue: W): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        **/
-        take(): LoDashArrayWrapper<T>;
-
-        /**
-        * @see _.first
-        * @param n The number of elements to return.
-        **/
-        take(n: number): LoDashArrayWrapper<T>;
-
-        /**
-        * Takes the first items based on a predicate
-        * @param predicate The function called per element.
-        * @param [thisArg] The this binding of callback.
-        **/
-        takeWhile(
-            predicate: ListIterator<T, boolean>,
-            thisArg?: any): LoDashArrayWrapper<T>;
-
-        /**
-        * Takes the first items based on a predicate
-        * @param pluckValue Uses a _.property style callback to return the property value of the given element
-        **/
-        takeWhile<T>(
-            pluckValue: string): LoDashArrayWrapper<any>;
-
-        /**
-        * Takes the first items based on a predicate
-        * @param whereValue Uses a _.matches style callback to return the first elements that match the given value
-        **/
-        takeWhile<W, T>(
-            whereValue: W): LoDashArrayWrapper<T>;
-
+         * @see _.first
+         */
+        first<TResult>(): TResult;
     }
 
     interface MaybeNestedList<T> extends List<T|List<T>> { }
@@ -875,324 +821,345 @@ declare module _ {
         flattenDeep<T>(): LoDashArrayWrapper<any>;
     }
 
+    //_.head
+    interface LoDashStatic {
+        /**
+         * @see _.first
+         */
+        head<T>(array: List<T>): T;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.first
+         */
+        head(): T;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.first
+         */
+        head<TResult>(): TResult;
+    }
+
     //_.indexOf
     interface LoDashStatic {
         /**
-        * Gets the index at which the first occurrence of value is found using strict equality
-        * for comparisons, i.e. ===. If the array is already sorted providing true for fromIndex
-        * will run a faster binary search.
-        * @param array The array to search.
-        * @param value The value to search for.
-        * @param fromIndex The index to search from.
-        * @return The index of `value` within `array`.
-        **/
-        indexOf<T>(
-            array: Array<T>,
-            value: T): number;
-
-        /**
-        * @see _.indexOf
-        **/
-        indexOf<T>(
-            array: List<T>,
-            value: T): number;
-
-        /**
-        * @see _.indexOf
-        * @param fromIndex The index to search from
-        **/
-        indexOf<T>(
-            array: Array<T>,
-            value: T,
-            fromIndex: number): number;
-
-        /**
-        * @see _.indexOf
-        * @param fromIndex The index to search from
-        **/
+         * Gets the index at which the first occurrence of value is found in array using SameValueZero for equality
+         * comparisons. If fromIndex is negative, it’s used as the offset from the end of array. If array is sorted
+         * providing true for fromIndex performs a faster binary search.
+         *
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+         * @return The index to search from or true to perform a binary search on a sorted array.
+         */
         indexOf<T>(
             array: List<T>,
             value: T,
-            fromIndex: number): number;
+            fromIndex?: boolean|number
+        ): number;
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.indexOf
-        * @param isSorted True to perform a binary search on a sorted array.
-        **/
-        indexOf<T>(
-            array: Array<T>,
+         * @see _.indexOf
+         */
+        indexOf(
             value: T,
-            isSorted: boolean): number;
+            fromIndex?: boolean|number
+        ): number;
+    }
 
+    interface LoDashObjectWrapper<T> {
         /**
-        * @see _.indexOf
-        * @param isSorted True to perform a binary search on a sorted array.
-        **/
-        indexOf<T>(
-            array: List<T>,
-            value: T,
-            isSorted: boolean): number;
+         * @see _.indexOf
+         */
+        indexOf<TValue>(
+            value: TValue,
+            fromIndex?: boolean|number
+        ): number;
     }
 
     //_.initial
     interface LoDashStatic {
         /**
-        * Gets all but the last element or last n elements of an array. If a callback is provided
-        * elements at the end of the array are excluded from the result as long as the callback
-        * returns truey. 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 query.
-        * @param n Leaves this many elements behind, optional.
-        * @return Returns everything but the last `n` elements of `array`.
-        **/
-        initial<T>(
-            array: Array<T>): T[];
+         * Gets all but the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        initial<T>(array: T[]|List<T>): T[];
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.initial
-        **/
-        initial<T>(
-            array: List<T>): T[];
+         * @see _.initial
+         */
+        initial(): LoDashArrayWrapper<T>;
+    }
 
+    interface LoDashObjectWrapper<T> {
         /**
-        * @see _.initial
-        * @param n The number of elements to exclude.
-        **/
-        initial<T>(
-            array: Array<T>,
-            n: number): T[];
-
-        /**
-        * @see _.initial
-        * @param n The number of elements to exclude.
-        **/
-        initial<T>(
-            array: List<T>,
-            n: number): T[];
-
-        /**
-        * @see _.initial
-        * @param callback The function called per element
-        **/
-        initial<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>): T[];
-
-        /**
-        * @see _.initial
-        * @param callback The function called per element
-        **/
-        initial<T>(
-            array: List<T>,
-            callback: ListIterator<T, boolean>): T[];
-
-        /**
-        * @see _.initial
-        * @param pluckValue _.pluck style callback
-        **/
-        initial<T>(
-            array: Array<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.initial
-        * @param pluckValue _.pluck style callback
-        **/
-        initial<T>(
-            array: List<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.initial
-        * @param whereValue _.where style callback
-        **/
-        initial<W, T>(
-            array: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.initial
-        * @param whereValue _.where style callback
-        **/
-        initial<W, T>(
-            array: List<T>,
-            whereValue: W): T[];
+         * @see _.initial
+         */
+        initial<TResult>(): LoDashArrayWrapper<TResult>;
     }
 
     //_.intersection
     interface LoDashStatic {
         /**
-        * Creates an array of unique values present in all provided arrays using strict
-        * equality for comparisons, i.e. ===.
-        * @param arrays The arrays to inspect.
-        * @return Returns an array of composite values.
-        **/
-        intersection<T>(...arrays: Array<T>[]): T[];
+         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of shared values.
+         */
+        intersection<T>(...arrays: (T[]|List<T>)[]): T[];
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.intersection
-        **/
-        intersection<T>(...arrays: List<T>[]): T[];
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashArrayWrapper<TResult>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashArrayWrapper<TResult>;
     }
 
     //_.last
     interface LoDashStatic {
         /**
-        * Gets the last element of an array.
-        * @param array The array to query.
-        * @return Returns the last element of array.
-        **/
-        last<T>(array: Array<T>): T;
+         * Gets the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the last element of array.
+         */
+        last<T>(array: List<T>): T;
     }
 
     interface LoDashArrayWrapper<T> {
         /**
          * @see _.last
-         **/
+         */
         last(): T;
     }
 
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last<T>(): T;
+    }
+
     //_.lastIndexOf
     interface LoDashStatic {
         /**
-        * Gets the index at which the last occurrence of value is found using strict equality
-        * for comparisons, i.e. ===. If fromIndex is negative, it is used as the offset from the
-        * end of the collection.
-        * @param array The array to search.
-        * @param value The value to search for.
-        * @param fromIndex The index to search from.
-        * @return The index of the matched value or -1.
-        **/
-        lastIndexOf<T>(
-            array: Array<T>,
-            value: T,
-            fromIndex?: number): number;
-
-        /**
-        * @see _.lastIndexOf
-        **/
+         * This method is like _.indexOf except that it iterates over elements of array from right to left.
+         *
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+         * @return Returns the index of the matched value, else -1.
+         */
         lastIndexOf<T>(
             array: List<T>,
             value: T,
-            fromIndex?: number): number;
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf(
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf<TResult>(
+            value: TResult,
+            fromIndex?: boolean|number
+        ): number;
     }
 
     //_.pull
     interface LoDashStatic {
         /**
-        * Removes all provided values from the given array using strict equality for comparisons,
-        * i.e. ===.
-        * @param array The array to modify.
-        * @param values The values to remove.
-        * @return array.
-        **/
-        pull(
-            array: Array<any>,
-            ...values: any[]): any[];
-
-        /**
-        * @see _.pull
-        **/
-        pull(
-            array: List<any>,
-            ...values: any[]): any[];
-    }
-
-    interface LoDashStatic {
-        /**
-         * Removes all provided values from the given array using strict equality for comparisons,
-         * i.e. ===.
+         * Removes all provided values from array using SameValueZero for equality comparisons.
+         *
+         * Note: Unlike _.without, this method mutates array.
+         *
          * @param array The array to modify.
          * @param values The values to remove.
-         * @return array.
-         **/
-        pullAt(
-            array: Array<any>,
-            ...values: any[]): any[];
+         * @return Returns array.
+         */
+        pull<T>(
+            array: T[],
+            ...values: T[]
+        ): T[];
 
         /**
          * @see _.pull
-         **/
-        pullAt(
-            array: List<any>,
-            ...values: any[]): any[];
+         */
+        pull<T>(
+            array: List<T>,
+            ...values: T[]
+        ): List<T>;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull(...values: T[]): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull<TValue>(...values: TValue[]): LoDashObjectWrapper<List<TValue>>;
+    }
+
+    //_.pullAt
+    interface LoDashStatic {
+        /**
+         * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+         * Indexes may be specified as an array of indexes or as individual arguments.
+         *
+         * Note: Unlike _.at, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+         * @return Returns the new array of removed elements.
+         */
+        pullAt<T>(
+            array: T[]|List<T>,
+            ...indexes: (number|number[])[]
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt(...indexes: (number|number[])[]): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt<TValue>(...indexes: (number|number[])[]): LoDashArrayWrapper<TValue>;
     }
 
     //_.remove
     interface LoDashStatic {
         /**
-        * Removes all elements from an array that the callback returns truey for and returns
-        * an array of removed elements. 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 modify.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return A new array of removed elements.
-        **/
-        remove(
-            array: Array<any>,
-            callback?: ListIterator<any, boolean>,
-            thisArg?: any): any[];
-
-        /**
-        * @see _.remove
-        **/
-        remove(
-            array: List<any>,
-            callback?: ListIterator<any, boolean>,
-            thisArg?: any): any[];
-
-        /**
-        * @see _.remove
-        * @param pluckValue _.pluck style callback
-        **/
-        remove(
-            array: Array<any>,
-            pluckValue?: string): any[];
-
-        /**
-        * @see _.remove
-        * @param pluckValue _.pluck style callback
-        **/
-        remove(
-            array: List<any>,
-            pluckValue?: string): any[];
-
-        /**
-        * @see _.remove
-        * @param whereValue _.where style callback
-        **/
-        remove(
-            array: Array<any>,
-            wherealue?: Dictionary<any>): any[];
-
-        /**
-        * @see _.remove
-        * @param whereValue _.where style callback
-        **/
-        remove(
-            array: List<any>,
-            wherealue?: Dictionary<any>): any[];
+         * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+         * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Note: Unlike _.filter, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new array of removed elements.
+         */
+        remove<T>(
+            array: List<T>,
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): T[];
 
         /**
          * @see _.remove
-         * @param item The item to remove
-         **/
+         */
         remove<T>(
-            array:Array<T>,
-            item:T): T[];
+            array: List<T>,
+            predicate?: string,
+            thisArg?: any
+        ): T[];
+
+        /**
+         * @see _.remove
+         */
+        remove<W, T>(
+            array: List<T>,
+            predicate?: W
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W>(
+            predicate?: W
+        ): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: ListIterator<TResult, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W, TResult>(
+            predicate?: W
+        ): LoDashArrayWrapper<TResult>;
     }
 
     //_.rest
@@ -1280,74 +1247,6 @@ declare module _ {
             array: List<T>,
             whereValue: W): T[];
 
-        /**
-        * @see _.rest
-        **/
-        drop<T>(array: Array<T>): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(array: List<T>): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: Array<T>,
-            n: number): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: List<T>,
-            n: number): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: Array<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<T>(
-            array: List<T>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<W, T>(
-            array: Array<T>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.rest
-        **/
-        drop<W, T>(
-            array: List<T>,
-            whereValue: W): T[];
-
         /**
         * @see _.rest
         **/
@@ -1417,6 +1316,33 @@ declare module _ {
             whereValue: W): T[];
     }
 
+    //_.slice
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array from start up to, but not including, end.
+         *
+         * @param array The array to slice.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns the slice of array.
+         */
+        slice<T>(
+            array: T[],
+            start?: number,
+            end?: number
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.slice
+         */
+        slice(
+            start?: number,
+            end?: number
+        ): LoDashArrayWrapper<T>;
+    }
+
     //_.sortedIndex
     interface LoDashStatic {
         /**
@@ -1487,6 +1413,252 @@ declare module _ {
             whereValue: W): number;
     }
 
+    //_.take
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        take<T>(
+            array: List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take(n?: number): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take<TResult>(n?: number): LoDashArrayWrapper<TResult>;
+    }
+
+    //_.takeRight
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        takeRight<T>(
+            array: T[]|List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight(n?: number): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight<TResult>(n?: number): LoDashArrayWrapper<TResult>;
+    }
+
+    //_.takeRightWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<TValue>;
+    }
+
+    //_.takeWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string,
+            thisArg?: any
+        ): TValue[];
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: string,
+            thisArg?: any
+        ): LoDashArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashArrayWrapper<TValue>;
+    }
+
     //_.union
     interface LoDashStatic {
         /**
@@ -1502,7 +1674,7 @@ declare module _ {
         **/
         union<T>(...arrays: List<T>[]): T[];
     }
-    
+
     interface LoDashArrayWrapper<T> {
         /**
         * @see _.union
@@ -1852,30 +2024,79 @@ declare module _ {
             whereValue: W): LoDashArrayWrapper<T>;
     }
 
+    //_.unzipWith
+    interface LoDashStatic {
+        /**
+         * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+         * group).
+         *
+         * @param array The array of grouped elements to process.
+         * @param iteratee The function to combine regrouped values.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzipWith<TArray, TResult>(
+            array: List<List<TArray>>,
+            iteratee?: MemoIterator<TArray, TResult>,
+            thisArg?: any
+        ): TResult[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<TArr, TResult>(
+            iteratee?: MemoIterator<TArr, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<TArr, TResult>(
+            iteratee?: MemoIterator<TArr, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+    }
+
     //_.without
     interface LoDashStatic {
         /**
-        * Creates an array excluding all provided values using strict equality for comparisons, i.e. ===.
-        * @param array The array to filter.
-        * @param values The value(s) to exclude.
-        * @return A new array of filtered values.
-        **/
+         * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+         *
+         * @param array The array to filter.
+         * @param values The values to exclude.
+         * @return Returns the new array of filtered values.
+         */
         without<T>(
-            array: Array<T>,
-            ...values: T[]): T[];
+            array: T[]|List<T>,
+            ...values: T[]
+        ): T[];
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.without
-        **/
-        without<T>(
-            array: List<T>,
-            ...values: T[]): T[];
+         * @see _.without
+         */
+        without(...values: T[]): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without<TValue>(...values: TValue[]): LoDashArrayWrapper<TValue>;
     }
 
     //_.xor
     interface LoDashStatic {
         /**
          * Creates an array of unique values that is the symmetric difference of the provided arrays.
+         *
          * @param arrays The arrays to inspect.
          * @return Returns the new array of values.
          */
@@ -1886,14 +2107,14 @@ declare module _ {
         /**
          * @see _.xor
          */
-        xor(...arrays: T[][]): LoDashArrayWrapper<T>;
+        xor(...arrays: List<T>[]): LoDashArrayWrapper<T>;
     }
 
     interface LoDashObjectWrapper<T> {
         /**
          * @see _.xor
          */
-        xor(...arrays: T[]): LoDashObjectWrapper<T>;
+        xor<TValue>(...arrays: List<TValue>[]): LoDashArrayWrapper<TValue>;
     }
 
     //_.zip
@@ -2000,58 +2221,333 @@ declare module _ {
         zipWith<TResult>(...args: any[]): LoDashArrayWrapper<TResult>;
     }
 
-    /* *************
-     * Collections *
-     ************* */
+    /*********
+     * Chain *
+     *********/
+
+    //_.thru
+    interface LoDashStatic {
+        /**
+         * This method is like _.tap except that it returns the result of interceptor.
+         * @param value The value to provide to interceptor.
+         * @param interceptor The function to invoke.
+         * @param thisArg The this binding of interceptor.
+         * @return Returns the result of interceptor.
+         */
+        thru<T, TResult>(
+            value: T,
+            interceptor: (value: T) => TResult,
+            thisArg?: any): TResult;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends number>(
+            interceptor: (value: T) => TResult,
+            thisArg?: any): LoDashWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends string>(
+            interceptor: (value: T) => TResult,
+            thisArg?: any): LoDashWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends boolean>(
+            interceptor: (value: T) => TResult,
+            thisArg?: any): LoDashWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends Object>(
+            interceptor: (value: T) => TResult,
+            thisArg?: any): LoDashObjectWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult>(
+            interceptor: (value: T) => TResult[],
+            thisArg?: any): LoDashArrayWrapper<TResult>;
+    }
+
+    // _.prototype.commit
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * Executes the chained sequence and returns the wrapped result.
+         *
+         * @return Returns the new lodash wrapper instance.
+         */
+        commit(): TWrapper;
+    }
+
+    //_.prototype.plant
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * Creates a clone of the chained sequence planting value as the wrapped value.
+         * @param value The value to plant as the wrapped value.
+         * @return Returns the new lodash wrapper instance.
+         */
+        plant(value: number): LoDashWrapper<number>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: string): LoDashStringWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: boolean): LoDashWrapper<boolean>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: number[]): LoDashNumberArrayWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant<T>(value: T[]): LoDashArrayWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant<T extends {}>(value: T): LoDashObjectWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: any): LoDashWrapper<any>;
+    }
+
+    /**************
+     * Collection *
+     **************/
+
+    //_.all
+    interface LoDashStatic {
+        /**
+         * @see _.every
+         */
+        all<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all<T>(
+            collection: List<T>|Dictionary<T>,
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.every
+         */
+        all(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all(
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.every
+         */
+        all<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all(
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        all<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
 
     //_.at
     interface LoDashStatic {
         /**
-        * Creates an array of elements from the specified indexes, or keys, of the collection.
-        * Indexes may be specified as individual arguments or as arrays of indexes.
-        * @param collection The collection to iterate over.
-        * @param indexes The indexes of collection to retrieve, specified as individual indexes or
-        * arrays of indexes.
-        * @return A new array of elements corresponding to the provided indexes.
-        **/
+         * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+         * specified as individual arguments or as arrays of keys.
+         *
+         * @param collection The collection to iterate over.
+         * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+         * @return Returns the new array of picked elements.
+         */
         at<T>(
-            collection: Array<T>,
-            indexes: number[]): T[];
+            collection: List<T>|Dictionary<T>,
+            ...props: Array<number|string|Array<number|string>>
+        ): T[];
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.at
-        **/
-        at<T>(
+         * @see _.at
+         */
+        at(...props: Array<number|string|Array<number|string>>): LoDashArrayWrapper<T>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at<TResult>(...props: Array<number|string|Array<number|string>>): LoDashArrayWrapper<TResult>;
+    }
+
+    //_.collect
+    interface LoDashStatic {
+        /**
+         * @see _.map
+         */
+        collect<T, TResult>(
             collection: List<T>,
-            indexes: number[]): T[];
+            iteratee?: ListIterator<T, TResult>,
+            thisArg?: any
+        ): TResult[];
 
         /**
-        * @see _.at
-        **/
-        at<T>(
+         * @see _.map
+         */
+        collect<T extends {}, TResult>(
             collection: Dictionary<T>,
-            indexes: number[]): T[];
+            iteratee?: DictionaryIterator<T, TResult>,
+            thisArg?: any
+        ): TResult[];
 
         /**
-        * @see _.at
-        **/
-        at<T>(
-            collection: Array<T>,
-            ...indexes: number[]): T[];
-
-        /**
-        * @see _.at
-        **/
-        at<T>(
+         * @see _.map
+         */
+        collect<T, TResult>(
             collection: List<T>,
-            ...indexes: number[]): T[];
+            iteratee?: string
+        ): TResult[];
 
         /**
-        * @see _.at
-        **/
-        at<T>(
+         * @see _.map
+         */
+        collect<T, TResult>(
             collection: Dictionary<T>,
-            ...indexes: number[]): T[];
+            iteratee?: string
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        collect<T, TObject extends {}>(
+            collection: List<T>,
+            iteratee?: TObject
+        ): boolean[];
+
+        /**
+         * @see _.map
+         */
+        collect<T, TObject extends {}>(
+            collection: Dictionary<T>,
+            iteratee?: TObject
+        ): boolean[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.map
+         */
+        collect<TResult>(
+            iteratee?: ListIterator<T, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        collect<TResult>(
+            iteratee?: string
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        collect<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashArrayWrapper<boolean>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.map
+         */
+        collect<TValue, TResult>(
+            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        collect<TValue, TResult>(
+            iteratee?: string
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        collect<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashArrayWrapper<boolean>;
     }
 
     //_.contains
@@ -2302,162 +2798,106 @@ declare module _ {
     //_.every
     interface LoDashStatic {
         /**
-        * Checks if the given callback returns truey value for all elements of a collection.
-        * The callback is bound to thisArg and invoked with three arguments; (value, index|key,
-        * collection).
-        *
-        * 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 collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return True if all elements passed the callback check, else false.
-        **/
-        every<T>(
-            collection: Array<T>,
-            callback?: ListIterator<T, boolean>,
-            thisArg?: any): boolean;
-
-        /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
+         * Checks if predicate returns truthy for all elements of collection. The predicate is bound to thisArg and
+         * invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @alias _.all
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns true if all elements pass the predicate check, else false.
+         */
         every<T>(
             collection: List<T>,
-            callback?: ListIterator<T, boolean>,
-            thisArg?: any): boolean;
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.every
+         */
         every<T>(
             collection: Dictionary<T>,
-            callback?: DictionaryIterator<T, boolean>,
-            thisArg?: any): boolean;
+            predicate?: DictionaryIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.every
+         */
         every<T>(
-            collection: Array<T>,
-            pluckValue: string): boolean;
+            collection: List<T>|Dictionary<T>,
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
-        every<T>(
-            collection: List<T>,
-            pluckValue: string): boolean;
+         * @see _.every
+         */
+        every<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: ListIterator<T, boolean>,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
-        every<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): boolean;
+         * @see _.every
+         */
+        every(
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        every<W, T>(
-            collection: Array<T>,
-            whereValue: W): boolean;
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        every<W, T>(
-            collection: List<T>,
-            whereValue: W): boolean;
+         * @see _.every
+         */
+        every(
+            predicate?: string,
+            thisArg?: any
+        ): boolean;
 
         /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        every<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): boolean;
-
-        /**
-        * @see _.every
-        **/
-        all<T>(
-            collection: Array<T>,
-            callback?: ListIterator<T, boolean>,
-            thisArg?: any): boolean;
-
-        /**
-        * @see _.every
-        **/
-        all<T>(
-            collection: List<T>,
-            callback?: ListIterator<T, boolean>,
-            thisArg?: any): boolean;
-
-        /**
-        * @see _.every
-        **/
-        all<T>(
-            collection: Dictionary<T>,
-            callback?: DictionaryIterator<T, boolean>,
-            thisArg?: any): boolean;
-
-        /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
-        all<T>(
-            collection: Array<T>,
-            pluckValue: string): boolean;
-
-        /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
-        all<T>(
-            collection: List<T>,
-            pluckValue: string): boolean;
-
-        /**
-        * @see _.every
-        * @param pluckValue _.pluck style callback
-        **/
-        all<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): boolean;
-
-        /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        all<W, T>(
-            collection: Array<T>,
-            whereValue: W): boolean;
-
-        /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        all<W, T>(
-            collection: List<T>,
-            whereValue: W): boolean;
-
-        /**
-        * @see _.every
-        * @param whereValue _.where style callback
-        **/
-        all<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): boolean;
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
     }
 
     //_.fill
@@ -2494,7 +2934,7 @@ declare module _ {
          * @see _.fill
          */
         fill<TResult>(
-            value: any,
+            value: TResult,
             start?: number,
             end?: number): LoDashArrayWrapper<TResult>;
     }
@@ -2504,7 +2944,7 @@ declare module _ {
          * @see _.fill
          */
         fill<TResult>(
-            value: any,
+            value: TResult,
             start?: number,
             end?: number): LoDashObjectWrapper<List<TResult>>;
     }
@@ -2514,13 +2954,13 @@ declare module _ {
         /**
         * Iterates over elements of a collection, returning an array of all elements the
         * identity function returns truey for.
-        * 
+        *
         * @param collection The collection to iterate over.
         * @return Returns a new array of elements that passed the callback check.
         **/
         filter<T>(
             collection: (Array<T>|List<T>)): T[];
-            
+
         /**
         * Iterates over elements of a collection, returning an array of all elements the
         * callback returns truey for. The callback is bound to thisArg and invoked with three
@@ -2683,7 +3123,7 @@ declare module _ {
         * @see _.filter
         **/
         filter(): LoDashArrayWrapper<T>;
-            
+
         /**
         * @see _.filter
         **/
@@ -3514,143 +3954,127 @@ declare module _ {
     //_.map
     interface LoDashStatic {
         /**
-        * Creates an array of values by running each element in the collection through the callback.
-        * The callback is bound to thisArg and invoked with three arguments; (value, index|key,
-        * collection).
-        *
-        * 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 collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param theArg The this binding of callback.
-        * @return The mapped array result.
-        **/
-        map<T, TResult>(
-            collection: Array<T>,
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): TResult[];
-
-        /**
-        * @see _.map
-        **/
+         * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+         * thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property value
+         * of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+         * _.reject, and _.some.
+         *
+         * The guarded methods are:
+         * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+         * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+         * sample, some, sum, uniq, and words
+         *
+         * @alias _.collect
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped array.
+         */
         map<T, TResult>(
             collection: List<T>,
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): TResult[];
+            iteratee?: ListIterator<T, TResult>,
+            thisArg?: any
+        ): TResult[];
 
         /**
-        * @see _.map
-        * @param object The object to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg `this` object in `iterator`, optional.
-        * @return The mapped object result.
-        **/
+         * @see _.map
+         */
         map<T extends {}, TResult>(
-            object: Dictionary<T>,
-            callback: DictionaryIterator<T, TResult>,
-            thisArg?: any): TResult[];
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TResult>,
+            thisArg?: any
+        ): TResult[];
 
         /**
-        * @see _.map
-        * @param pluckValue _.pluck style callback
-        **/
-        map<T, TResult>(
-            collection: Array<T>,
-            pluckValue: string): TResult[];
-
-        /**
-        * @see _.map
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.map
+         */
         map<T, TResult>(
             collection: List<T>,
-            pluckValue: string): TResult[];
+            iteratee?: string
+        ): TResult[];
 
         /**
-        * @see _.map
-        **/
-        collect<T, TResult>(
-            collection: Array<T>,
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): TResult[];
+         * @see _.map
+         */
+        map<T, TResult>(
+            collection: Dictionary<T>,
+            iteratee?: string
+        ): TResult[];
 
         /**
-        * @see _.map
-        **/
-        collect<T, TResult>(
+         * @see _.map
+         */
+        map<T, TObject extends {}>(
             collection: List<T>,
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): TResult[];
+            iteratee?: TObject
+        ): boolean[];
 
         /**
-        * @see _.map
-        **/
-        collect<T extends {}, TResult>(
-            object: Dictionary<T>,
-            callback: DictionaryIterator<T, TResult>,
-            thisArg?: any): TResult[];
-
-        /**
-        * @see _.map
-        **/
-        collect<T, TResult>(
-            collection: Array<T>,
-            pluckValue: string): TResult[];
-
-        /**
-        * @see _.map
-        **/
-        collect<T, TResult>(
-            collection: List<T>,
-            pluckValue: string): TResult[];
+         * @see _.map
+         */
+        map<T, TObject extends {}>(
+            collection: Dictionary<T>,
+            iteratee?: TObject
+        ): boolean[];
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.map
-        **/
+         * @see _.map
+         */
         map<TResult>(
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): LoDashArrayWrapper<TResult>;
+            iteratee?: ListIterator<T, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
 
         /**
-        * @see _.map
-        * @param pluckValue _.pluck style callback
-        **/
+         * @see _.map
+         */
         map<TResult>(
-            pluckValue: string): LoDashArrayWrapper<TResult>;
+            iteratee?: string
+        ): LoDashArrayWrapper<TResult>;
 
         /**
-        * @see _.map
-        **/
-        collect<TResult>(
-            callback: ListIterator<T, TResult>,
-            thisArg?: any): LoDashArrayWrapper<TResult>;
-
-        /**
-        * @see _.map
-        **/
-        collect<TResult>(
-            pluckValue: string): LoDashArrayWrapper<TResult>;
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashArrayWrapper<boolean>;
     }
 
     interface LoDashObjectWrapper<T> {
         /**
-        * @see _.map
-        **/
-        map<T extends {}, TResult>(
-            callback: ObjectIterator<T, TResult>,
-            thisArg?: any): LoDashArrayWrapper<TResult>;
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>,
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
 
         /**
-        * @see _.map
-        **/
-        collect<T extends {}, TResult>(
-            callback: ObjectIterator<T, TResult>,
-            thisArg?: any): LoDashArrayWrapper<TResult>;
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: string
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashArrayWrapper<boolean>;
     }
 
     //_.ceil
@@ -4069,21 +4493,21 @@ declare module _ {
         **/
         pluck<T extends {}>(
             collection: Array<T>,
-            property: string): any[];
+            property: string|string[]): any[];
 
         /**
         * @see _.pluck
         **/
         pluck<T extends {}>(
             collection: List<T>,
-            property: string): any[];
+            property: string|string[]): any[];
 
         /**
         * @see _.pluck
         **/
         pluck<T extends {}>(
             collection: Dictionary<T>,
-            property: string): any[];
+            property: string|string[]): any[];
     }
 
     interface LoDashArrayWrapper<T> {
@@ -5096,7 +5520,7 @@ declare module _ {
         sortBy<W, T>(
             collection: List<T>,
             whereValue: W): T[];
-            
+
         /**
          * Sorts by all the given arguments, using either ListIterator, pluckValue, or whereValue foramts
          * @param args The rules by which to sort
@@ -5126,7 +5550,7 @@ declare module _ {
         * @param whereValue _.where style callback
         **/
         sortBy<W>(whereValue: W): LoDashArrayWrapper<T>;
-        
+
         /**
          * Sorts by all the given arguments, using either ListIterator, pluckValue, or whereValue foramts
          * @param args The rules by which to sort
@@ -5997,6 +6421,88 @@ declare module _ {
      * Lang *
      ********/
 
+    //_.clone
+    interface LoDashStatic {
+        /**
+         * Creates a clone of value. If isDeep is true nested objects are cloned, otherwise they are assigned by
+         * reference. If customizer is provided it’s invoked to produce the cloned values. If customizer returns
+         * undefined cloning is handled by the method instead. The customizer is bound to thisArg and invoked with up
+         * to three argument; (value [, index|key, object]).
+         * Note: This method is loosely based on the structured clone algorithm. The enumerable properties of arguments
+         * objects and objects created by constructors other than Object are cloned to plain Object objects. An empty
+         * object is returned for uncloneable values such as functions, DOM nodes, Maps, Sets, and WeakMaps.
+         * @param value The value to clone.
+         * @param isDeep Specify a deep clone.
+         * @param customizer The function to customize cloning values.
+         * @param thisArg The this binding of customizer.
+         * @return Returns the cloned value.
+         */
+        clone<T>(
+            value: T,
+            isDeep?: boolean,
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+
+        /**
+         * @see _.clone
+         */
+        clone<T>(
+            value: T,
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(
+            isDeep?: boolean,
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+
+        /**
+         * @see _.clone
+         */
+        clone(
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(
+            isDeep?: boolean,
+            customizer?: (value: any) => any,
+            thisArg?: any): T[];
+
+        /**
+         * @see _.clone
+         */
+        clone(
+            customizer?: (value: any) => any,
+            thisArg?: any): T[];
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(
+            isDeep?: boolean,
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+
+        /**
+         * @see _.clone
+         */
+        clone(
+            customizer?: (value: any) => any,
+            thisArg?: any): T;
+    }
+
     //_.cloneDeep
     interface LoDashStatic {
         /**
@@ -6007,13 +6513,13 @@ declare module _ {
          * objects and objects created by constructors other than Object are cloned to plain Object objects. An empty
          * object is returned for uncloneable values such as functions, DOM nodes, Maps, Sets, and WeakMaps.
          * @param value The value to deep clone.
-         * @param callback The function to customize cloning values.
+         * @param customizer The function to customize cloning values.
          * @param thisArg The this binding of customizer.
          * @return Returns the deep cloned value.
          */
         cloneDeep<T>(
             value: T,
-            callback?: (value: any) => any,
+            customizer?: (value: any) => any,
             thisArg?: any): T;
     }
 
@@ -6022,7 +6528,7 @@ declare module _ {
          * @see _.cloneDeep
          */
         cloneDeep(
-            callback?: (value: any) => any,
+            customizer?: (value: any) => any,
             thisArg?: any): T;
     }
 
@@ -6031,7 +6537,7 @@ declare module _ {
          * @see _.cloneDeep
          */
         cloneDeep(
-            callback?: (value: any) => any,
+            customizer?: (value: any) => any,
             thisArg?: any): T[];
     }
 
@@ -6040,7 +6546,7 @@ declare module _ {
          * @see _.cloneDeep
          */
         cloneDeep(
-            callback?: (value: any) => any,
+            customizer?: (value: any) => any,
             thisArg?: any): T;
     }
 
@@ -6080,6 +6586,91 @@ declare module _ {
         gte(other: any): boolean;
     }
 
+    //_.isArguments
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an arguments object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArguments(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isArguments
+         */
+        isArguments(): boolean;
+    }
+
+    //_.isArray
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an Array object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         **/
+        isArray(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArray
+         */
+        isArray(): boolean;
+    }
+
+    //_.isBoolean
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a boolean primitive or object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         **/
+        isBoolean(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBoolean
+         */
+        isBoolean(): boolean;
+    }
+
+    //_.isDate
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Date object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         **/
+        isDate(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isDate
+         */
+        isDate(): boolean;
+    }
+
+    //_.isElement
+    interface LoDashStatic {
+        /**
+         * Checks if value is a DOM element.
+         * @param value The value to check.
+         * @return Returns true if value is a DOM element, else false.
+         */
+        isElement(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): boolean;
+    }
+
     //_.isEmpty
     interface LoDashStatic {
         /**
@@ -6098,6 +6689,59 @@ declare module _ {
         isEmpty(): boolean;
     }
 
+    //_.isError
+    interface LoDashStatic {
+        /**
+         * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
+         * object.
+         * @param value The value to check.
+         * @return Returns true if value is an error object, else false.
+         */
+        isError(value: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isError
+         */
+        isError(): boolean;
+    }
+
+    //_.isFinite
+    interface LoDashStatic {
+        /**
+         * Checks if value is a finite primitive number.
+         * Note: This method is based on Number.isFinite.
+         * @param value The value to check.
+         * @return Returns true if value is a finite number, else false.
+         **/
+        isFinite(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFinite
+         */
+        isFinite(): boolean;
+    }
+
+    //_.isFunction
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Function object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         **/
+        isFunction(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFunction
+         */
+        isFunction(): boolean;
+    }
+
     //_.isMatch
     interface isMatchCustomizer {
         (value: any, other: any, indexOrKey?: number|string): boolean;
@@ -6160,6 +6804,114 @@ declare module _ {
         isNative(): boolean;
     }
 
+    //_.isNull
+    interface LoDashStatic {
+        /**
+         * Checks if value is null.
+         * @param value The value to check.
+         * @return Returns true if value is null, else false.
+         **/
+        isNull(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNull
+         */
+        isNull(): boolean;
+    }
+
+    //_.isNumber
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Number primitive or object.
+         * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isNumber(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNumber
+         */
+        isNumber(): boolean;
+    }
+
+    //_.isObject
+    interface LoDashStatic {
+        /**
+         * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
+         * and new String(''))
+         * @param value The value to check.
+         * @return Returns true if value is an object, else false.
+         **/
+        isObject(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isObject
+         */
+        isObject(): boolean;
+    }
+
+    //_.isPlainObject
+    interface LoDashStatic {
+        /**
+         * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
+         * [[Prototype]] of null.
+         *
+         * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a plain object, else false.
+         */
+        isPlainObject(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isPlainObject
+         */
+        isPlainObject(): boolean;
+    }
+
+    //_.isRegExp
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a RegExp object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isRegExp(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isRegExp
+         */
+        isRegExp(): boolean;
+    }
+
+    //_.isString
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a String primitive or object.
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         **/
+        isString(value?: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isString
+         */
+        isString(): boolean;
+    }
+
     //_.isTypedArray
     interface LoDashStatic {
         /**
@@ -6177,6 +6929,23 @@ declare module _ {
         isTypedArray(): boolean;
     }
 
+    //_.isUndefined
+    interface LoDashStatic {
+        /**
+         * Checks if value is undefined.
+         * @param value The value to check.
+         * @return Returns true if value is undefined, else false.
+         **/
+        isUndefined(value: any): boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * see _.isUndefined
+         */
+        isUndefined(): boolean;
+    }
+
     //_.lt
     interface LoDashStatic {
         /**
@@ -6496,26 +7265,6 @@ declare module _ {
         create<TResult extends {}>(properties?: Object): LoDashObjectWrapper<TResult>;
     }
 
-    //_.clone
-    interface LoDashStatic {
-        /**
-        * Creates a clone of value. If deep is true nested objects will also be cloned, otherwise
-        * they will be assigned by reference. If a callback is provided it will be executed to produce
-        * the cloned values. If the callback returns undefined cloning will be handled by the method
-        * instead. The callback is bound to thisArg and invoked with one argument; (value).
-        * @param value The value to clone.
-        * @param deep Specify a deep clone.
-        * @param callback The function to customize cloning values.
-        * @param thisArg The this binding of callback.
-        * @return The cloned value.
-        **/
-        clone<T>(
-            value: T,
-            deep?: boolean,
-            callback?: (value: any) => any,
-            thisArg?: any): T;
-    }
-
     //_.defaults
     interface LoDashStatic {
         /**
@@ -6561,33 +7310,87 @@ declare module _ {
     //_.findKey
     interface LoDashStatic {
         /**
-        * This method is like _.findIndex except that it returns the key of the first element that
-        * passes the callback check, instead of the element itself.
-        * @param object The object to search.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return The key of the found element, else undefined.
-        **/
-        findKey(
-            object: any,
-            callback: (value: any) => boolean,
-            thisArg?: any): string;
+         * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+         * instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param object The object to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the key of the matched element, else undefined.
+         */
+        findKey<TValues, TObject>(
+            object: TObject,
+            predicate?: DictionaryIterator<TValues, boolean>,
+            thisArg?: any
+        ): string;
 
         /**
-        * @see _.findKey
-        * @param pluckValue _.pluck style callback
-        **/
-        findKey(
-            object: any,
-            pluckValue: string): string;
+         * @see _.findKey
+         */
+        findKey<TObject>(
+            object: TObject,
+            predicate?: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): string;
 
         /**
-        * @see _.findKey
-        * @param whereValue _.where style callback
-        **/
-        findKey<W extends Dictionary<any>, T>(
-            object: T,
-            whereValue: W): string;
+         * @see _.findKey
+         */
+        findKey<TObject>(
+            object: TObject,
+            predicate?: string,
+            thisArg?: any
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>, TObject>(
+            object: TObject,
+            predicate?: TWhere
+        ): string;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.findKey
+         */
+        findKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>,
+            thisArg?: any
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: string,
+            thisArg?: any
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): string;
     }
 
     //_.findLastKey
@@ -6792,17 +7595,17 @@ declare module _ {
          * @param defaultValue The value returned if the resolved value is undefined.
          * @return Returns the resolved value.
          **/
-        get<T>(object: Object,
-               path: string|string[],
-               defaultValue?:T
-        ): T;
+        get<TResult>(object: Object,
+               path: string|number|boolean|Array<string|number|boolean>,
+               defaultValue?:TResult
+        ): TResult;
     }
 
     interface LoDashObjectWrapper<T> {
         /**
          * @see _.get
          **/
-        get<TResult>(path: string|string[],
+        get<TResult>(path: string|number|boolean|Array<string|number|boolean>,
                      defaultValue?: TResult
         ): TResult;
     }
@@ -6810,84 +7613,40 @@ declare module _ {
     //_.has
     interface LoDashStatic {
         /**
-        * Checks if the specified object property exists and is a direct property, instead of an
-        * inherited property.
-        * @param object The object to check.
-        * @param property The property to check for.
-        * @return True if key is a direct property, else false.
-        **/
-        has(object: any, property: string): boolean;
+         * Checks if path is a direct property.
+         *
+         * @param object The object to query.
+         * @param path The path to check.
+         * @return Returns true if path is a direct property, else false.
+         */
+        has(object: any, path: string|number|boolean|Array<string|number|boolean>): boolean;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.has
+         */
+        has(path: string|number|boolean|Array<string|number|boolean>): boolean;
     }
 
     //_.invert
     interface LoDashStatic {
         /**
-        * Creates an object composed of the inverted keys and values of the given object.
-        * @param object The object to invert.
-        * @return The created inverted object.
-        **/
-        invert(object: any): any;
+         * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
+         * subsequent values overwrite property assignments of previous values unless multiValue is true.
+         *
+         * @param object The object to invert.
+         * @param multiValue Allow multiple values per key.
+         * @return Returns the new inverted object.
+         */
+        invert<T extends {}, TResult extends {}>(object: T, multiValue?: boolean): TResult;
     }
 
-    //_.isArguments
-    interface LoDashStatic {
+    interface LoDashObjectWrapper<T> {
         /**
-        * Checks if value is an arguments object.
-        * @param value The value to check.
-        * @return True if the value is an arguments object, else false.
-        **/
-        isArguments(value?: any): boolean;
-    }
-
-    //_.isArray
-    interface LoDashStatic {
-        /**
-        * Checks if value is an array.
-        * @param value The value to check.
-        * @return True if the value is an array, else false.
-        **/
-        isArray(value?: any): boolean;
-    }
-
-    //_.isBoolean
-    interface LoDashStatic {
-        /**
-        * Checks if value is a boolean value.
-        * @param value The value to check.
-        * @return True if the value is a boolean value, else false.
-        **/
-        isBoolean(value?: any): boolean;
-    }
-
-    //_.isDate
-    interface LoDashStatic {
-        /**
-        * Checks if value is a date.
-        * @param value The value to check.
-        * @return True if the value is a date, else false.
-        **/
-        isDate(value?: any): boolean;
-    }
-
-    //_.isElement
-    interface LoDashStatic {
-        /**
-        * Checks if value is a DOM element.
-        * @param value The value to check.
-        * @return True if the value is a DOM element, else false.
-        **/
-        isElement(value?: any): boolean;
-    }
-
-    //_.isError
-    interface LoDashStatic {
-        /**
-        * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError,
-        * or URIError object.
-        * @param value The value to check.
-        * @return True if value is an error object, else false.
-        */
-        isError(value: any): boolean;
+         * @see _.invert
+         */
+        invert<TResult extends {}>(multiValue?: boolean): LoDashObjectWrapper<TResult>;
     }
 
     //_.isEqual
@@ -6970,102 +7729,6 @@ declare module _ {
            thisArg?: any): boolean;
     }
 
-    //_.isFinite
-    interface LoDashStatic {
-        /**
-        * Checks if value is, or can be coerced to, a finite number.
-        *
-        * Note: This is not the same as native isFinite which will return true for booleans and empty
-        * strings. See http://es5.github.io/#x15.1.2.5.
-        * @param value The value to check.
-        * @return True if the value is finite, else false.
-        **/
-        isFinite(value?: any): boolean;
-    }
-
-    //_.isFunction
-    interface LoDashStatic {
-        /**
-        * Checks if value is a function.
-        * @param value The value to check.
-        * @return True if the value is a function, else false.
-        **/
-        isFunction(value?: any): boolean;
-    }
-
-    //_.isNull
-    interface LoDashStatic {
-        /**
-        * Checks if value is null.
-        * @param value The value to check.
-        * @return True if the value is null, else false.
-        **/
-        isNull(value?: any): boolean;
-    }
-
-    //_.isNumber
-    interface LoDashStatic {
-        /**
-        * Checks if value is a number.
-        *
-        * Note: NaN is considered a number. See http://es5.github.io/#x8.5.
-        * @param value The value to check.
-        * @return True if the value is a number, else false.
-        **/
-        isNumber(value?: any): boolean;
-    }
-
-    //_.isObject
-    interface LoDashStatic {
-        /**
-        * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes,
-        * new Number(0), and new String(''))
-        * @param value The value to check.
-        * @return True if the value is an object, else false.
-        **/
-        isObject(value?: any): boolean;
-    }
-
-    //_.isPlainObject
-    interface LoDashStatic {
-        /**
-        * Checks if value is an object created by the Object constructor.
-        * @param value The value to check.
-        * @return True if value is a plain object, else false.
-        **/
-        isPlainObject(value?: any): boolean;
-    }
-
-    //_.isRegExp
-    interface LoDashStatic {
-        /**
-        * Checks if value is a regular expression.
-        * @param value The value to check.
-        * @return True if the value is a regular expression, else false.
-        **/
-        isRegExp(value?: any): boolean;
-    }
-
-    //_.isString
-    interface LoDashStatic {
-        /**
-        * Checks if value is a string.
-        * @param value The value to check.
-        * @return True if the value is a string, else false.
-        **/
-        isString(value?: any): boolean;
-    }
-
-    //_.isUndefined
-    interface LoDashStatic {
-        /**
-        * Checks if value is undefined.
-        * @param value The value to check.
-        * @return True if the value is undefined, else false.
-        **/
-        isUndefined(value?: any): boolean;
-    }
-
     //_.keys
     interface LoDashStatic {
         /**
@@ -7100,6 +7763,97 @@ declare module _ {
         keysIn(): LoDashArrayWrapper<string>
     }
 
+    //_.mapKeys
+    interface LoDashStatic {
+        /**
+         * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+         * by running each own enumerable property of object through iteratee.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped object.
+         */
+        mapKeys<T, TKey>(
+            object: List<T>,
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T, TKey>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TKey>,
+            thisArg?: any
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T, TObject extends {}>(
+            object: List<T>|Dictionary<T>,
+            iteratee?: TObject
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            object: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): Dictionary<T>;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TKey>(
+            iteratee?: ListIterator<T, TKey>,
+            thisArg?: any
+        ): LoDashObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            iteratee?: string
+        ): LoDashObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TKey>(
+            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>,
+            thisArg?: any
+        ): LoDashObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult>(
+            iteratee?: string
+        ): LoDashObjectWrapper<Dictionary<TResult>>;
+    }
+
     //_.mapValues
     interface LoDashStatic {
         /**
@@ -7283,121 +8037,197 @@ declare module _ {
         pairs(): LoDashArrayWrapper<any[]>;
     }
 
-    //_.picks
+    //_.pick
     interface LoDashStatic {
         /**
-        * Creates a shallow clone of object composed of the specified properties. Property names may be
-        * specified as individual arguments or as arrays of property names. If a callback is provided
-        * it will be executed for each property of object picking the properties the callback returns
-        * truey for. The callback is bound to thisArg and invoked with three arguments; (value, key,
-        * object).
-        * @param object Object to strip unwanted key/value pairs.
-        * @param keys Property names to pick
-        * @return An object composed of the picked properties.
-        **/
-        pick<Picked, T>(
+         * Creates an object composed of the picked object properties. Property names may be specified as individual
+         * arguments or as arrays of property names. If predicate is provided it’s invoked for each property of object
+         * picking the properties predicate returns truthy for. The predicate is bound to thisArg and invoked with
+         * three arguments: (value, key, object).
+         *
+         * @param object The source object.
+         * @param predicate The function invoked per iteration or property names to pick, specified as individual
+         * property names or arrays of property names.
+         * @param thisArg The this binding of predicate.
+         * @return An object composed of the picked properties.
+         */
+        pick<TResult extends Object, T extends Object>(
             object: T,
-            ...keys: string[]): Picked;
+            predicate: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): TResult;
 
         /**
-        * @see _.pick
-        **/
-        pick<Picked, T>(
+         * @see _.pick
+         */
+        pick<TResult extends Object, T extends Object>(
             object: T,
-            keys: string[]): Picked;
+            ...predicate: Array<string|number|boolean|Array<string|number|boolean>>
+        ): TResult;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.pick
+         */
+        pick<TResult extends Object>(
+            predicate: ObjectIterator<any, boolean>,
+            thisArg?: any
+        ): LoDashObjectWrapper<TResult>;
 
         /**
-        * @see _.pick
-        **/
-        pick<Picked, T>(
-            object: T,
-            callback: ObjectIterator<any, boolean>,
-            thisArg?: any): Picked;
+         * @see _.pick
+         */
+        pick<TResult extends Object>(
+            ...predicate: Array<string|number|boolean|Array<string|number|boolean>>
+        ): LoDashObjectWrapper<TResult>;
+    }
+
+    //_.result
+    interface LoDashStatic {
+        /**
+         * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+         * of its parent object and its result is returned.
+         *
+         * @param object The object to query.
+         * @param path The path of the property to resolve.
+         * @param defaultValue The value returned if the resolved value is undefined.
+         * @return Returns the resolved value.
+         */
+        result<TObject, TResult>(
+            object: TObject,
+            path: number|string|boolean|Array<number|string|boolean>,
+            defaultValue?: TResult
+        ): TResult;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: number|string|boolean|Array<number|string|boolean>,
+            defaultValue?: TResult
+        ): TResult;
     }
 
     //_.set
     interface LoDashStatic {
         /**
-         * Sets the property value of path on object. If a portion of path does not exist it is created.
+         * Sets the property value of path on object. If a portion of path does not exist it’s created.
+         *
          * @param object The object to augment.
          * @param path The path of the property to set.
          * @param value The value to set.
          * @return Returns object.
-         **/
-        set<T>(object: T,
-            path: string|string[],
-            value: any): T;
+         */
+        set<T>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[],
+            value: any
+        ): T;
     }
 
     interface LoDashObjectWrapper<T> {
         /**
          * @see _.set
-         **/
-        set(path: string|string[],
-            value: any): LoDashObjectWrapper<T>;
+         */
+        set(
+            path: StringRepresentable|StringRepresentable[],
+            value: any
+        ): LoDashObjectWrapper<T>;
     }
 
     //_.transform
     interface LoDashStatic {
         /**
-        * An alternative to _.reduce this method transforms object to a new accumulator object which is
-        * the result of running each of its elements through a callback, with each callback execution
-        * potentially mutating the accumulator object. The callback is bound to thisArg and invoked with
-        * four arguments; (accumulator, value, key, object). Callbacks may exit iteration early by
-        * explicitly returning false.
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param accumulator The custom accumulator value.
-        * @param thisArg The this binding of callback.
-        * @return The accumulated value.
-        **/
-        transform<T, Acc>(
-            collection: Array<T>,
-            callback: MemoVoidIterator<T, Acc>,
-            accumulator: Acc,
-            thisArg?: any): Acc;
+         * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+         * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+         * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+         * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param accumulator The custom accumulator value.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the accumulated value.
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[],
+            thisArg?: any
+        ): TResult[];
 
         /**
-        * @see _.transform
-        **/
-        transform<T, Acc>(
-            collection: List<T>,
-            callback: MemoVoidIterator<T, Acc>,
-            accumulator: Acc,
-            thisArg?: any): Acc;
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>,
+            thisArg?: any
+        ): Dictionary<TResult>;
 
         /**
-        * @see _.transform
-        **/
-        transform<T, Acc>(
-            collection: Dictionary<T>,
-            callback: MemoVoidIterator<T, Acc>,
-            accumulator: Acc,
-            thisArg?: any): Acc;
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>,
+            thisArg?: any
+        ): Dictionary<TResult>;
 
         /**
-        * @see _.transform
-        **/
-        transform<T, Acc>(
-            collection: Array<T>,
-            callback?: MemoVoidIterator<T, Acc>,
-            thisArg?: any): Acc;
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[],
+            thisArg?: any
+        ): TResult[];
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.transform
+         */
+        transform<TResult>(
+            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[],
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
 
         /**
-        * @see _.transform
-        **/
-        transform<T, Acc>(
-            collection: List<T>,
-            callback?: MemoVoidIterator<T, Acc>,
-            thisArg?: any): Acc;
+         * @see _.transform
+         */
+        transform<TResult>(
+            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>,
+            thisArg?: any
+        ): LoDashObjectWrapper<Dictionary<TResult>>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>,
+            thisArg?: any
+        ): LoDashObjectWrapper<Dictionary<TResult>>;
 
         /**
-        * @see _.transform
-        **/
-        transform<T, Acc>(
-            collection: Dictionary<T>,
-            callback?: MemoVoidIterator<T, Acc>,
-            thisArg?: any): Acc;
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[],
+            thisArg?: any
+        ): LoDashArrayWrapper<TResult>;
     }
 
     //_.values
@@ -7438,11 +8268,70 @@ declare module _ {
      * String *
      **********/
 
+    //_.camelCase
     interface LoDashStatic {
-        camelCase(str?: string): string;
-        capitalize(str?: string): string;
-        deburr(str?: string): string;
-        endsWith(str?: string, target?: string, position?: number): boolean;
+        /**
+         * Converts string to camel case.
+         * @param string The string to convert.
+         * @return Returns the camel cased string.
+         */
+        camelCase(string?: string): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.camelCase
+         */
+        camelCase(): string;
+    }
+
+    //_.capitalize
+    interface LoDashStatic {
+        capitalize(string?: string): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.capitalize
+         */
+        capitalize(): string;
+    }
+
+    //_.deburr
+    interface LoDashStatic {
+        /**
+         * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
+         * diacritical marks.
+         * @param string The string to deburr.
+         * @return Returns the deburred string.
+         */
+        deburr(string?: string): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.deburr
+         */
+        deburr(): string;
+    }
+
+    //_.endsWith
+    interface LoDashStatic {
+        /**
+         * Checks if string ends with the given target string.
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string ends with target, else false.
+         */
+        endsWith(string?: string, target?: string, position?: number): boolean;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.endsWith
+         */
+        endsWith(target?: string, position?: number): boolean;
     }
 
     // _.escape
@@ -7480,11 +8369,82 @@ declare module _ {
         escapeRegExp(): string;
     }
 
+    //_.kebabCase
     interface LoDashStatic {
-        kebabCase(str?: string): string;
-        pad(str?: string, length?: number, chars?: string): string;
-        padLeft(str?: string, length?: number, chars?: string): string;
-        padRight(str?: string, length?: number, chars?: string): string;
+        /**
+         * Converts string to kebab case.
+         * @param string The string to convert.
+         * @return Returns the kebab cased string.
+         */
+        kebabCase(string?: string): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.kebabCase
+         */
+        kebabCase(): string;
+    }
+
+    interface LoDashStatic {
+        /**
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        pad(string?: string, length?: number, chars?: string): string;
+    }
+
+    //_.pad
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.pad
+         */
+        pad(length?: number, chars?: string): string;
+    }
+
+    //_.padLeft
+    interface LoDashStatic {
+        /**
+         * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padLeft(string?: string, length?: number, chars?: string): string;
+    }
+
+    //_.padLeft
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.padLeft
+         */
+        padLeft(length?: number, chars?: string): string;
+    }
+
+    //_.padRight
+    interface LoDashStatic {
+        /**
+         * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padRight(string?: string, length?: number, chars?: string): string;
+    }
+
+    //_.padRight
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.padRight
+         */
+        padRight(length?: number, chars?: string): string;
     }
 
     //_.parseInt
@@ -7507,8 +8467,22 @@ declare module _ {
         parseInt(radix?: number): number;
     }
 
+    //_.repeat
     interface LoDashStatic {
-        repeat(str?: string, n?: number): string;
+        /**
+         * Repeats the given string n times.
+         * @param string The string to repeat.
+         * @param n The number of times to repeat the string.
+         * @return Returns the repeated string.
+         */
+        repeat(string?: string, n?: number): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.repeat
+         */
+        repeat(n?: number): string;
     }
 
     //_.snakeCase
@@ -7528,9 +8502,84 @@ declare module _ {
         snakeCase(): string;
     }
 
+    //_.startCase
     interface LoDashStatic {
-        startCase(str?: string): string;
-        startsWith(str?: string, target?: string, position?: number): boolean;
+        /**
+         * Converts string to start case.
+         * @param string The string to convert.
+         * @return Returns the start cased string.
+         */
+        startCase(string?: string): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.startCase
+         */
+        startCase(): string;
+    }
+
+    //_.startsWith
+    interface LoDashStatic {
+        /**
+         * Checks if string starts with the given target string.
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string starts with target, else false.
+         */
+        startsWith(string?: string, target?: string, position?: number): boolean;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.startsWith
+         */
+        startsWith(target?: string, position?: number): boolean;
+    }
+
+    //_.template
+    interface TemplateExecutor {
+        (data?: Object): string;
+        source: string;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
+         * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
+         * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
+         * provided it takes precedence over _.templateSettings values.
+         *
+         * Note: In the development build _.template utilizes
+         * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
+         * debugging.
+         *
+         * For more information on precompiling templates see
+         * [lodash's custom builds documentation](https://lodash.com/custom-builds).
+         *
+         * For more information on Chrome extension sandboxes see
+         * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
+         *
+         * @param string The template string.
+         * @param options The options object.
+         * @param options.escape The HTML "escape" delimiter.
+         * @param options.evaluate The "evaluate" delimiter.
+         * @param options.imports An object to import into the template as free variables.
+         * @param options.interpolate The "interpolate" delimiter.
+         * @param options.variable The data object variable name.
+         * @return Returns the compiled template function.
+         */
+        template(
+            string: string,
+            options?: TemplateSettings): TemplateExecutor;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.template
+         */
+        template(options?: TemplateSettings): TemplateExecutor;
     }
 
     //_.trim
@@ -7587,9 +8636,32 @@ declare module _ {
         trimRight(chars?: string): string;
     }
 
+    //_.trunc
+    interface TruncOptions {
+        /** The maximum string length. */
+        length?: number;
+        /** The string to indicate text is omitted. */
+        omission?: string;
+        /** The separator pattern to truncate to. */
+        separator?: string|RegExp;
+    }
+
     interface LoDashStatic {
-        trunc(str?: string, len?: number): string;
-        trunc(str?: string, options?: { length?: number; omission?: string; separator?: string|RegExp }): string;
+        /**
+         * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+         * string are replaced with the omission string which defaults to "…".
+         * @param string The string to truncate.
+         * @param options The options object or maximum string length.
+         * @return Returns the truncated string.
+         */
+        trunc(string?: string, options?: TruncOptions|number): string;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.trunc
+         */
+        trunc(options?: TruncOptions|number): string;
     }
 
     //_.unescape
@@ -7610,24 +8682,260 @@ declare module _ {
         unescape(): string;
     }
 
+    //_.words
     interface LoDashStatic {
-        words(str?: string, pattern?: string|RegExp): string[];
+        /**
+         * Splits string into an array of its words.
+         * @param string The string to inspect.
+         * @param pattern The pattern to match words.
+         * @return Returns the words of string.
+         */
+        words(string?: string, pattern?: string|RegExp): string[];
     }
 
-    /*************
-     * Utilities *
-     *************/
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.words
+         */
+        words(pattern?: string|RegExp): string[];
+    }
+
+    /***********
+     * Utility *
+     ***********/
+
+    //_.attempt
+    interface LoDashStatic {
+        /**
+         * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
+         * are provided to func when it’s invoked.
+         * @param func The function to attempt.
+         * @return Returns the func result or error object.
+         */
+        attempt<TResult>(func: (...args: any[]) => TResult): TResult|Error;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.attempt
+         */
+        attempt<TResult>(): TResult|Error;
+    }
+
+    //_.callback
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of thisArg and arguments of the created function.
+         * If func is a property name the created callback returns the property value for a given element. If func is
+         * an object the created callback returns true for elements that contain the equivalent object properties,
+         * otherwise it returns false.
+         *
+         * @param func The value to convert to a callback.
+         * @param thisArg The this binding of func.
+         * @result Returns the callback.
+         */
+        callback<TResult>(
+            func: Function,
+            thisArg?: any
+        ): (...args: any[]) => TResult;
+
+        /**
+         * @see _.callback
+         */
+        callback<TResult>(
+            func: string,
+            thisArg?: any
+        ): (object: any) => TResult;
+
+        /**
+         * @see _.callback
+         */
+        callback(
+            func: Object,
+            thisArg?: any
+        ): (object: any) => boolean;
+
+        /**
+         * @see _.callback
+         */
+        callback<TResult>(): (value: TResult) => TResult;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.callback
+         */
+        callback<TResult>(thisArg?: any): LoDashObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.callback
+         */
+        callback(thisArg?: any): LoDashObjectWrapper<(object: any) => boolean>;
+
+        /**
+         * @see _.callback
+         */
+        callback<TResult>(thisArg?: any): LoDashObjectWrapper<(...args: any[]) => TResult>;
+    }
 
     //_.identity
     interface LoDashStatic {
         /**
-        * This method returns the first argument provided to it.
-        * @param value Any value.
-        * @return value.
-        **/
+         * This method returns the first argument provided to it.
+         * @param value Any value.
+         * @return Returns value.
+         */
         identity<T>(value?: T): T;
     }
 
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T;
+    }
+
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T[];
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T;
+    }
+
+    //_.iteratee
+    interface LoDashStatic {
+        /**
+         * @see _.callback
+         */
+        iteratee<TResult>(
+            func: Function,
+            thisArg?: any
+        ): (...args: any[]) => TResult;
+
+        /**
+         * @see _.callback
+         */
+        iteratee<TResult>(
+            func: string,
+            thisArg?: any
+        ): (object: any) => TResult;
+
+        /**
+         * @see _.callback
+         */
+        iteratee(
+            func: Object,
+            thisArg?: any
+        ): (object: any) => boolean;
+
+        /**
+         * @see _.callback
+         */
+        iteratee<TResult>(): (value: TResult) => TResult;
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.callback
+         */
+        iteratee<TResult>(thisArg?: any): LoDashObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.callback
+         */
+        iteratee(thisArg?: any): LoDashObjectWrapper<(object: any) => boolean>;
+
+        /**
+         * @see _.callback
+         */
+        iteratee<TResult>(thisArg?: any): LoDashObjectWrapper<(...args: any[]) => TResult>;
+    }
+
+    //_.matches
+    interface LoDashStatic {
+        /**
+         * Creates a function that performs a deep comparison between a given object and source, returning true if the
+         * given object has equivalent property values, else false.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties. For comparing a single own
+         * or inherited property value see _.matchesProperty.
+         *
+         * @param source The object of property values to match.
+         * @return Returns the new function.
+         */
+        matches<T>(
+            source: T
+        ): (value: any) => boolean;
+
+        /**
+         * @see _.matches
+         */
+        matches<T, V>(
+            source: T
+        ): (value: V) => boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matches
+         */
+        matches<V>(): LoDashObjectWrapper<(value: V) => boolean>;
+    }
+
+    //_.matchesProperty
+    interface LoDashStatic {
+        /**
+         * Creates a function that compares the property value of path on a given object to value.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties.
+         *
+         * @param path The path of the property to get.
+         * @param srcValue The value to match.
+         * @return Returns the new function.
+         */
+        matchesProperty<T>(
+            path: StringRepresentable|StringRepresentable[],
+            srcValue: T
+        ): (value: any) => boolean;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<T, V>(
+            path: StringRepresentable|StringRepresentable[],
+            srcValue: T
+        ): (value: V) => boolean;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue>(
+            srcValue: SrcValue
+        ): LoDashObjectWrapper<(value: any) => boolean>;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue, Value>(
+            srcValue: SrcValue
+        ): LoDashObjectWrapper<(value: Value) => boolean>;
+    }
+
     //_.method
     interface LoDashStatic {
         /**
@@ -7689,20 +8997,70 @@ declare module _ {
     }
 
     //_.mixin
+    interface MixinOptions {
+        chain?: boolean;
+    }
+
     interface LoDashStatic {
         /**
-        * Adds function properties of a source object to the lodash function and chainable wrapper.
-        * @param object The object of function properties to add to lodash.
-        **/
-        mixin(object?: Dictionary<(value: any) => any>): void;
+         * Adds all own enumerable function properties of a source object to the destination object. If object is a
+         * function then methods are added to its prototype as well.
+         *
+         * Note: Use _.runInContext to create a pristine lodash function to avoid conflicts caused by modifying
+         * the original.
+         *
+         * @param object The destination object.
+         * @param source The object of functions to add.
+         * @param options The options object.
+         * @param options.chain Specify whether the functions added are chainable.
+         * @return Returns object.
+         */
+        mixin<TResult, TObject>(
+            object: TObject,
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): TResult;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): TResult;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): LoDashObjectWrapper<TResult>;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            options?: MixinOptions
+        ): LoDashObjectWrapper<TResult>;
     }
 
     //_.noConflict
     interface LoDashStatic {
         /**
-        * Reverts the '_' variable to its previous value and returns a reference to the lodash function.
-        * @return The lodash function.
-        **/
+         * Reverts the _ variable to its previous value and returns a reference to the lodash function.
+         *
+         * @return Returns the lodash function.
+         */
+        noConflict(): typeof _;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noConflict
+         */
         noConflict(): typeof _;
     }
 
@@ -7817,98 +9175,79 @@ declare module _ {
         random(min: number, max: number, floating?: boolean): number;
     }
 
-    //_.result
-    interface LoDashStatic {
-        /**
-        * Resolves the value of property on object. If property is a function it will be invoked with
-        * the this binding of object and its result returned, else the property value is returned. If
-        * object is falsey then undefined is returned.
-        * @param object The object to inspect.
-        * @param property The property to get the value of.
-        * @return The resolved value.
-        **/
-        result(object: any, property: string): any;
-    }
-
     //_.runInContext
     interface LoDashStatic {
         /**
-        * Create a new lodash function using the given context object.
-        * @param context The context object
-        * @returns The lodash function.
-        **/
-        runInContext(context: any): typeof _;
+         * Create a new pristine lodash function using the given context object.
+         *
+         * @param context The context object.
+         * @return Returns a new lodash function.
+         */
+        runInContext(context?: Object): typeof _;
     }
 
-    //_.template
-    interface LoDashStatic {
+    interface LoDashObjectWrapper<T> {
         /**
-        * A micro-templating method that handles arbitrary delimiters, preserves whitespace, and
-        * correctly escapes quotes within interpolated code.
-        *
-        * Note: In the development build, _.template utilizes sourceURLs for easier debugging. See
-        * http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl
-        *
-        * For more information on precompiling templates see:
-        * http://lodash.com/#custom-builds
-        *
-        * For more information on Chrome extension sandboxes see:
-        * http://developer.chrome.com/stable/extensions/sandboxingEval.html
-        * @param text The template text.
-        * @param data The data object used to populate the text.
-        * @param options The options object.
-        * @param options.escape The "escape" delimiter.
-        * @param options.evaluate The "evaluate" delimiter.
-        * @param options.import An object to import into the template as local variables.
-        * @param options.interpolate The "interpolate" delimiter.
-        * @param sourceURL The sourceURL of the template's compiled source.
-        * @param variable The data object variable name.
-        * @return Returns the compiled Lo-Dash HTML template or a TemplateExecutor if no data is passed.
-        **/
-        template(
-            text: string): TemplateExecutor;
-
-        /**
-        * @see _.template
-        **/
-        template(
-            text: string,
-            data: any,
-            options?: TemplateSettings,
-            sourceURL?: string,
-            variable?: string): any /* string or TemplateExecutor*/;
-    }
-
-    interface TemplateExecutor {
-        (...data: any[]): string;
-        source: string;
+         * @see _.runInContext
+         */
+        runInContext(): typeof _;
     }
 
     //_.times
     interface LoDashStatic {
         /**
-        * Executes the callback n times, returning an array of the results of each callback execution.
-        * The callback is bound to thisArg and invoked with one argument; (index).
-        * @param n The number of times to execute the callback.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        **/
+         * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee is
+         * bound to thisArg and invoked with one argument; (index).
+         *
+         * @param n The number of times to invoke iteratee.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the array of results.
+         */
         times<TResult>(
             n: number,
-            callback: (num: number) => TResult,
-            context?: any): TResult[];
+            iteratee: (num: number) => TResult,
+            thisArg?: any
+        ): TResult[];
+
+        /**
+         * @see _.times
+         */
+        times(n: number): number[];
+    }
+
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.times
+         */
+        times<TResult>(
+            iteratee: (num: number) => TResult,
+            thisArgs?: any
+        ): LoDashArrayWrapper<TResult>;
+
+        /**
+         * @see _.times
+         */
+        times(): LoDashArrayWrapper<number>;
     }
 
     //_.uniqueId
     interface LoDashStatic {
         /**
-        * Generates a unique ID. If prefix is provided the ID will be appended to it.
-        * @param prefix The value to prefix the ID with.
-        * @return Returns the unique ID.
-        **/
+         * Generates a unique ID. If prefix is provided the ID is appended to it.
+         * @param prefix The value to prefix the ID with.
+         * @return Returns the unique ID.
+         */
         uniqueId(prefix?: string): string;
     }
 
+    interface LoDashWrapper<T> {
+        /**
+         * @see _.uniqueId
+         */
+        uniqueId(): string;
+    }
+
     //_.constant
     interface LoDashStatic {
         /**
@@ -7927,31 +9266,30 @@ declare module _ {
     }
 
     interface ListIterator<T, TResult> {
-        (value: T, index: number, collection: T[]): TResult;
+        (value: T, index: number, collection: List<T>): TResult;
     }
 
     interface DictionaryIterator<T, TResult> {
-        (value: T, key: string, collection: Dictionary<T>): TResult;
+        (value: T, key?: string, collection?: Dictionary<T>): TResult;
     }
 
     interface ObjectIterator<T, TResult> {
-        (element: T, key: string, collection: any): TResult;
+        (element: T, key?: string, collection?: any): TResult;
     }
 
     interface MemoVoidIterator<T, TResult> {
-        (prev: TResult, curr: T, indexOrKey: any, list?: T[]): void;
+        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): void;
     }
     interface MemoIterator<T, TResult> {
-        (prev: TResult, curr: T, indexOrKey: any, list?: T[]): TResult;
+        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): TResult;
     }
-    /*
-    interface MemoListIterator<T, TResult> {
-        (prev: TResult, curr: T, index: number, list?: T[]): TResult;
+
+    interface MemoVoidArrayIterator<T, TResult> {
+        (acc: TResult, curr: T, index?: number, arr?: T[]): void;
     }
-    interface MemoObjectIterator<T, TResult> {
-        (prev: TResult, curr: T, index: string, object?: Dictionary<T>): TResult;
+    interface MemoVoidDictionaryIterator<T, TResult> {
+        (acc: TResult, curr: T, key?: string, dict?: Dictionary<T>): void;
     }
-    */
 
     //interface Collection<T> {}
 
@@ -7964,6 +9302,10 @@ declare module _ {
     interface Dictionary<T> {
         [index: string]: T;
     }
+
+    interface StringRepresentable {
+        toString(): string;
+    }
 }
 
 declare module "lodash" {
diff --git a/log4javascript/log4javascript-tests.ts b/log4javascript/log4javascript-tests.ts
index 7d55c3891..c3b77c5b6 100644
--- a/log4javascript/log4javascript-tests.ts
+++ b/log4javascript/log4javascript-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="log4javascript.d.ts" />
+/// <reference path="./log4javascript.d.ts" />
 
 function aSimpleLoggingMessageString() {
 	var log = log4javascript.getDefaultLogger();
@@ -47,4 +47,8 @@ function changingTheFormatOfLogMessages() {
 	var popUpAppender = new log4javascript.PopUpAppender();
 	var layout = new log4javascript.PatternLayout("[%-5p] %m");
 	popUpAppender.setLayout(layout);
+}
+
+function configureLogLog() {
+	log4javascript.logLog.setQuietMode(true);
 }
\ No newline at end of file
diff --git a/log4javascript/log4javascript.d.ts b/log4javascript/log4javascript.d.ts
index 0a4026c85..44d226d0b 100644
--- a/log4javascript/log4javascript.d.ts
+++ b/log4javascript/log4javascript.d.ts
@@ -253,6 +253,8 @@ declare module log4javascript {
 		 * Asserts the given expression is true or evaluates to true. If so, nothing is logged. If not, an error is logged at the ERROR level.
 		 */
 		assert(expr: any): void;
+
+		name: string;
 	}
 
 	// #endregion
@@ -262,7 +264,20 @@ declare module log4javascript {
 	/**
 	 * Logging event.
 	 */
-	export class LoggingEvent { }
+	export class LoggingEvent {
+		logger: Logger;
+		timeStamp: Date;
+		timeStampInMilliseconds: number;
+		timeStampInSeconds: number;
+		milliseconds: number;
+		level: Level;
+		messages: any[];
+		exception: Error;
+
+		getThrowableStrRep: () => string;
+		getCombinedMessages: () => string;
+		toString: () => string;
+	}
 
 	/**
 	 * There are methods common to all appenders, as listed below.
@@ -920,6 +935,8 @@ declare module log4javascript {
 		 * Returns whether the layout has any custom fields.
 		 */
 		hasCustomFields(): boolean;
+
+		formatWithException(loggingEvent: LoggingEvent): string;
 	}
 
 	/**
@@ -1034,38 +1051,46 @@ declare module log4javascript {
 	// #region log4javascript error handling
 
 	/**
-	 * Sets whether LogLog is in quiet mode or not. In quiet mode, no messages sent to LogLog have any visible effect. By default, 
-	 * quiet mode is switched off.
-	 * @param quietMode Whether to turn quiet mode on or off.
+	 * log4javascript has a single rudimentary logger-like object of its own to handle messages generated by log4javascript itself.
+	 * This logger is called logLog and is accessed via log4javascript.logLog.
 	 */
-	export function setQuietMode(quietMode: boolean): void;
+	export namespace logLog { 	
 
-	/**
-	 * Sets how many errors LogLog will display alerts for. By default, only the first error encountered generates an alert to the 
-	 * user. If you turn all errors on by supplying true to this method then all errors will generate alerts.
-	 * @param showAllErrors Whether to show all errors or just the first.
-	 */
-	export function setAlertAllErrors(alertAllErrors: boolean): void;
+		/**
+		 * Sets whether logLog is in quiet mode or not. In quiet mode, no messages sent to logLog have any visible effect. By default, 
+		 * quiet mode is switched off.
+		 * @param quietMode Whether to turn quiet mode on or off.
+		 */
+		export function setQuietMode(quietMode: boolean): void;
 
-	/**
-	 * Logs a debugging message to an in-memory list.
-	 */
-	export function debug(message: string, exception?: Error): void;
+		/**
+		 * Sets how many errors logLog will display alerts for. By default, only the first error encountered generates an alert to the 
+		 * user. If you turn all errors on by supplying true to this method then all errors will generate alerts.
+		 * @param showAllErrors Whether to show all errors or just the first.
+		 */
+		export function setAlertAllErrors(alertAllErrors: boolean): void;
 
-	/**
-	 * Displays an alert of all debugging messages.
-	 */
-	export function displayDebug(): void;
+		/**
+		 * Logs a debugging message to an in-memory list.
+		 */
+		export function debug(message: string, exception?: Error): void;
 
-	/**
-	 * Currently has no effect.
-	 */
-	export function warn(message: string, exception?: Error): void;
+		/**
+		 * Displays an alert of all debugging messages.
+		 */
+		export function displayDebug(): void;
 
-	/**
-	 * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called.
-	 */
-	export function error(message: string, exception?: Error): void;
+		/**
+		 * Currently has no effect.
+		 */
+		export function warn(message: string, exception?: Error): void;
+
+		/**
+		 * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called.
+		 */
+		export function error(message: string, exception?: Error): void;
+
+	}
 
 	// #endregion
 }
diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index 28d821377..4888b9f51 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -63,8 +63,8 @@ declare module "log4js" {
    */
   export function shutdown(cb: Function): void;
 
-  export function configure(config: IConfig, options?: any): void;
   export function configure(filename: string, options?: any): void;
+  export function configure(config: IConfig, options?: any): void;
 
   export function setGlobalLogLevel(level: string): void;
   export function setGlobalLogLevel(level: Level): void;
@@ -126,14 +126,118 @@ declare module "log4js" {
   }
 
   export interface IConfig {
-    appenders: IAppenderConfig[];
+    appenders: AppenderConfig[];
     levels?: { [category: string]: string };
     replaceConsole?: boolean;
   }
-  export interface IAppenderConfig {
+
+  export interface AppenderConfigBase {
     type: string;
-    category?: string[];
-    // etc...
+    category?: string;
   }
+
+  export interface ConsoleAppenderConfig extends AppenderConfigBase {}
+  
+  export interface FileAppenderConfig extends AppenderConfigBase {
+    filename: string;
+  }
+  export interface DateFileAppenderConfig extends FileAppenderConfig {
+    /**
+     * The following strings are recognised in the pattern:
+     *  - yyyy : the full year, use yy for just the last two digits
+     *  - MM   : the month
+     *  - dd   : the day of the month
+     *  - hh   : the hour of the day (24-hour clock)
+     *  - mm   : the minute of the hour
+     *  - ss   : seconds
+     *  - SSS  : milliseconds (although I'm not sure you'd want to roll your logs every millisecond)
+     *  - O    : timezone (capital letter o)
+     */
+    pattern: string;
+    alwaysIncludePattern: boolean;
+  }
+  
+  export interface SmtpAppenderConfig extends AppenderConfigBase {
+    /** Comma separated list of email recipients */
+    recipients: string;
+    
+    /** Sender of all emails (defaults to transport user) */
+    sender: string;
+    
+    /** Subject of all email messages (defaults to first event's message)*/
+    subject: string;
+    
+    /**
+     * The time in seconds between sending attempts (defaults to 0).
+     * All events are buffered and sent in one email during this time.
+     * If 0 then every event sends an email
+     */
+    sendInterval: number;
+    
+    SMTP: {
+      host: string;
+      secure: boolean;
+      port: number;
+      auth: {
+          user: string;
+          pass: string;
+      }
+    }
+  }
+
+  export interface HookIoAppenderConfig extends FileAppenderConfig {
+    maxLogSize: number;
+    backup: number;
+    pollInterval: number;
+  }
+  
+  export interface GelfAppenderConfig extends AppenderConfigBase {
+    host: string;
+    hostname: string;
+    port: string;
+    facility: string;
+  }
+  
+  export interface MultiprocessAppenderConfig extends AppenderConfigBase {
+    mode: string;
+    loggerPort: number;
+    loggerHost: string;
+    facility: string;
+    appender?: AppenderConfig;
+  }
+  
+  export interface LogglyAppenderConfig extends AppenderConfigBase {
+    /** Loggly customer token - https://www.loggly.com/docs/api-sending-data/ */
+    token: string;
+    
+    /** Loggly customer subdomain (use 'abc' for abc.loggly.com) */
+    subdomain: string;
+    
+    /** an array of strings to help segment your data & narrow down search results in Loggly */
+    tags: string[];
+    
+    /** Enable JSON logging by setting to 'true' */
+    json: boolean;
+  }
+  
+  export interface ClusteredAppenderConfig extends AppenderConfigBase {
+    appenders?: AppenderConfig[];
+  }
+  
+  type CoreAppenderConfig = ConsoleAppenderConfig
+                          | FileAppenderConfig
+                          | DateFileAppenderConfig
+                          | SmtpAppenderConfig
+                          | HookIoAppenderConfig
+                          | GelfAppenderConfig
+                          | MultiprocessAppenderConfig
+                          | LogglyAppenderConfig
+                          | ClusteredAppenderConfig
+    
+  interface CustomAppenderConfig extends AppenderConfigBase {
+    [prop: string]: any;
+  }
+
+  type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
 }
 
diff --git a/loglevel/loglevel.d.ts b/loglevel/loglevel.d.ts
index 01b80b722..9f3c53f5a 100644
--- a/loglevel/loglevel.d.ts
+++ b/loglevel/loglevel.d.ts
@@ -98,5 +98,4 @@ declare module loglevel {
 	export function noConflict():any;
 }
 
-declare
-var log:typeof loglevel;
+declare var log:typeof loglevel;
diff --git a/lovefield/lovefield-tests.ts b/lovefield/lovefield-tests.ts
index aa77f5b2c..26e7c8e24 100644
--- a/lovefield/lovefield-tests.ts
+++ b/lovefield/lovefield-tests.ts
@@ -43,6 +43,8 @@ function main(): void {
       }).then(
       function() {
         return todoDb.select(lf.fn.count()).from(itemSchema).exec();
+      }).then(function() {
+        return todoDb.export();
       });
 }
 
diff --git a/lovefield/lovefield.d.ts b/lovefield/lovefield.d.ts
index b692a414f..02fdc5da0 100644
--- a/lovefield/lovefield.d.ts
+++ b/lovefield/lovefield.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Lovefield v2.0.56
+// Type definitions for Lovefield v2.0.62
 // Project: http://google.github.io/lovefield/
 // Definitions by: freshp86 <https://github.com/freshp86>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -18,6 +18,16 @@ declare module lf {
     STRING
   }
 
+  export enum ConstraintAction {
+    RESTRICT,
+    CASCADE
+  }
+
+  export enum ConstraintTiming {
+    IMMEDIATE,
+    DEFERRABLE
+  }
+
   export interface Binder {
     getIndex(): number
   }
@@ -56,7 +66,9 @@ declare module lf {
     close(): void
     createTransaction(type?: TransactionType): Transaction
     delete(): query.Delete
+    export(): Promise<Object>
     getSchema(): schema.Database
+    import(data: Object): Promise<void>
     insertOrReplace(): query.Insert
     insert(): query.Insert
     observe(query: query.Select, callback: Function): void
@@ -174,9 +186,16 @@ declare module lf {
       order: Order
     }
 
+    type RawForeignKeySpec = {
+      local: string
+      ref: string
+      action: lf.ConstraintAction
+      timing: lf.ConstraintAction
+    }
+
     export interface TableBuilder {
       addColumn(name: string, type: lf.Type): TableBuilder
-      addForeignKey(): TableBuilder
+      addForeignKey(name: string, spec: RawForeignKeySpec): TableBuilder
       addIndex(
           name: string, columns: Array<string>|Array<IndexedColumn>,
           unique?: boolean, order?: Order): TableBuilder
diff --git a/lscache/lscache.d.ts b/lscache/lscache.d.ts
index 24c34bd8d..ed5d133a5 100644
--- a/lscache/lscache.d.ts
+++ b/lscache/lscache.d.ts
@@ -1,13 +1,49 @@
-// Type definitions for lscache v1.0.2
+// Type definitions for lscache v1.0.5
 // Project: https://github.com/pamelafox/lscache
 // Definitions by: Chris Martinez <https://github.com/Chris-Martinezz>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface LSCache {
 
+    /**
+    * Stores the value in localStorage. Expires after specified number of minutes.
+    * @param {string} key
+    * @param {Object|string} value
+    * @param {number} time
+    */
     set(key: string, value: any, time?: number): void;
+    /**
+    * Retrieves specified value from localStorage, if not expired.
+    * @param {string} key
+    * @return {string|Object}
+    */
     get(key: string): any;
+    /**
+    * Removes a value from localStorage.
+    * Equivalent to 'delete' in memcache, but that's a keyword in JS.
+    * @param {string} key
+    */
     remove(key: string): void;
+    /**
+    * Flushes all lscache items and expiry markers without affecting rest of localStorage
+    */
+    flush(): void;
+    /**
+    * Flushes expired lscache items and expiry markers without affecting rest of localStorage
+    */
+    flushExpired(): void;
+    /**
+    * Appends CACHE_PREFIX so lscache will partition data in to different buckets.
+    * @param {string} bucket
+    */
+    setBucket(bucket: string):void;
+    /**
+    * Resets the string being appended to CACHE_PREFIX so lscache will use the default storage behavior.
+    */
+    resetBucket(): void;
+}
+declare var lscache:LSCache;
+declare module 'lscache' {
+    var lscache: LSCache;
+    export = lscache;
 }
-
-declare var lscache: LSCache;
\ No newline at end of file
diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts
index 7e0a529ef..f41aca00a 100644
--- a/mCustomScrollbar/mCustomScrollbar.d.ts
+++ b/mCustomScrollbar/mCustomScrollbar.d.ts
@@ -40,6 +40,10 @@ declare module MCustomScrollbar {
         */
         autoHideScrollbar?: boolean;
         scrollButtons?: {
+            /**
+             * Enable or disable scroll buttons.
+             */
+            enable?: boolean;
             /**
             * Scroll buttons scroll type, values: "continuous" (scroll continuously while pressing the button), "pixels" (scrolls by a fixed number of pixels on each click")
             */
@@ -47,11 +51,11 @@ declare module MCustomScrollbar {
             /**
             * Scroll buttons continuous scrolling speed, integer value or "auto" (script calculates and sets the speed according to content length)
             */
-            scrollSpeed?: any;
+            scrollSpeed?: number | string;
             /**
-            * Scroll buttons pixels scrolling amount, value in pixels
+            * Scroll buttons pixels scrolling amount, value in pixels or "auto"
             */
-            scrollAmount?: number;
+            scrollAmount?: number | string;
         }
     advanced?: {
             /**
@@ -94,14 +98,24 @@ declare module MCustomScrollbar {
             */
             onScroll?: () => void;
             /**
-            * User defined callback function, triggered when scroll end-limit is reached
+            * A function to call when scrolling is completed and content is scrolled all the way to the end (bottom/right)
+            */
+            onTotalScroll?: () => void;
+            /**
+            * A function to call when scrolling is completed and content is scrolled back to the beginning (top/left)
             */
             onTotalScrollBack?: () => void;
             /**
-            * Scroll end-limit offset, value in pixels
+            * Set an offset for which the onTotalScroll callback is triggered.
+            * Its value is in pixels.
             */
             onTotalScrollOffset?: number;
             /**
+            * Set an offset for which the onTotalScrollBack callback is triggered.
+            * Its value is in pixels
+            */
+            onTotalScrollBackOffset?: number;
+            /**
             * User defined callback function, triggered while scrolling
             */
             whileScrolling?: () => void;
@@ -129,12 +143,6 @@ declare module MCustomScrollbar {
 }
 
 interface JQuery {
-    /**
-    * Creates a new mCustomScrollbar with the specified or default options
-    *
-    * @param options Override default options
-    */
-    mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
     /**
     * Calls specified methods on the scrollbar "update", "stop", "disable", "destroy"
     *
@@ -149,4 +157,10 @@ interface JQuery {
     * @param options Override default options
     */
     mCustomScrollbar(scrollTo: string, parameter: any, options?: MCustomScrollbar.ScrollToParameterOptions): JQuery;
+    /**
+    * Creates a new mCustomScrollbar with the specified or default options
+    *
+    * @param options Override default options
+    */
+    mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
 }
\ No newline at end of file
diff --git a/mailcheck/mailcheck-tests.ts b/mailcheck/mailcheck-tests.ts
index 4a5caa12a..b3152b1d9 100644
--- a/mailcheck/mailcheck-tests.ts
+++ b/mailcheck/mailcheck-tests.ts
@@ -14,6 +14,7 @@ var superStringDistance = function(string1: string, string2: string): number {
 
 $('#email').on('blur', function() {
     $(this).mailcheck({
+        email: 'nonoptional@example.com',
         domains: domains,                       // optional
         secondLevelDomains: secondLevelDomains, // optional
         topLevelDomains: topLevelDomains,       // optional
@@ -28,6 +29,7 @@ $('#email').on('blur', function() {
 });
 
 Mailcheck.run({
+    email: 'nonoptional@example.com',
     domains: domains,                       // optional
     secondLevelDomains: secondLevelDomains, // optional
     topLevelDomains: topLevelDomains,       // optional
@@ -41,6 +43,7 @@ Mailcheck.run({
 });
 
 MC.run({
+    email: 'nonoptional@example.com',
     domains: domains,                       // optional
     secondLevelDomains: secondLevelDomains, // optional
     topLevelDomains: topLevelDomains,       // optional
diff --git a/mailcheck/mailcheck.d.ts b/mailcheck/mailcheck.d.ts
index c6f28d0db..66d90ba0c 100644
--- a/mailcheck/mailcheck.d.ts
+++ b/mailcheck/mailcheck.d.ts
@@ -46,7 +46,9 @@ declare module MailcheckModule {
     }
 
     export interface IOptions {
+        email: string;
         domains?: string[];
+        secondLevelDomains?: string[];
         topLevelDomains?: string[];
         distanceFunction?: IDistanceFunction;
         suggested?: ISuggested | IJQuerySuggested;
diff --git a/mailparser/mailparser-tests.ts b/mailparser/mailparser-tests.ts
new file mode 100644
index 000000000..b7df9adb4
--- /dev/null
+++ b/mailparser/mailparser-tests.ts
@@ -0,0 +1,67 @@
+/// <reference path="./mailparser.d.ts" />
+
+import mailparser_mod = require("mailparser");
+import MailParser = mailparser_mod.MailParser;
+import ParsedMail = mailparser_mod.ParsedMail;
+
+
+
+var mailparser = new MailParser();
+
+
+mailparser.on("headers", function(headers){
+    console.log(headers.received);
+});
+
+mailparser.on("end", function(mail){
+    mail; // object structure for parsed e-mail
+});
+
+
+// Decode a simple e-mail
+// This example decodes an e-mail from a string
+
+var email = "From: 'Sender Name' <sender@example.com>\r\n"+
+            "To: 'Receiver Name' <receiver@example.com>\r\n"+
+            "Subject: Hello world!\r\n"+
+            "\r\n"+
+            "How are you today?";
+    // setup an event listener when the parsing finishes
+mailparser.on("end", function(mail_object){
+    console.log("From:", mail_object.from); //[{address:'sender@example.com',name:'Sender Name'}]
+    console.log("Subject:", mail_object.subject); // Hello world!
+    console.log("Text body:", mail_object.text); // How are you today?
+});
+    // send the email source to the parser
+mailparser.write(email);
+mailparser.end();
+
+
+// Pipe file to MailParser
+// This example pipes a readableStream file to MailParser
+mailparser = new MailParser();
+import fs = require("fs");
+mailparser.on("end", function(mail_object){
+    console.log("Subject:", mail_object.subject);
+});
+
+fs.createReadStream("email.eml").pipe(mailparser);
+
+
+// Attachments
+mailparser.on("end", function(mail_object : ParsedMail){
+    mail_object.attachments.forEach(function(attachment){
+        console.log(attachment.fileName);
+    });
+});
+
+
+// Attachment streaming
+var mp = new MailParser({
+    streamAttachments: true
+})
+
+mp.on("attachment", function(attachment, mail){
+    var output = fs.createWriteStream(attachment.generatedFileName);
+    attachment.stream.pipe(output);
+});
diff --git a/mailparser/mailparser.d.ts b/mailparser/mailparser.d.ts
new file mode 100644
index 000000000..9e67cc78a
--- /dev/null
+++ b/mailparser/mailparser.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for mailparser v0.5.2
+// Project: https://www.npmjs.com/package/mailparser
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+/// <reference path='../node/node.d.ts' />
+
+
+declare module 'mailparser' {
+    import WritableStream = NodeJS.WritableStream;
+    import EventEmitter = NodeJS.EventEmitter;
+
+    interface Options {
+        debug?: boolean;    // if set to true print all incoming lines to console
+        streamAttachments?: boolean;   // if set to true, stream attachments instead of including them
+        unescapeSMTP?: boolean;   // if set to true replace double dots in the beginning of the file
+        defaultCharset?: string;   // the default charset for text/plain and text/html content, if not set reverts to Latin-1
+        showAttachmentLinks?: boolean;    // if set to true, show inlined attachment links <a href="cid:...">filename</a>
+    }
+    
+    
+    interface EmailAddress {
+        address: string;
+        name: string;
+    }
+    
+    
+    interface Attachment {
+        contentType: string;
+        fileName: string;
+        contentDisposition: string;    // e.g. 'attachment'
+        contentId: string;   // e.g. '5.1321281380971@localhost'
+        transferEncoding: string;   // e.g. 'base64'
+        length: number;   // length of the attachment in bytes
+        generatedFileName: string;   // e.g. 'image.png'
+        checksum: string;  // the md5 hash of the file, e.g. 'e4cef4c6e26037bcf8166905207ea09b'
+        content: Buffer;   // possibly a SlowBuffer
+    }
+    
+    // emitted with the 'end' event
+    interface ParsedMail {
+        headers: any;  // unprocessed headers in the form of - {key: value} - if there were multiple fields with the same key then the value is an array
+        from: EmailAddress[];  // should be only one though)
+        to: EmailAddress[];
+        cc?: EmailAddress[];
+        bcc?: EmailAddress[];
+        subject: string;  // the subject line
+        references?: string[];  // an array of reference message id values (not set if no reference values present)
+        inReplyTo?: string[];  // an array of In-Reply-To message id values (not set if no in-reply-to values present)
+        priority?: string;   // priority of the e-mail, always one of the following: normal (default), high, low
+        text: string;    // text body
+        html: string;    // html body
+        date?: Date; // If date could not be resolved or is not found this field is not set. Check the original date string from headers.date
+        attachments?: Attachment[];
+    }
+    
+
+
+    class MailParser implements WritableStream {
+        constructor(options? : Options);
+        on(event : string, callback : (any : any) => void) : void;
+        
+        // from WritableStream
+        writable: boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        
+        // from EventEmitter
+        static listenerCount(emitter: EventEmitter, event: string): number;
+        addListener(event: string, listener: Function): EventEmitter;
+        on(event: string, listener: Function): EventEmitter;
+        once(event: string, listener: Function): EventEmitter;
+        removeListener(event: string, listener: Function): EventEmitter;
+        removeAllListeners(event?: string): EventEmitter;
+        setMaxListeners(n: number): void;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+    }
+}
+
diff --git a/maker.js/makerjs-tests.ts b/maker.js/makerjs-tests.ts
index ca2aea17b..59a50e4fc 100644
--- a/maker.js/makerjs-tests.ts
+++ b/maker.js/makerjs-tests.ts
@@ -25,6 +25,7 @@ function test() {
 	}
 	
 	function testAngle() {
+		makerjs.angle.areEqual(12, 13);
 		makerjs.angle.mirror(45, true, false);
 		makerjs.angle.noRevolutions(90);
 		makerjs.angle.ofArcEnd(paths.arc);
@@ -63,12 +64,15 @@ function test() {
 	}
 	
 	function testModel(){
+		makerjs.model.combine(model, model, true, false, true, false);
 		makerjs.model.convertUnits(model, makerjs.unitType.Centimeter);
+		makerjs.model.getSimilarPathId(model, 'foo');
 		makerjs.model.mirror(model, false, true);
 		makerjs.model.move(makerjs.model.originate(model, [9,9]), [0,0]);
 		makerjs.model.moveRelative(model, [1,1]);
 		makerjs.model.originate(model);
 		makerjs.model.rotate(makerjs.model.scale(model, 6), 45, [0,0]);
+		makerjs.model.walkPaths(model, (modelContext: MakerJs.IModel, pathId: string, pathContext: MakerJs.IPath) => {});
 	}
 
 	function testModels(): MakerJs.IModel[] {
@@ -83,11 +87,13 @@ function test() {
 			new makerjs.models.Ring(7, 7),
 			new makerjs.models.RoundRectangle(2, 2, 0),
 			new makerjs.models.SCurve(5, .9),
-			new makerjs.models.Square(8)
+			new makerjs.models.Square(8),
+			new makerjs.models.Star(5, 10, 5)
 		];
 	}
 	
 	function testPath() {
+		makerjs.path.areEqual(paths.line, paths.circle);
 		makerjs.path.breakAtPoint(paths.arc, [0,0]).type;
 		makerjs.path.dogbone(paths.line, paths.line, 7);
 		makerjs.path.fillet(paths.arc, paths.line, 4);
@@ -110,6 +116,15 @@ function test() {
 		new makerjs.paths.Chord(paths.arc);
 		new makerjs.paths.Parallel(paths.line, 4, [1,1]);
 		
+		//paths.line.layer = "0";
+		
+		var x: MakerJs.IPathLine = { 
+			type: "line", 
+			origin: [9,9], 
+			end: [8,8], 
+			layer: "4"
+		};
+		
 		return paths;
 	}
 	
@@ -121,6 +136,7 @@ function test() {
 		makerjs.point.closest([0,0], [p1, p2]);
 		makerjs.point.fromAngleOnCircle(22, paths.circle);
 		makerjs.point.fromArc(paths.arc);
+		makerjs.point.fromPathEnds(paths.line);
 		makerjs.point.fromPolar(Math.PI, 7);
 		makerjs.point.middle(paths.line);
 		makerjs.point.mirror(p1, true, false);
diff --git a/maker.js/makerjs.d.ts b/maker.js/makerjs.d.ts
index 2d5c3419a..69cd3dbb7 100644
--- a/maker.js/makerjs.d.ts
+++ b/maker.js/makerjs.d.ts
@@ -37,6 +37,12 @@ declare module MakerJs {
      * @param accuracy Optional exemplar of number of decimal places.
      */
     function round(n: number, accuracy?: number): number;
+    /**
+     * Clone an object.
+     *
+     * @param objectToClone The object to clone.
+     * @returns A new clone of the original object.
+     */
     function cloneObject<T>(objectToClone: T): T;
     /**
      * Copy the properties from one object to another object.
@@ -90,11 +96,15 @@ declare module MakerJs {
         /**
          * The type of the path, e.g. "line", "circle", or "arc". These strings are enumerated in pathType.
          */
-        type: string;
+        "type": string;
         /**
          * The main point of reference for this path.
          */
         origin: IPoint;
+        /**
+         * Optional layer of this path.
+         */
+        layer?: string;
     }
     /**
      * Test to see if an object implements the required properties of a path.
@@ -187,7 +197,7 @@ 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]: (id: string, pathValue: IPath, origin: IPoint) => void;
+        [type: string]: (id: string, pathValue: IPath, origin: IPoint, layer: string) => void;
     }
     /**
      * String-based enumeration of all paths types.
@@ -270,7 +280,7 @@ declare module MakerJs {
         /**
          * A model may want to specify its type, but this value is not employed yet.
          */
-        type?: string;
+        "type"?: string;
         /**
          * Optional array of path objects in this model.
          */
@@ -287,6 +297,10 @@ declare module MakerJs {
          * An author may wish to add notes to this model instance.
          */
         notes?: string;
+        /**
+         * Optional layer of this model.
+         */
+        layer?: string;
     }
     /**
      * Test to see if an object implements the required properties of a model.
@@ -294,6 +308,14 @@ declare module MakerJs {
     function isModel(item: any): boolean;
 }
 declare module MakerJs.angle {
+    /**
+     * Find out if two angles are equal.
+     *
+     * @param a First angle.
+     * @param b Second angle.
+     * @returns true if angles are the same, false if they are not
+     */
+    function areEqual(angle1: number, angle2: number): boolean;
     /**
      * Ensures an angle is not greater than 360
      *
@@ -388,7 +410,7 @@ declare module MakerJs.point {
      * @param b Second point.
      * @returns true if points are the same, false if they are not
      */
-    function areEqualRounded(a: IPoint, b: IPoint): boolean;
+    function areEqualRounded(a: IPoint, b: IPoint, accuracy?: number): boolean;
     /**
      * Clone a point into a new point.
      *
@@ -426,14 +448,21 @@ declare module MakerJs.point {
      * @returns Array with 2 elements: [0] is the point object corresponding to the start angle, [1] is the point object corresponding to the end angle.
      */
     function fromArc(arc: IPathArc): IPoint[];
+    /**
+     * Get the two end points of a path.
+     *
+     * @param pathContext The path object.
+     * @returns Array with 2 elements: [0] is the point object corresponding to the origin, [1] is the point object corresponding to the end.
+     */
+    function fromPathEnds(pathContext: IPath): IPoint[];
     /**
      * Get the middle point of a path. Currently only supports Arc and Line paths.
      *
-     * @param path The path object.
+     * @param pathContext The path object.
      * @param ratio Optional ratio (between 0 and 1) of point along the path. Default is .5 for middle.
      * @returns Point on the path, in the middle of the path.
      */
-    function middle(path: IPath, ratio?: number): IPoint;
+    function middle(pathContext: IPath, ratio?: number): IPoint;
     /**
      * Create a clone of a point, mirrored on either or both x and y axes.
      *
@@ -477,6 +506,14 @@ declare module MakerJs.point {
     function zero(): IPoint;
 }
 declare module MakerJs.path {
+    /**
+     * Find out if two paths are equal.
+     *
+     * @param a First path.
+     * @param b Second path.
+     * @returns true if paths are the same, false if they are not
+     */
+    function areEqual(path1: IPath, path2: IPath): boolean;
     /**
      * Create a clone of a path, mirrored on either or both x and y axes.
      *
@@ -600,6 +637,13 @@ declare module MakerJs.paths {
     }
 }
 declare module MakerJs.model {
+    /**
+     * Get an unused id in the paths map with the same prefix.
+     *
+     * @param modelContext The model containing the paths map.
+     * @param pathId The pathId to use directly (if unused), or as a prefix.
+     */
+    function getSimilarPathId(modelContext: IModel, pathId: string): string;
     /**
      * 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.
      *
@@ -658,6 +702,33 @@ declare module MakerJs.model {
      * @returns The scaled model (for chaining).
      */
     function convertUnits(modeltoConvert: IModel, destUnitType: string): IModel;
+    /**
+     * Callback signature for walkPaths.
+     */
+    interface IModelPathCallback {
+        (modelContext: IModel, pathId: string, pathContext: IPath): void;
+    }
+    /**
+     * Recursively walk through all paths for a given model.
+     *
+     * @param modelContext The model to walk.
+     * @param callback Callback for each path.
+     */
+    function walkPaths(modelContext: IModel, callback: IModelPathCallback): void;
+}
+declare module MakerJs.model {
+    /**
+     * Combine 2 models. The models should be originated.
+     *
+     * @param modelA First model to combine.
+     * @param modelB Second model to combine.
+     * @param includeAInsideB Flag to include paths from modelA which are inside of modelB.
+     * @param includeAOutsideB Flag to include paths from modelA which are outside of modelB.
+     * @param includeBInsideA Flag to include paths from modelB which are inside of modelA.
+     * @param includeBOutsideA Flag to include paths from modelB which are outside of modelA.
+     * @param farPoint Optional point of reference which is outside the bounds of both models.
+     */
+    function combine(modelA: IModel, modelB: IModel, includeAInsideB: boolean, includeAOutsideB: boolean, includeBInsideA: boolean, includeBOutsideA: boolean, farPoint?: IPoint): void;
 }
 declare module MakerJs.units {
     /**
@@ -781,7 +852,7 @@ declare module MakerJs.exporter {
          * @param pathToExport The path to export.
          * @param offset The offset position of the path.
          */
-        exportPath(id: string, pathToExport: IPath, offset: IPoint): void;
+        exportPath(id: string, pathToExport: IPath, offset: IPoint, layer: string): void;
         /**
          * Export a model.
          *
@@ -1023,6 +1094,18 @@ declare module MakerJs.exporter {
         viewBox: boolean;
     }
 }
+declare module MakerJs.models {
+    class ConnectTheDots implements IModel {
+        paths: IPathMap;
+        constructor(isClosed: boolean, points: IPoint[]);
+    }
+}
+declare module MakerJs.models {
+    class Polygon extends ConnectTheDots {
+        constructor(numberOfSides: number, radius: number, firstCornerAngleInDegrees?: number);
+        static getPoints(numberOfSides: number, radius: number, firstCornerAngleInDegrees?: number): IPoint[];
+    }
+}
 declare module MakerJs.models {
     class BoltCircle implements IModel {
         paths: IPathMap;
@@ -1035,12 +1118,6 @@ declare module MakerJs.models {
         constructor(width: number, height: number, holeRadius: number);
     }
 }
-declare module MakerJs.models {
-    class ConnectTheDots implements IModel {
-        paths: IPathMap;
-        constructor(isClosed: boolean, points: IPoint[]);
-    }
-}
 declare module MakerJs.models {
     class RoundRectangle implements IModel {
         paths: IPathMap;
@@ -1058,12 +1135,6 @@ declare module MakerJs.models {
         constructor(startAngle: number, endAngle: number, sweepRadius: number, slotRadius: number);
     }
 }
-declare module MakerJs.models {
-    class Polygon extends ConnectTheDots {
-        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);
@@ -1086,3 +1157,10 @@ declare module MakerJs.models {
         constructor(side: number);
     }
 }
+declare module MakerJs.models {
+    class Star implements IModel {
+        paths: IPathMap;
+        constructor(numberOfPoints: number, outerRadius: number, innerRadius?: number, skipPoints?: number);
+        static InnerRadiusRatio(numberOfPoints: number, skipPoints: number): number;
+    }
+}
diff --git a/mapbox/mapbox.d.ts b/mapbox/mapbox.d.ts
index bc2c3c980..3c774bdf6 100644
--- a/mapbox/mapbox.d.ts
+++ b/mapbox/mapbox.d.ts
@@ -21,7 +21,7 @@ declare module L.mapbox {
 	function map(element: string, id: string, options?: MapOptions): L.mapbox.Map;
 	function map(element: string, tilejson: any, options?: MapOptions): L.mapbox.Map;
 
-	interface MapOptions extends L.MapOptions {
+	interface MapOptions extends L.Map.MapOptions {
 		featureLayer?  : FeatureLayerOptions;
 		gridLayer?     : any;
 		tileLayer?     : TileLayerOptions;
diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts
index 76819feba..c3ab5c848 100644
--- a/mariasql/mariasql-tests.ts
+++ b/mariasql/mariasql-tests.ts
@@ -1,7 +1,8 @@
 // These are the examples from the node-mariasql README transposed to TypeScript
 // https://github.com/mscdex/node-mariasql
 
-/// <reference path="../node/node-0.10.d.ts" />
+/// <reference path="./mariasql.d.ts" />
+/// <reference path="../node/node.d.ts" />
 
 // Example 1 - SHOW DATABASES
 import util = require('util');
@@ -198,4 +199,4 @@ c.end();
  Query #3 finished successfully
  Done with all queries
  Client closed
- */
\ No newline at end of file
+ */
diff --git a/marionette/marionette-tests.ts b/marionette/marionette-tests.ts
index a37eccc9f..7483c7e2f 100644
--- a/marionette/marionette-tests.ts
+++ b/marionette/marionette-tests.ts
@@ -179,7 +179,7 @@ module Marionette.Tests {
         }
     }
 
-    class MyCollectionView extends Marionette.CollectionView<MyModel> {
+    class MyCollectionView extends Marionette.CollectionView<MyModel, MyView> {
         constructor() {
             this.childView = MyView;
             this.childEvents = {
diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts
index be684d9a8..14d0a0b6c 100644
--- a/marionette/marionette.d.ts
+++ b/marionette/marionette.d.ts
@@ -9,49 +9,49 @@
 declare module Backbone {
 
     // Backbone.BabySitter
-    class ChildViewContainer<TModel extends Backbone.Model> {
+    class ChildViewContainer<TView extends View<Backbone.Model>> {
 
         constructor(initialViews?: any[]);
 
-        add(view: View<TModel>, customIndex?: number): void;
-        findByModel(model: TModel): View<TModel>;
-        findByModelCid(modelCid: string): View<TModel>;
-        findByCustom(index: number): View<TModel>;
-        findByIndex(index: number): View<TModel>;
-        findByCid(cid: string): View<TModel>;
-        remove(view: View<TModel>): void;
+        add(view: TView, customIndex?: number): void;
+        findByModel<TModel extends Backbone.Model>(model: TModel): TView;
+        findByModelCid(modelCid: string): TView;
+        findByCustom(index: number): TView;
+        findByIndex(index: number): TView;
+        findByCid(cid: string): TView;
+        remove(view: TView): void;
         call(method: any): void;
         apply(method: any, args?: any[]): void;
 
         //mixins from Collection (copied from Backbone's Collection declaration)
 
-        all(iterator: (element: View<TModel>, index: number) => boolean, context?: any): boolean;
-        any(iterator: (element: View<TModel>, index: number) => boolean, context?: any): boolean;
+        all(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        any(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
         contains(value: any): boolean;
         detect(iterator: (item: any) => boolean, context?: any): any;
-        each(iterator: (element: View<TModel>, index: number, list?: any) => void, context?: any): any;
-        every(iterator: (element: View<TModel>, index: number) => boolean, context?: any): boolean;
-        filter(iterator: (element: View<TModel>, index: number) => boolean, context?: any): View<TModel>[];
-        find(iterator: (element: View<TModel>, index: number) => boolean, context?: any): View<TModel>;
-        first(): View<TModel>;
-        forEach(iterator: (element: View<TModel>, index: number, list?: any) => void, context?: any): void;
+        each(iterator: (element: TView, index: number, list?: any) => void, context?: any): any;
+        every(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        filter(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
+        find(iterator: (element: TView, index: number) => boolean, context?: any): TView;
+        first(): TView;
+        forEach(iterator: (element: TView, index: number, list?: any) => void, context?: any): void;
         include(value: any): boolean;
-        initial(): View<TModel>;
-        initial(n: number): View<TModel>[];
+        initial(): TView;
+        initial(n: number): TView[];
         invoke(methodName: string, args?: any[]): any;
         isEmpty(object: any): boolean;
-        last(): View<TModel>;
-        last(n: number): View<TModel>[];
-        lastIndexOf(element: View<TModel>, fromIndex?: number): number;
-        map<U>(iterator: (element: View<TModel>, index: number, context?: any) => U, context?: any): U[];
+        last(): TView;
+        last(n: number): TView[];
+        lastIndexOf(element: TView, fromIndex?: number): number;
+        map<U>(iterator: (element: TView, index: number, context?: any) => U, context?: any): U[];
         pluck(attribute: string): any[];
-        reject(iterator: (element: View<TModel>, index: number) => boolean, context?: any): View<TModel>[];
-        rest(): View<TModel>;
-        rest(n: number): View<TModel>[];
+        reject(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
+        rest(): TView;
+        rest(n: number): TView[];
         select(iterator: any, context?: any): any[];
-        some(iterator: (element: View<TModel>, index: number) => boolean, context?: any): boolean;
+        some(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
         toArray(): any[];
-        without(...values: any[]): View<TModel>[];
+        without(...values: any[]): TView[];
     }
 
     // Backbone.Wreqr
@@ -856,7 +856,7 @@ declare module Marionette {
      * DOM. This behavior can be disabled by specifying {sort: false} on 
      * initialize.
      */
-    class CollectionView<TModel extends Backbone.Model> extends View<TModel> {
+    class CollectionView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends View<TModel> {
         constructor(options?: CollectionViewOptions<TModel>);
 
         /**
@@ -864,7 +864,7 @@ declare module Marionette {
          * Backbone view object definition, not an instance. It can be any 
          * Backbone.View or be derived from Marionette.ItemView
          */
-        childView: any;
+        childView: new (...args:any[]) => TView;
 
         /**
          * There may be scenarios where you need to pass data from your parent 
@@ -918,14 +918,14 @@ declare module Marionette {
          * collection view, iterate them, find them by a given indexer such as the 
          * view's model or collection, and more.
          */
-        children: Backbone.ChildViewContainer<TModel>;
+        children: Backbone.ChildViewContainer<TView>;
 
         /**
          * The render method of the collection view is responsible for rendering the 
          * entire collection. It loops through each of the children in the collection 
          * and renders them individually as an childView.
          */
-        render(): CollectionView<TModel>;
+        render(): CollectionView<TModel, TView>;
 
         /**
          * The addChild method is responsible for rendering the childViews and 
@@ -933,9 +933,9 @@ declare module Marionette {
          * responsible for triggering the events per ChildView. In most cases you 
          * should not override this method.
          */
-        addChild(item: any, ChildView: Backbone.View<TModel>, index: Number): void;
+        addChild(item: any, ChildView: TView, index: Number): void;
 
-        renderChildView(view: Backbone.View<TModel>, index: Number): void;
+        renderChildView(view: TView, index: Number): void;
 
         /**
          * When a custom view instance needs to be created for the childView that 
@@ -943,13 +943,13 @@ declare module Marionette {
          * takes three parameters and returns a view instance to be used as the 
          * child view.
          */
-        buildChildView(child: any, ItemViewType: any, itemViewOptions: any): View<TModel>;
+        buildChildView(child: any, ItemViewType: any, itemViewOptions: any): TView;
 
         /** 
          * Remove the child view and destroy it. This function also updates the indices of
          * later views in the collection in order to keep the children in sync with the collection.
          */
-        removeChildView(view: any): void;
+        removeChildView(view: TView): void;
 
         /**
          * Determines if the view is empty. If you want to control when the empty 
@@ -988,14 +988,14 @@ declare module Marionette {
          * a collection and displaying the sorted list in the correct order on the 
          * screen.
          */
-        attachHtml(collectionView: CollectionView<TModel>, childView: Backbone.View<TModel>, index: number): void;
+        attachHtml(collectionView: CollectionView<TModel, TView>, childView: TView, index: number): void;
 
         /**
          * The value returned by this method is the ChildView class that will be 
          * instantiated when a Model needs to be initially rendered. This method 
          * also gives you the ability to customize per Model ChildViews.
          */
-        getChildView(item: TModel): any;
+        getChildView<M extends Backbone.Model>(item: M): new (...args:any[]) => TView;
 
         /**
          * If you need the emptyView's class chosen dynamically, specify 
@@ -1020,27 +1020,27 @@ declare module Marionette {
          * instance is about to be added to the collection view. It provides 
          * access to the view instance for the child that was added.
          */
-        onBeforeAddChild(view: any): void;
+        onBeforeAddChild(childView: TView): void;
 
         /**
          * This callback function allows you to know when a child / child view 
          * instance has been added to the collection view. It provides access to 
          * the view instance for the child that was added.
          */
-        onAddChild(childView: any): void;
+        onAddChild(childView: TView): void;
 
         /**
          * This callback function allows you to know when a childView instance is 
          * about to be removed from the collectionView. It provides access to the 
          * view instance for the child that was removed.
          */
-        onBeforeRemoveChild(childView: any): void;
+        onBeforeRemoveChild(childView: TView): void;
 
         /**
          * This callback function allows you to know when a child / childView 
          * instance has been deleted or removed from the collection.
          */
-        onRemoveChild(childView: any): void;
+        onRemoveChild(childView: TView): void;
     }
 
     /**
@@ -1049,7 +1049,7 @@ declare module Marionette {
      * structure, or for scenarios where a collection needs to be rendered within 
      * a wrapper template.
      */
-    class CompositeView<TModel extends Backbone.Model> extends CollectionView<TModel> {
+    class CompositeView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends CollectionView<TModel, TView> {
 
         constructor(options?: CollectionViewOptions<TModel>);
 
@@ -1058,7 +1058,7 @@ declare module Marionette {
          * CompositeView's template is rendered and the childView's templates are 
          * added to this.
          */
-        childView: any;
+        childView: new (...args:any[]) => TView;
 
         /**
          * By default the composite view uses the same attachHtml method that the 
@@ -1074,7 +1074,7 @@ declare module Marionette {
         /**
         * Renders the view.
         */
-        render(): CompositeView<TModel>;
+        render(): CompositeView<TModel, TView>;
 
         /**
          * Invoked before the model has been rendered
@@ -1097,6 +1097,13 @@ declare module Marionette {
         onRenderCollection(): void;
     }
 
+    interface LayoutViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel> {
+        /**
+         * The LayoutView takes an additional parameter where you can pass the regions as option on creation.
+         */
+        regions?:any;
+    }
+
     /**
      * A LayoutView is a hybrid of an ItemView and a collection of Region objects. 
      * They are ideal for rendering application layouts with multiple sub-regions 
@@ -1119,7 +1126,12 @@ declare module Marionette {
          * A hash that can contain a regions hash that allows you to specify regions per 
          * LayoutView instance.
          */
-        constructor(options?: any);
+        constructor(options?: LayoutViewOptions<TModel>);
+
+        /**
+         * Regions hash or a method returning the regions hash that maps regions/selectors to methods on your View.
+         **/
+        regions():any;
 
         /** Adds a region to the layout view. */
         addRegion(name: string, definition: any): Region;
@@ -1129,7 +1141,7 @@ declare module Marionette {
          */
         addRegions(regions: any): any;
         
-	/** Returns a region from the layout view */
+	    /** Returns a region from the layout view */
         getRegion(name: string): Region;
 
         /**
@@ -1147,7 +1159,7 @@ declare module Marionette {
           * for customized region interactions and business specific
           * view logic for better control over single regions.
           */
-        getRegionManager(): any;
+        getRegionManager(): RegionManager;
     }
 
     interface AppRouterOptions extends Backbone.RouterOptions {
diff --git a/marked/marked-tests.ts b/marked/marked-tests.ts
index ca8b96920..44be0f0e8 100644
--- a/marked/marked-tests.ts
+++ b/marked/marked-tests.ts
@@ -8,7 +8,7 @@ var options: MarkedOptions = {
     breaks: false,
     pedantic: false,
     sanitize: true,
-    smartLsts: true,
+    smartLists: true,
     silent: false,
     highlight: function (code: string, lang: string) {
     	return '';
diff --git a/markitup/markitup-tests.ts b/markitup/markitup-tests.ts
new file mode 100644
index 000000000..e5b03ed5a
--- /dev/null
+++ b/markitup/markitup-tests.ts
@@ -0,0 +1,89 @@
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="markitup.d.ts" />
+
+// https://github.com/markitup/1.x/blob/master/markitup/sets/default/set.js
+var mySettings = {
+    onShiftEnter: {
+        keepDefault: false,
+        replaceWith: '<br />\n'
+    },
+    onCtrlEnter: {
+        keepDefault: false,
+        openWith: '\n<p>',
+        closeWith: '</p>'
+    },
+    onTab: {
+        keepDefault: false,
+        replaceWith: '    '
+    },
+    markupSet: [
+        {
+            name: 'Bold',
+            key: 'B',
+            openWith: '(!(<strong>|!|<b>)!)',
+            closeWith: '(!(</strong>|!|</b>)!)'
+        },
+        {
+            name: 'Italic',
+            key: 'I',
+            openWith: '(!(<em>|!|<i>)!)',
+            closeWith: '(!(</em>|!|</i>)!)'
+        },
+        {
+            name: 'Stroke through',
+            key: 'S',
+            openWith: '<del>',
+            closeWith: '</del>'
+        },
+        {separator: '---------------'},
+        {
+            name: 'Bulleted List',
+            openWith: '    <li>',
+            closeWith: '</li>',
+            multiline: true,
+            openBlockWith: '<ul>\n',
+            closeBlockWith: '\n</ul>'
+        },
+        {
+            name: 'Numeric List',
+            openWith: '    <li>',
+            closeWith: '</li>',
+            multiline: true,
+            openBlockWith: '<ol>\n',
+            closeBlockWith: '\n</ol>'
+        },
+        {
+            separator: '---------------'
+        },
+        {
+            name: 'Picture',
+            key: 'P',
+            replaceWith: '<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />'
+        },
+        {
+            name: 'Link',
+            key: 'L',
+            openWith: '<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>',
+            closeWith: '</a>',
+            placeHolder: 'Your text to link...'
+        },
+        {
+            separator: '---------------'
+        },
+        {
+            name: 'Clean',
+            className: 'clean',
+            replaceWith: (markitup: MarkItUp.MarkupSet): string => {
+                return markitup.selection.replace(/<(.*?)>/g, "")
+            }
+        },
+        {
+            name: 'Preview',
+            className: 'preview',
+            call: 'preview'
+        }
+    ]
+};
+
+// http://markitup.jaysalvat.com/documentation/
+$('#markItUp').markItUp(mySettings);
diff --git a/markitup/markitup.d.ts b/markitup/markitup.d.ts
new file mode 100644
index 000000000..0267a12c6
--- /dev/null
+++ b/markitup/markitup.d.ts
@@ -0,0 +1,237 @@
+// Type definitions for markitup 1.x
+// Project: https://github.com/markitup/1.x
+// Definitions by: drillbits <https://github.com/drillbits>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module MarkItUp {
+    interface Options {
+        /**
+         * Apply a specific className to the wrapping Div. Useful to prevent CSS conflicts between instances.
+         */
+        nameSpace?: string;
+
+        /**
+         * Enable/Disable the handle to resize the editor.
+         */
+        resizeHandle?: boolean;
+
+        /**
+         * Display the preview in a popup window with comma-separated list of specs. If empty or false, the preview will be displayed in the built-in iFrame preview.
+         */
+        previewInWindow?: string;
+
+        /**
+         * AutoRefresh the preview iFrame or window when the editor is used.
+         */
+        previewAutoRefresh?: boolean;
+
+        /**
+         * You can set the path of your own parser to preview markup languages other than html. If this property is set, the built-in preview will be overridden by your own preview script.
+         * Use ~/ for markItUp! root.
+         */
+        previewParserPath?: string;
+
+        /**
+         * Name of the var posted with the editor content to the parser defined above.
+         *
+         * default: 'data'
+         */
+        previewParserVar?: string;
+
+        /**
+         * Path to the Html preview template.
+         * Use ~/ for markItUp! root.
+         *
+         * default: '~/templates/preview.html'
+         */
+        previewTemplatePath?: string;
+
+        /**
+         * Parse the content with the javascript parser of your choice before passing it to the preview.
+         *
+         * default: false
+         */
+        previewParser?: boolean;
+
+        /**
+         * Position of the Built-in preview before or after the main textarea.
+         * 'before'|'after'
+         *
+         * default: 'after'
+         */
+        previewPosition?: string;
+
+        /**
+         * Define what to do when Enter key is pressed.
+         */
+        onEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Ctrl+Enter keys are pressed.
+         */
+        onCtrlEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Shift+Enter keys are pressed.
+         */
+        onShiftEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Tab key is pressed. Warning, this key is also used to jump at the end of a new inserted markup.
+         */
+        onTab?: MarkupSet;
+
+        /**
+         * Function to be called before any markup insertion.
+         */
+        beforeInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called after any markup insertion.
+         */
+        afterInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Note that most of the settings below are used by the engine for all insertion calls ($.markItUp( {} ), onEnter, onShiftEnter, onCtrlEnter, onTab) except exclusive button properties marked by
+         */
+        markupSet?: MarkupSet[];
+    }
+
+    interface MarkupSet {
+        /**
+         * Button name
+         */
+        name?: string;
+
+        /**
+         * Classname to be applied to this very button.
+         */
+        className?: string;
+
+        /**
+         * Shortcut key to be applied to the button. Ctrl+key trigger the action of a button.
+         */
+        key?: string;
+
+        /**
+         * Markup to be added before selection. Accepts functions.
+         */
+        openWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Markup to be added after selection. Accepts functions.
+         */
+        closeWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added in place of the cursor or selection. Accepts functions.
+         */
+        replaceWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added before a whole block. Accepts functions.
+         */
+        openBlockWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added after a whole block. Accepts functions.
+         */
+        closeBlockWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Set whether the tags has to be inserted at each line or on the whole selected block.
+         */
+        multiline?: boolean;
+
+        /**
+         * Placeholder text to be inserted if no text is selected by the user.
+         */
+        placeHolder?: string|((h: MarkupSet) => string);
+
+        /**
+         * Function to be called just before a markup insertion. If a global beforeInsert callback is already defined this function is fired just after.
+         */
+        beforeInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called just after a markup insertion. If a global afterInsert callback is already defined this function is fired before.
+         */
+        afterInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called before a multiline markup insertion.
+         */
+        beforeMultiInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called after a multiline markup insertion.
+         */
+        afterMultiInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Open a dropdown menu with another button set.
+         */
+        dropMenu?: MarkupSet[];
+
+        /**
+         * Keep (true) or not (false) the default behaviour of the key.
+         */
+        keepDefault?: boolean;
+
+        /**
+         * Returns the selection.
+         */
+        selection?: string;
+
+        /**
+         * Returns the textarea object.
+         */
+        textarea?: HTMLElement;
+
+        /**
+         * Returns the position of the selection.
+         */
+        caretPosition?: number;
+
+        /**
+         * Returns the position of the scrollbar.
+         */
+        scrollPosition?: number;
+
+        /**
+         * If a multi-line edition is trigged (Ctrl + Shift + click). This property return the number of the line being processed.
+         */
+        line?: number;
+
+        /**
+         * Returns true if the Control key is pressed when the callback is fired.
+         */
+        ctrlKey?: boolean;
+
+        /**
+         * Returns true if the Shift key is pressed when the callback is fired.
+         */
+        shiftKey?: boolean;
+
+        /**
+         * Returns true if the Alt key is pressed when the callback is fired.
+         */
+        altKey?: boolean;
+    }
+
+    interface Static {
+        (): JQuery;
+        (settings: Options): JQuery;
+    }
+}
+
+interface JQueryStatic {
+    markItUp: MarkItUp.Static;
+}
+
+interface JQuery {
+    markItUp(settings?: MarkItUp.Options): JQuery;
+    markItUpRemove(): JQuery;
+}
diff --git a/material-ui/legacy/material-ui-0.11.1-tests.tsx b/material-ui/legacy/material-ui-0.11.1-tests.tsx
new file mode 100644
index 000000000..c686efa9e
--- /dev/null
+++ b/material-ui/legacy/material-ui-0.11.1-tests.tsx
@@ -0,0 +1,476 @@
+///<reference path='../../react/react.d.ts' />
+///<reference path='material-ui-0.11.1.d.ts' />
+
+import * as React from "react/addons";
+import mui = require("material-ui");
+import Colors = require("material-ui/lib/styles/colors");
+import AppBar = require("material-ui/lib/app-bar");
+import IconButton = require("material-ui/lib/icon-button");
+import FlatButton = require("material-ui/lib/flat-button");
+import Avatar = require("material-ui/lib/avatar");
+import FontIcon = require("material-ui/lib/font-icon");
+import Typography = require("material-ui/lib/styles/typography");
+import RaisedButton = require("material-ui/lib/raised-button");
+import FloatingActionButton = require("material-ui/lib/floating-action-button");
+import Card = require("material-ui/lib/card/card");
+import CardHeader = require("material-ui/lib/card/card-header");
+import CardText = require("material-ui/lib/card/card-text");
+import CardActions = require("material-ui/lib/card/card-actions");
+import Dialog = require("material-ui/lib/dialog");
+import DropDownMenu = require("material-ui/lib/drop-down-menu");
+import RadioButtonGroup = require("material-ui/lib/radio-button-group");
+import RadioButton = require("material-ui/lib/radio-button");
+import Toggle = require("material-ui/lib/toggle");
+import TextField = require("material-ui/lib/text-field");
+import SelectField = require("material-ui/lib/select-field");
+import IconMenu = require("material-ui/lib/menus/icon-menu");
+import Menu = require('material-ui/lib/menus/menu');
+import MenuItem = require('material-ui/lib/menus/menu-item');
+import MenuDivider = require('material-ui/lib/menus/menu-divider');
+
+import NavigationClose = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/navigation/close", but they aren't defined yet.
+import FileFolder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/file/folder", but they aren't defined yet.
+import ToggleStar = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star", but they aren't defined yet.
+import ActionGrade = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/action/grade", but they aren't defined yet.
+import ToggleStarBorder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+import ArrowDropRight = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+
+class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedStateMixin {
+
+    // injected with mixin
+    linkState: <T>(key: string) => React.ReactLink<T>;
+    dialog: mui.Dialog;
+    //dialog2: Dialog;  // can't get type directly from require("material-ui/lib/dialog");
+
+    private touchTapEventHandler(e: __MaterialUI.TouchTapEvent) {
+        this.dialog.show();
+        //this.dialog2.show();
+    }
+    private formEventHandler(e: React.FormEvent) {
+    }
+    private selectFieldChangeHandler(e: __MaterialUI.TouchTapEvent, si: number, mi: any) {
+    }
+
+    render() {
+
+        // "http://material-ui.com/#/customization/themes"
+        let ThemeManager = new mui.Styles.ThemeManager();
+        ThemeManager.setTheme(ThemeManager.types.LIGHT);
+        ThemeManager.setTheme(ThemeManager.types.DARK);
+        let muiTheme = ThemeManager.getCurrentTheme();
+        ThemeManager.setComponentThemes({
+            toggle: {
+                thumbOnColor: "#00bcd4",
+                trackOnColor: "LightCyan",
+            }
+        });
+
+        // "http://material-ui.com/#/customization/inline-styles"
+        let Checkbox = mui.Checkbox;
+        let element: React.ReactElement<any>;
+        element = <Checkbox
+            id="checkboxId1"
+            name="checkboxName1"
+            value="checkboxValue1"
+            label="went for a run today"
+            style={{
+                width: '50%',
+                margin: '0 auto'
+            }}
+            iconStyle={{
+                fill: '#FF4081'
+            }}/>
+        element = React.createElement<__MaterialUI.CheckboxProps>(Checkbox, {
+            id: "checkboxId1", name: "checkboxName1", value: "checkboxValue1", label: "went for a run today", style: {
+                width: '50%',
+                margin: '0 auto'
+            }, iconStyle: {
+                fill: '#FF4081'
+            }
+        });
+
+        // "http://material-ui.com/#/customization/colors"
+        ThemeManager.setComponentThemes({
+            toggle: {
+                thumbOnColor: Colors.cyan200,
+                thumbOffColor: Colors.grey400,
+            }
+        });
+
+        // "http://material-ui.com/#/components/appbar"
+        element = <AppBar
+            title="Title"
+            iconClassNameRight="muidocs-icon-navigation-expand-more" />
+        element = <AppBar
+            title="Title"
+            iconElementLeft={<IconButton><NavigationClose /></IconButton>}
+            iconElementRight={<FlatButton label="Save" />} />;
+
+        // "http://material-ui.com/#/components/avatars"
+        //image avatar
+        element = <Avatar src="images/uxceo-128.jpg" />;
+        //SvgIcon avatar
+        element = <Avatar icon={<FileFolder />} />;
+        //SvgIcon avatar with custom colors
+        element = <Avatar
+            icon={<FileFolder />}
+            color={Colors.orange200}
+            backgroundColor={Colors.pink400} />;
+        //FontIcon avatar
+        element = <Avatar
+            icon={
+            <FontIcon className="muidocs-icon-communication-voicemail" />
+            } />;
+        //FontIcon avatar with custom colors
+        element = <Avatar
+            icon={<FontIcon className="muidocs-icon-communication-voicemail" />}
+            color={Colors.blue300}
+            backgroundColor={Colors.indigo900} />;
+        //Letter avatar
+        element = <Avatar>A</Avatar>;
+        //Letter avatar with custom colors
+        element = <Avatar
+            color={Colors.deepOrange300}
+            backgroundColor={Colors.purple500}>
+            </Avatar>
+
+
+        // "http://material-ui.com/#/components/buttons"
+        element = <FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </FlatButton>;
+        element = <RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </RaisedButton>;
+        element = <FloatingActionButton secondary={true} mini={true} linkButton={true}
+            href="https://github.com/callemall/material-ui" >
+            <ToggleStar />
+            </FloatingActionButton>;
+
+        // "http://material-ui.com/#/components/cards"
+        element = <Card initiallyExpanded={true}>
+        <CardHeader
+            title="Title"
+            subtitle="Subtitle"
+            avatar={<Avatar style={{ color: 'red' }}>A</Avatar>}
+            showExpandableButton={true}>
+            </CardHeader>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+        <CardActions expandable={true}>
+        <FlatButton label="Action1"/>
+        <FlatButton label="Action2"/>
+            </CardActions>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+            </Card>;
+
+        // "http://material-ui.com/#/components/date-picker"
+
+
+        // "http://material-ui.com/#/components/dialog"
+        let standardActions = [
+            { text: 'Cancel' },
+            { text: 'Submit', onTouchTap: this.touchTapEventHandler, ref: 'submit' }
+        ];
+
+        element = <Dialog
+            title="Dialog With Standard Actions"
+            actions={standardActions}
+            actionFocus="submit"
+            modal={true}>
+            The actions in this window are created from the json that's passed in.
+            </Dialog>;
+
+        //Custom Actions
+        let customActions = [
+            <FlatButton
+                label="Cancel"
+                secondary={true}
+                onTouchTap={this.touchTapEventHandler} />,
+            <FlatButton
+                label="Submit"
+                primary={true}
+                onTouchTap={this.touchTapEventHandler} />
+        ];
+
+        element = <Dialog
+            title="Dialog With Custom Actions"
+            actions={customActions}
+            modal={false}
+            autoDetectWindowHeight={true}
+            autoScrollBodyContent={true}>
+            The actions in this window were passed in as an array of react objects.
+            </Dialog>;
+
+
+        // "http://material-ui.com/#/components/dropdown-menu"
+        let menuItems = [
+            { payload: '1', text: 'Never' },
+            { payload: '2', text: 'Every Night' },
+            { payload: '3', text: 'Weeknights' },
+            { payload: '4', text: 'Weekends' },
+            { payload: '5', text: 'Weekly' },
+        ];
+        element = <DropDownMenu menuItems={menuItems} />;
+
+        // "http://material-ui.com/#/components/icons"
+        element = <FontIcon className= "material-icons" color= { Colors.red500 } > home</FontIcon>;
+
+        // "http://material-ui.com/#/components/icon-buttons"
+        //Method 1: muidocs-icon-github is defined in a style sheet.
+        element = <IconButton iconClassName="muidocs-icon-custom-github" tooltip="GitHub"/>;
+        //Method 2: ActionGrade is a component created using mui.SvgIcon.
+        element = <IconButton tooltip= "Star" touch= { true}>
+        <ActionGrade/>
+            </IconButton >;
+        //Method 3: Manually creating a mui.FontIcon component within IconButton
+        element = <IconButton tooltip= "Sort" disabled= {true}>
+        <FontIcon className="muidocs-icon-custom-sort"/>
+            </IconButton>;
+        //Method 4: Using Google material-icons
+        element = <IconButton iconClassName="material-icons" tooltipPosition="bottom-center"
+            tooltip="Sky">settings_system_daydream</IconButton>;
+
+        // "http://material-ui.com/#/components/icon-menus"
+        element = <IconMenu iconButtonElement={<IconButton />}>
+                <MenuItem primaryText="Refresh" />
+                <MenuItem primaryText="Send feedback" />
+                <MenuItem primaryText="Settings" />
+                <MenuItem primaryText="Help" />
+                <MenuItem primaryText="Sign out" />
+            </IconMenu>;
+
+        // "http://material-ui.com/#/components/left-nav"
+
+
+        // "http://material-ui.com/#/components/lists"
+
+
+        // "http://material-ui.com/#/components/menus"
+        element = <Menu>
+                <MenuItem primaryText="Maps" />
+                <MenuItem primaryText="Books" />
+                <MenuItem primaryText="Flights" />
+                <MenuItem primaryText="Apps" />
+            </Menu>;
+        element = <Menu desktop={true} width={320}>
+                <MenuItem primaryText="Bold" secondaryText="&#8984;B" />
+                <MenuItem primaryText="Italic" secondaryText="&#8984;I" />
+                <MenuItem primaryText="Underline" secondaryText="&#8984;U" />
+                <MenuItem primaryText="Strikethrough" secondaryText="Alt+Shift+5" />
+                <MenuItem primaryText="Superscript" secondaryText="&#8984;." />
+                <MenuItem primaryText="Subscript" secondaryText="&#8984;," />
+                <MenuDivider />
+                <MenuItem primaryText="Paragraph styles" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Align" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Line spacing" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Numbered list" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="List options" rightIcon={<ArrowDropRight />} />
+                <MenuDivider />
+                <MenuItem primaryText="Clear formatting" secondaryText="&#8984;/" />
+            </Menu>;
+
+        // "http://material-ui.com/#/components/paper"
+
+
+        // "http://material-ui.com/#/components/progress"
+
+
+        // "http://material-ui.com/#/components/refresh-indicator"
+
+
+        // "http://material-ui.com/#/components/sliders"
+
+
+        // "http://material-ui.com/#/components/switches"
+        element = <Checkbox
+            name="checkboxName2"
+            value="checkboxValue2"
+            label="fed the dog"
+            defaultChecked={true}/>;
+        element = <Checkbox
+            name = "checkboxName3"
+            value = "checkboxValue3"
+            label = "built a house on the moon"
+            disabled = {true}/>;
+        element = <Checkbox
+            name="checkboxName4"
+            value="checkboxValue4"
+            checkedIcon={<ToggleStar />}
+            unCheckedIcon={<ToggleStarBorder />}
+            label="custom icon" />;
+
+        element = <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
+        <RadioButton
+            value="light"
+            label="prepare for light speed"
+            style={{ marginBottom: 16 }} />;
+        <RadioButton
+            value="not_light"
+            label="light speed too slow"
+            style={{ marginBottom: 16 }}/>;
+        <RadioButton
+            value="ludicrous"
+            label="go to ludicrous speed"
+            style={{ marginBottom: 16 }}
+            disabled={true}/>
+            </RadioButtonGroup>;
+
+        element = <Toggle
+            name="toggleName1"
+            value="toggleValue1"
+            label="activate thrusters"/>;
+
+        element = <Toggle
+            name = "toggleName2"
+            value = "toggleValue2"
+            label = "auto-pilot"
+            defaultToggled = { true}/>;
+
+        element = <Toggle
+            name="toggleName3"
+            value="toggleValue3"
+            label="initiate self-destruct sequence"
+            disabled={true}/>;
+
+        // "http://material-ui.com/#/components/snackbar"
+
+
+        // "http://material-ui.com/#/components/table"
+
+
+        // "http://material-ui.com/#/components/tabs"
+
+
+        // "http://material-ui.com/#/components/text-fields"
+        element = <TextField
+            hintText="Hint Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value" />;
+        element = <TextField
+            hintText = "Hint Text"
+            value = { "value" }
+            underlineStyle = {{ borderColor: Colors.green500 }}
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Custom Underline Focus Color"
+            underlineFocusStyle={{ borderColor: Colors.amber900 }} />;
+        element = <TextField
+            hintText = "Hint Text"
+            valueLink = { this.linkState<string>('valueLinkValue') } />;
+        element = <TextField
+            hintText="Hint Text (MultiLine)"
+            multiLine={true} />;
+        element = <TextField
+            hintText = "The hint text can be as long as you want, it will wrap."
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText="The error text can be as long as you want, it will wrap." />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text (custom error color)"
+            errorText={"error text"}
+            errorStyle={{ color: 'orange' }}
+            onChange={ this.formEventHandler }
+            defaultValue="Custom error color" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true} />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            defaultValue="Disabled With Value" />;
+
+        //Select Fields
+        let arbitraryArrayMenuItems = [
+            {
+                id: 0,
+                name: "zero",
+            },
+        ];
+        element = <SelectField
+            value = { 0 }
+            onChange = { this.selectFieldChangeHandler }
+            hintText = "Hint Text"
+            menuItems = { menuItems } />;
+        element = <SelectField
+            valueLink={this.linkState('selectValueLinkValue') }
+            floatingLabelText="Float Label Text"
+            valueMember="id"
+            displayMember="name"
+            menuItems={arbitraryArrayMenuItems} />;
+        element = <SelectField
+            valueLink = { this.linkState('selectValueLinkValue2') }
+            floatingLabelText = "Float Custom Label Text"
+            floatingLabelStyle = {{ color: "red" }}
+            valueMember = "id"
+            displayMember = "name"
+            menuItems = { arbitraryArrayMenuItems } />;
+        element = <SelectField
+            value={0}
+            onChange={ this.selectFieldChangeHandler }
+            menuItems={arbitraryArrayMenuItems} />;
+
+        //Floating Hint Text Labels
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value"
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text"
+            value = { "value" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text"
+            floatingLabelText="Floating Label Text"
+            valueLink={this.linkState<string>('floatingValueLinkValue') } />;
+        element = <TextField
+            hintText = "Hint Text (MultiLine)"
+            floatingLabelText = "Floating Label Text"
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText={"floating text"}
+            floatingLabelText="Floating Label Text"
+            onChange={this.formEventHandler } />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            defaultValue = "abc"
+            floatingLabelText = "Floating Label Text"
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true}
+            defaultValue = "Disabled With Value"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Password Field"
+            floatingLabelText="Password"
+            type="password" />;
+
+
+        // "http://material-ui.com/#/components/time-picker"
+
+
+        // "http://material-ui.com/#/components/toolbars"
+
+        return element;
+    }
+}
\ No newline at end of file
diff --git a/material-ui/legacy/material-ui-0.11.1.d.ts b/material-ui/legacy/material-ui-0.11.1.d.ts
new file mode 100644
index 000000000..7f464bc57
--- /dev/null
+++ b/material-ui/legacy/material-ui-0.11.1.d.ts
@@ -0,0 +1,2096 @@
+// Type definitions for material-ui v0.11.1
+// Project: https://github.com/callemall/material-ui
+// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../../react/react.d.ts' />
+
+declare module "material-ui" {
+    // The reason for exporting the namespace types (__MaterialUI.*) is to also export the type for casting variable.
+
+    export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
+    export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
+    export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
+    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
+    export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
+    export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
+    export import CardExpandable = __MaterialUI.Card.CardExpandable; // require('material-ui/lib/card/card-expandable');
+    export import CardHeader = __MaterialUI.Card.CardHeader; // require('material-ui/lib/card/card-header');
+    export import CardMedia = __MaterialUI.Card.CardMedia; // require('material-ui/lib/card/card-media');
+    export import CardText = __MaterialUI.Card.CardText; // require('material-ui/lib/card/card-text');
+    export import CardTitle = __MaterialUI.Card.CardTitle; // require('material-ui/lib/card/card-title');
+    export import Checkbox = __MaterialUI.Checkbox; // require('material-ui/lib/checkbox');
+    export import CircularProgress = __MaterialUI.CircularProgress; // require('material-ui/lib/circular-progress');
+    export import ClearFix = __MaterialUI.ClearFix; // require('material-ui/lib/clearfix');
+    export import DatePicker = __MaterialUI.DatePicker.DatePicker; // require('material-ui/lib/date-picker/date-picker');
+    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; // require('material-ui/lib/date-picker/date-picker-dialog');
+    export import Dialog = __MaterialUI.Dialog // require('material-ui/lib/dialog');
+    export import DropDownIcon = __MaterialUI.DropDownIcon; // require('material-ui/lib/drop-down-icon');
+    export import DropDownMenu = __MaterialUI.DropDownMenu; // require('material-ui/lib/drop-down-menu');
+    export import EnhancedButton = __MaterialUI.EnhancedButton; // require('material-ui/lib/enhanced-button');
+    export import FlatButton = __MaterialUI.FlatButton; // require('material-ui/lib/flat-button');
+    export import FloatingActionButton = __MaterialUI.FloatingActionButton; // require('material-ui/lib/floating-action-button');
+    export import FontIcon = __MaterialUI.FontIcon; // require('material-ui/lib/font-icon');
+    export import IconButton = __MaterialUI.IconButton; // require('material-ui/lib/icon-button');
+    export import IconMenu = __MaterialUI.Menus.IconMenu; // require('material-ui/lib/menus/icon-menu');
+    export import LeftNav = __MaterialUI.LeftNav; // require('material-ui/lib/left-nav');
+    export import LinearProgress = __MaterialUI.LinearProgress; // require('material-ui/lib/linear-progress');
+    export import List = __MaterialUI.Lists.List; // require('material-ui/lib/lists/list');
+    export import ListDivider = __MaterialUI.Lists.ListDivider; // require('material-ui/lib/lists/list-divider');
+    export import ListItem = __MaterialUI.Lists.ListItem; // require('material-ui/lib/lists/list-item');
+    export import Menu = __MaterialUI.Menu.Menu; // require('material-ui/lib/menu/menu');
+    export import MenuItem = __MaterialUI.Menu.MenuItem; // require('material-ui/lib/menu/menu-item');
+    export import Mixins = __MaterialUI.Mixins; // require('material-ui/lib/mixins/');
+    export import Overlay = __MaterialUI.Overlay; // require('material-ui/lib/overlay');
+    export import Paper = __MaterialUI.Paper; // require('material-ui/lib/paper');
+    export import RadioButton = __MaterialUI.RadioButton; // require('material-ui/lib/radio-button');
+    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup; // require('material-ui/lib/radio-button-group');
+    export import RaisedButton = __MaterialUI.RaisedButton; // require('material-ui/lib/raised-button');
+    export import RefreshIndicator = __MaterialUI.RefreshIndicator; // require('material-ui/lib/refresh-indicator');
+    export import Ripples = __MaterialUI.Ripples; // require('material-ui/lib/ripples/');
+    export import SelectField = __MaterialUI.SelectField; // require('material-ui/lib/select-field');
+    export import Slider = __MaterialUI.Slider; // require('material-ui/lib/slider');
+    export import SvgIcon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon');
+
+    import NavigationMenu = require('material-ui/lib/svg-icons/navigation/menu');
+    import NavigationChevronLeft = require('material-ui/lib/svg-icons/navigation/chevron-left');
+    import NavigationChevronRight = require('material-ui/lib/svg-icons/navigation/chevron-right');
+    export var Icons: {
+        NavigationMenu: __MaterialUI.NavigationMenu;
+        NavigationChevronLeft: __MaterialUI.NavigationChevronLeft;
+        NavigationChevronRight: __MaterialUI.NavigationChevronRight;
+    };
+
+    export import Styles = __MaterialUI.Styles; // require('material-ui/lib/styles/');
+    export import Snackbar = __MaterialUI.Snackbar; // require('material-ui/lib/snackbar');
+    export import Tab = __MaterialUI.Tabs.Tab; // require('material-ui/lib/tabs/tab');
+    export import Tabs = __MaterialUI.Tabs.Tabs; // require('material-ui/lib/tabs/tabs');
+    export import Table = __MaterialUI.Table.Table; // require('material-ui/lib/table/table');
+    export import TableBody = __MaterialUI.Table.TableBody; // require('material-ui/lib/table/table-body');
+    export import TableFooter = __MaterialUI.Table.TableFooter; // require('material-ui/lib/table/table-footer');
+    export import TableHeader = __MaterialUI.Table.TableHeader; // require('material-ui/lib/table/table-header');
+    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn; // require('material-ui/lib/table/table-header-column');
+    export import TableRow = __MaterialUI.Table.TableRow; // require('material-ui/lib/table/table-row');
+    export import TableRowColumn = __MaterialUI.Table.TableRowColumn; // require('material-ui/lib/table/table-row-column');
+    export import Theme = __MaterialUI.Theme; // require('material-ui/lib/theme');
+    export import Toggle = __MaterialUI.Toggle; // require('material-ui/lib/toggle');
+    export import TimePicker = __MaterialUI.TimePicker; // require('material-ui/lib/time-picker');
+    export import TextField = __MaterialUI.TextField; // require('material-ui/lib/text-field');
+    export import Toolbar = __MaterialUI.Toolbar.Toolbar; // require('material-ui/lib/toolbar/toolbar');
+    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup; // require('material-ui/lib/toolbar/toolbar-group');
+    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator; // require('material-ui/lib/toolbar/toolbar-separator');
+    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
+    export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
+    export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils/');
+
+    // export type definitions
+    export import TouchTapEvent = __MaterialUI.TouchTapEvent;
+    export import TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
+    export import DialogAction = __MaterialUI.DialogAction;
+}
+
+declare namespace __MaterialUI {
+    import React = __React;
+
+    // ReactLink is from "react/addons"
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    // What's common between React.TouchEvent and React.MouseEvent
+    interface TouchTapEvent extends React.SyntheticEvent {
+        altKey: boolean;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+    }
+
+    // What's common between React.TouchEventHandler and React.MouseEventHandler
+    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
+
+    // more specific than React.HTMLAttributes
+
+    interface AppBarProps extends React.Props<AppBar> {
+        iconClassNameLeft?: string;
+        iconClassNameRight?: string;
+        iconElementLeft?: React.ReactElement<any>;
+        iconElementRight?: React.ReactElement<any>;
+        iconStyleRight?: string;
+        style?: React.CSSProperties;
+        showMenuIconButton?: boolean;
+        title?: React.ReactNode;
+        zDepth?: number;
+
+        onLeftIconButtonTouchTap?: TouchTapEventHandler;
+        onRightIconButtonTouchTap?: TouchTapEventHandler;
+    }
+    export class AppBar extends React.Component<AppBarProps, {}>{
+    }
+
+    interface AppCanvasProps extends React.Props<AppCanvas> {
+    }
+    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    }
+
+    interface AvatarProps extends React.Props<Avatar> {
+        icon?: React.ReactElement<any>;
+        backgroundColor?: string;
+        color?: string;
+        size?: number;
+        src?: string;
+        style?: React.CSSProperties;
+    }
+    export class Avatar extends React.Component<AvatarProps, {}> {
+    }
+
+    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
+        beforeStyle?: React.CSSProperties;
+        afterStyle?: React.CSSProperties;
+        beforeElementType?: string;
+        afterElementType?: string;
+        elementType?: string;
+    }
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    }
+
+    namespace Card {
+
+        interface CardProps extends React.Props<Card> {
+            expandable?: boolean;
+            initiallyExpanded?: boolean;
+            onExpandedChange?: (isExpanded: boolean) => void;
+            style?: React.CSSProperties;
+        }
+        export class Card extends React.Component<CardProps, {}> {
+        }
+
+        interface CardActionsProps extends React.Props<CardActions> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+        }
+        export class CardActions extends React.Component<CardActionsProps, {}> {
+        }
+
+        interface CardExpandableProps extends React.Props<CardExpandable> {
+            onExpanding?: (isExpanded: boolean) => void;
+            expanded?: boolean;
+        }
+        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        }
+
+        interface CardHeaderProps extends React.Props<CardHeader> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            avatar: React.ReactElement<any> | string;
+        }
+        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        }
+
+        interface CardMediaProps extends React.Props<CardMedia> {
+            expandable?: boolean;
+            overlay?: React.ReactNode;
+            overlayStyle?: React.CSSProperties;
+            overlayContainerStyle?: React.CSSProperties;
+            overlayContentStyle?: React.CSSProperties;
+            mediaStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        }
+
+        interface CardTextProps extends React.Props<CardText> {
+            expandable?: boolean;
+            color?: string;
+            style?: React.CSSProperties;
+        }
+        export class CardText extends React.Component<CardTextProps, {}> {
+        }
+
+        interface CardTitleProps extends React.Props<CardTitle> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        }
+    }
+
+    // what's not commonly overridden by Checkbox, RadioButton, or Toggle
+    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributesBase<T> {
+        // <input/> is root element
+        id?: string;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        rippleStyle?: React.CSSProperties;
+        thumbStyle?: React.CSSProperties;
+        trackStyle?: React.CSSProperties;
+        name?: string;
+        value?: string;
+        label?: string;
+        required?: boolean;
+        disabled?: boolean;
+        defaultSwitched?: boolean;
+        disableFocusRipple?: boolean;
+        disableTouchRipple?: boolean;
+    }
+
+    interface EnhancedSwitchProps extends CommonEnhancedSwitchProps<EnhancedSwitch> {
+        // <input/> is root element
+        inputType: string;
+        switchElement: React.ReactElement<any>;
+        onParentShouldUpdate: (isInputChecked: boolean) => void;
+        switched: boolean;
+        rippleColor?: string;
+        onSwitch?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        labelPosition?: string;
+    }
+    export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        isSwitched(): boolean;
+        setSwitched(newSwitchedValue: boolean): void;
+        getValue(): any;
+        isKeyboardFocused(): boolean;
+    }
+
+    interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
+        // <EnhancedSwitch/> is root element
+        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        checked?: boolean;
+        unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+
+        disabled?: boolean;
+        valueLink?: ReactLink<boolean>;
+        checkedLink?: ReactLink<boolean>;
+
+        onCheck?: (event: React.MouseEvent, checked: boolean) => void;
+    }
+    export class Checkbox extends React.Component<CheckboxProps, {}> {
+        isChecked(): void;
+        setChecked(newCheckedValue: boolean): void;
+    }
+
+    interface CircularProgressProps extends React.Props<CircularProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+        size?: number;
+        color?: string;
+        innerStyle?: React.CSSProperties;
+
+    }
+    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    }
+
+    interface ClearFixProps extends React.Props<ClearFix> {
+    }
+    export class ClearFix extends React.Component<ClearFixProps, {}> {
+    }
+
+    namespace DatePicker {
+        interface DatePickerProps extends React.Props<DatePicker> {
+            autoOk?: boolean;
+            defaultDate?: Date;
+            formatDate?: string;
+            hideToolbarYearChange?: boolean;
+            maxDate?: Date;
+            minDate?: Date;
+            mode?: string;
+            onDismiss?: () => void;
+
+            // e is always null
+            onChange?: (e: any, d: Date) => void;
+
+            onFocus?: React.FocusEventHandler;
+            onShow?: () => void;
+            onTouchTap?: React.TouchEventHandler;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+            textFieldStyle?: React.CSSProperties;
+        }
+        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        }
+
+        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
+            disableYearSelection?: boolean;
+            initialDate?: Date;
+            maxDate?: Date;
+            minDate?: Date;
+            onAccept?: (d: Date) => void;
+            onClickAway?: () => void;
+            onDismiss?: () => void;
+            onShow?: () => void;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+        }
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        }
+    }
+
+    export interface DialogAction {
+        text: string;
+        ref?: string;
+
+        onTouchTap?: TouchTapEventHandler;
+        onClick?: React.MouseEventHandler;
+    }
+    interface DialogProps extends React.Props<Dialog> {
+        actions?: Array<DialogAction | React.ReactElement<any>>;
+        actionFocus?: string;
+        autoDetectWindowHeight?: boolean;
+        autoScrollBodyContent?: boolean;
+        bodyStyle?: React.CSSProperties;
+        contentClassName?: string;
+        contentInnerStyle?: React.CSSProperties;
+        contentStyle?: React.CSSProperties;
+        modal?: boolean;
+        openImmediately?: boolean;
+        repositionOnUpdate?: boolean;
+        title?: React.ReactNode;
+
+        onClickAway?: () => void;
+        onDismiss?: () => void;
+        onShow?: () => void;
+    }
+    export class Dialog extends React.Component<DialogProps, {}> {
+        dismiss(): void;
+        show(): void;
+    }
+
+    interface DropDownIconProps extends React.Props<DropDownIcon> {
+        menuItems: Menu.MenuItemRequest[];
+        closeOnMenuItemTouchTap?: boolean;
+        iconStyle?: React.CSSProperties;
+        iconClassName?: string;
+        iconLigature?: string;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownIcon extends React.Component<DropDownIconProps, {}> {
+    }
+
+    interface DropDownMenuProps extends React.Props<DropDownMenu> {
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+    }
+
+    // non generally overridden elements of EnhancedButton
+    interface SharedEnhancedButtonProps<T> extends React.HTMLAttributesBase<T> {
+        centerRipple?: boolean;
+        containerElement?: string | React.ReactElement<any>;
+        disabled?: boolean;
+        disableFocusRipple?: boolean;
+        disableKeyboardFocus?: boolean;
+        disableTouchRipple?: boolean;
+        keyboardFocused?: boolean;
+        linkButton?: boolean;
+        focusRippleColor?: string;
+        focusRippleOpacity?: number;
+        touchRippleOpacity?: number;
+        tabIndex?: number;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onKeyDown?: React.KeyboardEventHandler;
+        onKeyUp?: React.KeyboardEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+    }
+
+    interface EnhancedButtonProps extends SharedEnhancedButtonProps<EnhancedButton> {
+        touchRippleColor?: string;
+        focusRippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    }
+
+    interface FlatButtonProps extends SharedEnhancedButtonProps<FlatButton> {
+        hoverColor?: string;
+        label?: string;
+        labelPosition?: string;
+        labelStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        primary?: boolean;
+        secondary?: boolean;
+        rippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    }
+
+    interface FloatingActionButtonProps extends SharedEnhancedButtonProps<FloatingActionButton> {
+        backgroundColor?: string;
+        disabled?: boolean;
+        disabledColor?: string;
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        mini?: boolean;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    }
+
+    interface FontIconProps extends React.Props<FontIcon> {
+        color?: string;
+        hoverColor?: string;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+        className?: string;
+    }
+    export class FontIcon extends React.Component<FontIconProps, {}> {
+    }
+
+    interface IconButtonProps extends SharedEnhancedButtonProps<IconButton> {
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        tooltip?: string;
+        tooltipPosition?: string;
+        tooltipStyles?: React.CSSProperties;
+        touch?: boolean;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+    }
+    export class IconButton extends React.Component<IconButtonProps, {}> {
+    }
+
+    interface LeftNavProps extends React.Props<LeftNav> {
+        disableSwipeToOpen?: boolean;
+        docked?: boolean;
+        header?: React.ReactElement<any>;
+        menuItems: Menu.MenuItemRequest[];
+        onChange?: Menu.ItemTapEventHandler;
+        onNavOpen?: () => void;
+        onNavClose?: () => void;
+        openRight?: Boolean;
+        selectedIndex?: number;
+        menuItemClassName?: string;
+        menuItemClassNameSubheader?: string;
+        menuItemClassNameLink?: string;
+    }
+    export class LeftNav extends React.Component<LeftNavProps, {}> {
+    }
+
+    interface LinearProgressProps extends React.Props<LinearProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+    }
+    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    }
+
+    namespace Lists {
+        interface ListProps extends React.Props<List> {
+            insetSubheader?: boolean;
+            subheader?: string;
+            subheaderStyle?: React.CSSProperties;
+            zDepth?: number;
+        }
+        export class List extends React.Component<ListProps, {}> {
+        }
+
+        interface ListDividerProps extends React.Props<ListDivider> {
+            inset?: boolean;
+        }
+        export class ListDivider extends React.Component<ListDividerProps, {}> {
+        }
+
+        interface ListItemProps extends React.Props<ListItem> {
+            autoGenerateNestedIndicator?: boolean;
+            disableKeyboardFocus?: boolean;
+            initiallyOpen?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            innerStyle?: React.CSSProperties;
+            leftAvatar?: React.ReactElement<any>;
+            leftCheckbox?: React.ReactElement<any>;
+            leftIcon?: React.ReactElement<any>;
+            nestedLevel?: number;
+            nestedItems?: React.ReactElement<any>[];
+            onKeyboardFocus?: React.FocusEventHandler;
+            onNestedListToggle?: (item: ListItem) => void;
+            rightAvatar?: React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            rightIconButton?: React.ReactElement<any>;
+            rightToggle?: React.ReactElement<any>;
+            primaryText?: React.ReactNode;
+            secondaryText?: React.ReactNode;
+            secondaryTextLines?: number;
+        }
+        export class ListItem extends React.Component<ListItemProps, {}> {
+        }
+    }
+
+    // Old menu implementation.  Being replaced by new "menus".
+    namespace Menu {
+        interface ItemTapEventHandler {
+            (e: TouchTapEvent, index: number, menuItem: MenuItemRequest): void;
+        }
+
+        // almost extends MenuItemProps, but certain required items are generated in Menu and not passed here.
+        interface MenuItemRequest extends React.Props<MenuItem> {
+            // use value from MenuItem.Types.*
+            type?: string;
+
+            text?: string;
+            data?: string;
+            payload?: string;
+            icon?: React.ReactElement<any>;
+            attribute?: string;
+            number?: string;
+            toggle?: boolean;
+            onTouchTap?: TouchTapEventHandler;
+            isDisabled?: boolean;
+
+            // for MenuItems.Types.NESTED
+            items?: MenuItemRequest[];
+
+            // for custom text or payloads
+            [propertyName: string]: any;
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            index: number;
+            text?: string;
+            menuItems: MenuItemRequest[];
+            zDepth?: number;
+            active?: boolean;
+            onItemTap?: ItemTapEventHandler;
+            menuItemStyle?: React.CSSProperties;
+        }
+        export class Menu extends React.Component<MenuProps, {}> {
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            index: number;
+            icon?: React.ReactElement<any>;
+            iconClassName?: string;
+            iconRightClassName?: string;
+            iconStyle?: React.CSSProperties;
+            iconRightStyle?: React.CSSProperties;
+            attribute?: string;
+            number?: string;
+            data?: string;
+            toggle?: boolean;
+            onTouchTap?: (e: React.MouseEvent, key: number) => void;
+            onToggle?: (e: React.MouseEvent, key: number, toggled: boolean) => void;
+            selected?: boolean;
+            active?: boolean;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}> {
+            static Types: { LINK: string, SUBHEADER: string, NESTED: string, }
+        }
+    }
+
+    export namespace Mixins {
+        interface ClickAwayable extends React.Mixin<any, any> {
+        }
+        var ClickAwayable: ClickAwayable;
+
+        interface WindowListenable extends React.Mixin<any, any> {
+        }
+        var WindowListenable: WindowListenable;
+
+        interface StylePropable extends React.Mixin<any, any> {
+        }
+        var StylePropable: StylePropable
+
+        interface StyleResizable extends React.Mixin<any, any> {
+        }
+        var StyleResizable: StyleResizable
+    }
+
+    interface OverlayProps extends React.Props<Overlay> {
+        autoLockScrolling?: boolean;
+        show?: boolean;
+        transitionEnabled?: boolean;
+    }
+    export class Overlay extends React.Component<OverlayProps, {}> {
+    }
+
+    interface PaperProps extends React.Props<Paper> {
+        circle?: boolean;
+        rounded?: boolean;
+        transitionEnabled?: boolean;
+        zDepth?: number;
+    }
+    export class Paper extends React.Component<PaperProps, {}> {
+    }
+
+    interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
+        // <EnhancedSwitch/> is root element
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        value?: string;
+
+        onCheck?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButton extends React.Component<RadioButtonProps, {}> {
+    }
+
+    interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
+        defaultSelected?: string;
+        labelPosition?: string;
+        name: string;
+        style?: React.CSSProperties;
+        valueSelected?: string;
+
+        onChange?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        getSelectedValue(): string;
+        setSelectedValue(newSelectionValue: string): void;
+        clearValue(): void;
+    }
+
+    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
+        className?: string;
+        disabled?: boolean;
+        label?: string;
+        primary?: boolean;
+        secondary?: boolean;
+        labelStyle?: React.CSSProperties;
+        backgroundColor?: string;
+        labelColor?: string;
+        disabledBackgroundColor?: string;
+        disabledLabelColor?: string;
+        fullWidth?: boolean;
+    }
+    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    }
+
+    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
+        left: number;
+        percentage?: number;
+        size?: number;
+        status?: string;
+        top: number;
+    }
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    }
+
+    namespace Ripples {
+        interface CircleRippleProps extends React.Props<CircleRipple> {
+            color?: string;
+            opacity?: number;
+        }
+        export class CircleRipple extends React.Component<CircleRippleProps, {}> {
+        }
+
+        interface FocusRippleProps extends React.Props<FocusRipple> {
+            color?: string;
+            innerStyle?: React.CSSProperties;
+            opacity?: number;
+            show?: boolean;
+        }
+        export class FocusRipple extends React.Component<FocusRippleProps, {}> {
+        }
+
+        interface TouchRippleProps extends React.Props<TouchRipple> {
+            centerRipple?: boolean;
+            color?: string;
+            opacity?: number;
+        }
+        export class TouchRipple extends React.Component<TouchRippleProps, {}> {
+        }
+    }
+
+    interface SelectFieldProps extends React.Props<SelectField> {
+        // passed to TextField
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+
+        // passed to DropDownMenu
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+
+        // own properties
+        selectFieldRoot?: string;
+        multiLine?: boolean;
+        type?: string;
+        rows?: number;
+        inputStyle?: React.CSSProperties;
+    }
+    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    }
+
+    interface SliderProps extends React.Props<Slider> {
+        name: string;
+        defaultValue?: number;
+        description?: string;
+        error?: string;
+        max?: number;
+        min?: number;
+        required?: boolean;
+        step?: number;
+        value?: number;
+    }
+    export class Slider extends React.Component<SliderProps, {}> {
+    }
+
+    interface SvgIconProps extends React.Props<SvgIcon> {
+        color?: string;
+        hoverColor?: string;
+        viewBox?: string;
+    }
+    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    }
+
+    interface NavigationMenuProps extends React.Props<NavigationMenu> {
+    }
+    export class NavigationMenu extends React.Component<NavigationMenuProps, {}> {
+    }
+
+    interface NavigationChevronLeftProps extends React.Props<NavigationChevronLeft> {
+    }
+    export class NavigationChevronLeft extends React.Component<NavigationChevronLeftProps, {}> {
+    }
+
+    interface NavigationChevronRightProps extends React.Props<NavigationChevronRight> {
+    }
+    export class NavigationChevronRight extends React.Component<NavigationChevronRightProps, {}> {
+    }
+
+    export namespace Styles {
+        interface AutoPrefix {
+            all(styles: React.CSSProperties): React.CSSProperties;
+            set(style: React.CSSProperties, key: string, value: string | number): void;
+            single(key: string): string;
+            singleHyphened(key: string): string;
+        }
+        export var AutoPrefix: AutoPrefix;
+
+        interface Spacing {
+            iconSize?: number;
+
+            desktopGutter?: number;
+            desktopGutterMore?: number;
+            desktopGutterLess?: number;
+            desktopGutterMini?: number;
+            desktopKeylineIncrement?: number;
+            desktopDropDownMenuItemHeight?: number;
+            desktopDropDownMenuFontSize?: number;
+            desktopLeftNavMenuItemHeight?: number;
+            desktopSubheaderHeight?: number;
+            desktopToolbarHeight?: number;
+        }
+        interface ThemePalette {
+            primary1Color?: string,
+            primary2Color?: string,
+            primary3Color?: string,
+            accent1Color?: string,
+            accent2Color?: string,
+            accent3Color?: string,
+            textColor?: string,
+            canvasColor?: string,
+            borderColor?: string,
+            disabledColor?: string
+        }
+        interface Theme {
+            appBar?: {
+                color?: string,
+                textColor?: string,
+                height?: number
+            },
+            button?: {
+                height?: number,
+                minWidth?: number,
+                iconButtonSize?: number
+            },
+            checkbox?: {
+                boxColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            datePicker?: {
+                color?: string,
+                textColor?: string,
+                calendarTextColor?: string,
+                selectColor?: string,
+                selectTextColor?: string,
+            },
+            dropDownMenu?: {
+                accentColor?: string,
+            },
+            flatButton?: {
+                color?: string,
+                textColor?: string,
+                primaryTextColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string
+            },
+            floatingActionButton?: {
+                buttonSize?: number,
+                miniSize?: number,
+                color?: string,
+                iconColor?: string,
+                secondaryColor?: string,
+                secondaryIconColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            leftNav?: {
+                width?: number,
+                color?: string,
+            },
+            menu?: {
+                backgroundColor?: string,
+                containerBackgroundColor?: string,
+            },
+            menuItem?: {
+                dataHeight?: number,
+                height?: number,
+                hoverColor?: string,
+                padding?: number,
+                selectedTextColor?: string,
+            },
+            menuSubheader?: {
+                padding?: number,
+                borderColor?: string,
+                textColor?: string,
+            },
+            paper?: {
+                backgroundColor?: string,
+            },
+            radioButton?: {
+                borderColor?: string,
+                backgroundColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                size?: number,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            raisedButton?: {
+                color?: string,
+                textColor?: string,
+                primaryColor?: string,
+                primaryTextColor?: string,
+                secondaryColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            slider?: {
+                trackSize?: number,
+                trackColor?: string,
+                trackColorSelected?: string,
+                handleSize?: number,
+                handleSizeActive?: number,
+                handleSizeDisabled?: number,
+                handleColorZero?: string,
+                handleFillColor?: string,
+                selectionColor?: string,
+                rippleColor?: string,
+            },
+            snackbar?: {
+                textColor?: string,
+                backgroundColor?: string,
+                actionColor?: string,
+            },
+            toggle?: {
+                thumbOnColor?: string,
+                thumbOffColor?: string,
+                thumbDisabledColor?: string,
+                thumbRequiredColor?: string,
+                trackOnColor?: string,
+                trackOffColor?: string,
+                trackDisabledColor?: string,
+                trackRequiredColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            toolbar?: {
+                backgroundColor?: string,
+                height?: number,
+                titleFontSize?: number,
+                iconColor?: string,
+                separatorColor?: string,
+                menuHoverColor?: string,
+            }
+        }
+        interface CustomTheme {
+            spacing?: Spacing;
+            contentFontFamily?: string;
+            getPalette(): ThemePalette;
+            getComponentThemes(palette: ThemePalette, spacing: Spacing): Theme;
+        }
+
+        export class ThemeManager {
+            static: boolean;
+            spacing: Spacing;
+            palette: ThemePalette;
+            component: Theme;
+            contentFontFamily: string;
+            template: CustomTheme;
+            types: {
+                LIGHT: CustomTheme;
+                DARK: CustomTheme;
+            };
+
+            getCurrentTheme(): ThemeManager;
+            setContentFontFamily(newContentFontFamily: string): void;
+            setTheme(newTheme: CustomTheme): void;
+            setSpacing(newSpacing: Spacing): void;
+            setPalette(newPalette: ThemePalette): void;
+            setComponentThemes(overrides: Theme): void;
+            setIsRtl(isRtl: boolean): void;
+        }
+
+        interface Transitions {
+            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
+            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
+            easeOutFunction: string;
+            easeInOutFunction: string;
+        }
+        export var Transitions: Transitions;
+
+        interface Typography {
+            textFullBlack:string;
+            textDarkBlack: string;
+            textLightBlack: string;
+            textMinBlack: string;
+            textFullWhite: string;
+            textDarkWhite: string;
+            textLightWhite: string;
+
+            // font weight
+            fontWeightLight: number;
+            fontWeightNormal: number;
+            fontWeightMedium: number;
+
+            fontStyleButtonFontSize: number;
+        }
+        export var Typography: Typography;
+    }
+
+    interface SnackbarProps extends React.Props<Snackbar> {
+        message: string;
+        action?: string;
+        autoHideDuration?: number;
+        onActionTouchTap?: React.TouchEventHandler;
+        onShow?: () => void;
+        onDismiss?: () => void;
+        openOnMount?: boolean;
+    }
+    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    }
+
+    namespace Tabs {
+        interface TabProps extends React.Props<Tab> {
+            label?: string;
+            value?: string;
+            selected?: boolean;
+            width?: string;
+
+            // Called by Tabs component
+            onActive?: (tab: Tab) => void;
+
+            onTouchTap?: (value: string, e: TouchTapEvent, tab: Tab) => void;
+        }
+        export class Tab extends React.Component<TabProps, {}> {
+        }
+
+        interface TabsProps extends React.Props<Tabs> {
+            contentContainerStyle?: React.CSSProperties;
+            initialSelectedIndex?: number;
+            inkBarStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            tabItemContainerStyle?: React.CSSProperties;
+            tabWidth?: number;
+            value?: string | number;
+
+            onChange?: (value: string | number, e: React.FormEvent, tab: Tab) => void;
+        }
+        export class Tabs extends React.Component<TabsProps, {}> {
+        }
+    }
+
+    namespace Table {
+        interface TableProps extends React.Props<Table> {
+            allRowsSelected?: boolean;
+            fixedFooter?: boolean;
+            fixedHeader?: boolean;
+            height?: string;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            selectable?: boolean;
+        }
+        export class Table extends React.Component<TableProps, {}> {
+        }
+
+        interface TableBodyProps extends React.Props<TableBody> {
+            allRowsSelected?: boolean;
+            deselectOnClickaway?: boolean;
+            displayRowCheckbox?: boolean;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            preScanRows?: boolean;
+            selectable?: boolean;
+            showRowHover?: boolean;
+            stripedRows?: boolean;
+        }
+        export class TableBody extends React.Component<TableBodyProps, {}> {
+        }
+
+        interface TableFooterProps extends React.Props<TableFooter> {
+            adjustForCheckbox?: boolean;
+        }
+        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        }
+
+        interface TableHeaderProps extends React.Props<TableHeader> {
+            adjustForCheckbox?: boolean;
+            displaySelectAll?: boolean;
+            enableSelectAll?: boolean;
+            onSelectAll?: (event: React.MouseEvent) => void;
+            selectAllSelected?: boolean;
+        }
+        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        }
+
+        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
+            columnNumber?: number;
+            onClick?:  (e: React.MouseEvent, column: number) => void;
+            tooltip?: string;
+            tooltipStyle?: React.CSSProperties;
+        }
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        }
+
+        interface TableRowProps extends React.Props<TableRow> {
+            displayBorder?: boolean;
+            hoverable?: boolean;
+            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
+            onRowClick?: (e: React.MouseEvent, row: number) => void;
+            onRowHover?: (e: React.MouseEvent, row: number) => void;
+            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
+            rowNumber?: number;
+            selectable?: boolean;
+            selected?: boolean;
+            striped?: boolean;
+        }
+        export class TableRow extends React.Component<TableRowProps, {}> {
+        }
+
+        interface TableRowColumnProps extends React.Props<TableRowColumn> {
+            columnNumber?: number;
+            hoverable?: boolean;
+            onHover?: (e: React.MouseEvent, column: number) => void;
+            onHoverExit?: (e: React.MouseEvent, column: number) => void;
+        }
+        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        }
+    }
+
+    interface ThemeProps extends React.Props<Theme> {
+        theme: Styles.CustomTheme;
+    }
+    export class Theme extends React.Component<ThemeProps, {}> {
+        static theme(customTheme: Styles.CustomTheme): <P>(Component: React.ComponentClass<P>) => React.ComponentClass<P>;
+    }
+
+    interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
+        // <EnhancedSwitch/> is root element
+
+        elementStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        toggled?: boolean;
+        defaultToggled?: boolean;
+    }
+    export class Toggle extends React.Component<ToggleProps, {}> {
+        isToggled(): boolean;
+        setToggled(newToggledValue: boolean): void;
+    }
+
+    interface TimePickerProps extends React.Props<TimePicker> {
+        defaultTime?: Date;
+        format?: string;
+        pedantic?: boolean;
+        onFocus?: React.FocusEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+        onChange?: (e: any, time: Date) => void;
+        onShow?: () => void;
+        onDismiss?: () => void;
+    }
+    export class TimePicker extends React.Component<TimePickerProps, {}> {
+    }
+
+    interface TextFieldProps extends React.Props<TextField> {
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+        id?: string;
+        inputStyle?: React.CSSProperties;
+        multiLine?: boolean;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+        style?: React.CSSProperties;
+        rows?: number,
+        underlineStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineDisabledStyle?: React.CSSProperties;
+        type?: string;
+
+        disabled?: boolean;
+        isRtl?: boolean;
+        value?: string;
+        defaultValue?: string;
+        valueLink?: ReactLink<string>;
+
+        onBlur?: React.FocusEventHandler;
+        onChange?: React.FormEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyDown?: React.KeyboardEventHandler;
+    }
+    export class TextField extends React.Component<TextFieldProps, {}> {
+        blur(): void;
+        clearValue(): void;
+        focus(): void;
+        getValue(): string;
+        setErrorText(newErrorText: string): void;
+        setValue(newValue: string): void;
+    }
+
+    namespace Toolbar {
+        interface ToolbarProps extends React.Props<Toolbar> {
+        }
+        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        }
+
+        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
+            float?: string;
+        }
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        }
+
+        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+        }
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        }
+
+        interface ToolbarTitleProps extends React.Props<ToolbarTitle> {
+           text?: string;
+        }
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        }
+    }
+
+    interface TooltipProps extends React.Props<Tooltip> {
+        label: string;
+        show?: boolean;
+        touch?: boolean;
+        verticalPosition?: string;
+        horizontalPosition?: string;
+    }
+    export class Tooltip extends React.Component<TooltipProps, {}> {
+    }
+
+    export namespace Utils {
+        interface ContrastLevel {
+            range: [number, number];
+            color: string;
+        }
+        interface ColorManipulator {
+            fade(color: string, amount: string|number): string;
+            lighten(color: string, amount: string|number): string;
+            darken(color: string, amount: string|number): string;
+            contrastRatio(background: string, foreground: string): number;
+            contrastRatioLevel(background: string, foreground: string): ContrastLevel;
+        }
+        export var ColorManipulator: ColorManipulator;
+
+        interface CssEvent {
+            transitionEndEventName(): string;
+            animationEndEventName(): string;
+            onTransitionEnd(el: Element, callback: () => void): void;
+            onAnimationEnd(el: Element, callback: () => void): void;
+        }
+        export var CssEvent: CssEvent;
+
+        interface Dom {
+            isDescendant(parent: Node, child: Node): boolean;
+            offset(el: Element): { top: number, left: number };
+            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
+            addClass(el: Element, className: string): void;
+            removeClass(el: Element, className: string): void;
+            hasClass(el: Element, className: string): boolean;
+            toggleClass(el: Element, className: string): void;
+            forceRedraw(el: HTMLElement): void;
+            withoutTransition(el: HTMLElement, callback: () => void): void;
+        }
+        export var Dom: Dom;
+
+        interface Events {
+            once(el: Element, type: string, callback: EventListener): void;
+            on(el: Element, type: string, callback: EventListener): void;
+            off(el: Element, type: string, callback: EventListener): void;
+            isKeyboard(e: Event): boolean;
+        }
+        export var Events: Events;
+
+        function Extend<T, S1>(base: T, override: S1): (T & S1);
+
+        interface ImmutabilityHelper {
+            merge(base: any, ...args: any[]): any;
+            mergeItem(obj: any, key: any, newValueObject: any): any;
+            push(array: any[], obj: any): any[];
+            shift(array: any[]): any[];
+        }
+        export var ImmutabilityHelper: ImmutabilityHelper;
+
+        interface KeyCode {
+            DOWN: number;
+            ESC: number;
+            ENTER: number;
+            LEFT: number;
+            RIGHT: number;
+            SPACE: number;
+            TAB: number;
+            UP: number;
+        }
+        var KeyCode: KeyCode;
+
+        interface KeyLine {
+            Desktop: {
+                GUTTER: number;
+                GUTTER_LESS: number;
+                INCREMENT: number;
+                MENU_ITEM_HEIGHT: number;
+            };
+
+            getIncrementalDim(dim: number): number;
+        }
+        export var KeyLine: KeyLine;
+
+        interface UniqueId {
+            generate(): string;
+        }
+        export var UniqueId: UniqueId;
+
+        interface Styles {
+            mergeAndPrefix(base: any, ...args: any[]): React.CSSProperties;
+        }
+        export var Styles: Styles;
+    }
+
+    // New menus available only through requiring directly to the end file
+    namespace Menus {
+        interface IconMenuProps extends React.Props<IconMenu> {
+            closeOnItemTouchTap?: boolean;
+            desktop?: boolean;
+            iconButtonElement: React.ReactElement<IconButtonProps>;
+            openDirection?: string;
+            menuStyle?: React.CSSProperties;
+            multiple?: boolean;
+            value?: string | Array<string>;
+            width?: string | number;
+            touchTapCloseDelay?: number;
+
+            onKeyboardFocus?: React.FocusEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string | Array<string>) => void;
+        }
+        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            animated?: boolean;
+            autoWidth?: boolean;
+            desktop?: boolean;
+            listStyle?: React.CSSProperties;
+            maxHeight?: number;
+            multiple?: boolean;
+            openDirection?: string;
+            value?: string | Array<string>;
+            width?: string | number;
+            zDepth?: number;
+        }
+        export class Menu extends React.Component<MenuProps, {}>{
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            checked?: boolean;
+            desktop?: boolean;
+            disabled?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            leftIcon?: React.ReactElement<any>;
+            primaryText?: string | React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            secondaryText?: React.ReactNode;
+            value?: string;
+
+            onEscKeyDown?: React.KeyboardEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string) => void;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}>{
+        }
+
+        interface MenuDividerProps extends React.Props<MenuDivider> {
+            inset?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class MenuDivider extends React.Component<MenuDividerProps, {}>{
+        }
+    }
+}    // __MaterialUI
+
+declare module 'material-ui/lib/app-bar' {
+    export = __MaterialUI.AppBar;
+}
+
+declare module 'material-ui/lib/app-canvas' {
+    export = __MaterialUI.AppCanvas;
+}
+
+declare module 'material-ui/lib/avatar' {
+    export = __MaterialUI.Avatar;
+}
+
+declare module 'material-ui/lib/before-after-wrapper' {
+    export = __MaterialUI.BeforeAfterWrapper;
+}
+
+declare module 'material-ui/lib/card/card' {
+    export = __MaterialUI.Card.Card;
+}
+
+declare module 'material-ui/lib/card/card-actions' {
+    export = __MaterialUI.Card.CardActions;
+}
+
+declare module 'material-ui/lib/card/card-expandable' {
+    export = __MaterialUI.Card.CardExpandable;
+}
+
+declare module 'material-ui/lib/card/card-header' {
+    export = __MaterialUI.Card.CardHeader;
+}
+
+declare module 'material-ui/lib/card/card-media' {
+    export = __MaterialUI.Card.CardMedia;
+}
+
+declare module 'material-ui/lib/card/card-text' {
+    export = __MaterialUI.Card.CardText;
+}
+
+declare module 'material-ui/lib/card/card-title' {
+    export = __MaterialUI.Card.CardTitle;
+}
+
+declare module 'material-ui/lib/checkbox' {
+    export = __MaterialUI.Checkbox;
+}
+
+declare module 'material-ui/lib/circular-progress' {
+    export = __MaterialUI.CircularProgress;
+}
+
+declare module 'material-ui/lib/clearfix' {
+    export = __MaterialUI.ClearFix;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker' {
+    export = __MaterialUI.DatePicker.DatePicker;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker-dialog' {
+    export = __MaterialUI.DatePicker.DatePickerDialog;
+}
+
+declare module 'material-ui/lib/dialog' {
+    export = __MaterialUI.Dialog;
+}
+
+declare module 'material-ui/lib/drop-down-icon' {
+    export = __MaterialUI.DropDownIcon;
+}
+
+declare module 'material-ui/lib/drop-down-menu' {
+    export = __MaterialUI.DropDownMenu;
+}
+
+declare module 'material-ui/lib/enhanced-button' {
+    export = __MaterialUI.EnhancedButton;
+}
+
+declare module 'material-ui/lib/flat-button' {
+    export = __MaterialUI.FlatButton;
+}
+
+declare module 'material-ui/lib/floating-action-button' {
+    export = __MaterialUI.FloatingActionButton;
+}
+
+declare module 'material-ui/lib/font-icon' {
+    export = __MaterialUI.FontIcon;
+}
+
+declare module 'material-ui/lib/icon-button' {
+    export = __MaterialUI.IconButton;
+}
+
+declare module 'material-ui/lib/left-nav' {
+    export = __MaterialUI.LeftNav;
+}
+
+declare module 'material-ui/lib/linear-progress' {
+    export = __MaterialUI.LinearProgress;
+}
+
+declare module 'material-ui/lib/lists/list' {
+    export = __MaterialUI.Lists.List;
+}
+
+declare module 'material-ui/lib/lists/list-divider' {
+    export = __MaterialUI.Lists.ListDivider;
+}
+
+declare module 'material-ui/lib/lists/list-item' {
+    export = __MaterialUI.Lists.ListItem;
+}
+
+declare module 'material-ui/lib/menu/menu' {
+    export = __MaterialUI.Menu.Menu;
+}
+
+declare module 'material-ui/lib/menu/menu-item' {
+    export = __MaterialUI.Menu.MenuItem;
+}
+
+declare module 'material-ui/lib/mixins/' {
+    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable');
+    export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');
+    export import StylePropable = __MaterialUI.Mixins.StylePropable; // require('material-ui/lib/mixins/style-propable');
+    export import StyleResizable = __MaterialUI.Mixins.StyleResizable; // require('material-ui/lib/mixins/style-resizable');
+}
+
+declare module 'material-ui/lib/mixins/click-awayable' {
+    export = __MaterialUI.Mixins.ClickAwayable;
+}
+
+declare module 'material-ui/lib/mixins/window-listenable' {
+    export = __MaterialUI.Mixins.WindowListenable;
+}
+
+declare module 'material-ui/lib/mixins/style-propable' {
+    export = __MaterialUI.Mixins.StylePropable;
+}
+
+declare module 'material-ui/lib/mixins/style-resizable' {
+    export = __MaterialUI.Mixins.StyleResizable;
+}
+
+declare module 'material-ui/lib/overlay' {
+    export = __MaterialUI.Overlay;
+}
+
+declare module 'material-ui/lib/paper' {
+    export = __MaterialUI.Paper;
+}
+
+declare module 'material-ui/lib/radio-button' {
+    export = __MaterialUI.RadioButton;
+}
+
+declare module 'material-ui/lib/radio-button-group' {
+    export = __MaterialUI.RadioButtonGroup;
+}
+
+declare module 'material-ui/lib/raised-button' {
+    export = __MaterialUI.RaisedButton;
+}
+
+declare module 'material-ui/lib/refresh-indicator' {
+    export = __MaterialUI.RefreshIndicator;
+}
+
+declare module 'material-ui/lib/ripples/' {
+    export import CircleRipple = __MaterialUI.Ripples.CircleRipple;
+    export import FocusRipple = __MaterialUI.Ripples.FocusRipple;
+    export import TouchRipple = __MaterialUI.Ripples.TouchRipple;
+}
+
+declare module 'material-ui/lib/select-field' {
+    export = __MaterialUI.SelectField;
+}
+
+declare module 'material-ui/lib/slider' {
+    export = __MaterialUI.Slider;
+}
+
+declare module 'material-ui/lib/svg-icon' {
+    export = __MaterialUI.SvgIcon;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/menu' {
+    export = __MaterialUI.NavigationMenu;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-left' {
+    export = __MaterialUI.NavigationChevronLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-right' {
+    export = __MaterialUI.NavigationChevronRight;
+}
+
+declare module 'material-ui/lib/styles/' {
+    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix; // require('material-ui/lib/styles/auto-prefix');
+    export import Colors = __MaterialUI.Styles.Colors; // require('material-ui/lib/styles/colors');
+    export import Spacing = require('material-ui/lib/styles/spacing');
+    export import ThemeManager = __MaterialUI.Styles.ThemeManager; // require('material-ui/lib/styles/theme-manager');
+    export import Transitions = __MaterialUI.Styles.Transitions; // require('material-ui/lib/styles/transitions');
+    export import Typography = __MaterialUI.Styles.Typography; // require('material-ui/lib/styles/typography');
+}
+
+declare module 'material-ui/lib/styles/auto-prefix' {
+    export = __MaterialUI.Styles.AutoPrefix;
+}
+
+declare module 'material-ui/lib/styles/spacing' {
+    var Spacing: __MaterialUI.Styles.Spacing;
+    export = Spacing;
+}
+
+declare module 'material-ui/lib/styles/theme-manager' {
+    export = __MaterialUI.Styles.ThemeManager;
+}
+
+declare module 'material-ui/lib/styles/transitions' {
+    export = __MaterialUI.Styles.Transitions;
+}
+
+declare module 'material-ui/lib/styles/typography' {
+    export = __MaterialUI.Styles.Typography;
+}
+
+declare module 'material-ui/lib/snackbar' {
+    export = __MaterialUI.Snackbar;
+}
+
+declare module 'material-ui/lib/tabs/tab' {
+    export = __MaterialUI.Tabs.Tab;
+}
+
+declare module 'material-ui/lib/tabs/tabs' {
+    export = __MaterialUI.Tabs.Tabs;
+}
+
+declare module 'material-ui/lib/table/table' {
+    export = __MaterialUI.Table.Table;
+}
+
+declare module 'material-ui/lib/table/table-body' {
+    export = __MaterialUI.Table.TableBody;
+}
+
+declare module 'material-ui/lib/table/table-footer' {
+    export = __MaterialUI.Table.TableFooter;
+}
+
+declare module 'material-ui/lib/table/table-header' {
+    export = __MaterialUI.Table.TableHeader;
+}
+
+declare module 'material-ui/lib/table/table-header-column' {
+    export = __MaterialUI.Table.TableHeaderColumn;
+}
+
+declare module 'material-ui/lib/table/table-row' {
+    export = __MaterialUI.Table.TableRow;
+}
+
+declare module 'material-ui/lib/table/table-row-column' {
+    export = __MaterialUI.Table.TableRowColumn;
+}
+
+declare module 'material-ui/lib/theme' {
+    export = __MaterialUI.Theme;
+}
+
+declare module 'material-ui/lib/toggle' {
+    export = __MaterialUI.Toggle;
+}
+
+declare module 'material-ui/lib/time-picker' {
+    export = __MaterialUI.TimePicker;
+}
+
+declare module 'material-ui/lib/text-field' {
+    export = __MaterialUI.TextField;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar' {
+    export = __MaterialUI.Toolbar.Toolbar;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-group' {
+    export = __MaterialUI.Toolbar.ToolbarGroup;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-separator' {
+    export = __MaterialUI.Toolbar.ToolbarSeparator;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-title' {
+    export = __MaterialUI.Toolbar.ToolbarTitle;
+}
+
+declare module 'material-ui/lib/tooltip' {
+    export = __MaterialUI.Tooltip;
+}
+
+declare module 'material-ui/lib/utils/' {
+    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator; // require('material-ui/lib/utils/color-manipulator');
+    export import CssEvent = __MaterialUI.Utils.CssEvent; // require('material-ui/lib/utils/css-event');
+    export import Dom = __MaterialUI.Utils.Dom; // require('material-ui/lib/utils/dom');
+    export import Events = __MaterialUI.Utils.Events; // require('material-ui/lib/utils/events');
+    export import Extend = __MaterialUI.Utils.Extend; // require('material-ui/lib/utils/extend');
+    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper; // require('material-ui/lib/utils/immutability-helper');
+    export import KeyCode = __MaterialUI.Utils.KeyCode; // require('material-ui/lib/utils/key-code');
+    export import KeyLine = __MaterialUI.Utils.KeyLine; // require('material-ui/lib/utils/key-line');
+    export import UniqueId = __MaterialUI.Utils.UniqueId; // require('material-ui/lib/utils/unique-id');
+    export import Styles = __MaterialUI.Utils.Styles; // require('material-ui/lib/utils/styles');
+}
+
+declare module 'material-ui/lib/utils/color-manipulator' {
+    export = __MaterialUI.Utils.ColorManipulator;
+}
+
+declare module 'material-ui/lib/utils/css-event' {
+    export = __MaterialUI.Utils.CssEvent;
+}
+
+declare module 'material-ui/lib/utils/dom' {
+    export = __MaterialUI.Utils.Dom;
+}
+
+declare module 'material-ui/lib/utils/events' {
+    export = __MaterialUI.Utils.Events;
+}
+
+declare module 'material-ui/lib/utils/extend' {
+    export = __MaterialUI.Utils.Extend;
+}
+
+declare module 'material-ui/lib/utils/immutability-helper' {
+    export = __MaterialUI.Utils.ImmutabilityHelper;
+}
+
+declare module 'material-ui/lib/utils/key-code' {
+    export = __MaterialUI.Utils.KeyCode;
+}
+
+declare module 'material-ui/lib/utils/key-line' {
+    export = __MaterialUI.Utils.KeyLine;
+}
+
+declare module 'material-ui/lib/utils/unique-id' {
+    export = __MaterialUI.Utils.UniqueId;
+}
+
+declare module 'material-ui/lib/utils/styles' {
+    export = __MaterialUI.Utils.Styles;
+}
+
+declare module "material-ui/lib/menus/icon-menu" {
+    export = __MaterialUI.Menus.IconMenu;
+}
+
+declare module "material-ui/lib/menus/menu" {
+    export = __MaterialUI.Menus.Menu;
+}
+
+declare module "material-ui/lib/menus/menu-item" {
+    export = __MaterialUI.Menus.MenuItem;
+}
+
+declare module "material-ui/lib/menus/menu-divider" {
+    export = __MaterialUI.Menus.MenuDivider;
+}
+
+declare module "material-ui/lib/styles/colors" {
+    export = __MaterialUI.Styles.Colors;
+}
+
+declare namespace __MaterialUI.Styles {
+    interface Colors {
+        red50: string;
+        red100: string;
+        red200: string;
+        red300: string;
+        red400: string;
+        red500: string;
+        red600: string;
+        red700: string;
+        red800: string;
+        red900: string;
+        redA100: string;
+        redA200: string;
+        redA400: string;
+        redA700: string;
+
+        pink50: string;
+        pink100: string;
+        pink200: string;
+        pink300: string;
+        pink400: string;
+        pink500: string;
+        pink600: string;
+        pink700: string;
+        pink800: string;
+        pink900: string;
+        pinkA100: string;
+        pinkA200: string;
+        pinkA400: string;
+        pinkA700: string;
+
+        purple50: string;
+        purple100: string;
+        purple200: string;
+        purple300: string;
+        purple400: string;
+        purple500: string;
+        purple600: string;
+        purple700: string;
+        purple800: string;
+        purple900: string;
+        purpleA100: string;
+        purpleA200: string;
+        purpleA400: string;
+        purpleA700: string;
+
+        deepPurple50: string;
+        deepPurple100: string;
+        deepPurple200: string;
+        deepPurple300: string;
+        deepPurple400: string;
+        deepPurple500: string;
+        deepPurple600: string;
+        deepPurple700: string;
+        deepPurple800: string;
+        deepPurple900: string;
+        deepPurpleA100: string;
+        deepPurpleA200: string;
+        deepPurpleA400: string;
+        deepPurpleA700: string;
+
+        indigo50: string;
+        indigo100: string;
+        indigo200: string;
+        indigo300: string;
+        indigo400: string;
+        indigo500: string;
+        indigo600: string;
+        indigo700: string;
+        indigo800: string;
+        indigo900: string;
+        indigoA100: string;
+        indigoA200: string;
+        indigoA400: string;
+        indigoA700: string;
+
+        blue50: string;
+        blue100: string;
+        blue200: string;
+        blue300: string;
+        blue400: string;
+        blue500: string;
+        blue600: string;
+        blue700: string;
+        blue800: string;
+        blue900: string;
+        blueA100: string;
+        blueA200: string;
+        blueA400: string;
+        blueA700: string;
+
+        lightBlue50: string;
+        lightBlue100: string;
+        lightBlue200: string;
+        lightBlue300: string;
+        lightBlue400: string;
+        lightBlue500: string;
+        lightBlue600: string;
+        lightBlue700: string;
+        lightBlue800: string;
+        lightBlue900: string;
+        lightBlueA100: string;
+        lightBlueA200: string;
+        lightBlueA400: string;
+        lightBlueA700: string;
+
+        cyan50: string;
+        cyan100: string;
+        cyan200: string;
+        cyan300: string;
+        cyan400: string;
+        cyan500: string;
+        cyan600: string;
+        cyan700: string;
+        cyan800: string;
+        cyan900: string;
+        cyanA100: string;
+        cyanA200: string;
+        cyanA400: string;
+        cyanA700: string;
+
+        teal50: string;
+        teal100: string;
+        teal200: string;
+        teal300: string;
+        teal400: string;
+        teal500: string;
+        teal600: string;
+        teal700: string;
+        teal800: string;
+        teal900: string;
+        tealA100: string;
+        tealA200: string;
+        tealA400: string;
+        tealA700: string;
+
+        green50: string;
+        green100: string;
+        green200: string;
+        green300: string;
+        green400: string;
+        green500: string;
+        green600: string;
+        green700: string;
+        green800: string;
+        green900: string;
+        greenA100: string;
+        greenA200: string;
+        greenA400: string;
+        greenA700: string;
+
+        lightGreen50: string;
+        lightGreen100: string;
+        lightGreen200: string;
+        lightGreen300: string;
+        lightGreen400: string;
+        lightGreen500: string;
+        lightGreen600: string;
+        lightGreen700: string;
+        lightGreen800: string;
+        lightGreen900: string;
+        lightGreenA100: string;
+        lightGreenA200: string;
+        lightGreenA400: string;
+        lightGreenA700: string;
+
+        lime50: string;
+        lime100: string;
+        lime200: string;
+        lime300: string;
+        lime400: string;
+        lime500: string;
+        lime600: string;
+        lime700: string;
+        lime800: string;
+        lime900: string;
+        limeA100: string;
+        limeA200: string;
+        limeA400: string;
+        limeA700: string;
+
+        yellow50: string;
+        yellow100: string;
+        yellow200: string;
+        yellow300: string;
+        yellow400: string;
+        yellow500: string;
+        yellow600: string;
+        yellow700: string;
+        yellow800: string;
+        yellow900: string;
+        yellowA100: string;
+        yellowA200: string;
+        yellowA400: string;
+        yellowA700: string;
+
+        amber50: string;
+        amber100: string;
+        amber200: string;
+        amber300: string;
+        amber400: string;
+        amber500: string;
+        amber600: string;
+        amber700: string;
+        amber800: string;
+        amber900: string;
+        amberA100: string;
+        amberA200: string;
+        amberA400: string;
+        amberA700: string;
+
+        orange50: string;
+        orange100: string;
+        orange200: string;
+        orange300: string;
+        orange400: string;
+        orange500: string;
+        orange600: string;
+        orange700: string;
+        orange800: string;
+        orange900: string;
+        orangeA100: string;
+        orangeA200: string;
+        orangeA400: string;
+        orangeA700: string;
+
+        deepOrange50: string;
+        deepOrange100: string;
+        deepOrange200: string;
+        deepOrange300: string;
+        deepOrange400: string;
+        deepOrange500: string;
+        deepOrange600: string;
+        deepOrange700: string;
+        deepOrange800: string;
+        deepOrange900: string;
+        deepOrangeA100: string;
+        deepOrangeA200: string;
+        deepOrangeA400: string;
+        deepOrangeA700: string;
+
+        brown50: string;
+        brown100: string;
+        brown200: string;
+        brown300: string;
+        brown400: string;
+        brown500: string;
+        brown600: string;
+        brown700: string;
+        brown800: string;
+        brown900: string;
+
+        blueGrey50: string;
+        blueGrey100: string;
+        blueGrey200: string;
+        blueGrey300: string;
+        blueGrey400: string;
+        blueGrey500: string;
+        blueGrey600: string;
+        blueGrey700: string;
+        blueGrey800: string;
+        blueGrey900: string;
+
+        grey50: string;
+        grey100: string;
+        grey200: string;
+        grey300: string;
+        grey400: string;
+        grey500: string;
+        grey600: string;
+        grey700: string;
+        grey800: string;
+        grey900: string;
+
+        black: string;
+        white: string;
+
+        transparent: string;
+        fullBlack: string;
+        darkBlack: string;
+        lightBlack: string;
+        minBlack: string;
+        faintBlack: string;
+        fullWhite: string;
+        darkWhite: string;
+        lightWhite: string;
+    }
+    export var Colors: Colors;
+}
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
new file mode 100644
index 000000000..39691caa8
--- /dev/null
+++ b/material-ui/material-ui-tests.tsx
@@ -0,0 +1,467 @@
+///<reference path='../react/react.d.ts' />
+///<reference path='material-ui.d.ts' />
+
+import * as React from "react/addons";
+import mui = require("material-ui");
+import Colors = require("material-ui/lib/styles/colors");
+import AppBar = require("material-ui/lib/app-bar");
+import IconButton = require("material-ui/lib/icon-button");
+import FlatButton = require("material-ui/lib/flat-button");
+import Avatar = require("material-ui/lib/avatar");
+import FontIcon = require("material-ui/lib/font-icon");
+import Typography = require("material-ui/lib/styles/typography");
+import RaisedButton = require("material-ui/lib/raised-button");
+import FloatingActionButton = require("material-ui/lib/floating-action-button");
+import Card = require("material-ui/lib/card/card");
+import CardHeader = require("material-ui/lib/card/card-header");
+import CardText = require("material-ui/lib/card/card-text");
+import CardActions = require("material-ui/lib/card/card-actions");
+import Dialog = require("material-ui/lib/dialog");
+import DropDownMenu = require("material-ui/lib/drop-down-menu");
+import RadioButtonGroup = require("material-ui/lib/radio-button-group");
+import RadioButton = require("material-ui/lib/radio-button");
+import Toggle = require("material-ui/lib/toggle");
+import TextField = require("material-ui/lib/text-field");
+import SelectField = require("material-ui/lib/select-field");
+import IconMenu = require("material-ui/lib/menus/icon-menu");
+import Menu = require('material-ui/lib/menus/menu');
+import MenuItem = require('material-ui/lib/menus/menu-item');
+import MenuDivider = require('material-ui/lib/menus/menu-divider');
+
+import NavigationClose = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/navigation/close", but they aren't defined yet.
+import FileFolder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/file/folder", but they aren't defined yet.
+import ToggleStar = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star", but they aren't defined yet.
+import ActionGrade = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/action/grade", but they aren't defined yet.
+import ToggleStarBorder = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+import ArrowDropRight = require("material-ui/lib/svg-icon");  // TODO: Should actually import the actual "material-ui/lib/svg-icons/toggle/star-border", but they aren't defined yet.
+
+class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedStateMixin {
+
+    // injected with mixin
+    linkState: <T>(key: string) => React.ReactLink<T>;
+    dialog: mui.Dialog;
+    //dialog2: Dialog;  // can't get type directly from require("material-ui/lib/dialog");
+
+    private touchTapEventHandler(e: __MaterialUI.TouchTapEvent) {
+        this.dialog.show();
+        //this.dialog2.show();
+    }
+    private formEventHandler(e: React.FormEvent) {
+    }
+    private selectFieldChangeHandler(e: __MaterialUI.TouchTapEvent, si: number, mi: any) {
+    }
+
+    render() {
+
+        // "http://material-ui.com/#/customization/themes"
+        let ThemeManager = mui.Styles.ThemeManager;
+        let muiTheme: mui.Styles.MuiTheme = ThemeManager.getMuiTheme({
+            palette: {
+                accent1Color: Colors.cyan100
+            },
+            spacing: {
+                
+            }
+        });
+
+        // "http://material-ui.com/#/customization/inline-styles"
+        let Checkbox = mui.Checkbox;
+        let element: React.ReactElement<any>;
+        element = <Checkbox
+            id="checkboxId1"
+            name="checkboxName1"
+            value="checkboxValue1"
+            label="went for a run today"
+            style={{
+                width: '50%',
+                margin: '0 auto'
+            }}
+            iconStyle={{
+                fill: '#FF4081'
+            }}/>
+        element = React.createElement<__MaterialUI.CheckboxProps>(Checkbox, {
+            id: "checkboxId1", name: "checkboxName1", value: "checkboxValue1", label: "went for a run today", style: {
+                width: '50%',
+                margin: '0 auto'
+            }, iconStyle: {
+                fill: '#FF4081'
+            }
+        });
+
+        // "http://material-ui.com/#/components/appbar"
+        element = <AppBar
+            title="Title"
+            iconClassNameRight="muidocs-icon-navigation-expand-more" />
+        element = <AppBar
+            title="Title"
+            iconElementLeft={<IconButton><NavigationClose /></IconButton>}
+            iconElementRight={<FlatButton label="Save" />} />;
+
+        // "http://material-ui.com/#/components/avatars"
+        //image avatar
+        element = <Avatar src="images/uxceo-128.jpg" />;
+        //SvgIcon avatar
+        element = <Avatar icon={<FileFolder />} />;
+        //SvgIcon avatar with custom colors
+        element = <Avatar
+            icon={<FileFolder />}
+            color={Colors.orange200}
+            backgroundColor={Colors.pink400} />;
+        //FontIcon avatar
+        element = <Avatar
+            icon={
+            <FontIcon className="muidocs-icon-communication-voicemail" />
+            } />;
+        //FontIcon avatar with custom colors
+        element = <Avatar
+            icon={<FontIcon className="muidocs-icon-communication-voicemail" />}
+            color={Colors.blue300}
+            backgroundColor={Colors.indigo900} />;
+        //Letter avatar
+        element = <Avatar>A</Avatar>;
+        //Letter avatar with custom colors
+        element = <Avatar
+            color={Colors.deepOrange300}
+            backgroundColor={Colors.purple500}>
+            </Avatar>
+
+
+        // "http://material-ui.com/#/components/buttons"
+        element = <FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </FlatButton>;
+        element = <RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
+        <FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
+            </RaisedButton>;
+        element = <FloatingActionButton secondary={true} mini={true} linkButton={true}
+            href="https://github.com/callemall/material-ui" >
+            <ToggleStar />
+            </FloatingActionButton>;
+
+        // "http://material-ui.com/#/components/cards"
+        element = <Card initiallyExpanded={true}>
+        <CardHeader
+            title="Title"
+            subtitle="Subtitle"
+            avatar={<Avatar style={{ color: 'red' }}>A</Avatar>}
+            showExpandableButton={true}>
+            </CardHeader>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+        <CardActions expandable={true}>
+        <FlatButton label="Action1"/>
+        <FlatButton label="Action2"/>
+            </CardActions>
+        <CardText expandable={true}>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </CardText>
+            </Card>;
+
+        // "http://material-ui.com/#/components/date-picker"
+
+
+        // "http://material-ui.com/#/components/dialog"
+        let standardActions = [
+            { text: 'Cancel' },
+            { text: 'Submit', onTouchTap: this.touchTapEventHandler, ref: 'submit' }
+        ];
+
+        element = <Dialog
+            title="Dialog With Standard Actions"
+            actions={standardActions}
+            actionFocus="submit"
+            modal={true}>
+            The actions in this window are created from the json that's passed in.
+            </Dialog>;
+
+        //Custom Actions
+        let customActions = [
+            <FlatButton
+                label="Cancel"
+                secondary={true}
+                onTouchTap={this.touchTapEventHandler} />,
+            <FlatButton
+                label="Submit"
+                primary={true}
+                onTouchTap={this.touchTapEventHandler} />
+        ];
+
+        element = <Dialog
+            title="Dialog With Custom Actions"
+            actions={customActions}
+            modal={false}
+            autoDetectWindowHeight={true}
+            autoScrollBodyContent={true}>
+            The actions in this window were passed in as an array of react objects.
+            </Dialog>;
+
+
+        // "http://material-ui.com/#/components/dropdown-menu"
+        let menuItems = [
+            { payload: '1', text: 'Never' },
+            { payload: '2', text: 'Every Night' },
+            { payload: '3', text: 'Weeknights' },
+            { payload: '4', text: 'Weekends' },
+            { payload: '5', text: 'Weekly' },
+        ];
+        element = <DropDownMenu menuItems={menuItems} />;
+
+        // "http://material-ui.com/#/components/icons"
+        element = <FontIcon className= "material-icons" color= { Colors.red500 } > home</FontIcon>;
+
+        // "http://material-ui.com/#/components/icon-buttons"
+        //Method 1: muidocs-icon-github is defined in a style sheet.
+        element = <IconButton iconClassName="muidocs-icon-custom-github" tooltip="GitHub"/>;
+        //Method 2: ActionGrade is a component created using mui.SvgIcon.
+        element = <IconButton tooltip= "Star" touch= { true}>
+        <ActionGrade/>
+            </IconButton >;
+        //Method 3: Manually creating a mui.FontIcon component within IconButton
+        element = <IconButton tooltip= "Sort" disabled= {true}>
+        <FontIcon className="muidocs-icon-custom-sort"/>
+            </IconButton>;
+        //Method 4: Using Google material-icons
+        element = <IconButton iconClassName="material-icons" tooltipPosition="bottom-center"
+            tooltip="Sky">settings_system_daydream</IconButton>;
+
+        // "http://material-ui.com/#/components/icon-menus"
+        element = <IconMenu iconButtonElement={<IconButton />}>
+                <MenuItem primaryText="Refresh" />
+                <MenuItem primaryText="Send feedback" />
+                <MenuItem primaryText="Settings" />
+                <MenuItem primaryText="Help" />
+                <MenuItem primaryText="Sign out" />
+            </IconMenu>;
+
+        // "http://material-ui.com/#/components/left-nav"
+
+
+        // "http://material-ui.com/#/components/lists"
+
+
+        // "http://material-ui.com/#/components/menus"
+        element = <Menu>
+                <MenuItem primaryText="Maps" />
+                <MenuItem primaryText="Books" />
+                <MenuItem primaryText="Flights" />
+                <MenuItem primaryText="Apps" />
+            </Menu>;
+        element = <Menu desktop={true} width={320}>
+                <MenuItem primaryText="Bold" secondaryText="&#8984;B" />
+                <MenuItem primaryText="Italic" secondaryText="&#8984;I" />
+                <MenuItem primaryText="Underline" secondaryText="&#8984;U" />
+                <MenuItem primaryText="Strikethrough" secondaryText="Alt+Shift+5" />
+                <MenuItem primaryText="Superscript" secondaryText="&#8984;." />
+                <MenuItem primaryText="Subscript" secondaryText="&#8984;," />
+                <MenuDivider />
+                <MenuItem primaryText="Paragraph styles" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Align" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Line spacing" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="Numbered list" rightIcon={<ArrowDropRight />} />
+                <MenuItem primaryText="List options" rightIcon={<ArrowDropRight />} />
+                <MenuDivider />
+                <MenuItem primaryText="Clear formatting" secondaryText="&#8984;/" />
+            </Menu>;
+
+        // "http://material-ui.com/#/components/paper"
+
+
+        // "http://material-ui.com/#/components/progress"
+
+
+        // "http://material-ui.com/#/components/refresh-indicator"
+
+
+        // "http://material-ui.com/#/components/sliders"
+
+
+        // "http://material-ui.com/#/components/switches"
+        element = <Checkbox
+            name="checkboxName2"
+            value="checkboxValue2"
+            label="fed the dog"
+            defaultChecked={true}/>;
+        element = <Checkbox
+            name = "checkboxName3"
+            value = "checkboxValue3"
+            label = "built a house on the moon"
+            disabled = {true}/>;
+        element = <Checkbox
+            name="checkboxName4"
+            value="checkboxValue4"
+            checkedIcon={<ToggleStar />}
+            unCheckedIcon={<ToggleStarBorder />}
+            label="custom icon" />;
+
+        element = <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
+        <RadioButton
+            value="light"
+            label="prepare for light speed"
+            style={{ marginBottom: 16 }} />;
+        <RadioButton
+            value="not_light"
+            label="light speed too slow"
+            style={{ marginBottom: 16 }}/>;
+        <RadioButton
+            value="ludicrous"
+            label="go to ludicrous speed"
+            style={{ marginBottom: 16 }}
+            disabled={true}/>
+            </RadioButtonGroup>;
+
+        element = <Toggle
+            name="toggleName1"
+            value="toggleValue1"
+            label="activate thrusters"/>;
+
+        element = <Toggle
+            name = "toggleName2"
+            value = "toggleValue2"
+            label = "auto-pilot"
+            defaultToggled = { true}/>;
+
+        element = <Toggle
+            name="toggleName3"
+            value="toggleValue3"
+            label="initiate self-destruct sequence"
+            disabled={true}/>;
+
+        // "http://material-ui.com/#/components/snackbar"
+
+
+        // "http://material-ui.com/#/components/table"
+
+
+        // "http://material-ui.com/#/components/tabs"
+
+
+        // "http://material-ui.com/#/components/text-fields"
+        element = <TextField
+            hintText="Hint Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value" />;
+        element = <TextField
+            hintText = "Hint Text"
+            value = { "value" }
+            underlineStyle = {{ borderColor: Colors.green500 }}
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Custom Underline Focus Color"
+            underlineFocusStyle={{ borderColor: Colors.amber900 }} />;
+        element = <TextField
+            hintText = "Hint Text"
+            valueLink = { this.linkState<string>('valueLinkValue') } />;
+        element = <TextField
+            hintText="Hint Text (MultiLine)"
+            multiLine={true} />;
+        element = <TextField
+            hintText = "The hint text can be as long as you want, it will wrap."
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText="The error text can be as long as you want, it will wrap." />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text (custom error color)"
+            errorText={"error text"}
+            errorStyle={{ color: 'orange' }}
+            onChange={ this.formEventHandler }
+            defaultValue="Custom error color" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true} />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            defaultValue="Disabled With Value" />;
+
+        //Select Fields
+        let arbitraryArrayMenuItems = [
+            {
+                id: 0,
+                name: "zero",
+            },
+        ];
+        element = <SelectField
+            value = { 0 }
+            onChange = { this.selectFieldChangeHandler }
+            hintText = "Hint Text"
+            menuItems = { menuItems } />;
+        element = <SelectField
+            valueLink={this.linkState('selectValueLinkValue') }
+            floatingLabelText="Float Label Text"
+            valueMember="id"
+            displayMember="name"
+            menuItems={arbitraryArrayMenuItems} />;
+        element = <SelectField
+            valueLink = { this.linkState('selectValueLinkValue2') }
+            floatingLabelText = "Float Custom Label Text"
+            floatingLabelStyle = {{ color: "red" }}
+            valueMember = "id"
+            displayMember = "name"
+            menuItems = { arbitraryArrayMenuItems } />;
+        element = <SelectField
+            value={0}
+            onChange={ this.selectFieldChangeHandler }
+            menuItems={arbitraryArrayMenuItems} />;
+
+        //Floating Hint Text Labels
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Hint Text"
+            defaultValue="Default Value"
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Hint Text"
+            floatingLabelText = "Floating Label Text"
+            value = { "value" }
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Hint Text"
+            floatingLabelText="Floating Label Text"
+            valueLink={this.linkState<string>('floatingValueLinkValue') } />;
+        element = <TextField
+            hintText = "Hint Text (MultiLine)"
+            floatingLabelText = "Floating Label Text"
+            multiLine = { true} />;
+        element = <TextField
+            hintText="Hint Text"
+            errorText={"floating text"}
+            floatingLabelText="Floating Label Text"
+            onChange={this.formEventHandler } />;
+        element = <TextField
+            hintText = "Hint Text"
+            errorText = { "error text" }
+            defaultValue = "abc"
+            floatingLabelText = "Floating Label Text"
+            onChange = { this.formEventHandler } />;
+        element = <TextField
+            hintText="Disabled Hint Text"
+            disabled={true}
+            floatingLabelText="Floating Label Text" />;
+        element = <TextField
+            hintText = "Disabled Hint Text"
+            disabled = { true}
+            defaultValue = "Disabled With Value"
+            floatingLabelText = "Floating Label Text" />;
+        element = <TextField
+            hintText="Password Field"
+            floatingLabelText="Password"
+            type="password" />;
+
+
+        // "http://material-ui.com/#/components/time-picker"
+
+
+        // "http://material-ui.com/#/components/toolbars"
+
+        return element;
+    }
+}
\ No newline at end of file
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
new file mode 100644
index 000000000..8b1201bf5
--- /dev/null
+++ b/material-ui/material-ui.d.ts
@@ -0,0 +1,2165 @@
+// Type definitions for material-ui v0.12.1
+// Project: https://github.com/callemall/material-ui
+// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../react/react.d.ts' />
+
+declare module "material-ui" {
+    // The reason for exporting the namespace types (__MaterialUI.*) is to also export the type for casting variable.
+
+    export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
+    export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
+    export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
+    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
+    export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
+    export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
+    export import CardExpandable = __MaterialUI.Card.CardExpandable; // require('material-ui/lib/card/card-expandable');
+    export import CardHeader = __MaterialUI.Card.CardHeader; // require('material-ui/lib/card/card-header');
+    export import CardMedia = __MaterialUI.Card.CardMedia; // require('material-ui/lib/card/card-media');
+    export import CardText = __MaterialUI.Card.CardText; // require('material-ui/lib/card/card-text');
+    export import CardTitle = __MaterialUI.Card.CardTitle; // require('material-ui/lib/card/card-title');
+    export import Checkbox = __MaterialUI.Checkbox; // require('material-ui/lib/checkbox');
+    export import CircularProgress = __MaterialUI.CircularProgress; // require('material-ui/lib/circular-progress');
+    export import ClearFix = __MaterialUI.ClearFix; // require('material-ui/lib/clearfix');
+    export import DatePicker = __MaterialUI.DatePicker.DatePicker; // require('material-ui/lib/date-picker/date-picker');
+    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; // require('material-ui/lib/date-picker/date-picker-dialog');
+    export import Dialog = __MaterialUI.Dialog // require('material-ui/lib/dialog');
+    export import DropDownIcon = __MaterialUI.DropDownIcon; // require('material-ui/lib/drop-down-icon');
+    export import DropDownMenu = __MaterialUI.DropDownMenu; // require('material-ui/lib/drop-down-menu');
+    export import EnhancedButton = __MaterialUI.EnhancedButton; // require('material-ui/lib/enhanced-button');
+    export import FlatButton = __MaterialUI.FlatButton; // require('material-ui/lib/flat-button');
+    export import FloatingActionButton = __MaterialUI.FloatingActionButton; // require('material-ui/lib/floating-action-button');
+    export import FontIcon = __MaterialUI.FontIcon; // require('material-ui/lib/font-icon');
+    export import IconButton = __MaterialUI.IconButton; // require('material-ui/lib/icon-button');
+    export import IconMenu = __MaterialUI.Menus.IconMenu; // require('material-ui/lib/menus/icon-menu');
+    export import LeftNav = __MaterialUI.LeftNav; // require('material-ui/lib/left-nav');
+    export import LinearProgress = __MaterialUI.LinearProgress; // require('material-ui/lib/linear-progress');
+    export import List = __MaterialUI.Lists.List; // require('material-ui/lib/lists/list');
+    export import ListDivider = __MaterialUI.Lists.ListDivider; // require('material-ui/lib/lists/list-divider');
+    export import ListItem = __MaterialUI.Lists.ListItem; // require('material-ui/lib/lists/list-item');
+    export import Menu = __MaterialUI.Menu.Menu; // require('material-ui/lib/menu/menu');
+    export import MenuItem = __MaterialUI.Menu.MenuItem; // require('material-ui/lib/menu/menu-item');
+    export import Mixins = __MaterialUI.Mixins; // require('material-ui/lib/mixins/');
+    export import Overlay = __MaterialUI.Overlay; // require('material-ui/lib/overlay');
+    export import Paper = __MaterialUI.Paper; // require('material-ui/lib/paper');
+    export import RadioButton = __MaterialUI.RadioButton; // require('material-ui/lib/radio-button');
+    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup; // require('material-ui/lib/radio-button-group');
+    export import RaisedButton = __MaterialUI.RaisedButton; // require('material-ui/lib/raised-button');
+    export import RefreshIndicator = __MaterialUI.RefreshIndicator; // require('material-ui/lib/refresh-indicator');
+    export import Ripples = __MaterialUI.Ripples; // require('material-ui/lib/ripples/');
+    export import SelectField = __MaterialUI.SelectField; // require('material-ui/lib/select-field');
+    export import Slider = __MaterialUI.Slider; // require('material-ui/lib/slider');
+    export import SvgIcon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon');
+
+    import NavigationMenu = require('material-ui/lib/svg-icons/navigation/menu');
+    import NavigationChevronLeft = require('material-ui/lib/svg-icons/navigation/chevron-left');
+    import NavigationChevronRight = require('material-ui/lib/svg-icons/navigation/chevron-right');
+    export var Icons: {
+        NavigationMenu: __MaterialUI.NavigationMenu;
+        NavigationChevronLeft: __MaterialUI.NavigationChevronLeft;
+        NavigationChevronRight: __MaterialUI.NavigationChevronRight;
+    };
+
+    export import Styles = __MaterialUI.Styles; // require('material-ui/lib/styles/');
+    export import Snackbar = __MaterialUI.Snackbar; // require('material-ui/lib/snackbar');
+    export import Tab = __MaterialUI.Tabs.Tab; // require('material-ui/lib/tabs/tab');
+    export import Tabs = __MaterialUI.Tabs.Tabs; // require('material-ui/lib/tabs/tabs');
+    export import Table = __MaterialUI.Table.Table; // require('material-ui/lib/table/table');
+    export import TableBody = __MaterialUI.Table.TableBody; // require('material-ui/lib/table/table-body');
+    export import TableFooter = __MaterialUI.Table.TableFooter; // require('material-ui/lib/table/table-footer');
+    export import TableHeader = __MaterialUI.Table.TableHeader; // require('material-ui/lib/table/table-header');
+    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn; // require('material-ui/lib/table/table-header-column');
+    export import TableRow = __MaterialUI.Table.TableRow; // require('material-ui/lib/table/table-row');
+    export import TableRowColumn = __MaterialUI.Table.TableRowColumn; // require('material-ui/lib/table/table-row-column');
+    export import ThemeWrapper = __MaterialUI.ThemeWrapper; // require('material-ui/lib/theme-wrapper');
+    export import Toggle = __MaterialUI.Toggle; // require('material-ui/lib/toggle');
+    export import TimePicker = __MaterialUI.TimePicker; // require('material-ui/lib/time-picker');
+    export import TextField = __MaterialUI.TextField; // require('material-ui/lib/text-field');
+    export import Toolbar = __MaterialUI.Toolbar.Toolbar; // require('material-ui/lib/toolbar/toolbar');
+    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup; // require('material-ui/lib/toolbar/toolbar-group');
+    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator; // require('material-ui/lib/toolbar/toolbar-separator');
+    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
+    export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
+    export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils/');
+
+    // export type definitions
+    export import TouchTapEvent = __MaterialUI.TouchTapEvent;
+    export import TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
+    export import DialogAction = __MaterialUI.DialogAction;
+}
+
+declare namespace __MaterialUI {
+    import React = __React;
+
+    // ReactLink is from "react/addons"
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    // What's common between React.TouchEvent and React.MouseEvent
+    interface TouchTapEvent extends React.SyntheticEvent {
+        altKey: boolean;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+    }
+
+    // What's common between React.TouchEventHandler and React.MouseEventHandler
+    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
+
+    // more specific than React.HTMLAttributes
+
+    interface AppBarProps extends React.Props<AppBar> {
+        iconClassNameLeft?: string;
+        iconClassNameRight?: string;
+        iconElementLeft?: React.ReactElement<any>;
+        iconElementRight?: React.ReactElement<any>;
+        iconStyleRight?: string;
+        style?: React.CSSProperties;
+        showMenuIconButton?: boolean;
+        title?: React.ReactNode;
+        zDepth?: number;
+
+        onLeftIconButtonTouchTap?: TouchTapEventHandler;
+        onRightIconButtonTouchTap?: TouchTapEventHandler;
+    }
+    export class AppBar extends React.Component<AppBarProps, {}>{
+    }
+
+    interface AppCanvasProps extends React.Props<AppCanvas> {
+    }
+    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    }
+
+    interface AvatarProps extends React.Props<Avatar> {
+        icon?: React.ReactElement<any>;
+        backgroundColor?: string;
+        color?: string;
+        size?: number;
+        src?: string;
+        style?: React.CSSProperties;
+    }
+    export class Avatar extends React.Component<AvatarProps, {}> {
+    }
+
+    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
+        beforeStyle?: React.CSSProperties;
+        afterStyle?: React.CSSProperties;
+        beforeElementType?: string;
+        afterElementType?: string;
+        elementType?: string;
+    }
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    }
+
+    namespace Card {
+
+        interface CardProps extends React.Props<Card> {
+            expandable?: boolean;
+            initiallyExpanded?: boolean;
+            onExpandedChange?: (isExpanded: boolean) => void;
+            style?: React.CSSProperties;
+        }
+        export class Card extends React.Component<CardProps, {}> {
+        }
+
+        interface CardActionsProps extends React.Props<CardActions> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+        }
+        export class CardActions extends React.Component<CardActionsProps, {}> {
+        }
+
+        interface CardExpandableProps extends React.Props<CardExpandable> {
+            onExpanding?: (isExpanded: boolean) => void;
+            expanded?: boolean;
+        }
+        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        }
+
+        interface CardHeaderProps extends React.Props<CardHeader> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            avatar: React.ReactElement<any> | string;
+        }
+        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        }
+
+        interface CardMediaProps extends React.Props<CardMedia> {
+            expandable?: boolean;
+            overlay?: React.ReactNode;
+            overlayStyle?: React.CSSProperties;
+            overlayContainerStyle?: React.CSSProperties;
+            overlayContentStyle?: React.CSSProperties;
+            mediaStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        }
+
+        interface CardTextProps extends React.Props<CardText> {
+            expandable?: boolean;
+            color?: string;
+            style?: React.CSSProperties;
+        }
+        export class CardText extends React.Component<CardTextProps, {}> {
+        }
+
+        interface CardTitleProps extends React.Props<CardTitle> {
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            title?: string | React.ReactElement<any>;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+            subtitle?: string | React.ReactElement<any>;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        }
+    }
+
+    // what's not commonly overridden by Checkbox, RadioButton, or Toggle
+    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributesBase<T> {
+        // <input/> is root element
+        id?: string;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        rippleStyle?: React.CSSProperties;
+        thumbStyle?: React.CSSProperties;
+        trackStyle?: React.CSSProperties;
+        name?: string;
+        value?: string;
+        label?: string;
+        required?: boolean;
+        disabled?: boolean;
+        defaultSwitched?: boolean;
+        disableFocusRipple?: boolean;
+        disableTouchRipple?: boolean;
+    }
+
+    interface EnhancedSwitchProps extends CommonEnhancedSwitchProps<EnhancedSwitch> {
+        // <input/> is root element
+        inputType: string;
+        switchElement: React.ReactElement<any>;
+        onParentShouldUpdate: (isInputChecked: boolean) => void;
+        switched: boolean;
+        rippleColor?: string;
+        onSwitch?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        labelPosition?: string;
+    }
+    export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        isSwitched(): boolean;
+        setSwitched(newSwitchedValue: boolean): void;
+        getValue(): any;
+        isKeyboardFocused(): boolean;
+    }
+
+    interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
+        // <EnhancedSwitch/> is root element
+        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        checked?: boolean;
+        unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+
+        disabled?: boolean;
+        valueLink?: ReactLink<boolean>;
+        checkedLink?: ReactLink<boolean>;
+
+        onCheck?: (event: React.MouseEvent, checked: boolean) => void;
+    }
+    export class Checkbox extends React.Component<CheckboxProps, {}> {
+        isChecked(): void;
+        setChecked(newCheckedValue: boolean): void;
+    }
+
+    interface CircularProgressProps extends React.Props<CircularProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+        size?: number;
+        color?: string;
+        innerStyle?: React.CSSProperties;
+
+    }
+    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    }
+
+    interface ClearFixProps extends React.Props<ClearFix> {
+    }
+    export class ClearFix extends React.Component<ClearFixProps, {}> {
+    }
+
+    namespace DatePicker {
+        interface DatePickerProps extends React.Props<DatePicker> {
+            autoOk?: boolean;
+            defaultDate?: Date;
+            formatDate?: string;
+            hideToolbarYearChange?: boolean;
+            maxDate?: Date;
+            minDate?: Date;
+            mode?: string;
+            onDismiss?: () => void;
+
+            // e is always null
+            onChange?: (e: any, d: Date) => void;
+
+            onFocus?: React.FocusEventHandler;
+            onShow?: () => void;
+            onTouchTap?: React.TouchEventHandler;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+            textFieldStyle?: React.CSSProperties;
+        }
+        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        }
+
+        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
+            disableYearSelection?: boolean;
+            initialDate?: Date;
+            maxDate?: Date;
+            minDate?: Date;
+            onAccept?: (d: Date) => void;
+            onClickAway?: () => void;
+            onDismiss?: () => void;
+            onShow?: () => void;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+        }
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        }
+    }
+
+    export interface DialogAction {
+        id?: string;
+        text: string;
+        ref?: string;
+
+        onTouchTap?: TouchTapEventHandler;
+        onClick?: React.MouseEventHandler;
+    }
+    interface DialogProps extends React.Props<Dialog> {
+        actions?: Array<DialogAction | React.ReactElement<any>>;
+        actionFocus?: string;
+        autoDetectWindowHeight?: boolean;
+        autoScrollBodyContent?: boolean;
+        bodyStyle?: React.CSSProperties;
+        contentClassName?: string;
+        contentInnerStyle?: React.CSSProperties;
+        contentStyle?: React.CSSProperties;
+        modal?: boolean;
+        openImmediately?: boolean;
+        repositionOnUpdate?: boolean;
+        title?: React.ReactNode;
+
+        onClickAway?: () => void;
+        onDismiss?: () => void;
+        onShow?: () => void;
+    }
+    export class Dialog extends React.Component<DialogProps, {}> {
+        dismiss(): void;
+        show(): void;
+    }
+
+    interface DropDownIconProps extends React.Props<DropDownIcon> {
+        menuItems: Menu.MenuItemRequest[];
+        closeOnMenuItemTouchTap?: boolean;
+        iconStyle?: React.CSSProperties;
+        iconClassName?: string;
+        iconLigature?: string;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownIcon extends React.Component<DropDownIconProps, {}> {
+    }
+
+    interface DropDownMenuProps extends React.Props<DropDownMenu> {
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+    }
+    export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+    }
+
+    // non generally overridden elements of EnhancedButton
+    interface SharedEnhancedButtonProps<T> extends React.HTMLAttributesBase<T> {
+        centerRipple?: boolean;
+        containerElement?: string | React.ReactElement<any>;
+        disabled?: boolean;
+        disableFocusRipple?: boolean;
+        disableKeyboardFocus?: boolean;
+        disableTouchRipple?: boolean;
+        keyboardFocused?: boolean;
+        linkButton?: boolean;
+        focusRippleColor?: string;
+        focusRippleOpacity?: number;
+        touchRippleOpacity?: number;
+        tabIndex?: number;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onKeyDown?: React.KeyboardEventHandler;
+        onKeyUp?: React.KeyboardEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+    }
+
+    interface EnhancedButtonProps extends SharedEnhancedButtonProps<EnhancedButton> {
+        touchRippleColor?: string;
+        focusRippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    }
+
+    interface FlatButtonProps extends SharedEnhancedButtonProps<FlatButton> {
+        hoverColor?: string;
+        label?: string;
+        labelPosition?: string;
+        labelStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        primary?: boolean;
+        secondary?: boolean;
+        rippleColor?: string;
+        style?: React.CSSProperties;
+    }
+    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    }
+
+    interface FloatingActionButtonProps extends SharedEnhancedButtonProps<FloatingActionButton> {
+        backgroundColor?: string;
+        disabled?: boolean;
+        disabledColor?: string;
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        mini?: boolean;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    }
+
+    interface FontIconProps extends React.Props<FontIcon> {
+        color?: string;
+        hoverColor?: string;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+        className?: string;
+    }
+    export class FontIcon extends React.Component<FontIconProps, {}> {
+    }
+
+    interface IconButtonProps extends SharedEnhancedButtonProps<IconButton> {
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        tooltip?: string;
+        tooltipPosition?: string;
+        tooltipStyles?: React.CSSProperties;
+        touch?: boolean;
+
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+    }
+    export class IconButton extends React.Component<IconButtonProps, {}> {
+    }
+
+    interface LeftNavProps extends React.Props<LeftNav> {
+        disableSwipeToOpen?: boolean;
+        docked?: boolean;
+        header?: React.ReactElement<any>;
+        menuItems: Menu.MenuItemRequest[];
+        onChange?: Menu.ItemTapEventHandler;
+        onNavOpen?: () => void;
+        onNavClose?: () => void;
+        openRight?: Boolean;
+        selectedIndex?: number;
+        menuItemClassName?: string;
+        menuItemClassNameSubheader?: string;
+        menuItemClassNameLink?: string;
+    }
+    export class LeftNav extends React.Component<LeftNavProps, {}> {
+    }
+
+    interface LinearProgressProps extends React.Props<LinearProgress> {
+        mode?: string;
+        value?: number;
+        min?: number;
+        max?: number;
+    }
+    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    }
+
+    namespace Lists {
+        interface ListProps extends React.Props<List> {
+            insetSubheader?: boolean;
+            subheader?: string;
+            subheaderStyle?: React.CSSProperties;
+            zDepth?: number;
+        }
+        export class List extends React.Component<ListProps, {}> {
+        }
+
+        interface ListDividerProps extends React.Props<ListDivider> {
+            inset?: boolean;
+        }
+        export class ListDivider extends React.Component<ListDividerProps, {}> {
+        }
+
+        interface ListItemProps extends React.Props<ListItem> {
+            autoGenerateNestedIndicator?: boolean;
+            disableKeyboardFocus?: boolean;
+            initiallyOpen?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            innerStyle?: React.CSSProperties;
+            leftAvatar?: React.ReactElement<any>;
+            leftCheckbox?: React.ReactElement<any>;
+            leftIcon?: React.ReactElement<any>;
+            nestedLevel?: number;
+            nestedItems?: React.ReactElement<any>[];
+            onKeyboardFocus?: React.FocusEventHandler;
+            onNestedListToggle?: (item: ListItem) => void;
+            rightAvatar?: React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            rightIconButton?: React.ReactElement<any>;
+            rightToggle?: React.ReactElement<any>;
+            primaryText?: React.ReactNode;
+            secondaryText?: React.ReactNode;
+            secondaryTextLines?: number;
+        }
+        export class ListItem extends React.Component<ListItemProps, {}> {
+        }
+    }
+
+    // Old menu implementation.  Being replaced by new "menus".
+    namespace Menu {
+        interface ItemTapEventHandler {
+            (e: TouchTapEvent, index: number, menuItem: MenuItemRequest): void;
+        }
+
+        // almost extends MenuItemProps, but certain required items are generated in Menu and not passed here.
+        interface MenuItemRequest extends React.Props<MenuItem> {
+            // use value from MenuItem.Types.*
+            type?: string;
+
+            text?: string;
+            data?: string;
+            payload?: string;
+            icon?: React.ReactElement<any>;
+            attribute?: string;
+            number?: string;
+            toggle?: boolean;
+            onTouchTap?: TouchTapEventHandler;
+            isDisabled?: boolean;
+
+            // for MenuItems.Types.NESTED
+            items?: MenuItemRequest[];
+
+            // for custom text or payloads
+            [propertyName: string]: any;
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            index: number;
+            text?: string;
+            menuItems: MenuItemRequest[];
+            zDepth?: number;
+            active?: boolean;
+            onItemTap?: ItemTapEventHandler;
+            menuItemStyle?: React.CSSProperties;
+        }
+        export class Menu extends React.Component<MenuProps, {}> {
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            index: number;
+            icon?: React.ReactElement<any>;
+            iconClassName?: string;
+            iconRightClassName?: string;
+            iconStyle?: React.CSSProperties;
+            iconRightStyle?: React.CSSProperties;
+            attribute?: string;
+            number?: string;
+            data?: string;
+            toggle?: boolean;
+            onTouchTap?: (e: React.MouseEvent, key: number) => void;
+            onToggle?: (e: React.MouseEvent, key: number, toggled: boolean) => void;
+            selected?: boolean;
+            active?: boolean;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}> {
+            static Types: { LINK: string, SUBHEADER: string, NESTED: string, }
+        }
+    }
+
+    export namespace Mixins {
+        interface ClickAwayable extends React.Mixin<any, any> {
+        }
+        var ClickAwayable: ClickAwayable;
+
+        interface WindowListenable extends React.Mixin<any, any> {
+        }
+        var WindowListenable: WindowListenable;
+
+        interface StylePropable extends React.Mixin<any, any> {
+        }
+        var StylePropable: StylePropable
+
+        interface StyleResizable extends React.Mixin<any, any> {
+        }
+        var StyleResizable: StyleResizable
+    }
+
+    interface OverlayProps extends React.Props<Overlay> {
+        autoLockScrolling?: boolean;
+        show?: boolean;
+        transitionEnabled?: boolean;
+    }
+    export class Overlay extends React.Component<OverlayProps, {}> {
+    }
+
+    interface PaperProps extends React.HTMLAttributesBase<Paper> {
+        circle?: boolean;
+        rounded?: boolean;
+        transitionEnabled?: boolean;
+        zDepth?: number;
+    }
+    export class Paper extends React.Component<PaperProps, {}> {
+    }
+
+    interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
+        // <EnhancedSwitch/> is root element
+        defaultChecked?: boolean;
+        iconStyle?: React.CSSProperties;
+        label?: string;
+        labelStyle?: React.CSSProperties;
+        labelPosition?: string;
+        style?: React.CSSProperties;
+        value?: string;
+
+        onCheck?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButton extends React.Component<RadioButtonProps, {}> {
+    }
+
+    interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
+        defaultSelected?: string;
+        labelPosition?: string;
+        name: string;
+        style?: React.CSSProperties;
+        valueSelected?: string;
+
+        onChange?: (e: React.FormEvent, selected: string) => void;
+    }
+    export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        getSelectedValue(): string;
+        setSelectedValue(newSelectionValue: string): void;
+        clearValue(): void;
+    }
+
+    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
+        className?: string;
+        disabled?: boolean;
+        label?: string;
+        primary?: boolean;
+        secondary?: boolean;
+        labelStyle?: React.CSSProperties;
+        backgroundColor?: string;
+        labelColor?: string;
+        disabledBackgroundColor?: string;
+        disabledLabelColor?: string;
+        fullWidth?: boolean;
+    }
+    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    }
+
+    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
+        left: number;
+        percentage?: number;
+        size?: number;
+        status?: string;
+        top: number;
+    }
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    }
+
+    namespace Ripples {
+        interface CircleRippleProps extends React.Props<CircleRipple> {
+            color?: string;
+            opacity?: number;
+        }
+        export class CircleRipple extends React.Component<CircleRippleProps, {}> {
+        }
+
+        interface FocusRippleProps extends React.Props<FocusRipple> {
+            color?: string;
+            innerStyle?: React.CSSProperties;
+            opacity?: number;
+            show?: boolean;
+        }
+        export class FocusRipple extends React.Component<FocusRippleProps, {}> {
+        }
+
+        interface TouchRippleProps extends React.Props<TouchRipple> {
+            centerRipple?: boolean;
+            color?: string;
+            opacity?: number;
+        }
+        export class TouchRipple extends React.Component<TouchRippleProps, {}> {
+        }
+    }
+
+    interface SelectFieldProps extends React.Props<SelectField> {
+        // passed to TextField
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+
+        // passed to DropDownMenu
+        displayMember?: string;
+        valueMember?: string;
+        autoWidth?: boolean;
+        menuItems: Menu.MenuItemRequest[];
+        menuItemStyle?: React.CSSProperties;
+        selectedIndex?: number;
+        underlineStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        disabled?: boolean;
+        valueLink?: ReactLink<any>;
+        value?: number;
+
+        onChange?: Menu.ItemTapEventHandler;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+
+        // own properties
+        selectFieldRoot?: string;
+        multiLine?: boolean;
+        type?: string;
+        rows?: number;
+        inputStyle?: React.CSSProperties;
+    }
+    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    }
+
+    interface SliderProps extends React.Props<Slider> {
+        name: string;
+        defaultValue?: number;
+        description?: string;
+        error?: string;
+        max?: number;
+        min?: number;
+        required?: boolean;
+        step?: number;
+        value?: number;
+    }
+    export class Slider extends React.Component<SliderProps, {}> {
+    }
+
+    interface SvgIconProps extends React.Props<SvgIcon> {
+        color?: string;
+        hoverColor?: string;
+        viewBox?: string;
+    }
+    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    }
+
+    interface NavigationMenuProps extends React.Props<NavigationMenu> {
+    }
+    export class NavigationMenu extends React.Component<NavigationMenuProps, {}> {
+    }
+
+    interface NavigationChevronLeftProps extends React.Props<NavigationChevronLeft> {
+    }
+    export class NavigationChevronLeft extends React.Component<NavigationChevronLeftProps, {}> {
+    }
+
+    interface NavigationChevronRightProps extends React.Props<NavigationChevronRight> {
+    }
+    export class NavigationChevronRight extends React.Component<NavigationChevronRightProps, {}> {
+    }
+
+    export namespace Styles {
+        interface AutoPrefix {
+            all(styles: React.CSSProperties): React.CSSProperties;
+            set(style: React.CSSProperties, key: string, value: string | number): void;
+            single(key: string): string;
+            singleHyphened(key: string): string;
+        }
+        export var AutoPrefix: AutoPrefix;
+
+        interface Spacing {
+            iconSize?: number;
+
+            desktopGutter?: number;
+            desktopGutterMore?: number;
+            desktopGutterLess?: number;
+            desktopGutterMini?: number;
+            desktopKeylineIncrement?: number;
+            desktopDropDownMenuItemHeight?: number;
+            desktopDropDownMenuFontSize?: number;
+            desktopLeftNavMenuItemHeight?: number;
+            desktopSubheaderHeight?: number;
+            desktopToolbarHeight?: number;
+        }
+        interface ThemePalette {
+            primary1Color?: string;
+            primary2Color?: string;
+            primary3Color?: string;
+            accent1Color?: string;
+            accent2Color?: string;
+            accent3Color?: string;
+            textColor?: string;
+            canvasColor?: string;
+            borderColor?: string;
+            disabledColor?: string;
+            alternateTextColor?: string;
+        }
+        interface MuiTheme {
+            rawTheme: RawTheme;
+            static: boolean;
+            appBar?: {
+                color?: string,
+                textColor?: string,
+                height?: number
+            },
+            avatar?: {
+                borderColor?: string;
+            }
+            button?: {
+                height?: number,
+                minWidth?: number,
+                iconButtonSize?: number
+            },
+            checkbox?: {
+                boxColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            datePicker?: {
+                color?: string,
+                textColor?: string,
+                calendarTextColor?: string,
+                selectColor?: string,
+                selectTextColor?: string,
+            },
+            dropDownMenu?: {
+                accentColor?: string,
+            },
+            flatButton?: {
+                color?: string,
+                textColor?: string,
+                primaryTextColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string
+            },
+            floatingActionButton?: {
+                buttonSize?: number,
+                miniSize?: number,
+                color?: string,
+                iconColor?: string,
+                secondaryColor?: string,
+                secondaryIconColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            inkBar?: {
+                backgroundColor?: string;
+            },
+            leftNav?: {
+                width?: number,
+                color?: string,
+            },
+            listItem?: {
+                nestedLevelDepth?: number;
+            },
+            menu?: {
+                backgroundColor?: string,
+                containerBackgroundColor?: string,
+            },
+            menuItem?: {
+                dataHeight?: number,
+                height?: number,
+                hoverColor?: string,
+                padding?: number,
+                selectedTextColor?: string,
+            },
+            menuSubheader?: {
+                padding?: number,
+                borderColor?: string,
+                textColor?: string,
+            },
+            paper?: {
+                backgroundColor?: string,
+            },
+            radioButton?: {
+                borderColor?: string,
+                backgroundColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                size?: number,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            raisedButton?: {
+                color?: string,
+                textColor?: string,
+                primaryColor?: string,
+                primaryTextColor?: string,
+                secondaryColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string
+            },
+            refreshIndicator?: {
+                strokeColor?: string;
+                loadingStrokeColor?: string;
+            };
+            slider?: {
+                trackSize?: number,
+                trackColor?: string,
+                trackColorSelected?: string,
+                handleSize?: number,
+                handleSizeActive?: number,
+                handleSizeDisabled?: number,
+                handleColorZero?: string,
+                handleFillColor?: string,
+                selectionColor?: string,
+                rippleColor?: string,
+            },
+            snackbar?: {
+                textColor?: string,
+                backgroundColor?: string,
+                actionColor?: string,
+            },
+            table?: {
+                backgroundColor?: string;
+            };
+            tableHeader?: {
+                borderColor?: string;
+            };
+            tableHeaderColumn?: {
+                textColor?: string;
+            };
+            tableFooter?: {
+                borderColor?: string;
+                textColor?: string;
+            };
+            tableRow?: {
+                hoverColor?: string;
+                stripeColor?: string;
+                selectedColor?: string;
+                textColor?: string;
+                borderColor?: string;
+            };
+            tableRowColumn?: {
+                height?: number;
+                spacing?: number;
+            };
+            timePicker?: {
+                color?: string;
+                textColor?: string;
+                accentColor?: string;
+                clockColor?: string;
+                selectColor?: string;
+                selectTextColor?: string;
+            };
+            toggle?: {
+                thumbOnColor?: string,
+                thumbOffColor?: string,
+                thumbDisabledColor?: string,
+                thumbRequiredColor?: string,
+                trackOnColor?: string,
+                trackOffColor?: string,
+                trackDisabledColor?: string,
+                trackRequiredColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+            },
+            toolbar?: {
+                backgroundColor?: string,
+                height?: number,
+                titleFontSize?: number,
+                iconColor?: string,
+                separatorColor?: string,
+                menuHoverColor?: string,
+            };
+            tabs?: {
+                backgroundColor?: string;
+            };
+            textField?: {
+                textColor?: string;
+                hintColor?: string;
+                floatingLabelColor?: string;
+                disabledTextColor?: string;
+                errorColor?: string;
+                focusColor?: string;
+                backgroundColor?: string;
+                borderColor?: string;
+            };
+        }
+
+        interface RawTheme {
+            spacing: Spacing;
+            fontFamily?: string;
+            palette: ThemePalette;
+        }
+
+        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <P>(Component: React.ComponentClass<P>) => React.ComponentClass<P>;
+
+        interface ThemeManager {
+            getMuiTheme(rawTheme: RawTheme): MuiTheme;
+            modifyRawThemeSpacing(muiTheme: MuiTheme, newSpacing: Spacing): MuiTheme;
+            modifyRawThemePalette(muiTheme: MuiTheme, newPaletteKeys: ThemePalette): MuiTheme;
+            modifyRawThemeFontFamily(muiTheme: MuiTheme, newFontFamily: string): MuiTheme;
+        }
+        export var ThemeManager: ThemeManager;
+
+        interface Transitions {
+            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
+            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
+            easeOutFunction: string;
+            easeInOutFunction: string;
+        }
+        export var Transitions: Transitions;
+
+        interface Typography {
+            textFullBlack:string;
+            textDarkBlack: string;
+            textLightBlack: string;
+            textMinBlack: string;
+            textFullWhite: string;
+            textDarkWhite: string;
+            textLightWhite: string;
+
+            // font weight
+            fontWeightLight: number;
+            fontWeightNormal: number;
+            fontWeightMedium: number;
+
+            fontStyleButtonFontSize: number;
+        }
+        export var Typography: Typography;
+
+        export var DarkRawTheme: RawTheme;
+        export var LightRawTheme: RawTheme;
+    }
+
+    interface SnackbarProps extends React.Props<Snackbar> {
+        message: string;
+        action?: string;
+        autoHideDuration?: number;
+        onActionTouchTap?: React.TouchEventHandler;
+        onShow?: () => void;
+        onDismiss?: () => void;
+        openOnMount?: boolean;
+    }
+    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    }
+
+    namespace Tabs {
+        interface TabProps extends React.Props<Tab> {
+            label?: string;
+            value?: string;
+            selected?: boolean;
+            width?: string;
+
+            // Called by Tabs component
+            onActive?: (tab: Tab) => void;
+
+            onTouchTap?: (value: string, e: TouchTapEvent, tab: Tab) => void;
+        }
+        export class Tab extends React.Component<TabProps, {}> {
+        }
+
+        interface TabsProps extends React.Props<Tabs> {
+            contentContainerStyle?: React.CSSProperties;
+            initialSelectedIndex?: number;
+            inkBarStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            tabItemContainerStyle?: React.CSSProperties;
+            tabWidth?: number;
+            value?: string | number;
+
+            onChange?: (value: string | number, e: React.FormEvent, tab: Tab) => void;
+        }
+        export class Tabs extends React.Component<TabsProps, {}> {
+        }
+    }
+
+    namespace Table {
+        interface TableProps extends React.Props<Table> {
+            allRowsSelected?: boolean;
+            fixedFooter?: boolean;
+            fixedHeader?: boolean;
+            height?: string;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            selectable?: boolean;
+        }
+        export class Table extends React.Component<TableProps, {}> {
+        }
+
+        interface TableBodyProps extends React.Props<TableBody> {
+            allRowsSelected?: boolean;
+            deselectOnClickaway?: boolean;
+            displayRowCheckbox?: boolean;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[])=> void;
+            preScanRows?: boolean;
+            selectable?: boolean;
+            showRowHover?: boolean;
+            stripedRows?: boolean;
+        }
+        export class TableBody extends React.Component<TableBodyProps, {}> {
+        }
+
+        interface TableFooterProps extends React.Props<TableFooter> {
+            adjustForCheckbox?: boolean;
+        }
+        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        }
+
+        interface TableHeaderProps extends React.Props<TableHeader> {
+            adjustForCheckbox?: boolean;
+            displaySelectAll?: boolean;
+            enableSelectAll?: boolean;
+            onSelectAll?: (event: React.MouseEvent) => void;
+            selectAllSelected?: boolean;
+        }
+        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        }
+
+        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
+            columnNumber?: number;
+            onClick?:  (e: React.MouseEvent, column: number) => void;
+            tooltip?: string;
+            tooltipStyle?: React.CSSProperties;
+        }
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        }
+
+        interface TableRowProps extends React.Props<TableRow> {
+            displayBorder?: boolean;
+            hoverable?: boolean;
+            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
+            onRowClick?: (e: React.MouseEvent, row: number) => void;
+            onRowHover?: (e: React.MouseEvent, row: number) => void;
+            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
+            rowNumber?: number;
+            selectable?: boolean;
+            selected?: boolean;
+            striped?: boolean;
+        }
+        export class TableRow extends React.Component<TableRowProps, {}> {
+        }
+
+        interface TableRowColumnProps extends React.Props<TableRowColumn> {
+            columnNumber?: number;
+            hoverable?: boolean;
+            onHover?: (e: React.MouseEvent, column: number) => void;
+            onHoverExit?: (e: React.MouseEvent, column: number) => void;
+        }
+        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        }
+    }
+
+    interface ThemeWrapperProps extends React.Props<ThemeWrapper> {
+        theme: Styles.MuiTheme;
+    }
+    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
+    }
+
+    interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
+        // <EnhancedSwitch/> is root element
+
+        elementStyle?: React.CSSProperties;
+        labelStyle?: React.CSSProperties;
+        onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        toggled?: boolean;
+        defaultToggled?: boolean;
+    }
+    export class Toggle extends React.Component<ToggleProps, {}> {
+        isToggled(): boolean;
+        setToggled(newToggledValue: boolean): void;
+    }
+
+    interface TimePickerProps extends React.Props<TimePicker> {
+        defaultTime?: Date;
+        format?: string;
+        pedantic?: boolean;
+        onFocus?: React.FocusEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+        onChange?: (e: any, time: Date) => void;
+        onShow?: () => void;
+        onDismiss?: () => void;
+    }
+    export class TimePicker extends React.Component<TimePickerProps, {}> {
+    }
+
+    interface TextFieldProps extends React.Props<TextField> {
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        floatingLabelText?: string;
+        floatingLabelStyle?: React.CSSProperties;
+        fullWidth?: boolean;
+        hintText?: string | React.ReactElement<any>;
+        id?: string;
+        inputStyle?: React.CSSProperties;
+        multiLine?: boolean;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+        style?: React.CSSProperties;
+        rows?: number,
+        underlineStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineDisabledStyle?: React.CSSProperties;
+        type?: string;
+
+        disabled?: boolean;
+        isRtl?: boolean;
+        value?: string;
+        defaultValue?: string;
+        valueLink?: ReactLink<string>;
+
+        onBlur?: React.FocusEventHandler;
+        onChange?: React.FormEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyDown?: React.KeyboardEventHandler;
+    }
+    export class TextField extends React.Component<TextFieldProps, {}> {
+        blur(): void;
+        clearValue(): void;
+        focus(): void;
+        getValue(): string;
+        setErrorText(newErrorText: string): void;
+        setValue(newValue: string): void;
+    }
+
+    namespace Toolbar {
+        interface ToolbarProps extends React.Props<Toolbar> {
+        }
+        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        }
+
+        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
+            float?: string;
+        }
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        }
+
+        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+        }
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        }
+
+        interface ToolbarTitleProps extends React.HTMLAttributesBase<ToolbarTitle> {
+           text?: string;
+        }
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        }
+    }
+
+    interface TooltipProps extends React.Props<Tooltip> {
+        label: string;
+        show?: boolean;
+        touch?: boolean;
+        verticalPosition?: string;
+        horizontalPosition?: string;
+    }
+    export class Tooltip extends React.Component<TooltipProps, {}> {
+    }
+
+    export namespace Utils {
+        interface ContrastLevel {
+            range: [number, number];
+            color: string;
+        }
+        interface ColorManipulator {
+            fade(color: string, amount: string|number): string;
+            lighten(color: string, amount: string|number): string;
+            darken(color: string, amount: string|number): string;
+            contrastRatio(background: string, foreground: string): number;
+            contrastRatioLevel(background: string, foreground: string): ContrastLevel;
+        }
+        export var ColorManipulator: ColorManipulator;
+
+        interface CssEvent {
+            transitionEndEventName(): string;
+            animationEndEventName(): string;
+            onTransitionEnd(el: Element, callback: () => void): void;
+            onAnimationEnd(el: Element, callback: () => void): void;
+        }
+        export var CssEvent: CssEvent;
+
+        interface Dom {
+            isDescendant(parent: Node, child: Node): boolean;
+            offset(el: Element): { top: number, left: number };
+            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
+            addClass(el: Element, className: string): void;
+            removeClass(el: Element, className: string): void;
+            hasClass(el: Element, className: string): boolean;
+            toggleClass(el: Element, className: string): void;
+            forceRedraw(el: HTMLElement): void;
+            withoutTransition(el: HTMLElement, callback: () => void): void;
+        }
+        export var Dom: Dom;
+
+        interface Events {
+            once(el: Element, type: string, callback: EventListener): void;
+            on(el: Element, type: string, callback: EventListener): void;
+            off(el: Element, type: string, callback: EventListener): void;
+            isKeyboard(e: Event): boolean;
+        }
+        export var Events: Events;
+
+        function Extend<T, S1>(base: T, override: S1): (T & S1);
+
+        interface ImmutabilityHelper {
+            merge(base: any, ...args: any[]): any;
+            mergeItem(obj: any, key: any, newValueObject: any): any;
+            push(array: any[], obj: any): any[];
+            shift(array: any[]): any[];
+        }
+        export var ImmutabilityHelper: ImmutabilityHelper;
+
+        interface KeyCode {
+            DOWN: number;
+            ESC: number;
+            ENTER: number;
+            LEFT: number;
+            RIGHT: number;
+            SPACE: number;
+            TAB: number;
+            UP: number;
+        }
+        var KeyCode: KeyCode;
+
+        interface KeyLine {
+            Desktop: {
+                GUTTER: number;
+                GUTTER_LESS: number;
+                INCREMENT: number;
+                MENU_ITEM_HEIGHT: number;
+            };
+
+            getIncrementalDim(dim: number): number;
+        }
+        export var KeyLine: KeyLine;
+
+        interface UniqueId {
+            generate(): string;
+        }
+        export var UniqueId: UniqueId;
+
+        interface Styles {
+            mergeAndPrefix(base: any, ...args: any[]): React.CSSProperties;
+        }
+        export var Styles: Styles;
+    }
+
+    // New menus available only through requiring directly to the end file
+    namespace Menus {
+        interface IconMenuProps extends React.Props<IconMenu> {
+            closeOnItemTouchTap?: boolean;
+            desktop?: boolean;
+            iconButtonElement: React.ReactElement<IconButtonProps>;
+            openDirection?: string;
+            menuStyle?: React.CSSProperties;
+            multiple?: boolean;
+            value?: string | Array<string>;
+            width?: string | number;
+            touchTapCloseDelay?: number;
+
+            onKeyboardFocus?: React.FocusEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string | Array<string>) => void;
+        }
+        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        }
+
+        interface MenuProps extends React.Props<Menu> {
+            animated?: boolean;
+            autoWidth?: boolean;
+            desktop?: boolean;
+            listStyle?: React.CSSProperties;
+            maxHeight?: number;
+            multiple?: boolean;
+            openDirection?: string;
+            value?: string | Array<string>;
+            width?: string | number;
+            zDepth?: number;
+        }
+        export class Menu extends React.Component<MenuProps, {}>{
+        }
+
+        interface MenuItemProps extends React.Props<MenuItem> {
+            checked?: boolean;
+            desktop?: boolean;
+            disabled?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            leftIcon?: React.ReactElement<any>;
+            primaryText?: string | React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            secondaryText?: React.ReactNode;
+            value?: string;
+
+            onEscKeyDown?: React.KeyboardEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: React.ReactElement<any>) => void;
+            onChange?: (e: React.FormEvent, value: string) => void;
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}>{
+        }
+
+        interface MenuDividerProps extends React.Props<MenuDivider> {
+            inset?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class MenuDivider extends React.Component<MenuDividerProps, {}>{
+        }
+    }
+}    // __MaterialUI
+
+declare module 'material-ui/lib/app-bar' {
+    export = __MaterialUI.AppBar;
+}
+
+declare module 'material-ui/lib/app-canvas' {
+    export = __MaterialUI.AppCanvas;
+}
+
+declare module 'material-ui/lib/avatar' {
+    export = __MaterialUI.Avatar;
+}
+
+declare module 'material-ui/lib/before-after-wrapper' {
+    export = __MaterialUI.BeforeAfterWrapper;
+}
+
+declare module 'material-ui/lib/card/card' {
+    export = __MaterialUI.Card.Card;
+}
+
+declare module 'material-ui/lib/card/card-actions' {
+    export = __MaterialUI.Card.CardActions;
+}
+
+declare module 'material-ui/lib/card/card-expandable' {
+    export = __MaterialUI.Card.CardExpandable;
+}
+
+declare module 'material-ui/lib/card/card-header' {
+    export = __MaterialUI.Card.CardHeader;
+}
+
+declare module 'material-ui/lib/card/card-media' {
+    export = __MaterialUI.Card.CardMedia;
+}
+
+declare module 'material-ui/lib/card/card-text' {
+    export = __MaterialUI.Card.CardText;
+}
+
+declare module 'material-ui/lib/card/card-title' {
+    export = __MaterialUI.Card.CardTitle;
+}
+
+declare module 'material-ui/lib/checkbox' {
+    export = __MaterialUI.Checkbox;
+}
+
+declare module 'material-ui/lib/circular-progress' {
+    export = __MaterialUI.CircularProgress;
+}
+
+declare module 'material-ui/lib/clearfix' {
+    export = __MaterialUI.ClearFix;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker' {
+    export = __MaterialUI.DatePicker.DatePicker;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker-dialog' {
+    export = __MaterialUI.DatePicker.DatePickerDialog;
+}
+
+declare module 'material-ui/lib/dialog' {
+    export = __MaterialUI.Dialog;
+}
+
+declare module 'material-ui/lib/drop-down-icon' {
+    export = __MaterialUI.DropDownIcon;
+}
+
+declare module 'material-ui/lib/drop-down-menu' {
+    export = __MaterialUI.DropDownMenu;
+}
+
+declare module 'material-ui/lib/enhanced-button' {
+    export = __MaterialUI.EnhancedButton;
+}
+
+declare module 'material-ui/lib/flat-button' {
+    export = __MaterialUI.FlatButton;
+}
+
+declare module 'material-ui/lib/floating-action-button' {
+    export = __MaterialUI.FloatingActionButton;
+}
+
+declare module 'material-ui/lib/font-icon' {
+    export = __MaterialUI.FontIcon;
+}
+
+declare module 'material-ui/lib/icon-button' {
+    export = __MaterialUI.IconButton;
+}
+
+declare module 'material-ui/lib/left-nav' {
+    export = __MaterialUI.LeftNav;
+}
+
+declare module 'material-ui/lib/linear-progress' {
+    export = __MaterialUI.LinearProgress;
+}
+
+declare module 'material-ui/lib/lists/list' {
+    export = __MaterialUI.Lists.List;
+}
+
+declare module 'material-ui/lib/lists/list-divider' {
+    export = __MaterialUI.Lists.ListDivider;
+}
+
+declare module 'material-ui/lib/lists/list-item' {
+    export = __MaterialUI.Lists.ListItem;
+}
+
+declare module 'material-ui/lib/menu/menu' {
+    export = __MaterialUI.Menu.Menu;
+}
+
+declare module 'material-ui/lib/menu/menu-item' {
+    export = __MaterialUI.Menu.MenuItem;
+}
+
+declare module 'material-ui/lib/mixins/' {
+    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable');
+    export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');
+    export import StylePropable = __MaterialUI.Mixins.StylePropable; // require('material-ui/lib/mixins/style-propable');
+    export import StyleResizable = __MaterialUI.Mixins.StyleResizable; // require('material-ui/lib/mixins/style-resizable');
+}
+
+declare module 'material-ui/lib/mixins/click-awayable' {
+    export = __MaterialUI.Mixins.ClickAwayable;
+}
+
+declare module 'material-ui/lib/mixins/window-listenable' {
+    export = __MaterialUI.Mixins.WindowListenable;
+}
+
+declare module 'material-ui/lib/mixins/style-propable' {
+    export = __MaterialUI.Mixins.StylePropable;
+}
+
+declare module 'material-ui/lib/mixins/style-resizable' {
+    export = __MaterialUI.Mixins.StyleResizable;
+}
+
+declare module 'material-ui/lib/overlay' {
+    export = __MaterialUI.Overlay;
+}
+
+declare module 'material-ui/lib/paper' {
+    export = __MaterialUI.Paper;
+}
+
+declare module 'material-ui/lib/radio-button' {
+    export = __MaterialUI.RadioButton;
+}
+
+declare module 'material-ui/lib/radio-button-group' {
+    export = __MaterialUI.RadioButtonGroup;
+}
+
+declare module 'material-ui/lib/raised-button' {
+    export = __MaterialUI.RaisedButton;
+}
+
+declare module 'material-ui/lib/refresh-indicator' {
+    export = __MaterialUI.RefreshIndicator;
+}
+
+declare module 'material-ui/lib/ripples/' {
+    export import CircleRipple = __MaterialUI.Ripples.CircleRipple;
+    export import FocusRipple = __MaterialUI.Ripples.FocusRipple;
+    export import TouchRipple = __MaterialUI.Ripples.TouchRipple;
+}
+
+declare module 'material-ui/lib/select-field' {
+    export = __MaterialUI.SelectField;
+}
+
+declare module 'material-ui/lib/slider' {
+    export = __MaterialUI.Slider;
+}
+
+declare module 'material-ui/lib/svg-icon' {
+    export = __MaterialUI.SvgIcon;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/menu' {
+    export = __MaterialUI.NavigationMenu;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-left' {
+    export = __MaterialUI.NavigationChevronLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-right' {
+    export = __MaterialUI.NavigationChevronRight;
+}
+
+declare module 'material-ui/lib/styles/' {
+    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix; // require('material-ui/lib/styles/auto-prefix');
+    export import Colors = __MaterialUI.Styles.Colors; // require('material-ui/lib/styles/colors');
+    export import Spacing = require('material-ui/lib/styles/spacing');
+    export import ThemeManager = __MaterialUI.Styles.ThemeManager; // require('material-ui/lib/styles/theme-manager');
+    export import Transitions = __MaterialUI.Styles.Transitions; // require('material-ui/lib/styles/transitions');
+    export import Typography = __MaterialUI.Styles.Typography; // require('material-ui/lib/styles/typography');
+    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme; // require('material-ui/lib/styles/raw-themes/light-raw-theme'),
+    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme; // require('material-ui/lib/styles/raw-themes/dark-raw-theme'),
+    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator; //require('material-ui/lib/styles/theme-decorator');
+}
+
+declare module 'material-ui/lib/styles/auto-prefix' {
+    export = __MaterialUI.Styles.AutoPrefix;
+}
+
+declare module 'material-ui/lib/styles/spacing' {
+    var Spacing: __MaterialUI.Styles.Spacing;
+    export = Spacing;
+}
+
+declare module 'material-ui/lib/styles/theme-manager' {
+    export = __MaterialUI.Styles.ThemeManager;
+}
+
+declare module 'material-ui/lib/styles/transitions' {
+    export = __MaterialUI.Styles.Transitions;
+}
+
+declare module 'material-ui/lib/styles/typography' {
+    export = __MaterialUI.Styles.Typography;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/light-raw-theme' {
+    export = __MaterialUI.Styles.LightRawTheme;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/dark-raw-theme' {
+    export = __MaterialUI.Styles.DarkRawTheme;
+}
+
+declare module 'material-ui/lib/styles/theme-decorator' {
+    export = __MaterialUI.Styles.ThemeDecorator;
+}
+
+
+declare module 'material-ui/lib/snackbar' {
+    export = __MaterialUI.Snackbar;
+}
+
+declare module 'material-ui/lib/tabs/tab' {
+    export = __MaterialUI.Tabs.Tab;
+}
+
+declare module 'material-ui/lib/tabs/tabs' {
+    export = __MaterialUI.Tabs.Tabs;
+}
+
+declare module 'material-ui/lib/table/table' {
+    export = __MaterialUI.Table.Table;
+}
+
+declare module 'material-ui/lib/table/table-body' {
+    export = __MaterialUI.Table.TableBody;
+}
+
+declare module 'material-ui/lib/table/table-footer' {
+    export = __MaterialUI.Table.TableFooter;
+}
+
+declare module 'material-ui/lib/table/table-header' {
+    export = __MaterialUI.Table.TableHeader;
+}
+
+declare module 'material-ui/lib/table/table-header-column' {
+    export = __MaterialUI.Table.TableHeaderColumn;
+}
+
+declare module 'material-ui/lib/table/table-row' {
+    export = __MaterialUI.Table.TableRow;
+}
+
+declare module 'material-ui/lib/table/table-row-column' {
+    export = __MaterialUI.Table.TableRowColumn;
+}
+
+declare module 'material-ui/lib/theme-wrapper' {
+    export = __MaterialUI.ThemeWrapper;
+}
+
+declare module 'material-ui/lib/toggle' {
+    export = __MaterialUI.Toggle;
+}
+
+declare module 'material-ui/lib/time-picker' {
+    export = __MaterialUI.TimePicker;
+}
+
+declare module 'material-ui/lib/text-field' {
+    export = __MaterialUI.TextField;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar' {
+    export = __MaterialUI.Toolbar.Toolbar;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-group' {
+    export = __MaterialUI.Toolbar.ToolbarGroup;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-separator' {
+    export = __MaterialUI.Toolbar.ToolbarSeparator;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-title' {
+    export = __MaterialUI.Toolbar.ToolbarTitle;
+}
+
+declare module 'material-ui/lib/tooltip' {
+    export = __MaterialUI.Tooltip;
+}
+
+declare module 'material-ui/lib/utils/' {
+    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator; // require('material-ui/lib/utils/color-manipulator');
+    export import CssEvent = __MaterialUI.Utils.CssEvent; // require('material-ui/lib/utils/css-event');
+    export import Dom = __MaterialUI.Utils.Dom; // require('material-ui/lib/utils/dom');
+    export import Events = __MaterialUI.Utils.Events; // require('material-ui/lib/utils/events');
+    export import Extend = __MaterialUI.Utils.Extend; // require('material-ui/lib/utils/extend');
+    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper; // require('material-ui/lib/utils/immutability-helper');
+    export import KeyCode = __MaterialUI.Utils.KeyCode; // require('material-ui/lib/utils/key-code');
+    export import KeyLine = __MaterialUI.Utils.KeyLine; // require('material-ui/lib/utils/key-line');
+    export import UniqueId = __MaterialUI.Utils.UniqueId; // require('material-ui/lib/utils/unique-id');
+    export import Styles = __MaterialUI.Utils.Styles; // require('material-ui/lib/utils/styles');
+}
+
+declare module 'material-ui/lib/utils/color-manipulator' {
+    export = __MaterialUI.Utils.ColorManipulator;
+}
+
+declare module 'material-ui/lib/utils/css-event' {
+    export = __MaterialUI.Utils.CssEvent;
+}
+
+declare module 'material-ui/lib/utils/dom' {
+    export = __MaterialUI.Utils.Dom;
+}
+
+declare module 'material-ui/lib/utils/events' {
+    export = __MaterialUI.Utils.Events;
+}
+
+declare module 'material-ui/lib/utils/extend' {
+    export = __MaterialUI.Utils.Extend;
+}
+
+declare module 'material-ui/lib/utils/immutability-helper' {
+    export = __MaterialUI.Utils.ImmutabilityHelper;
+}
+
+declare module 'material-ui/lib/utils/key-code' {
+    export = __MaterialUI.Utils.KeyCode;
+}
+
+declare module 'material-ui/lib/utils/key-line' {
+    export = __MaterialUI.Utils.KeyLine;
+}
+
+declare module 'material-ui/lib/utils/unique-id' {
+    export = __MaterialUI.Utils.UniqueId;
+}
+
+declare module 'material-ui/lib/utils/styles' {
+    export = __MaterialUI.Utils.Styles;
+}
+
+declare module "material-ui/lib/menus/icon-menu" {
+    export = __MaterialUI.Menus.IconMenu;
+}
+
+declare module "material-ui/lib/menus/menu" {
+    export = __MaterialUI.Menus.Menu;
+}
+
+declare module "material-ui/lib/menus/menu-item" {
+    export = __MaterialUI.Menus.MenuItem;
+}
+
+declare module "material-ui/lib/menus/menu-divider" {
+    export = __MaterialUI.Menus.MenuDivider;
+}
+
+declare module "material-ui/lib/styles/colors" {
+    export = __MaterialUI.Styles.Colors;
+}
+
+declare namespace __MaterialUI.Styles {
+    interface Colors {
+        red50: string;
+        red100: string;
+        red200: string;
+        red300: string;
+        red400: string;
+        red500: string;
+        red600: string;
+        red700: string;
+        red800: string;
+        red900: string;
+        redA100: string;
+        redA200: string;
+        redA400: string;
+        redA700: string;
+
+        pink50: string;
+        pink100: string;
+        pink200: string;
+        pink300: string;
+        pink400: string;
+        pink500: string;
+        pink600: string;
+        pink700: string;
+        pink800: string;
+        pink900: string;
+        pinkA100: string;
+        pinkA200: string;
+        pinkA400: string;
+        pinkA700: string;
+
+        purple50: string;
+        purple100: string;
+        purple200: string;
+        purple300: string;
+        purple400: string;
+        purple500: string;
+        purple600: string;
+        purple700: string;
+        purple800: string;
+        purple900: string;
+        purpleA100: string;
+        purpleA200: string;
+        purpleA400: string;
+        purpleA700: string;
+
+        deepPurple50: string;
+        deepPurple100: string;
+        deepPurple200: string;
+        deepPurple300: string;
+        deepPurple400: string;
+        deepPurple500: string;
+        deepPurple600: string;
+        deepPurple700: string;
+        deepPurple800: string;
+        deepPurple900: string;
+        deepPurpleA100: string;
+        deepPurpleA200: string;
+        deepPurpleA400: string;
+        deepPurpleA700: string;
+
+        indigo50: string;
+        indigo100: string;
+        indigo200: string;
+        indigo300: string;
+        indigo400: string;
+        indigo500: string;
+        indigo600: string;
+        indigo700: string;
+        indigo800: string;
+        indigo900: string;
+        indigoA100: string;
+        indigoA200: string;
+        indigoA400: string;
+        indigoA700: string;
+
+        blue50: string;
+        blue100: string;
+        blue200: string;
+        blue300: string;
+        blue400: string;
+        blue500: string;
+        blue600: string;
+        blue700: string;
+        blue800: string;
+        blue900: string;
+        blueA100: string;
+        blueA200: string;
+        blueA400: string;
+        blueA700: string;
+
+        lightBlue50: string;
+        lightBlue100: string;
+        lightBlue200: string;
+        lightBlue300: string;
+        lightBlue400: string;
+        lightBlue500: string;
+        lightBlue600: string;
+        lightBlue700: string;
+        lightBlue800: string;
+        lightBlue900: string;
+        lightBlueA100: string;
+        lightBlueA200: string;
+        lightBlueA400: string;
+        lightBlueA700: string;
+
+        cyan50: string;
+        cyan100: string;
+        cyan200: string;
+        cyan300: string;
+        cyan400: string;
+        cyan500: string;
+        cyan600: string;
+        cyan700: string;
+        cyan800: string;
+        cyan900: string;
+        cyanA100: string;
+        cyanA200: string;
+        cyanA400: string;
+        cyanA700: string;
+
+        teal50: string;
+        teal100: string;
+        teal200: string;
+        teal300: string;
+        teal400: string;
+        teal500: string;
+        teal600: string;
+        teal700: string;
+        teal800: string;
+        teal900: string;
+        tealA100: string;
+        tealA200: string;
+        tealA400: string;
+        tealA700: string;
+
+        green50: string;
+        green100: string;
+        green200: string;
+        green300: string;
+        green400: string;
+        green500: string;
+        green600: string;
+        green700: string;
+        green800: string;
+        green900: string;
+        greenA100: string;
+        greenA200: string;
+        greenA400: string;
+        greenA700: string;
+
+        lightGreen50: string;
+        lightGreen100: string;
+        lightGreen200: string;
+        lightGreen300: string;
+        lightGreen400: string;
+        lightGreen500: string;
+        lightGreen600: string;
+        lightGreen700: string;
+        lightGreen800: string;
+        lightGreen900: string;
+        lightGreenA100: string;
+        lightGreenA200: string;
+        lightGreenA400: string;
+        lightGreenA700: string;
+
+        lime50: string;
+        lime100: string;
+        lime200: string;
+        lime300: string;
+        lime400: string;
+        lime500: string;
+        lime600: string;
+        lime700: string;
+        lime800: string;
+        lime900: string;
+        limeA100: string;
+        limeA200: string;
+        limeA400: string;
+        limeA700: string;
+
+        yellow50: string;
+        yellow100: string;
+        yellow200: string;
+        yellow300: string;
+        yellow400: string;
+        yellow500: string;
+        yellow600: string;
+        yellow700: string;
+        yellow800: string;
+        yellow900: string;
+        yellowA100: string;
+        yellowA200: string;
+        yellowA400: string;
+        yellowA700: string;
+
+        amber50: string;
+        amber100: string;
+        amber200: string;
+        amber300: string;
+        amber400: string;
+        amber500: string;
+        amber600: string;
+        amber700: string;
+        amber800: string;
+        amber900: string;
+        amberA100: string;
+        amberA200: string;
+        amberA400: string;
+        amberA700: string;
+
+        orange50: string;
+        orange100: string;
+        orange200: string;
+        orange300: string;
+        orange400: string;
+        orange500: string;
+        orange600: string;
+        orange700: string;
+        orange800: string;
+        orange900: string;
+        orangeA100: string;
+        orangeA200: string;
+        orangeA400: string;
+        orangeA700: string;
+
+        deepOrange50: string;
+        deepOrange100: string;
+        deepOrange200: string;
+        deepOrange300: string;
+        deepOrange400: string;
+        deepOrange500: string;
+        deepOrange600: string;
+        deepOrange700: string;
+        deepOrange800: string;
+        deepOrange900: string;
+        deepOrangeA100: string;
+        deepOrangeA200: string;
+        deepOrangeA400: string;
+        deepOrangeA700: string;
+
+        brown50: string;
+        brown100: string;
+        brown200: string;
+        brown300: string;
+        brown400: string;
+        brown500: string;
+        brown600: string;
+        brown700: string;
+        brown800: string;
+        brown900: string;
+
+        blueGrey50: string;
+        blueGrey100: string;
+        blueGrey200: string;
+        blueGrey300: string;
+        blueGrey400: string;
+        blueGrey500: string;
+        blueGrey600: string;
+        blueGrey700: string;
+        blueGrey800: string;
+        blueGrey900: string;
+
+        grey50: string;
+        grey100: string;
+        grey200: string;
+        grey300: string;
+        grey400: string;
+        grey500: string;
+        grey600: string;
+        grey700: string;
+        grey800: string;
+        grey900: string;
+
+        black: string;
+        white: string;
+
+        transparent: string;
+        fullBlack: string;
+        darkBlack: string;
+        lightBlack: string;
+        minBlack: string;
+        faintBlack: string;
+        fullWhite: string;
+        darkWhite: string;
+        lightWhite: string;
+    }
+    export var Colors: Colors;
+}
diff --git a/mathjax/mathjax.d.ts b/mathjax/mathjax.d.ts
index 65c10e3ad..f49a8435b 100644
--- a/mathjax/mathjax.d.ts
+++ b/mathjax/mathjax.d.ts
@@ -549,7 +549,10 @@ declare module jax {
         * from “Show Source” and put it into a page that uses MathJax’s MathML input jax and expect to get the same
         * results as the original TeX. (Without this, there may be some spacing differences.)
         */
-        texHints?:boolean;
+        texHints?: boolean;
+
+        mpContext?: boolean;
+        mpMouse?: boolean;
     }
 
     export interface IErrorSettings {
@@ -582,27 +585,27 @@ declare module jax {
         asciimath2jax?:IAsciimath2jaxPreprocessor;
         mml2jax?:IMML2jaxPreprocessor;
         tex2jax?:ITEX2jaxPreprocessor;
-        /*A comma-separated list of input and output jax to initialize at startup. Their main code is loaded only when
+        /*A list of input and output jax to initialize at startup. Their main code is loaded only when
          * they are actually used, so it is not inefficient to include jax that may not actually be used on the page.
          * These are found in the MathJax/jax directory.
          */
         jax?:string[];
-        /*A comma-separated list of extensions to load at startup. The default directory is MathJax/extensions. The
+        /*A list of extensions to load at startup. The default directory is MathJax/extensions. The
          * tex2jax and mml2jax preprocessors can be listed here, as well as a FontWarnings extension that you can use to
          * inform your user that mathematics fonts are available that they can download to improve their experience of
          * your site.
          */
         extensions?:string[];
-        /*A comma-separated list of configuration files to load when MathJax starts up, e.g., to define local macros,
+        /*A list of configuration files to load when MathJax starts up, e.g., to define local macros,
          * etc., and there is a sample config file named config/local/local.js. The default directory is the
          * MathJax/config directory. The MMLorHTML.js configuration is one such configuration file, and there are a
          * number of other pre-defined configurations (see Using a configuration file for more details).
          */
         config?:string[];
-        /*A comma-separated list of CSS stylesheet files to be loaded when MathJax starts up. The default directory is
+        /*A list of CSS stylesheet files to be loaded when MathJax starts up. The default directory is
          * the MathJax/config directory.
          */
-        styleSheets?:string;
+        styleSheets?:string[];
         /*CSS styles to be defined dynamically at startup time. These are in the form selector:rules (see CSS Style
          * Objects for complete details).
          */
@@ -1272,7 +1275,14 @@ declare module jax {
         * of a’s in MathJax’s equation buffer, the MAXBUFFER constant is used to limit the size of the string being
         * processed by MathJax. It is set to 5KB, which should be sufficient for any reasonable equation.
         */
-        MAXBUFFER?:number;
+        MAXBUFFER?: number;
+
+        /*A comma-separated list of extensions to load at startup. The default directory is MathJax/extensions. The
+         * tex2jax and mml2jax preprocessors can be listed here, as well as a FontWarnings extension that you can use to
+         * inform your user that mathematics fonts are available that they can download to improve their experience of
+         * your site.
+         */
+        extensions?: string[];
     }
 
     export interface IEquationNumbers {
diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index 5c4426ea2..e4c72b13c 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -44,7 +44,7 @@ declare module Matter
     {
         /**
          * Clears the engine including the world, pairs and broadphase.
-         * @param engine 
+         * @param engine
          */
         static clear(engine:Engine):void;
 
@@ -844,24 +844,24 @@ declare module Matter
          */
             type?:string;
     }
-    
+
     export class Query
     {
         /**
          * Casts a ray segment against a set of bodies and returns all collisions, ray width is optional. Intersection points are not provided.
-         * 
-         * @param bodies 
-         * @param startPoint 
-         * @param endPoint 
+         *
+         * @param bodies
+         * @param startPoint
+         * @param endPoint
          * @param [rayWidth]
-         * 
+         *
          * @returns Object[] Collisions
          */
         static ray( bodies:Array<Body>,  startPoint:Vector,  endPoint:Vector,  rayWidth?:number ):Array<any>;
-        
+
         /**
          * Returns all bodies whose bounds are inside (or outside if set) the given set of bounds, from the given set of bodies.
-         * 
+         *
          * @param bodies
          * @param bounds
          * @returns Body[] The bodies matching the query
@@ -1375,7 +1375,7 @@ declare module Matter
          * @param vertices
          * @returns The polygon's moment of inertia
          */
-        static inertia( vertices:Array<Vector>,  mass:number ):number;
+        static inertia ( vertices:Array<Vector>,  mass:number ):number;
 
         /**
          * Rotates the set of vertices in-place.
@@ -1384,7 +1384,7 @@ declare module Matter
          * @param angle
          * @param point
          */
-        static static  ( vertices:Array<Vector>,  angle:number,  point:Vector ):void;
+        static rotate ( vertices:Array<Vector>,  angle:number,  point:Vector ):void;
 
         /**
          * Scales the vertices from a point (default is centre) in-place.
diff --git a/mendixmodelsdk/mendixmodelsdk-tests.ts b/mendixmodelsdk/mendixmodelsdk-tests.ts
new file mode 100644
index 000000000..4598e8ada
--- /dev/null
+++ b/mendixmodelsdk/mendixmodelsdk-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="./mendixmodelsdk.d.ts"/>
+
+import {domainmodels, IModel, ModelSdkClient} from "mendixmodelsdk";
+
+
+// This doesn't do anything useful, just for testing typings...
+
+const client: ModelSdkClient = new ModelSdkClient({
+	credentials: {
+		username: "username",
+		apikey: "apikey"
+	}
+});
+
+client.createWorkingCopy({
+	name: "workingCopy",
+	template: "test.mpk"
+}, (model:IModel) => {
+	client.openWorkingCopy(model.id, (model:IModel) => {
+		var domainModel:domainmodels.IDomainModel = model.allDomainModels()[0];
+		domainModel.load((d:domainmodels.DomainModel) => {});
+
+		domainModel = model.root.modules[0].domainModel;
+		var entity:domainmodels.IEntity = model.findEntityByQualifiedName("x.y");
+		model.exportMpk("test.mpk", () => {}, (err) => {})
+	}, (err) => {});
+}, (err) => {});
diff --git a/mendixmodelsdk/mendixmodelsdk-tests.ts.tscparams b/mendixmodelsdk/mendixmodelsdk-tests.ts.tscparams
new file mode 100644
index 000000000..f06722489
--- /dev/null
+++ b/mendixmodelsdk/mendixmodelsdk-tests.ts.tscparams
@@ -0,0 +1 @@
+-m commonjs -t es5
\ No newline at end of file
diff --git a/mendixmodelsdk/mendixmodelsdk.d.ts b/mendixmodelsdk/mendixmodelsdk.d.ts
new file mode 100644
index 000000000..d95d9af9c
--- /dev/null
+++ b/mendixmodelsdk/mendixmodelsdk.d.ts
@@ -0,0 +1,12718 @@
+// Type definitions for mendixmodelsdk v0.0.1
+// Project: http://www.mendix.com
+// Definitions by: Mendix <https://github.com/mendix>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+
+/// <reference path="../mobservable/mobservable.d.ts" />
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `references` sub module contains all classes that handle/wrap references,
+             * as a special cases of property value/settings.
+             */
+            module references {
+                /**
+                 * Abstract base class for both {@link ReferenceByName by-name} and {@link ReferenceById by-id} references
+                 * to elements of type `T`, which are observed.
+                 */
+                class AbstractReference<T extends elements.IAbstractElement> implements properties.IObservable {
+                    owner: elements.AbstractElement;
+                    protected isResolved: boolean;
+                    protected target: Mobservable.IObservableValue<T>;
+                    protected isResolving: boolean;
+                    protected referenceId: string;
+                    /**
+                     * Constructs and returns a new reference instance, that is owned (by a property of) an abstract element.
+                     */
+                    constructor(owner: elements.AbstractElement);
+                    /**
+                     * Registers an observer in the form of a callback with this references and fires that callback
+                     * immediately if the reference is already resolved.
+                     * Used by properties to observe this reference, so that storage and logical updates can be applied.
+                     */
+                    observe(callback: (newValue: T, oldValue: T) => void, fireImmediately?: boolean): common.IVoidCallback;
+                    /**
+                     * Returns the value of the wrapped reference.
+                     */
+                    get(): T;
+                    /**
+                     * Sets the value of the wrapped reference, taking care of resolution and life cycle.
+                     */
+                    set(newValue: T): void;
+                    /**
+                     * Sets only the raw target id, without trying to resolve that.
+                     */
+                    updateWithRawValue(value: string): void;
+                    protected registerRef(): void;
+                    protected unregisterRef(): void;
+                    resolve(): boolean;
+                    dispose(): void;
+                }
+                class ByIdReference<T extends elements.AbstractElement> extends AbstractReference<T> {
+                    set(newValue: T): void;
+                    get(): T;
+                    resolve(): boolean;
+                }
+                class ByNameReference<T extends elements.IAbstractElement> extends AbstractReference<T> {
+                    private targetType;
+                    constructor(owner: elements.AbstractElement, targetType: string);
+                    resolve(): boolean;
+                    /**
+                     * The target does no longer exist, but the stored reference should stay the same.
+                     */
+                    unresolve(): void;
+                    dispose(): void;
+                    qualifiedName(): string;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `structures` sub module contains all interfaces and classes related to the **structures** concept.
+             */
+            module structures {
+                type IContainer = units.IStructuralUnit | elements.IAbstractElement;
+                type Container = units.StructuralUnit | elements.AbstractElement;
+                /**
+                 * "Something" that contains properties.
+                 * Concrete sub types: MxElement, MxStructuralUnit, MxModelUnit.
+                 * Abstract sub types: MxAbstractElement, MxAbstractUnit.
+                 *
+                 * Each unit in the model is guaranteed to exist only once in memory.
+                 */
+                interface IStructure {
+                    id: string;
+                    typeName: string;
+                    container: IContainer;
+                    isLoaded: boolean;
+                    /**
+                     * Unit that owns/contains this thing.
+                     */
+                    unit: units.IAbstractUnit;
+                    load<T extends IStructure>(callback?: (elem: T) => void): any;
+                    load<T extends IStructure>(): T;
+                    /**
+                     * Renders the structure as plain JSON (without observables magic).
+                     * This is intended for debugging and development convenience.
+                     * Note that the resulting object is not of the interface type corresponding to this structure.
+                     */
+                    toPlainJson(): Object;
+                }
+                class Structure implements IStructure {
+                    id: string;
+                    typeName: string;
+                    container: Container;
+                    /**
+                     * These deltas where created before the create delta of this element was submitted to the server.
+                     * As soon as this happens, the queue is processed and should stay empty.
+                     * Each element is either an delta, or a new child that was added under a specific property.
+                     */
+                    constructor(isCreatingNewInstance: boolean, _model: model.Model, container: Container, json: transport.IStructureJson, isPartial: boolean);
+                    unit: units.IAbstractUnit;
+                    isLoaded: boolean;
+                    /**
+                     * Asserts that the complete element is available, and not just its public part.
+                     */
+                    /**
+                     * Should be called after deserialisation / remote updates, to make sure all references are bound to their actual value.
+                     */
+                    /**
+                     * If the name of a model element changes, this might effect currently broken references-by-name, so let's process those.
+                     */
+                    /**
+                     * Housekeeping: a child of ours was deleted, so let's find the part that contained it and update that part.
+                     */
+                    /**
+                     * This model element is no longer part of the model, and can be cleaned up.
+                     */
+                    /**
+                     * Update an existing (probably partial) interface with real contents received from the server.
+                     */
+                    /**
+                     * Sends the change delta in case a simple property has changed.
+                     */
+                    /**
+                     * Sends the delete in case that we were removed from the model.
+                     */
+                    /**
+                     * Deletes a model from the model.
+                     * This will automatically remove the item from its model parent,
+                     * and update incoming references and send server changes.
+                     */
+                    delete(): void;
+                    /**
+                     * Transforms a IModelElement interface into a ModelElement class.
+                     * (Those are technically already the same, but this function makes sure its properties are available).
+                     *
+                     * - If invoked without callback, it checks whether the properties are available or throw;
+                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
+                     */
+                    load<T extends Structure>(callback?: (elem: T) => void): any;
+                    load<T extends Structure>(): T;
+                    toPlainJson(): Object;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `instances` module contains various classes and functions
+             * related to elements, specifically: (abstract) elements.
+             */
+            module elements {
+                /**
+                 * Abstract elements are structures that are referable by name.
+                 * Sub types: (I)Element and (I)ModelUnit.
+                 */
+                interface IAbstractElement extends structures.IStructure {
+                    isLoaded: boolean;
+                    qualifiedName: string;
+                    container: structures.IContainer;
+                }
+                /**
+                 * See {@link IAbstractElement}.
+                 */
+                class AbstractElement extends structures.Structure implements IAbstractElement {
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: structures.Container, json: transport.IStructureJson, isPartial: boolean);
+                    /**
+                     * Checks whether all properties are available at the moment
+                     *  - if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Calculates the fully qualified name of this element,
+                     * by visiting all parents that have $isNamespace set to `true`.
+                     */
+                    qualifiedName: string;
+                    /**
+                     * Transforms a IElement interface into a Element class, fetching the containing unit if necessary.
+                     * (Those are technically already the same, but this function makes sure its properties are available.)
+                     *
+                     * - If invoked without callback, it checks whether the properties are available or it will throw;
+                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
+                     */
+                    load<T extends AbstractElement>(callback?: (elem: T) => void): any;
+                    load<T extends AbstractElement>(): T;
+                    /**
+                     * updateElementsContainer recursively sets the unit to which this elements belong
+                     * During deserialization this is not needed, but if used in the SDK, we only can set the unit once
+                     * an element is actually added to the tree (buy pushing / assigning it to some part property)
+                     */
+                    /**
+                     * Adds a back reference, i.e. a reference pointing to us,
+                     * which needs to be informed of changes to this element (including deletion).
+                     */
+                    /**
+                     * Removes the given back reference.
+                     */
+                    delete(): void;
+                }
+                /**
+                 * An element (short for: "model element") lives inside a unit
+                 * and contains (per being an IStructure) property values.
+                 */
+                interface IElement extends IAbstractElement {
+                }
+                class Element extends AbstractElement implements IElement {
+                    container: AbstractElement;
+                    constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+                    unit: units.ModelUnit;
+                    /**
+                     * Checks whether all attributes are available ATM
+                     *  -  if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Sends the appropriate create delta to the server, and also sends all pending deltas,
+                     * after this element has been assigned to some parent.
+                     */
+                    /**
+                     * Sends the appropriate create delta to the server
+                     * after this element has been moved to a new parent.
+                     */
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `instances` module contains various classes and functions
+             * which revolve around creating/maintaining/updating actual model contents.
+             */
+            module instances {
+                /**
+                 * Generic type alias for `Mobservable.IObservableArray<T>`.
+                 */
+                interface IList<T> extends Mobservable.IObservableArray<T> {
+                }
+                /**
+                 * Base class for enumerations in the meta model.
+                 * Literals of an enumeration are generated as public static constants of the generated sub class
+                 * which are instances of the generated sub class.
+                 */
+                class IEnum {
+                    protected qualifiedTsTypeName: string;
+                    constructor(_name: string);
+                    name: string;
+                    toString(): string;
+                    qualifiedTsLiteralName(): string;
+                }
+                /**
+                 * Given some a (normalised) JSON representation of a unit,
+                 * creates an instance of the corresponding `unit.AbstractUnit` sub class (structural/model)
+                 * and populates that from the JSON.
+                 * Should only be called if this unit was not already in memory.
+                 */
+                function abstractUnitJsonToInstance(model: model.Model, json: transport.IAbstractUnitJson, isPartial: boolean): units.AbstractUnit;
+                /**
+                 * Given some a (normalised) JSON representation of a model element,
+                 * creates an instance of the corresponding `elements.Element`
+                 * and populates that from the JSON.
+                 * Will update existing elements if this element was created before.
+                 */
+                function modelElementJsonToInstance(unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean): elements.Element;
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `units` module contains interfaces and base classes related to the concept of **units**.
+             * For more information on this concept, see the README of this repository, under "About Mendix models".
+             */
+            module units {
+                /**
+                 * An abstract unit is a vertex, and usually: a node, in the project tree, i.e. a macro-level construct.
+                 * Examples are: modules, folders, microflows, pages.
+                 * This interface is implemented by {@link AbstractUnit}.
+                 */
+                interface IAbstractUnit extends structures.IStructure {
+                    /**
+                     * The parent unit of this unit.
+                     */
+                    container: IStructuralUnit;
+                    /**
+                     * The name of the property of the parent's type which owns this unit.
+                     */
+                    /**
+                     * The {@link modelstore.IModelStore model store} holding the project/Mendix model this unit abides in.
+                     */
+                    /**
+                     * Whether this unit has been completely loaded and does not consist of the unit's interface
+                     *  (which corresponds to the unit being partial).
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Whether this unit is currently being loaded.
+                     */
+                    /**
+                     * Registers a callback taking this unit as argument, to be executed after the unit has been mark
+                     * as completely loaded.
+                     */
+                    /**
+                     * Mark this unit as having been loaded.
+                     */
+                    /**
+                     * Mark this unit as being loaded.
+                     */
+                }
+                /**
+                 * Base class for implementations of {@link IAbstractUnit}.
+                 */
+                class AbstractUnit extends structures.Structure implements IAbstractUnit {
+                    container: StructuralUnit;
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    /**
+                     * Checks whether all attributes are available at this instant;
+                     * if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Sends the create delta for this unit and all pending deltas.
+                     */
+                }
+                /**
+                 * A structural unit is a node (not a leaf) in the project tree.
+                 * Examples: folders & modules.
+                 */
+                interface IStructuralUnit extends IAbstractUnit {
+                }
+                /**
+                 * Implementation of {@link IStructuralUnit}.
+                 */
+                class StructuralUnit extends AbstractUnit implements IStructuralUnit {
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    unit: StructuralUnit;
+                }
+                /**
+                 * Model Units
+                 *
+                 * A model unit is a leaf (not a node) in the project tree and the root containing model {@link elements.Element} elements.
+                 * It is both a(n abstract) unit as well as "model element-like" by virtue of being an MxAbstractElement,
+                 * but minus the following features of MxElement:
+                 *  public - a model unit is public by nature
+                 *  container - a model unit is itself the root of the tree of elements it contains
+                 *
+                 * A unit acts as scope to resolve by-id references and keeps a cache of elements it owns.
+                 */
+                interface IModelUnit extends IAbstractUnit, elements.IAbstractElement {
+                    container: IStructuralUnit;
+                    moduleName: string;
+                }
+                interface IElementsCache {
+                    [id: string]: elements.AbstractElement;
+                }
+                /**
+                 * Implementation of {@link IModelUnit}.
+                 */
+                class ModelUnit extends elements.AbstractElement implements IModelUnit {
+                    container: StructuralUnit;
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    unit: ModelUnit;
+                    isLoaded: boolean;
+                    /**
+                     * Returns the module name of the model unit, which is the first section of the qualified name.
+                     */
+                    moduleName: string;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `properties` sub module contains all interfaces and classes
+             * required for handling and wrapping property values/settings.
+             */
+            module properties {
+                /**
+                 * Standard interface for an observable object.
+                 */
+                interface IObservable {
+                    observe(listener: any, fire: any): () => void;
+                }
+                /**
+                 * Abstract base wrapper for property values/settings.
+                 * All values/settings of ModelElement-s are wrapped in the appropriate way.
+                 * This is particularly important for reference values which require additional magic.
+                 */
+                class AbstractProperty<T, P extends IObservable> {
+                    protected parent: structures.Structure;
+                    protected name: string;
+                    protected isPublic: boolean;
+                    handle: () => void;
+                    observableValue: P;
+                    /**
+                     * initialValue is default value except parts and GUID-typed primitives.
+                     * (by-id/name references do not have default values.)
+                     */
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, ...moreArgs: any[]);
+                    /**
+                     * Initialize should return something that is observable.
+                     * The property will observe this internal structure
+                     * and make sure changes are pushed to the server whenever needed, in its onChange event.
+                     */
+                    initialize(value: T, ...moreConstructorArgs: any[]): P;
+                    fireOnChange(): void;
+                    onChange(...args: any[]): void;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: any): void;
+                    assertLoaded(): void;
+                    resolveReferences(): void;
+                    dispose(): void;
+                }
+                /**
+                 * All primitive types.
+                 * Note: must match exactly with MxPrimitiveTypeEnum!
+                 */
+                enum PrimitiveTypeEnum {
+                    Integer = 0,
+                    String = 1,
+                    Boolean = 2,
+                    Double = 3,
+                    DateTime = 4,
+                    Guid = 5,
+                    Point = 6,
+                    Size = 7,
+                    Color = 8,
+                    Blob = 9,
+                }
+                class PrimitiveProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    private defaultValue;
+                    private primitiveType;
+                    initialize(defaultValue: T, primitiveType: PrimitiveTypeEnum): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: T): void;
+                    onChange(newValue: T, oldValue: T): void;
+                }
+                /**
+                 * Primitive-typed property values list.
+                 */
+                class PrimitiveListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
+                    get(): Mobservable.IObservableArray<T>;
+                    set(newValue: T[]): void;
+                    updateWithRawValue(value: T[]): void;
+                    onChange(change: Mobservable.IArraySplice<T> | Mobservable.IArrayChange<T>): void;
+                    toRawChangeValue(value: T): any;
+                }
+                /**
+                 * A property value that is an enum literal.
+                 */
+                class EnumProperty<T extends instances.IEnum> extends PrimitiveProperty<T> {
+                    private initialValue;
+                    protected enumType: new (key: string) => instances.IEnum;
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, enumType: new (key: string) => instances.IEnum);
+                    updateWithRawValue(value: any): void;
+                    onChange(newValue: any, oldValue: any): void;
+                }
+                /**
+                 * A property value that is a list of enum literals.
+                 */
+                class EnumListProperty<T extends instances.IEnum> extends PrimitiveListProperty<T> {
+                    private initialValue;
+                    protected enumType: new (key: string) => instances.IEnum;
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T[], enumType: new (key: string) => instances.IEnum);
+                    updateWithRawValue(value: any): void;
+                    toRawChangeValue(value: T): any;
+                }
+                /**
+                 * A property value that is a (model) element.
+                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
+                 */
+                class PartProperty<T extends elements.Element> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    protected parent: elements.AbstractElement;
+                    private hasDefaultValue;
+                    initialize(value: T, hasDefaultValue: boolean): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(newValue: any): void;
+                    updateWithRawValue(value: any): void;
+                    onChange(newValue: elements.Element, oldValue: elements.Element): void;
+                    resolveReferences(): void;
+                    updateElementContainer(unit: units.ModelUnit): void;
+                    dispose(): void;
+                }
+                /**
+                 * A property value that is a list of (model) elements.
+                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
+                 */
+                class PartListProperty<T extends elements.Element> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    parent: elements.AbstractElement;
+                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
+                    get(): Mobservable.IObservableArray<T>;
+                    set(newValue: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    onChange(changeData: Mobservable.IArrayChange<T> | Mobservable.IArraySplice<T>): void;
+                    processChildRemoval(element: T): void;
+                    processChildAddition(index: number): void;
+                    resolveReferences(): void;
+                    updateElementContainer(unit: units.ModelUnit): void;
+                    removeChild(child: T): boolean;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that references a (model) element by name.
+                 */
+                class ByNameReferenceProperty<T extends elements.IAbstractElement> extends AbstractProperty<T, references.ByNameReference<T>> {
+                    private targetType;
+                    parent: elements.AbstractElement;
+                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, initialValue: T, targetType: string);
+                    initialize(value: T, targetType: string): references.ByNameReference<T>;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: string): void;
+                    resolveReferences(): void;
+                    onChange(newValue: T, oldValue: T): void;
+                    qualifiedName(): string;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that references zero or more (model) elements by name.
+                 *
+                 * The reference list is only used internally, and externally a view of the referencelist that returns the real objects is exposed.
+                 * So, the flow is either:
+                 *  [server] -> [internal ref list (observable)] -> [update view]
+                 * or:
+                 *  [Sdk] -> [view] -- onchange ---> [internal ref list] --- onChange event ---> [send delta's]
+                 *
+                 * For simplicity sake referencesByName should be considered immutable here (TODO: they should be in general?), so that their internal value
+                 * doesn't need to be observed.
+                 */
+                class ByNameReferenceListProperty<T extends elements.IAbstractElement> extends AbstractProperty<T[], Mobservable.IObservableArray<references.ByNameReference<T>>> {
+                    private targetType;
+                    parent: elements.AbstractElement;
+                    private viewList;
+                    private viewListDisposer;
+                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, value: T[], targetType: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<references.ByNameReference<T>>;
+                    get(): instances.IList<T>;
+                    set(newElements: T[]): void;
+                    updateWithRawValue(qualifiedNames: string[]): void;
+                    resolveReferences(): void;
+                    qualifiedNames(): string[];
+                    dispose(): void;
+                    supressViewEvents: boolean;
+                    replaceViewItems(newItems: T[]): void;
+                    onChange(changeData: Mobservable.IArrayChange<references.ByNameReference<T>> | Mobservable.IArraySplice<references.ByNameReference<T>>): void;
+                    toRawChangeValue(reference: references.ByNameReference<T>): any;
+                }
+                /**
+                 * Property value that references a (model) element by id.
+                 */
+                class ByIdReferenceProperty<T extends elements.AbstractElement> extends AbstractProperty<T, references.ByIdReference<T>> {
+                    parent: elements.AbstractElement;
+                    initialize(value: T): references.ByIdReference<T>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: string): void;
+                    resolveReferences(): void;
+                    onChange(newValue: T, oldValue: T): void;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that is a derived value.
+                 */
+                class DerivedProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T, targetRefType?: string);
+                    initialize(value: any): Mobservable.IObservableValue<any>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: any): void;
+                    qualifiedName(): string;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that is a list of derived values.
+                 */
+                class DerivedListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T[], targetRefType?: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<T>;
+                    get(): instances.IList<T>;
+                    set(value: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    qualifiedNames(): string[];
+                    dispose(): void;
+                }
+                /**
+                 * Value of a property owned by a structural unit.
+                 */
+                class StructuralChildProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T, targetRefType?: string);
+                    initialize(value: T): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: any): void;
+                    dispose(): void;
+                }
+                /**
+                 * Property instance that wraps a list of structural units.
+                 */
+                class StructuralChildListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T[], targetRefType?: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<T>;
+                    get(): instances.IList<T>;
+                    set(value: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    dispose(): void;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * Types defined in this `transport` module express JSON serialisation and are shared with the Model API Server.
+             * Some types (points, deltas) are used verbatim through the rest of the SDK.
+             */
+            module transport {
+                /**
+                 * The contents of the `MetaData` table (which always contains one row) in the MPR contained in the working copy's MPK.
+                 * This is useful to determine product version and to be able to re-export the MPR as part of an MPK
+                 * that can be read in by the Business Modeler.
+                 */
+                interface IMprMetaData {
+                }
+                /**
+                 * The meta data for a working copy (- not for the MPR).
+                 */
+                interface IWorkingCopyMetaData {
+                    name: string;
+                    description: string;
+                    avatarUrl: string;
+                }
+                /**
+                 * The representation of a working copy.
+                 */
+                interface IWorkingCopy {
+                    id: string;
+                    metaData: IWorkingCopyMetaData;
+                    /**
+                     * OpenIDs of all users that are granted access.
+                     */
+                    members: string[];
+                    /**
+                     * The name of the MPR file within the working copy's MPK, relative to its root.
+                     * This will typically but not necessarily equal `project.mpr`.
+                     */
+                    mprFileName: string;
+                    mprMetaData: IMprMetaData;
+                }
+                /**
+                 * The base interface of any "structure", i.e. either any unit or an element within a model unit.
+                 */
+                interface IStructureJson {
+                    $Type: string;
+                    $ID: string;
+                }
+                /**
+                 * The base serialisation structure of a unit, i.e. either a structural or a model unit.
+                 */
+                interface IAbstractUnitJson extends IStructureJson {
+                    contents: {
+                        [key: string]: any;
+                    };
+                    containerId: string;
+                    containmentName: string;
+                }
+                /**
+                 * The base interface of an (model) element (within a model unit).
+                 * (It extends {@link IStructureJson} with a general map structure to hold arbitrary properties.)
+                 */
+                interface IAbstractElementJson extends IStructureJson {
+                    [key: string]: any;
+                }
+                /**
+                 * The base interface for any delta.
+                 */
+                interface IDelta {
+                    /**
+                     * The type of the delta, which can be one of deltas.deltas.DeltaTypes, as a string.
+                     * This type determines the rest of the JSON serialisation:<br/>
+                     *  "CREATE_ELEMENT" &rarr; ICreateElementDelta,<br/>
+                     *  "UPDATE_PROPERTY_VALUE" &rarr; IUpdatePropertyValueDelta,<br/>
+                     *  "MOVE_ELEMENT" &rarr; IMoveElementDelta,<br/>
+                     *  "DELETE_ELEMENT" &rarr; IDeleteElementDelta,<br/>
+                     *  "CREATE_UNIT" &rarr; ICreateUnitDelta.
+                     */
+                    deltaType: string;
+                    /**
+                     * The ID of the unit (containing an element or property value) to which the delta is to be applied.
+                     */
+                    unitId: string;
+                }
+                /**
+                 * Base interface for deltas acting on/in elements.
+                 */
+                interface IElementDelta extends IDelta {
+                    elementId: string;
+                }
+                /**
+                 * A delta to create an element.
+                 */
+                interface ICreateElementDelta extends IElementDelta {
+                    /**
+                     * The ID of the parent element to create the new element in.
+                     */
+                    parentId: string;
+                    /**
+                     * The name of the property to create the new element on/in.
+                     * This must a property of PART kind with an element type compatible with `elementType`.
+                     */
+                    parentPropertyName: string;
+                    /**
+                     * The qualified name of the type of element to create.
+                     */
+                    elementType: string;
+                }
+                /**
+                 * Information returned from a successful creation of an element.
+                 */
+                interface ICreateElementDeltaResult {
+                    /**
+                     * The index of a listy property to which the element was added,
+                     * or -1 if the property is not listy.
+                     */
+                    additionIndex: number;
+                }
+                /**
+                 * A delta to change the value of a property of an element,
+                 * in a way that's specific by the "_mutator_"" given.
+                 */
+                interface IUpdatePropertyValueDelta extends IElementDelta {
+                    propertyName: string;
+                    mutator: IMutator;
+                }
+                /**
+                 * Base interface for mutators acting on a property's value.
+                 */
+                interface IMutator {
+                    /**
+                     * The type of the mutator, which can be one of deltas.deltas.MutatorTypes, as a string.
+                     * This type determines the rest of the JSON serialisation:<br/>
+                     *  "CHANGE" &rarr; IChangeMutator,<br/>
+                     *  "ADD" &rarr; IAddMutator,<br/>
+                     *  "REMOVE" &rarr; IRemoveMutator,<br/>
+                     *  "MOVE" &rarr; IMoveMutator.<br/>
+                     */
+                    mutatorType: string;
+                }
+                /**
+                 * Sets the value of the whole property (if non-listy),
+                 * or a specific item (if listy - which item is indicated by `updateIndex`) to the given `value`.
+                 */
+                interface IChangeMutator extends IMutator {
+                    value: any;
+                    updateIndex?: number;
+                }
+                /**
+                 * Adds the given `value` to a listy property,
+                 * either at the end if `insertionIndex` is not set,
+                 * or at the indicated index, shifting any and all subsequent items "down".
+                 */
+                interface IAddMutator extends IMutator {
+                    value: any;
+                    insertionIndex?: number;
+                }
+                /**
+                 * Removes the item of a listy property with the given `removalIndex`,
+                 * shifting any and all subsequent items "up".
+                 */
+                interface IRemoveMutator extends IMutator {
+                    removalIndex: number;
+                }
+                /**
+                 * Moves the item of listy property at the given `fromIndex` to the given `toIndex`,
+                 * reshuffling all other items accordingly.
+                 */
+                interface IMoveMutator extends IMutator {
+                    fromIndex: number;
+                    toIndex: number;
+                }
+                /**
+                 * Information returned from a successful update of a property value.
+                 */
+                interface IUpdatePropertyValueDeltaResult {
+                }
+                /**
+                 * A delta to move an element from one parent element to another.
+                 */
+                interface IMoveElementDelta extends IElementDelta {
+                    /**
+                     * The ID of the parent element to move the element indicated by `elementId` to.
+                     */
+                    newParentId: string;
+                    /**
+                     * The name of the property of the new parent element to put the element-to-move in/on.
+                     */
+                    newParentPropertyName: string;
+                    /**
+                     * If the indicated new property is listy, `newIndex` is the index where the element-to-move will end up.
+                     * If not set, the element-to-move will be added at the end.
+                     */
+                    newIndex?: number;
+                }
+                /**
+                 * Information returned from a successful move of an element.
+                 */
+                interface IMoveElementDeltaResult {
+                    /**
+                     * The ID of the parent element the element-to-move was removed from.
+                     */
+                    oldParentId: string;
+                    /**
+                     * The name of the property of the parent element the element-to-move was removed from.
+                     */
+                    oldParentPropertyName: string;
+                    /**
+                     * If the old property is listy, this was the index of the element-to-move within that list,
+                     * or -1 otherwise.
+                     */
+                    oldIndex: number;
+                    /**
+                     * If the new property is listy, this is the index of the moved element within that list,
+                     * or -1 otherwise.
+                     */
+                    newIndex: number;
+                }
+                /**
+                 * A delta to delete an element, including all its contained properties and children.
+                 */
+                interface IDeleteElementDelta extends IElementDelta {
+                }
+                /**
+                 * Information returned from a successful deletion of an element.
+                 */
+                interface IDeleteElementDeltaResult {
+                    /** The ID of the parent element from which the element was removed. */
+                    parentId: string;
+                    /**
+                     * The name of the property that contained the element.
+                     */
+                    propertyName: string;
+                    /**
+                     * The zero-based index at which the element was found,
+                     * if it resided inside a listy property; otherwise: -1.
+                     */
+                    removalIndex: number;
+                }
+                /**
+                 * A delta to create a (structural or model) unit.
+                 */
+                interface ICreateUnitDelta extends IDelta {
+                    /**
+                     * The ID of the containing unit.
+                     * (This relates to the project tree.)
+                     */
+                    containerId: string;
+                    /**
+                     * The name of the property of the containing unit which will contain the unit-to-create.
+                     * (This relates to the project tree.)
+                     */
+                    containmentName: string;
+                    /**
+                     * The qualified name of the type of unit to create.
+                     */
+                    contentType: string;
+                }
+                /**
+                 * Information returned from a successful creation of a unit.
+                 */
+                interface ICreateUnitDeltaResult {
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    /**
+     * Module containing several often-used interfaces.
+     */
+    module common {
+        /**
+         * Representation of a point.
+         */
+        interface IPoint {
+            x: number;
+            y: number;
+        }
+        /**
+         * Representation of a size, e.g. of an entity box.
+         */
+        interface ISize {
+            width: number;
+            height: number;
+        }
+        /**
+         * Representation of an RGB color.
+         */
+        interface IColor {
+            red: number;
+            green: number;
+            blue: number;
+        }
+        /**
+         * Unification of the {@link IPoint} and {@link ISize} types.
+         */
+        interface IDimension extends IPoint, ISize {
+        }
+        /**
+         * Callback interface returning nothing, not even an error.
+         */
+        interface IVoidCallback {
+            (): void;
+        }
+        /**
+         * Callback interface returning an error at most.
+         */
+        interface IErrorCallback {
+            (err: any): void;
+        }
+        /**
+         * Callback interface returning data of some type `T`.
+         */
+        interface ICallback<T> {
+            (data: T): void;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        /**
+         * The `utils` module contains various utility interfaces and functions.
+         */
+        module utils {
+            /**
+             * Generates a random UUID to set the ID of an element or unit to.
+             * There is no intrinsic ID collision detection/avoidance mechanism but it's good enough in practice.
+             */
+            function randomUuid(): any;
+            /**
+             * Flattens an array of arrays of items of type `T`, returning a single array
+             * that consists of the concatenation of the original arrays.
+             * This is especially useful for arrays of arrays of observables since the `lodash`
+             * doesn't handle these correctly.
+             */
+            function flatten<T>(array: T[][]): T[];
+            /**
+             * Combines the given `parts` and returns them as an URL, avoiding duplicate slashes.
+             */
+            function combineUrl(...parts: string[]): string;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Projects`.
+     */
+    module projects {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProject extends units.IStructuralUnit {
+            load(): Project;
+            load(callback: (element: Project) => void): any;
+            projectDocuments: instances.IList<IProjectDocument>;
+            modules: instances.IList<IModule>;
+            projectConversion: IProjectConversion;
+            isSystemProject: boolean;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        class Project extends units.StructuralUnit implements IProject {
+            static typeName: string;
+            projectDocuments: instances.IList<ProjectDocument>;
+            modules: instances.IList<Module>;
+            projectConversion: ProjectConversion;
+            isSystemProject: boolean;
+            constructor(container: units.IStructuralUnit);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: Project;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFolderBase extends units.IStructuralUnit {
+            load(): FolderBase;
+            load(callback: (element: FolderBase) => void): any;
+            folders: instances.IList<IFolder>;
+            documents: instances.IList<IDocument>;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FolderBase extends units.StructuralUnit implements IFolderBase {
+            static typeName: string;
+            folders: instances.IList<Folder>;
+            documents: instances.IList<Document>;
+            constructor(container: units.IStructuralUnit);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
+         */
+        interface IFolder extends IFolderBase {
+            container: IFolderBase;
+            load(): Folder;
+            load(callback: (element: Folder) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
+         */
+        class Folder extends FolderBase implements IFolder {
+            static typeName: string;
+            container: FolderBase;
+            name: string;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
+         */
+        interface IModule extends IFolderBase {
+            container: IProject;
+            load(): Module;
+            load(callback: (element: Module) => void): any;
+            sortIndex: number;
+            name: string;
+            domainModel: domainmodels.IDomainModel;
+            moduleSecurity: security.IModuleSecurity;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
+         */
+        class Module extends FolderBase implements IModule {
+            static typeName: string;
+            container: Project;
+            sortIndex: number;
+            name: string;
+            domainModel: domainmodels.DomainModel;
+            moduleSecurity: security.ModuleSecurity;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: FolderBase;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends IModuleDocument {
+            container: IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends ModuleDocument implements IDocument {
+            static typeName: string;
+            container: FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOneTimeConversionMarker extends elements.IElement {
+            container: IProjectConversion;
+            load(): OneTimeConversionMarker;
+            load(callback: (element: OneTimeConversionMarker) => void): any;
+        }
+        class OneTimeConversionMarker extends elements.Element implements IOneTimeConversionMarker {
+            static typeName: string;
+            container: ProjectConversion;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectConversion extends units.IModelUnit {
+            container: IProject;
+            load(): ProjectConversion;
+            load(callback: (element: ProjectConversion) => void): any;
+        }
+        class ProjectConversion extends units.ModelUnit implements IProjectConversion {
+            static typeName: string;
+            container: Project;
+            markers: instances.IList<OneTimeConversionMarker>;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class ConversionState extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Start: ConversionState;
+            static SetAppstoreModules: ConversionState;
+            static UpdateAppstoreModules: ConversionState;
+            static SolveModelerErrors: ConversionState;
+            static FixJavaCode: ConversionState;
+            static FixIntegrationJavaCode: ConversionState;
+            static DeployToEclipse: ConversionState;
+            static MigrateJavaLibs: ConversionState;
+            static RemoveUnusedJars: ConversionState;
+            static CopyRuntimeJars: ConversionState;
+            static Finished: ConversionState;
+        }
+        class HashAlgorithmType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static BCrypt: HashAlgorithmType;
+            static SSHA256: HashAlgorithmType;
+            static SSHA: HashAlgorithmType;
+            static SHA256: HashAlgorithmType;
+            static SHA1: HashAlgorithmType;
+            static MD5: HashAlgorithmType;
+        }
+        class SecurityLevel extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static CheckNothing: SecurityLevel;
+            static CheckFormsAndMicroflows: SecurityLevel;
+            static CheckEverything: SecurityLevel;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Microflows`.
+     */
+    module microflows {
+        /**
+         * TODO
+         */
+        interface IMicroflowAction extends elements.IElement {
+            container: IActionActivity;
+            load(): MicroflowAction;
+            load(callback: (element: MicroflowAction) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowAction extends elements.Element implements IMicroflowAction {
+            static typeName: string;
+            container: ActionActivity;
+            errorHandlingType: ErrorHandlingType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        interface IAppServiceCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): AppServiceCallAction;
+            load(callback: (element: AppServiceCallAction) => void): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        class AppServiceCallAction extends MicroflowAction implements IAppServiceCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            appServiceAction: appservices.IAppServiceAction;
+            appServiceActionQualifiedName: string;
+            parameterMappings: instances.IList<AppServiceCallParameterMapping>;
+            useVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        interface IAppServiceCallParameterMapping extends elements.IElement {
+            container: IAppServiceCallAction;
+            load(): AppServiceCallParameterMapping;
+            load(callback: (element: AppServiceCallParameterMapping) => void): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        class AppServiceCallParameterMapping extends elements.Element implements IAppServiceCallParameterMapping {
+            static typeName: string;
+            container: AppServiceCallAction;
+            parameter: appservices.IAppServiceActionParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
+         */
+        interface IWebServiceCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): WebServiceCallAction;
+            load(callback: (element: WebServiceCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
+         */
+        class WebServiceCallAction extends MicroflowAction implements IWebServiceCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            useRequestTimeOut: boolean;
+            timeOut: number;
+            sendNullValueChoice: NullValueOption;
+            requestHeaderHandling: RequestHandling;
+            requestBodyHandling: RequestHandling;
+            resultHandling: ResultHandling;
+            httpConfiguration: HttpConfiguration;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRequestHandling extends elements.IElement {
+            container: IWebServiceCallAction;
+            load(): RequestHandling;
+            load(callback: (element: RequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RequestHandling extends elements.Element implements IRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO
+         */
+        interface IAdvancedRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): AdvancedRequestHandling;
+            load(callback: (element: AdvancedRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class AdvancedRequestHandling extends RequestHandling implements IAdvancedRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            parameterMappings: instances.IList<WebServiceOperationAdvancedParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHttpConfiguration extends elements.IElement {
+            container: IWebServiceCallAction;
+            load(): HttpConfiguration;
+            load(callback: (element: HttpConfiguration) => void): any;
+        }
+        class HttpConfiguration extends elements.Element implements IHttpConfiguration {
+            static typeName: string;
+            container: WebServiceCallAction;
+            overrideLocation: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            customLocation: string;
+            useAuthentication: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            httpAuthenticationUserName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            authenticationPassword: string;
+            headerEntries: instances.IList<HttpHeaderEntry>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IHttpHeaderEntry extends elements.IElement {
+            container: IHttpConfiguration;
+            load(): HttpHeaderEntry;
+            load(callback: (element: HttpHeaderEntry) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class HttpHeaderEntry extends elements.Element implements IHttpHeaderEntry {
+            static typeName: string;
+            container: HttpConfiguration;
+            key: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IImportMappingCall extends elements.IElement {
+            container: IResultHandling;
+            load(): ImportMappingCall;
+            load(callback: (element: ImportMappingCall) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class ImportMappingCall extends elements.Element implements IImportMappingCall {
+            static typeName: string;
+            container: ResultHandling;
+            mapping: importmappings.IImportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            range: Range;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
+         */
+        interface IImportXmlAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ImportXmlAction;
+            load(callback: (element: ImportXmlAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
+         */
+        class ImportXmlAction extends MicroflowAction implements IImportXmlAction {
+            static typeName: string;
+            container: ActionActivity;
+            xmlDocumentVariableName: string;
+            resultHandling: ResultHandling;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IResultHandling extends elements.IElement {
+            load(): ResultHandling;
+            load(callback: (element: ResultHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class ResultHandling extends elements.Element implements IResultHandling {
+            static typeName: string;
+            importMappingCall: ImportMappingCall;
+            storeInVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ICustomRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): CustomRequestHandling;
+            load(callback: (element: CustomRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class CustomRequestHandling extends RequestHandling implements ICustomRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            template: StringTemplate;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IMappingRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): MappingRequestHandling;
+            load(callback: (element: MappingRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class MappingRequestHandling extends RequestHandling implements IMappingRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISimpleRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): SimpleRequestHandling;
+            load(callback: (element: SimpleRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SimpleRequestHandling extends RequestHandling implements ISimpleRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            parameterMappings: instances.IList<WebServiceOperationSimpleParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
+         */
+        interface IExportXmlAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ExportXmlAction;
+            load(callback: (element: ExportXmlAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
+         */
+        class ExportXmlAction extends MicroflowAction implements IExportXmlAction {
+            static typeName: string;
+            container: ActionActivity;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            outputMethod: OutputMethod;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IOutputMethod extends elements.IElement {
+            container: IExportXmlAction;
+            load(): OutputMethod;
+            load(callback: (element: OutputMethod) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class OutputMethod extends elements.Element implements IOutputMethod {
+            static typeName: string;
+            container: ExportXmlAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO
+         */
+        interface IFileDocumentExport extends IOutputMethod {
+            container: IExportXmlAction;
+            load(): FileDocumentExport;
+            load(callback: (element: FileDocumentExport) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class FileDocumentExport extends OutputMethod implements IFileDocumentExport {
+            static typeName: string;
+            container: ExportXmlAction;
+            targetDocumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IVariableExport extends IOutputMethod {
+            container: IExportXmlAction;
+            load(): VariableExport;
+            load(callback: (element: VariableExport) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class VariableExport extends OutputMethod implements IVariableExport {
+            static typeName: string;
+            container: ExportXmlAction;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IWebServiceOperationAdvancedParameterMapping extends elements.IElement {
+            container: IAdvancedRequestHandling;
+            load(): WebServiceOperationAdvancedParameterMapping;
+            load(callback: (element: WebServiceOperationAdvancedParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class WebServiceOperationAdvancedParameterMapping extends elements.Element implements IWebServiceOperationAdvancedParameterMapping {
+            static typeName: string;
+            container: AdvancedRequestHandling;
+            isChecked: boolean;
+            parameterName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IWebServiceOperationSimpleParameterMapping extends elements.IElement {
+            container: ISimpleRequestHandling;
+            load(): WebServiceOperationSimpleParameterMapping;
+            load(callback: (element: WebServiceOperationSimpleParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class WebServiceOperationSimpleParameterMapping extends elements.Element implements IWebServiceOperationSimpleParameterMapping {
+            static typeName: string;
+            container: SimpleRequestHandling;
+            isChecked: boolean;
+            parameterName: string;
+            /**
+             * The value of this property is conceptually of type Mappings$ElementPath.
+             */
+            parameterPath: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
+         */
+        interface ICloseFormAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CloseFormAction;
+            load(callback: (element: CloseFormAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
+         */
+        class CloseFormAction extends MicroflowAction implements ICloseFormAction {
+            static typeName: string;
+            container: ActionActivity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
+         */
+        interface IDownloadFileAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DownloadFileAction;
+            load(callback: (element: DownloadFileAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
+         */
+        class DownloadFileAction extends MicroflowAction implements IDownloadFileAction {
+            static typeName: string;
+            container: ActionActivity;
+            fileDocumentVariableName: string;
+            showFileInBrowser: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDocumentTemplateParameterMapping extends elements.IElement {
+            container: IGenerateDocumentAction;
+            load(): DocumentTemplateParameterMapping;
+            load(callback: (element: DocumentTemplateParameterMapping) => void): any;
+        }
+        class DocumentTemplateParameterMapping extends elements.Element implements IDocumentTemplateParameterMapping {
+            static typeName: string;
+            container: GenerateDocumentAction;
+            widgetName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
+         */
+        interface IGenerateDocumentAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): GenerateDocumentAction;
+            load(callback: (element: GenerateDocumentAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
+         */
+        class GenerateDocumentAction extends MicroflowAction implements IGenerateDocumentAction {
+            static typeName: string;
+            container: ActionActivity;
+            parameterMappings: instances.IList<DocumentTemplateParameterMapping>;
+            fileVariableName: string;
+            languageVariableName: string;
+            documentType: TargetDocumentType;
+            languageSetting: LanguageSettingType;
+            documentTemplate: documenttemplates.IDocumentTemplate;
+            documentTemplateQualifiedName: string;
+            overrideTopMargin: boolean;
+            overrideBottomMargin: boolean;
+            overrideLeftMargin: boolean;
+            overrideRightMargin: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginLeftInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginRightInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginTopInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginBottomInInch: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
+         */
+        interface IShowHomePageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowHomePageAction;
+            load(callback: (element: ShowHomePageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
+         */
+        class ShowHomePageAction extends MicroflowAction implements IShowHomePageAction {
+            static typeName: string;
+            container: ActionActivity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
+         */
+        interface IShowMessageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowMessageAction;
+            load(callback: (element: ShowMessageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
+         */
+        class ShowMessageAction extends MicroflowAction implements IShowMessageAction {
+            static typeName: string;
+            container: ActionActivity;
+            template: TextTemplate;
+            type: ShowMessageType;
+            blocking: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
+         */
+        interface IShowPageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowPageAction;
+            load(callback: (element: ShowPageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
+         */
+        class ShowPageAction extends MicroflowAction implements IShowPageAction {
+            static typeName: string;
+            container: ActionActivity;
+            pageSettings: pages.PageSettings;
+            passedObjectVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
+         */
+        interface IValidationFeedbackAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ValidationFeedbackAction;
+            load(callback: (element: ValidationFeedbackAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
+         */
+        class ValidationFeedbackAction extends MicroflowAction implements IValidationFeedbackAction {
+            static typeName: string;
+            container: ActionActivity;
+            feedbackTemplate: TextTemplate;
+            objectVariableName: string;
+            /**
+             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
+             */
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            /**
+             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
+             */
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Abstract
+         */
+        interface IMicroflowObject extends elements.IElement {
+            container: IMicroflowObjectCollection;
+            load(): MicroflowObject;
+            load(callback: (element: MicroflowObject) => void): any;
+        }
+        /**
+         * TODO: Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowObject extends elements.Element implements IMicroflowObject {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            relativeMiddlePoint: common.IPoint;
+            size: common.ISize;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: abstract element
+         */
+        interface IActivity extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): Activity;
+            load(callback: (element: Activity) => void): any;
+        }
+        /**
+         * TODO: abstract element
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Activity extends MicroflowObject implements IActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
+         */
+        interface IActionActivity extends IActivity {
+            container: IMicroflowObjectCollection;
+            load(): ActionActivity;
+            load(callback: (element: ActionActivity) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
+         */
+        class ActionActivity extends Activity implements IActionActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            action: MicroflowAction;
+            caption: string;
+            autoGenerateCaption: boolean;
+            backgroundColor: ActionActivityColor;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
+         */
+        interface IAggregateListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): AggregateListAction;
+            load(callback: (element: AggregateListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
+         */
+        class AggregateListAction extends MicroflowAction implements IAggregateListAction {
+            static typeName: string;
+            container: ActionActivity;
+            inputListVariableName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            aggregateFunction: AggregateFunctionEnum;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
+         */
+        interface IAnnotation extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): Annotation;
+            load(callback: (element: Annotation) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
+         */
+        class Annotation extends MicroflowObject implements IAnnotation {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO abstract
+         */
+        interface IFlow extends elements.IElement {
+            container: IMicroflowBase;
+            load(): Flow;
+            load(callback: (element: Flow) => void): any;
+        }
+        /**
+         * TODO abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Flow extends elements.Element implements IFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            origin: MicroflowObject;
+            destination: MicroflowObject;
+            originConnectionIndex: number;
+            destinationConnectionIndex: number;
+            originBezierVector: common.ISize;
+            destinationBezierVector: common.ISize;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
+         */
+        interface IAnnotationFlow extends IFlow {
+            container: IMicroflowBase;
+            load(): AnnotationFlow;
+            load(callback: (element: AnnotationFlow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
+         */
+        class AnnotationFlow extends Flow implements IAnnotationFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRetrieveSource extends elements.IElement {
+            container: IRetrieveAction;
+            load(): RetrieveSource;
+            load(callback: (element: RetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RetrieveSource extends elements.Element implements IRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IAssociationRetrieveSource extends IRetrieveSource {
+            container: IRetrieveAction;
+            load(): AssociationRetrieveSource;
+            load(callback: (element: AssociationRetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class AssociationRetrieveSource extends RetrieveSource implements IAssociationRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            startVariableName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListOperation extends elements.IElement {
+            container: IListOperationAction;
+            load(): ListOperation;
+            load(callback: (element: ListOperation) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ListOperation extends elements.Element implements IListOperation {
+            static typeName: string;
+            container: ListOperationAction;
+            listVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBinaryListOperation extends IListOperation {
+            container: IListOperationAction;
+            load(): BinaryListOperation;
+            load(callback: (element: BinaryListOperation) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class BinaryListOperation extends ListOperation implements IBinaryListOperation {
+            static typeName: string;
+            container: ListOperationAction;
+            secondListOrObjectName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
+         */
+        interface IBreakEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): BreakEvent;
+            load(callback: (element: BreakEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
+         */
+        class BreakEvent extends MicroflowObject implements IBreakEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ICaseValue extends elements.IElement {
+            container: ISequenceFlow;
+            load(): CaseValue;
+            load(callback: (element: CaseValue) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class CaseValue extends elements.Element implements ICaseValue {
+            static typeName: string;
+            container: SequenceFlow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
+         */
+        interface ICastAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CastAction;
+            load(callback: (element: CastAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
+         */
+        class CastAction extends MicroflowAction implements ICastAction {
+            static typeName: string;
+            container: ActionActivity;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IChangeMembersAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeMembersAction;
+            load(callback: (element: ChangeMembersAction) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ChangeMembersAction extends MicroflowAction implements IChangeMembersAction {
+            static typeName: string;
+            container: ActionActivity;
+            items: instances.IList<MemberChange>;
+            refreshInClient: boolean;
+            commit: CommitEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
+         */
+        interface IChangeObjectAction extends IChangeMembersAction {
+            container: IActionActivity;
+            load(): ChangeObjectAction;
+            load(callback: (element: ChangeObjectAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
+         */
+        class ChangeObjectAction extends ChangeMembersAction implements IChangeObjectAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IMemberChange extends elements.IElement {
+            container: IChangeMembersAction;
+            load(): MemberChange;
+            load(callback: (element: MemberChange) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class MemberChange extends elements.Element implements IMemberChange {
+            static typeName: string;
+            container: ChangeMembersAction;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            type: ChangeActionItemType;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
+         */
+        interface IChangeListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeListAction;
+            load(callback: (element: ChangeListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
+         */
+        class ChangeListAction extends MicroflowAction implements IChangeListAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            type: ChangeListActionType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
+         */
+        interface IChangeVariableAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeVariableAction;
+            load(callback: (element: ChangeVariableAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
+         */
+        class ChangeVariableAction extends MicroflowAction implements IChangeVariableAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
+         */
+        interface ICommitAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CommitAction;
+            load(callback: (element: CommitAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
+         */
+        class CommitAction extends MicroflowAction implements ICommitAction {
+            static typeName: string;
+            container: ActionActivity;
+            withEvents: boolean;
+            commitVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface IRange extends elements.IElement {
+            load(): Range;
+            load(callback: (element: Range) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Range extends elements.Element implements IRange {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface IConstantRange extends IRange {
+            load(): ConstantRange;
+            load(callback: (element: ConstantRange) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        class ConstantRange extends Range implements IConstantRange {
+            static typeName: string;
+            singleObject: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IContains extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Contains;
+            load(callback: (element: Contains) => void): any;
+        }
+        class Contains extends BinaryListOperation implements IContains {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
+         */
+        interface IContinueEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ContinueEvent;
+            load(callback: (element: ContinueEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
+         */
+        class ContinueEvent extends MicroflowObject implements IContinueEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
+         */
+        interface IDeprecatedCreateAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DeprecatedCreateAction;
+            load(callback: (element: DeprecatedCreateAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
+         */
+        class DeprecatedCreateAction extends MicroflowAction implements IDeprecatedCreateAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            refreshInClient: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
+         */
+        interface ICreateObjectAction extends IChangeMembersAction {
+            container: IActionActivity;
+            load(): CreateObjectAction;
+            load(callback: (element: CreateObjectAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
+         */
+        class CreateObjectAction extends ChangeMembersAction implements ICreateObjectAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
+         */
+        interface ICreateListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CreateListAction;
+            load(callback: (element: CreateListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
+         */
+        class CreateListAction extends MicroflowAction implements ICreateListAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
+         */
+        interface ICreateVariableAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CreateVariableAction;
+            load(callback: (element: CreateVariableAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
+         */
+        class CreateVariableAction extends MicroflowAction implements ICreateVariableAction {
+            static typeName: string;
+            container: ActionActivity;
+            variableName: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            variableDataType: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            initialValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface ICustomRange extends IRange {
+            load(): CustomRange;
+            load(callback: (element: CustomRange) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        class CustomRange extends Range implements ICustomRange {
+            static typeName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            limitExpression: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            offsetExpression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IDatabaseRetrieveSource extends IRetrieveSource {
+            container: IRetrieveAction;
+            load(): DatabaseRetrieveSource;
+            load(callback: (element: DatabaseRetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class DatabaseRetrieveSource extends RetrieveSource implements IDatabaseRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            range: Range;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            sortItemList: SortItemList;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
+         */
+        interface IDeleteAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DeleteAction;
+            load(callback: (element: DeleteAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
+         */
+        class DeleteAction extends MicroflowAction implements IDeleteAction {
+            static typeName: string;
+            container: ActionActivity;
+            deleteVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
+         */
+        interface IEndEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): EndEvent;
+            load(callback: (element: EndEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
+         */
+        class EndEvent extends MicroflowObject implements IEndEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            returnValue: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IEnumerationCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): EnumerationCase;
+            load(callback: (element: EnumerationCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class EnumerationCase extends CaseValue implements IEnumerationCase {
+            static typeName: string;
+            container: SequenceFlow;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListEquals extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): ListEquals;
+            load(callback: (element: ListEquals) => void): any;
+        }
+        class ListEquals extends BinaryListOperation implements IListEquals {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
+         */
+        interface IErrorEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ErrorEvent;
+            load(callback: (element: ErrorEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
+         */
+        class ErrorEvent extends MicroflowObject implements IErrorEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
+         */
+        interface IExclusiveMerge extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ExclusiveMerge;
+            load(callback: (element: ExclusiveMerge) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
+         */
+        class ExclusiveMerge extends MicroflowObject implements IExclusiveMerge {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
+         */
+        interface IExclusiveSplit extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ExclusiveSplit;
+            load(callback: (element: ExclusiveSplit) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
+         */
+        class ExclusiveSplit extends MicroflowObject implements IExclusiveSplit {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            splitCondition: SplitCondition;
+            caption: string;
+            errorHandlingType: ErrorHandlingType;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO : Abstract
+         */
+        interface ISplitCondition extends elements.IElement {
+            container: IExclusiveSplit;
+            load(): SplitCondition;
+            load(callback: (element: SplitCondition) => void): any;
+        }
+        /**
+         * TODO : Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SplitCondition extends elements.Element implements ISplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IExpressionSplitCondition extends ISplitCondition {
+            container: IExclusiveSplit;
+            load(): ExpressionSplitCondition;
+            load(callback: (element: ExpressionSplitCondition) => void): any;
+        }
+        class ExpressionSplitCondition extends SplitCondition implements IExpressionSplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IInspectAttribute extends IListOperation {
+            container: IListOperationAction;
+            load(): InspectAttribute;
+            load(callback: (element: InspectAttribute) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class InspectAttribute extends ListOperation implements IInspectAttribute {
+            static typeName: string;
+            container: ListOperationAction;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFilter extends IInspectAttribute {
+            container: IListOperationAction;
+            load(): Filter;
+            load(callback: (element: Filter) => void): any;
+        }
+        class Filter extends InspectAttribute implements IFilter {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFind extends IInspectAttribute {
+            container: IListOperationAction;
+            load(): Find;
+            load(callback: (element: Find) => void): any;
+        }
+        class Find extends InspectAttribute implements IFind {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHead extends IListOperation {
+            container: IListOperationAction;
+            load(): Head;
+            load(callback: (element: Head) => void): any;
+        }
+        class Head extends ListOperation implements IHead {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IInheritanceCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): InheritanceCase;
+            load(callback: (element: InheritanceCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class InheritanceCase extends CaseValue implements IInheritanceCase {
+            static typeName: string;
+            container: SequenceFlow;
+            value: domainmodels.IEntity;
+            valueQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
+         */
+        interface IInheritanceSplit extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): InheritanceSplit;
+            load(callback: (element: InheritanceSplit) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
+         */
+        class InheritanceSplit extends MicroflowObject implements IInheritanceSplit {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            splitVariableName: string;
+            caption: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IIntersect extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Intersect;
+            load(callback: (element: Intersect) => void): any;
+        }
+        class Intersect extends BinaryListOperation implements IIntersect {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
+         */
+        interface IJavaActionCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): JavaActionCallAction;
+            load(callback: (element: JavaActionCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
+         */
+        class JavaActionCallAction extends MicroflowAction implements IJavaActionCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            javaAction: javaactions.IJavaAction;
+            javaActionQualifiedName: string;
+            parameterMappings: instances.IList<JavaActionParameterMapping>;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IJavaActionParameterMapping extends elements.IElement {
+            container: IJavaActionCallAction;
+            load(): JavaActionParameterMapping;
+            load(callback: (element: JavaActionParameterMapping) => void): any;
+        }
+        class JavaActionParameterMapping extends elements.Element implements IJavaActionParameterMapping {
+            static typeName: string;
+            container: JavaActionCallAction;
+            parameter: javaactions.IJavaActionParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
+         */
+        interface IListOperationAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ListOperationAction;
+            load(callback: (element: ListOperationAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
+         */
+        class ListOperationAction extends MicroflowAction implements IListOperationAction {
+            static typeName: string;
+            container: ActionActivity;
+            operation: ListOperation;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
+         */
+        interface ILogMessageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): LogMessageAction;
+            load(callback: (element: LogMessageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
+         */
+        class LogMessageAction extends MicroflowAction implements ILogMessageAction {
+            static typeName: string;
+            container: ActionActivity;
+            level: LogLevel;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            node: string;
+            messageTemplate: StringTemplate;
+            includeLatestStackTrace: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
+         */
+        interface ILoopedActivity extends IActivity {
+            container: IMicroflowObjectCollection;
+            load(): LoopedActivity;
+            load(callback: (element: LoopedActivity) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
+         */
+        class LoopedActivity extends Activity implements ILoopedActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            objectCollection: MicroflowObjectCollection;
+            iteratedListVariableName: string;
+            loopVariableName: string;
+            errorHandlingType: ErrorHandlingType;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Abstract
+         */
+        interface IMicroflowBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MicroflowBase;
+            load(callback: (element: MicroflowBase) => void): any;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            returnType: string;
+        }
+        /**
+         * TODO: Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowBase extends projects.Document implements IMicroflowBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            objectCollection: MicroflowObjectCollection;
+            flows: instances.IList<Flow>;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            returnType: string;
+            applyEntityAccess: boolean;
+            markAsUsed: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
+         */
+        interface IMicroflow extends IMicroflowBase {
+            container: projects.IFolderBase;
+            load(): Microflow;
+            load(callback: (element: Microflow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
+         */
+        class Microflow extends MicroflowBase implements IMicroflow {
+            static typeName: string;
+            container: projects.FolderBase;
+            allowedModuleRoles: instances.IList<security.IModuleRole>;
+            allowedModuleRolesQualifiedNames: string[];
+            allowConcurrentExecution: boolean;
+            concurrenyErrorMessage: texts.Text;
+            concurrencyErrorMicroflow: IMicroflow;
+            concurrencyErrorMicroflowQualifiedName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowCall extends elements.IElement {
+            container: IMicroflowCallAction;
+            load(): MicroflowCall;
+            load(callback: (element: MicroflowCall) => void): any;
+        }
+        class MicroflowCall extends elements.Element implements IMicroflowCall {
+            static typeName: string;
+            container: MicroflowCallAction;
+            microflow: IMicroflow;
+            microflowQualifiedName: string;
+            parameterMappings: instances.IList<MicroflowCallParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
+         */
+        interface IMicroflowCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): MicroflowCallAction;
+            load(callback: (element: MicroflowCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
+         */
+        class MicroflowCallAction extends MicroflowAction implements IMicroflowCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            microflowCall: MicroflowCall;
+            useReturnVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowCallParameterMapping extends elements.IElement {
+            container: IMicroflowCall;
+            load(): MicroflowCallParameterMapping;
+            load(callback: (element: MicroflowCallParameterMapping) => void): any;
+        }
+        class MicroflowCallParameterMapping extends elements.Element implements IMicroflowCallParameterMapping {
+            static typeName: string;
+            container: MicroflowCall;
+            parameter: IMicroflowParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: artificial object
+         */
+        interface IMicroflowObjectCollection extends elements.IElement {
+            load(): MicroflowObjectCollection;
+            load(callback: (element: MicroflowObjectCollection) => void): any;
+        }
+        /**
+         * TODO: artificial object
+         */
+        class MicroflowObjectCollection extends elements.Element implements IMicroflowObjectCollection {
+            static typeName: string;
+            objects: instances.IList<MicroflowObject>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowParameterBase extends elements.IElement {
+            container: IMicroflowBase;
+            load(): MicroflowParameterBase;
+            load(callback: (element: MicroflowParameterBase) => void): any;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowParameterBase extends elements.Element implements IMicroflowParameterBase {
+            static typeName: string;
+            container: MicroflowBase;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        interface IMicroflowParameter extends IMicroflowParameterBase {
+            container: IMicroflow;
+            load(): MicroflowParameter;
+            load(callback: (element: MicroflowParameter) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        class MicroflowParameter extends MicroflowParameterBase implements IMicroflowParameter {
+            static typeName: string;
+            container: Microflow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        interface IRuleParameter extends IMicroflowParameterBase {
+            container: IRule;
+            load(): RuleParameter;
+            load(callback: (element: RuleParameter) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        class RuleParameter extends MicroflowParameterBase implements IRuleParameter {
+            static typeName: string;
+            container: Rule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowParameterObject extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): MicroflowParameterObject;
+            load(callback: (element: MicroflowParameterObject) => void): any;
+        }
+        class MicroflowParameterObject extends MicroflowObject implements IMicroflowParameterObject {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface INoCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): NoCase;
+            load(callback: (element: NoCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class NoCase extends CaseValue implements INoCase {
+            static typeName: string;
+            container: SequenceFlow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
+         */
+        interface IRetrieveAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): RetrieveAction;
+            load(callback: (element: RetrieveAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
+         */
+        class RetrieveAction extends MicroflowAction implements IRetrieveAction {
+            static typeName: string;
+            container: ActionActivity;
+            retrieveSource: RetrieveSource;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
+         */
+        interface IRollbackAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): RollbackAction;
+            load(callback: (element: RollbackAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
+         */
+        class RollbackAction extends MicroflowAction implements IRollbackAction {
+            static typeName: string;
+            container: ActionActivity;
+            rollbackVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
+         */
+        interface IRule extends IMicroflowBase {
+            container: projects.IFolderBase;
+            load(): Rule;
+            load(callback: (element: Rule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
+         */
+        class Rule extends MicroflowBase implements IRule {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRuleCall extends elements.IElement {
+            container: IRuleSplitCondition;
+            load(): RuleCall;
+            load(callback: (element: RuleCall) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class RuleCall extends elements.Element implements IRuleCall {
+            static typeName: string;
+            container: RuleSplitCondition;
+            rule: IRule;
+            ruleQualifiedName: string;
+            parameterMappings: instances.IList<RuleCallParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRuleCallParameterMapping extends elements.IElement {
+            container: IRuleCall;
+            load(): RuleCallParameterMapping;
+            load(callback: (element: RuleCallParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class RuleCallParameterMapping extends elements.Element implements IRuleCallParameterMapping {
+            static typeName: string;
+            container: RuleCall;
+            parameter: IRuleParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRuleSplitCondition extends ISplitCondition {
+            container: IExclusiveSplit;
+            load(): RuleSplitCondition;
+            load(callback: (element: RuleSplitCondition) => void): any;
+        }
+        class RuleSplitCondition extends SplitCondition implements IRuleSplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            ruleCall: RuleCall;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
+         */
+        interface ISequenceFlow extends IFlow {
+            container: IMicroflowBase;
+            load(): SequenceFlow;
+            load(callback: (element: SequenceFlow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
+         */
+        class SequenceFlow extends Flow implements ISequenceFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            caseValue: CaseValue;
+            isErrorHandler: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISort extends IListOperation {
+            container: IListOperationAction;
+            load(): Sort;
+            load(callback: (element: Sort) => void): any;
+        }
+        class Sort extends ListOperation implements ISort {
+            static typeName: string;
+            container: ListOperationAction;
+            sortItemList: SortItemList;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISortItem extends elements.IElement {
+            container: ISortItemList;
+            load(): SortItem;
+            load(callback: (element: SortItem) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SortItem extends elements.Element implements ISortItem {
+            static typeName: string;
+            container: SortItemList;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            sortOrder: SortOrderEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISortItemList extends elements.IElement {
+            load(): SortItemList;
+            load(callback: (element: SortItemList) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SortItemList extends elements.Element implements ISortItemList {
+            static typeName: string;
+            items: instances.IList<SortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
+         */
+        interface IStartEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): StartEvent;
+            load(callback: (element: StartEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
+         */
+        class StartEvent extends MicroflowObject implements IStartEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITemplate extends elements.IElement {
+            load(): Template;
+            load(callback: (element: Template) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Template extends elements.Element implements ITemplate {
+            static typeName: string;
+            arguments: instances.IList<TemplateArgument>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IStringTemplate extends ITemplate {
+            load(): StringTemplate;
+            load(callback: (element: StringTemplate) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class StringTemplate extends Template implements IStringTemplate {
+            static typeName: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISubtract extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Subtract;
+            load(callback: (element: Subtract) => void): any;
+        }
+        class Subtract extends BinaryListOperation implements ISubtract {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITail extends IListOperation {
+            container: IListOperationAction;
+            load(): Tail;
+            load(callback: (element: Tail) => void): any;
+        }
+        class Tail extends ListOperation implements ITail {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ITemplateArgument extends elements.IElement {
+            container: ITemplate;
+            load(): TemplateArgument;
+            load(callback: (element: TemplateArgument) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class TemplateArgument extends elements.Element implements ITemplateArgument {
+            static typeName: string;
+            container: Template;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ITextTemplate extends ITemplate {
+            load(): TextTemplate;
+            load(callback: (element: TextTemplate) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class TextTemplate extends Template implements ITextTemplate {
+            static typeName: string;
+            text: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IUnion extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Union;
+            load(callback: (element: Union) => void): any;
+        }
+        class Union extends BinaryListOperation implements IUnion {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class NullValueOption extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SendAsNil: NullValueOption;
+            static LeaveOutElement: NullValueOption;
+        }
+        class LanguageSettingType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static CurrentUser: LanguageSettingType;
+            static ProjectDefault: LanguageSettingType;
+            static Variable: LanguageSettingType;
+        }
+        class TargetDocumentType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static HTML: TargetDocumentType;
+            static PDF: TargetDocumentType;
+            static DOCX: TargetDocumentType;
+            static DOC: TargetDocumentType;
+            static RTF: TargetDocumentType;
+            static ODT: TargetDocumentType;
+        }
+        class ShowMessageType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Information: ShowMessageType;
+            static Warning: ShowMessageType;
+            static Error: ShowMessageType;
+        }
+        class ActionActivityColor extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ActionActivityColor;
+            static Red: ActionActivityColor;
+            static Orange: ActionActivityColor;
+            static Yellow: ActionActivityColor;
+            static Green: ActionActivityColor;
+            static Blue: ActionActivityColor;
+            static Purple: ActionActivityColor;
+            static Gray: ActionActivityColor;
+        }
+        class AggregateFunctionEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Sum: AggregateFunctionEnum;
+            static Average: AggregateFunctionEnum;
+            static Count: AggregateFunctionEnum;
+            static Minimum: AggregateFunctionEnum;
+            static Maximum: AggregateFunctionEnum;
+        }
+        class ChangeActionItemType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Set: ChangeActionItemType;
+            static Add: ChangeActionItemType;
+            static Remove: ChangeActionItemType;
+        }
+        class ChangeListActionType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Set: ChangeListActionType;
+            static Add: ChangeListActionType;
+            static Remove: ChangeListActionType;
+            static Clear: ChangeListActionType;
+        }
+        class CommitEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Yes: CommitEnum;
+            static YesWithoutEvents: CommitEnum;
+            static No: CommitEnum;
+        }
+        class ErrorHandlingType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Rollback: ErrorHandlingType;
+            static Custom: ErrorHandlingType;
+            static CustomWithoutRollBack: ErrorHandlingType;
+            static Continue: ErrorHandlingType;
+        }
+        class LogLevel extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Trace: LogLevel;
+            static Debug: LogLevel;
+            static Info: LogLevel;
+            static Warning: LogLevel;
+            static Error: LogLevel;
+            static Critical: LogLevel;
+        }
+        class SortOrderEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Ascending: SortOrderEnum;
+            static Descending: SortOrderEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `WebServices`.
+     */
+    module webservices {
+        interface IDataMember extends elements.IElement {
+            load(): DataMember;
+            load(callback: (element: DataMember) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataMember extends elements.Element implements IDataMember {
+            static typeName: string;
+            isLockedByContract: boolean;
+            exposedName: string;
+            isOptionalByContract: boolean;
+            isOptional: boolean;
+            isNillableByContract: boolean;
+            isNillable: boolean;
+            isKey: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataEntityBase extends IDataMember {
+            load(): DataEntityBase;
+            load(callback: (element: DataEntityBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataEntityBase extends DataMember implements IDataEntityBase {
+            static typeName: string;
+            childMembers: instances.IList<DataMember>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            exposedItemName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataAssociation extends IDataEntityBase {
+            container: IDataEntityBase;
+            load(): DataAssociation;
+            load(callback: (element: DataAssociation) => void): any;
+        }
+        class DataAssociation extends DataEntityBase implements IDataAssociation {
+            static typeName: string;
+            container: DataEntityBase;
+            associationByContract: appservices.MsdAssociation;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataAttribute extends IDataMember {
+            container: IDataEntityBase;
+            load(): DataAttribute;
+            load(callback: (element: DataAttribute) => void): any;
+        }
+        class DataAttribute extends DataMember implements IDataAttribute {
+            static typeName: string;
+            container: DataEntityBase;
+            attributeByContract: appservices.MsdAttribute;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataEntity extends IDataEntityBase {
+            load(): DataEntity;
+            load(callback: (element: DataEntity) => void): any;
+        }
+        class DataEntity extends DataEntityBase implements IDataEntity {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
+         */
+        interface IImportedWebService extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ImportedWebService;
+            load(callback: (element: ImportedWebService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
+         */
+        class ImportedWebService extends projects.Document implements IImportedWebService {
+            static typeName: string;
+            container: projects.FolderBase;
+            wsdlDescription: WsdlDescription;
+            wsdlUrl: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOperationInfo extends elements.IElement {
+            container: IServiceInfo;
+            load(): OperationInfo;
+            load(callback: (element: OperationInfo) => void): any;
+        }
+        class OperationInfo extends elements.Element implements IOperationInfo {
+            static typeName: string;
+            container: ServiceInfo;
+            requestHeaderRpcElement: RpcOperationElement;
+            requestBodyRpcElement: RpcOperationElement;
+            responseBodyRpcElement: RpcOperationElement;
+            requestHeaderPartEncoding: PartEncoding;
+            requestBodyPartEncodings: instances.IList<PartEncoding>;
+            name: string;
+            documentation: string;
+            soapAction: string;
+            requestHeaderElementName: string;
+            requestHeaderEncoded: boolean;
+            requestBodyEncoded: boolean;
+            requestBodyElementName: string;
+            responseBodyElementName: string;
+            allowSimpleMappingInheritance: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPartEncoding extends elements.IElement {
+            container: IOperationInfo;
+            load(): PartEncoding;
+            load(callback: (element: PartEncoding) => void): any;
+        }
+        class PartEncoding extends elements.Element implements IPartEncoding {
+            static typeName: string;
+            container: OperationInfo;
+            partName: string;
+            partXsdType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedServiceBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): PublishedServiceBase;
+            load(callback: (element: PublishedServiceBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class PublishedServiceBase extends projects.Document implements IPublishedServiceBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            versionedServices: instances.IList<VersionedService>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
+         */
+        interface IPublishedAppService extends IPublishedServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedAppService;
+            load(callback: (element: PublishedAppService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
+         */
+        class PublishedAppService extends PublishedServiceBase implements IPublishedAppService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedOperation extends elements.IElement {
+            container: IVersionedService;
+            load(): PublishedOperation;
+            load(callback: (element: PublishedOperation) => void): any;
+        }
+        class PublishedOperation extends elements.Element implements IPublishedOperation {
+            static typeName: string;
+            container: VersionedService;
+            parameters: instances.IList<PublishedParameter>;
+            dataEntity: DataEntity;
+            isLockedByContract: boolean;
+            name: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            description: string;
+            documentation: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            returnTypeNameByContract: string;
+            returnTypeSpecificationByContract: string;
+            entityExposedNameByContract: string;
+            entityExposedName: string;
+            returnTypeIsOptional: boolean;
+            returnTypeIsNillable: boolean;
+            returnType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedParameter extends elements.IElement {
+            container: IPublishedOperation;
+            load(): PublishedParameter;
+            load(callback: (element: PublishedParameter) => void): any;
+        }
+        class PublishedParameter extends elements.Element implements IPublishedParameter {
+            static typeName: string;
+            container: PublishedOperation;
+            parameterByContract: appservices.MsdMicroflowParameter;
+            dataEntity: DataEntity;
+            isLockedByContract: boolean;
+            parameter: microflows.IMicroflowParameter;
+            parameterQualifiedName: string;
+            entityExposedName: string;
+            isOptionalByContract: boolean;
+            isOptional: boolean;
+            isNillable: boolean;
+            entityExposedItemNameByContract: string;
+            entityExposedItemName: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        interface IPublishedWebService extends IPublishedServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedWebService;
+            load(callback: (element: PublishedWebService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        class PublishedWebService extends PublishedServiceBase implements IPublishedWebService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRpcMessagePartElement extends elements.IElement {
+            container: IRpcOperationElement;
+            load(): RpcMessagePartElement;
+            load(callback: (element: RpcMessagePartElement) => void): any;
+        }
+        class RpcMessagePartElement extends elements.Element implements IRpcMessagePartElement {
+            static typeName: string;
+            container: RpcOperationElement;
+            partName: string;
+            typeName: string;
+            elementName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRpcOperationElement extends elements.IElement {
+            container: IOperationInfo;
+            load(): RpcOperationElement;
+            load(callback: (element: RpcOperationElement) => void): any;
+        }
+        class RpcOperationElement extends elements.Element implements IRpcOperationElement {
+            static typeName: string;
+            container: OperationInfo;
+            messagePartElements: instances.IList<RpcMessagePartElement>;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IServiceInfo extends elements.IElement {
+            container: IWsdlDescription;
+            load(): ServiceInfo;
+            load(callback: (element: ServiceInfo) => void): any;
+        }
+        class ServiceInfo extends elements.Element implements IServiceInfo {
+            static typeName: string;
+            container: WsdlDescription;
+            operations: instances.IList<OperationInfo>;
+            name: string;
+            documentation: string;
+            portName: string;
+            location: string;
+            soapVersion: SoapVersion;
+            locationConstant: constants.IConstant;
+            locationConstantQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        interface IVersionedService extends elements.IElement {
+            container: IPublishedServiceBase;
+            load(): VersionedService;
+            load(callback: (element: VersionedService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        class VersionedService extends elements.Element implements IVersionedService {
+            static typeName: string;
+            container: PublishedServiceBase;
+            operations: instances.IList<PublishedOperation>;
+            enumerationsByContract: appservices.MsdEnumerationContainer;
+            documentation: string;
+            targetNamespace: string;
+            headerAuthentication: integration.HeaderAuthentication;
+            isLockedByContract: boolean;
+            headerImportMapping: importmappings.IImportMapping;
+            headerImportMappingQualifiedName: string;
+            headerMicroflow: microflows.IMicroflow;
+            headerMicroflowQualifiedName: string;
+            versionNumber: number;
+            caption: string;
+            description: string;
+            appServiceState: AppServiceState;
+            image: images.IImage;
+            imageQualifiedName: string;
+            validate: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWsdlDescription extends elements.IElement {
+            load(): WsdlDescription;
+            load(callback: (element: WsdlDescription) => void): any;
+        }
+        class WsdlDescription extends elements.Element implements IWsdlDescription {
+            static typeName: string;
+            wsdlEntries: instances.IList<WsdlEntry>;
+            schemaEntries: instances.IList<xmlschemas.MxXmlSchemaEntry>;
+            services: instances.IList<ServiceInfo>;
+            targetNamespace: string;
+            importsHaveLocations: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWsdlEntry extends elements.IElement {
+            container: IWsdlDescription;
+            load(): WsdlEntry;
+            load(callback: (element: WsdlEntry) => void): any;
+        }
+        class WsdlEntry extends elements.Element implements IWsdlEntry {
+            static typeName: string;
+            container: WsdlDescription;
+            location: string;
+            contents: string;
+            localizedLocationFormat: string;
+            localizedContentsFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class AppServiceState extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Draft: AppServiceState;
+            static Consumable: AppServiceState;
+            static Deprecated: AppServiceState;
+        }
+        class SoapVersion extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Soap11: SoapVersion;
+            static Soap12: SoapVersion;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import instances = internal.instances;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Integration`.
+     */
+    module integration {
+        class AppServiceLocationEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: AppServiceLocationEnum;
+            static Constant: AppServiceLocationEnum;
+            static Parameter: AppServiceLocationEnum;
+        }
+        class ElementType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Undefined: ElementType;
+            static Inheritance: ElementType;
+            static Choice: ElementType;
+            static Object: ElementType;
+            static Value: ElementType;
+            static Sequence: ElementType;
+            static All: ElementType;
+        }
+        class HeaderAuthentication extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: HeaderAuthentication;
+            static UsernamePassword: HeaderAuthentication;
+            static Custom: HeaderAuthentication;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `XmlSchemas`.
+     */
+    module xmlschemas {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
+         */
+        interface IMxXmlSchema extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MxXmlSchema;
+            load(callback: (element: MxXmlSchema) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
+         */
+        class MxXmlSchema extends projects.Document implements IMxXmlSchema {
+            static typeName: string;
+            container: projects.FolderBase;
+            schemaEntries: instances.IList<MxXmlSchemaEntry>;
+            filePath: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxXmlSchemaEntry extends elements.IElement {
+            load(): MxXmlSchemaEntry;
+            load(callback: (element: MxXmlSchemaEntry) => void): any;
+        }
+        class MxXmlSchemaEntry extends elements.Element implements IMxXmlSchemaEntry {
+            static typeName: string;
+            targetNamespace: string;
+            location: string;
+            contents: string;
+            localizedLocationFormat: string;
+            localizedContentsFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class XmlPrimitiveType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Unknown: XmlPrimitiveType;
+            static Boolean: XmlPrimitiveType;
+            static Date: XmlPrimitiveType;
+            static Time: XmlPrimitiveType;
+            static DateTime: XmlPrimitiveType;
+            static Decimal: XmlPrimitiveType;
+            static Float: XmlPrimitiveType;
+            static Integer: XmlPrimitiveType;
+            static Binary: XmlPrimitiveType;
+            static String: XmlPrimitiveType;
+            static AnyType: XmlPrimitiveType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `AppServices`.
+     */
+    module appservices {
+        interface IAppServiceAction extends elements.IElement {
+            container: IConsumedAppService;
+            load(): AppServiceAction;
+            load(callback: (element: AppServiceAction) => void): any;
+            parameters: instances.IList<IAppServiceActionParameter>;
+            name: string;
+        }
+        class AppServiceAction extends elements.Element implements IAppServiceAction {
+            static typeName: string;
+            container: ConsumedAppService;
+            parameters: instances.IList<AppServiceActionParameter>;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            returnType: string;
+            returnTypeCanBeEmpty: boolean;
+            name: string;
+            imageString: string;
+            caption: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAppServiceActionParameter extends elements.IElement {
+            container: IAppServiceAction;
+            load(): AppServiceActionParameter;
+            load(callback: (element: AppServiceActionParameter) => void): any;
+            name: string;
+        }
+        class AppServiceActionParameter extends elements.Element implements IAppServiceActionParameter {
+            static typeName: string;
+            container: AppServiceAction;
+            name: string;
+            type: string;
+            canBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
+         */
+        interface IConsumedAppService extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ConsumedAppService;
+            load(callback: (element: ConsumedAppService) => void): any;
+            actions: instances.IList<IAppServiceAction>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
+         */
+        class ConsumedAppService extends projects.Document implements IConsumedAppService {
+            static typeName: string;
+            container: projects.FolderBase;
+            actions: instances.IList<AppServiceAction>;
+            msd: Msd;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+            appServiceLocation: integration.AppServiceLocationEnum;
+            locationConstant: constants.IConstant;
+            locationConstantQualifiedName: string;
+            useTimeOut: boolean;
+            timeOut: number;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsd extends elements.IElement {
+            container: IConsumedAppService;
+            load(): Msd;
+            load(callback: (element: Msd) => void): any;
+        }
+        class Msd extends elements.Element implements IMsd {
+            static typeName: string;
+            container: ConsumedAppService;
+            version: MsdVersion;
+            metadata: MsdMetadata;
+            domainModel: MsdDomainModel;
+            enumerations: MsdEnumerationContainer;
+            wsdlDescription: webservices.WsdlDescription;
+            wsdlString: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdAssociation extends elements.IElement {
+            load(): MsdAssociation;
+            load(callback: (element: MsdAssociation) => void): any;
+        }
+        class MsdAssociation extends elements.Element implements IMsdAssociation {
+            static typeName: string;
+            name: string;
+            guid: string;
+            parentEntityName: string;
+            childEntityName: string;
+            associationType: string;
+            associationOwner: string;
+            parentDeleteBehavior: string;
+            childDeleteBehavior: string;
+            associationKind: string;
+            parentX: number;
+            parentY: number;
+            childX: number;
+            childY: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdAttribute extends elements.IElement {
+            load(): MsdAttribute;
+            load(callback: (element: MsdAttribute) => void): any;
+        }
+        class MsdAttribute extends elements.Element implements IMsdAttribute {
+            static typeName: string;
+            name: string;
+            guid: string;
+            attributeType: string;
+            enumerationName: string;
+            defaultValue: string;
+            length: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdDomainModel extends elements.IElement {
+            container: IMsd;
+            load(): MsdDomainModel;
+            load(callback: (element: MsdDomainModel) => void): any;
+        }
+        class MsdDomainModel extends elements.Element implements IMsdDomainModel {
+            static typeName: string;
+            container: Msd;
+            entities: instances.IList<MsdEntity>;
+            associations: instances.IList<MsdAssociation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEntity extends elements.IElement {
+            container: IMsdDomainModel;
+            load(): MsdEntity;
+            load(callback: (element: MsdEntity) => void): any;
+        }
+        class MsdEntity extends elements.Element implements IMsdEntity {
+            static typeName: string;
+            container: MsdDomainModel;
+            attributes: instances.IList<MsdAttribute>;
+            name: string;
+            guid: string;
+            generalizationName: string;
+            persistable: boolean;
+            locationX: number;
+            locationY: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumeration extends elements.IElement {
+            container: IMsdEnumerationContainer;
+            load(): MsdEnumeration;
+            load(callback: (element: MsdEnumeration) => void): any;
+        }
+        class MsdEnumeration extends elements.Element implements IMsdEnumeration {
+            static typeName: string;
+            container: MsdEnumerationContainer;
+            values: instances.IList<MsdEnumerationValue>;
+            name: string;
+            guid: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumerationContainer extends elements.IElement {
+            load(): MsdEnumerationContainer;
+            load(callback: (element: MsdEnumerationContainer) => void): any;
+        }
+        class MsdEnumerationContainer extends elements.Element implements IMsdEnumerationContainer {
+            static typeName: string;
+            msdEnumerations: instances.IList<MsdEnumeration>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumerationValue extends elements.IElement {
+            container: IMsdEnumeration;
+            load(): MsdEnumerationValue;
+            load(callback: (element: MsdEnumerationValue) => void): any;
+        }
+        class MsdEnumerationValue extends elements.Element implements IMsdEnumerationValue {
+            static typeName: string;
+            container: MsdEnumeration;
+            translations: instances.IList<MsdText>;
+            name: string;
+            guid: string;
+            base64image: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMetadata extends elements.IElement {
+            container: IMsd;
+            load(): MsdMetadata;
+            load(callback: (element: MsdMetadata) => void): any;
+        }
+        class MsdMetadata extends elements.Element implements IMsdMetadata {
+            static typeName: string;
+            container: Msd;
+            microflows: instances.IList<MsdMicroflow>;
+            name: string;
+            documentation: string;
+            version: number;
+            publishDateTime: string;
+            serviceGuid: string;
+            versionGuid: string;
+            instanceGuid: string;
+            supportedProtocols: instances.IList<string>;
+            headerAuthentication: string;
+            caption: string;
+            imageBase64: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMicroflow extends elements.IElement {
+            container: IMsdMetadata;
+            load(): MsdMicroflow;
+            load(callback: (element: MsdMicroflow) => void): any;
+        }
+        class MsdMicroflow extends elements.Element implements IMsdMicroflow {
+            static typeName: string;
+            container: MsdMetadata;
+            parameters: instances.IList<MsdMicroflowParameter>;
+            name: string;
+            documentation: string;
+            imageBase64: string;
+            description: string;
+            returnType: string;
+            systemEntityType: string;
+            returnTypeSpecification: string;
+            returnTypeCanBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMicroflowParameter extends elements.IElement {
+            load(): MsdMicroflowParameter;
+            load(callback: (element: MsdMicroflowParameter) => void): any;
+        }
+        class MsdMicroflowParameter extends elements.Element implements IMsdMicroflowParameter {
+            static typeName: string;
+            name: string;
+            type: string;
+            typeSpecification: string;
+            systemEntityType: string;
+            canBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdText extends elements.IElement {
+            container: IMsdEnumerationValue;
+            load(): MsdText;
+            load(callback: (element: MsdText) => void): any;
+        }
+        class MsdText extends elements.Element implements IMsdText {
+            static typeName: string;
+            container: MsdEnumerationValue;
+            languageCode: string;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdVersion extends elements.IElement {
+            container: IMsd;
+            load(): MsdVersion;
+            load(callback: (element: MsdVersion) => void): any;
+        }
+        class MsdVersion extends elements.Element implements IMsdVersion {
+            static typeName: string;
+            container: Msd;
+            version: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Mappings`.
+     */
+    module mappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingMicroflowCall extends elements.IElement {
+            container: IObjectMappingElement;
+            load(): MappingMicroflowCall;
+            load(callback: (element: MappingMicroflowCall) => void): any;
+        }
+        class MappingMicroflowCall extends elements.Element implements IMappingMicroflowCall {
+            static typeName: string;
+            container: ObjectMappingElement;
+            parameterMappings: instances.IList<MappingMicroflowParameter>;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingMicroflowParameter extends elements.IElement {
+            container: IMappingMicroflowCall;
+            load(): MappingMicroflowParameter;
+            load(callback: (element: MappingMicroflowParameter) => void): any;
+        }
+        class MappingMicroflowParameter extends elements.Element implements IMappingMicroflowParameter {
+            static typeName: string;
+            container: MappingMicroflowCall;
+            parameter: microflows.IMicroflowParameter;
+            parameterQualifiedName: string;
+            levelOfParent: number;
+            valueElementPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: MappingMicroflowCall;
+            children: instances.IList<MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: importmappings.ObjectHandlingEnum;
+            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends IMappingElement {
+            container: IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ExportMappings`.
+     */
+    module exportmappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
+         */
+        interface IExportMapping extends mappings.IMappingDocument {
+            container: projects.IFolderBase;
+            load(): ExportMapping;
+            load(callback: (element: ExportMapping) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
+         */
+        class ExportMapping extends mappings.MappingDocument implements IExportMapping {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameterName: string;
+            parameterTypeName: string;
+            isHeader: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends mappings.IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: mappings.MappingMicroflowCall;
+            children: instances.IList<mappings.MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: importmappings.ObjectHandlingEnum;
+            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IExportObjectMappingElement extends mappings.IObjectMappingElement {
+            load(): ExportObjectMappingElement;
+            load(callback: (element: ExportObjectMappingElement) => void): any;
+        }
+        class ExportObjectMappingElement extends mappings.ObjectMappingElement implements IExportObjectMappingElement {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends mappings.IMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IExportValueMappingElement extends mappings.IValueMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ExportValueMappingElement;
+            load(callback: (element: ExportValueMappingElement) => void): any;
+        }
+        class ExportValueMappingElement extends mappings.ValueMappingElement implements IExportValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ImportMappings`.
+     */
+    module importmappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
+         */
+        interface IImportMapping extends mappings.IMappingDocument {
+            container: projects.IFolderBase;
+            load(): ImportMapping;
+            load(callback: (element: ImportMapping) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
+         */
+        class ImportMapping extends mappings.MappingDocument implements IImportMapping {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameterEntity: domainmodels.IEntity;
+            parameterEntityQualifiedName: string;
+            useSubtransactionsForMicroflows: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends mappings.IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: mappings.MappingMicroflowCall;
+            children: instances.IList<mappings.MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: ObjectHandlingEnum;
+            objectHandlingBackup: ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImportObjectMappingElement extends mappings.IObjectMappingElement {
+            load(): ImportObjectMappingElement;
+            load(callback: (element: ImportObjectMappingElement) => void): any;
+        }
+        class ImportObjectMappingElement extends mappings.ObjectMappingElement implements IImportObjectMappingElement {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends mappings.IMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImportValueMappingElement extends mappings.IValueMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ImportValueMappingElement;
+            load(callback: (element: ImportValueMappingElement) => void): any;
+        }
+        class ImportValueMappingElement extends mappings.ValueMappingElement implements IImportValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class ObjectHandlingBackupEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: ObjectHandlingBackupEnum;
+            static Ignore: ObjectHandlingBackupEnum;
+            static Error: ObjectHandlingBackupEnum;
+        }
+        class ObjectHandlingEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: ObjectHandlingEnum;
+            static Find: ObjectHandlingEnum;
+            static Custom: ObjectHandlingEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Rest`.
+     */
+    module rest {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestServiceBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): PublishedRestServiceBase;
+            load(callback: (element: PublishedRestServiceBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class PublishedRestServiceBase extends projects.Document implements IPublishedRestServiceBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            resources: instances.IList<PublishedRestResource>;
+            namespaceName: string;
+            path: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedOdataService extends IPublishedRestServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedOdataService;
+            load(callback: (element: PublishedOdataService) => void): any;
+        }
+        class PublishedOdataService extends PublishedRestServiceBase implements IPublishedOdataService {
+            static typeName: string;
+            container: projects.FolderBase;
+            allowedRoleIds: instances.IList<security.IModuleRole>;
+            allowedRoleIdsQualifiedNames: string[];
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestResource extends elements.IElement {
+            container: IPublishedRestServiceBase;
+            load(): PublishedRestResource;
+            load(callback: (element: PublishedRestResource) => void): any;
+        }
+        class PublishedRestResource extends elements.Element implements IPublishedRestResource {
+            static typeName: string;
+            container: PublishedRestServiceBase;
+            dataEntity: webservices.DataEntity;
+            path: string;
+            usePaging: boolean;
+            pageSize: number;
+            returnType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestService extends IPublishedRestServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedRestService;
+            load(callback: (element: PublishedRestService) => void): any;
+        }
+        class PublishedRestService extends PublishedRestServiceBase implements IPublishedRestService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Settings`.
+     */
+    module settings {
+        interface ICertificate extends elements.IElement {
+            container: IProjectSettings;
+            load(): Certificate;
+            load(callback: (element: Certificate) => void): any;
+        }
+        class Certificate extends elements.Element implements ICertificate {
+            static typeName: string;
+            container: ProjectSettings;
+            type: CertificateType;
+            data: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConstantValue extends elements.IElement {
+            container: IServerConfiguration;
+            load(): ConstantValue;
+            load(callback: (element: ConstantValue) => void): any;
+        }
+        class ConstantValue extends elements.Element implements IConstantValue {
+            static typeName: string;
+            container: ServerConfiguration;
+            constant: constants.IConstant;
+            constantQualifiedName: string;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomSetting extends elements.IElement {
+            container: IServerConfiguration;
+            load(): CustomSetting;
+            load(callback: (element: CustomSetting) => void): any;
+        }
+        class CustomSetting extends elements.Element implements ICustomSetting {
+            static typeName: string;
+            container: ServerConfiguration;
+            name: string;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectSettingsPart extends elements.IElement {
+            container: IProjectSettings;
+            load(): ProjectSettingsPart;
+            load(callback: (element: ProjectSettingsPart) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
+            static typeName: string;
+            container: ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegrationProjectSettingsPart extends IProjectSettingsPart {
+            container: IProjectSettings;
+            load(): IntegrationProjectSettingsPart;
+            load(callback: (element: IntegrationProjectSettingsPart) => void): any;
+        }
+        class IntegrationProjectSettingsPart extends ProjectSettingsPart implements IIntegrationProjectSettingsPart {
+            static typeName: string;
+            container: ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        interface IProjectSettings extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): ProjectSettings;
+            load(callback: (element: ProjectSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        class ProjectSettings extends projects.ProjectDocument implements IProjectSettings {
+            static typeName: string;
+            container: projects.Project;
+            languages: instances.IList<texts.Language>;
+            settingsParts: instances.IList<ProjectSettingsPart>;
+            configurations: instances.IList<ServerConfiguration>;
+            certificates: instances.IList<Certificate>;
+            hashAlgorithm: projects.HashAlgorithmType;
+            roundingMode: RoundingMode;
+            conversionState: projects.ConversionState;
+            skipJarAnalyzerStep: boolean;
+            afterStartupMicroflow: microflows.IMicroflow;
+            afterStartupMicroflowQualifiedName: string;
+            beforeShutdownMicroflow: microflows.IMicroflow;
+            beforeShutdownMicroflowQualifiedName: string;
+            healthCheckMicroflow: microflows.IMicroflow;
+            healthCheckMicroflowQualifiedName: string;
+            defaultLanguageCode: string;
+            firstDayOfWeek: FirstDayOfWeekEnum;
+            defaultTimeZoneCode: string;
+            scheduledEventTimeZoneCode: string;
+            allowUserMultipleSessions: boolean;
+            lowerCaseMicroflowVariables: boolean;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IServerConfiguration extends elements.IElement {
+            container: IProjectSettings;
+            load(): ServerConfiguration;
+            load(callback: (element: ServerConfiguration) => void): any;
+        }
+        class ServerConfiguration extends elements.Element implements IServerConfiguration {
+            static typeName: string;
+            container: ProjectSettings;
+            customSettings: instances.IList<CustomSetting>;
+            constantValues: instances.IList<ConstantValue>;
+            name: string;
+            applicationRootUrl: string;
+            portOnlyLocal: boolean;
+            adminPortOnlyLocal: boolean;
+            portNumber: number;
+            adminPortNumber: number;
+            maxJavaHeapSize: number;
+            emulateCloudSecurity: boolean;
+            extraJvmParameters: string;
+            databaseType: DatabaseType;
+            databaseUrl: string;
+            databaseName: string;
+            databaseUseIntegratedSecurity: boolean;
+            databaseUserName: string;
+            databasePassword: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class CertificateType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Authority: CertificateType;
+            static Client: CertificateType;
+        }
+        class DatabaseType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Hsqldb: DatabaseType;
+            static SqlServer: DatabaseType;
+            static MySql: DatabaseType;
+            static Oracle: DatabaseType;
+            static PostgreSql: DatabaseType;
+        }
+        class FirstDayOfWeekEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: FirstDayOfWeekEnum;
+            static Sunday: FirstDayOfWeekEnum;
+            static Monday: FirstDayOfWeekEnum;
+            static Tuesday: FirstDayOfWeekEnum;
+            static Wednesday: FirstDayOfWeekEnum;
+            static Thursday: FirstDayOfWeekEnum;
+            static Friday: FirstDayOfWeekEnum;
+            static Saturday: FirstDayOfWeekEnum;
+        }
+        class RoundingMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static HalfUp: RoundingMode;
+            static HalfEven: RoundingMode;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Pages`.
+     */
+    module pages {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IFormBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): FormBase;
+            load(callback: (element: FormBase) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FormBase extends projects.Document implements IFormBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            canvasWidth: number;
+            canvasHeight: number;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
+         */
+        interface IPage extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Page;
+            load(callback: (element: Page) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
+         */
+        class Page extends FormBase implements IPage {
+            static typeName: string;
+            container: projects.FolderBase;
+            layoutCall: LayoutCall;
+            title: texts.Text;
+            class: string;
+            style: string;
+            allowedRoles: instances.IList<security.IModuleRole>;
+            allowedRolesQualifiedNames: string[];
+            popupWidth: number;
+            popupHeight: number;
+            popupResizable: boolean;
+            markAsUsed: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
+         */
+        interface ILayout extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Layout;
+            load(callback: (element: Layout) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
+         */
+        class Layout extends FormBase implements ILayout {
+            static typeName: string;
+            container: projects.FolderBase;
+            widget: Widget;
+            layoutCall: LayoutCall;
+            layoutType: LayoutType;
+            mainPlaceholder: ILayoutParameter;
+            mainPlaceholderQualifiedName: string;
+            acceptButtonPlaceholder: ILayoutParameter;
+            acceptButtonPlaceholderQualifiedName: string;
+            cancelButtonPlaceholder: ILayoutParameter;
+            cancelButtonPlaceholderQualifiedName: string;
+            useMainPlaceholderForPopups: boolean;
+            class: string;
+            style: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutCall extends elements.IElement {
+            load(): LayoutCall;
+            load(callback: (element: LayoutCall) => void): any;
+        }
+        class LayoutCall extends elements.Element implements ILayoutCall {
+            static typeName: string;
+            layout: ILayout;
+            layoutQualifiedName: string;
+            arguments: instances.IList<LayoutCallArgument>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutCallArgument extends elements.IElement {
+            container: ILayoutCall;
+            load(): LayoutCallArgument;
+            load(callback: (element: LayoutCallArgument) => void): any;
+        }
+        class LayoutCallArgument extends elements.Element implements ILayoutCallArgument {
+            static typeName: string;
+            container: LayoutCall;
+            parameterName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutParameter extends elements.IElement {
+            container: ILayout;
+            load(): LayoutParameter;
+            load(callback: (element: LayoutParameter) => void): any;
+            name: string;
+        }
+        class LayoutParameter extends elements.Element implements ILayoutParameter {
+            static typeName: string;
+            container: Layout;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
+         */
+        interface IPlaceholder extends IWidget {
+            load(): Placeholder;
+            load(callback: (element: Placeholder) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
+         */
+        class Placeholder extends Widget implements IPlaceholder {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientAction extends elements.IElement {
+            load(): ClientAction;
+            load(callback: (element: ClientAction) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ClientAction extends elements.Element implements IClientAction {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface INoClientAction extends IClientAction {
+            load(): NoClientAction;
+            load(callback: (element: NoClientAction) => void): any;
+        }
+        class NoClientAction extends ClientAction implements INoClientAction {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IPageClientAction extends IClientAction {
+            load(): PageClientAction;
+            load(callback: (element: PageClientAction) => void): any;
+        }
+        class PageClientAction extends ClientAction implements IPageClientAction {
+            static typeName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowClientAction extends IClientAction {
+            load(): MicroflowClientAction;
+            load(callback: (element: MicroflowClientAction) => void): any;
+        }
+        class MicroflowClientAction extends ClientAction implements IMicroflowClientAction {
+            static typeName: string;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
+         */
+        interface IPageSettings extends elements.IElement {
+            load(): PageSettings;
+            load(callback: (element: PageSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
+         */
+        class PageSettings extends elements.Element implements IPageSettings {
+            static typeName: string;
+            page: IPage;
+            pageQualifiedName: string;
+            formTitle: texts.Text;
+            location: FormLocation;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
+         */
+        interface IMicroflowSettings extends elements.IElement {
+            load(): MicroflowSettings;
+            load(callback: (element: MicroflowSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
+         */
+        class MicroflowSettings extends elements.Element implements IMicroflowSettings {
+            static typeName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            useAllPages: boolean;
+            progressBar: ProgressBarType;
+            progressMessage: texts.Text;
+            asynchronous: boolean;
+            formValidations: FormValidations;
+            confirmationInfo: ConfirmationInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConfirmationInfo extends elements.IElement {
+            container: IMicroflowSettings;
+            load(): ConfirmationInfo;
+            load(callback: (element: ConfirmationInfo) => void): any;
+        }
+        class ConfirmationInfo extends elements.Element implements IConfirmationInfo {
+            static typeName: string;
+            container: MicroflowSettings;
+            question: texts.Text;
+            proceedButtonCaption: texts.Text;
+            cancelButtonCaption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionallyVisibleWidget extends IWidget {
+            load(): ConditionallyVisibleWidget;
+            load(callback: (element: ConditionallyVisibleWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionallyVisibleWidget extends Widget implements IConditionallyVisibleWidget {
+            static typeName: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
+         */
+        interface ILabel extends IConditionallyVisibleWidget {
+            load(): Label;
+            load(callback: (element: Label) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
+         */
+        class Label extends ConditionallyVisibleWidget implements ILabel {
+            static typeName: string;
+            caption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
+         */
+        interface IStaticImageViewer extends IConditionallyVisibleWidget {
+            load(): StaticImageViewer;
+            load(callback: (element: StaticImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
+         */
+        class StaticImageViewer extends ConditionallyVisibleWidget implements IStaticImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            widthUnit: ImageSizeUnit;
+            heightUnit: ImageSizeUnit;
+            width: number;
+            height: number;
+            clickAction: ClientAction;
+            responsive: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
+         */
+        interface IDivContainer extends IConditionallyVisibleWidget {
+            load(): DivContainer;
+            load(callback: (element: DivContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
+         */
+        class DivContainer extends ConditionallyVisibleWidget implements IDivContainer {
+            static typeName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IVerticalFlow extends IWidget {
+            load(): VerticalFlow;
+            load(callback: (element: VerticalFlow) => void): any;
+        }
+        class VerticalFlow extends Widget implements IVerticalFlow {
+            static typeName: string;
+            widgets: instances.IList<Widget>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionallyEditableWidget extends IConditionallyVisibleWidget {
+            load(): ConditionallyEditableWidget;
+            load(callback: (element: ConditionallyEditableWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionallyEditableWidget extends ConditionallyVisibleWidget implements IConditionallyEditableWidget {
+            static typeName: string;
+            conditionalEditabilitySettings: ConditionalEditabilitySettings;
+            editable: EditableEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IInputWidget extends IConditionallyEditableWidget {
+            load(): InputWidget;
+            load(callback: (element: InputWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class InputWidget extends ConditionallyEditableWidget implements IInputWidget {
+            static typeName: string;
+            label: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMemberWidget extends IInputWidget {
+            load(): MemberWidget;
+            load(callback: (element: MemberWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MemberWidget extends InputWidget implements IMemberWidget {
+            static typeName: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidget extends IMemberWidget {
+            load(): AttributeWidget;
+            load(callback: (element: AttributeWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidget extends MemberWidget implements IAttributeWidget {
+            static typeName: string;
+            required: boolean;
+            requiredMessage: texts.Text;
+            onChangeMicroflowSettings: MicroflowSettings;
+            onEnterMicroflowSettings: MicroflowSettings;
+            onLeaveMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidgetWithPlaceholder extends IAttributeWidget {
+            load(): AttributeWidgetWithPlaceholder;
+            load(callback: (element: AttributeWidgetWithPlaceholder) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidgetWithPlaceholder extends AttributeWidget implements IAttributeWidgetWithPlaceholder {
+            static typeName: string;
+            placeholder: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITextWidget extends IAttributeWidgetWithPlaceholder {
+            load(): TextWidget;
+            load(callback: (element: TextWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class TextWidget extends AttributeWidgetWithPlaceholder implements ITextWidget {
+            static typeName: string;
+            maxLengthCode: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
+         */
+        interface ITextBox extends ITextWidget {
+            load(): TextBox;
+            load(callback: (element: TextBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
+         */
+        class TextBox extends TextWidget implements ITextBox {
+            static typeName: string;
+            inputMask: string;
+            formattingInfo: FormattingInfo;
+            isPasswordBox: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
+         */
+        interface ITextArea extends ITextWidget {
+            load(): TextArea;
+            load(callback: (element: TextArea) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
+         */
+        class TextArea extends TextWidget implements ITextArea {
+            static typeName: string;
+            numberOfLines: number;
+            counterMessage: texts.Text;
+            textTooLongMessage: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
+         */
+        interface ICheckBox extends IAttributeWidget {
+            load(): CheckBox;
+            load(callback: (element: CheckBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
+         */
+        class CheckBox extends AttributeWidget implements ICheckBox {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
+         */
+        interface IDatePicker extends IAttributeWidgetWithPlaceholder {
+            load(): DatePicker;
+            load(callback: (element: DatePicker) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
+         */
+        class DatePicker extends AttributeWidgetWithPlaceholder implements IDatePicker {
+            static typeName: string;
+            formattingInfo: FormattingInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFormattingInfo extends elements.IElement {
+            load(): FormattingInfo;
+            load(callback: (element: FormattingInfo) => void): any;
+        }
+        class FormattingInfo extends elements.Element implements IFormattingInfo {
+            static typeName: string;
+            decimalPrecision: number;
+            groupDigits: boolean;
+            enumFormat: EnumFormat;
+            dateFormat: DateFormat;
+            customDateFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalSettings extends elements.IElement {
+            load(): ConditionalSettings;
+            load(callback: (element: ConditionalSettings) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionalSettings extends elements.Element implements IConditionalSettings {
+            static typeName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            conditions: instances.IList<enumerations.Condition>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalVisibilitySettings extends IConditionalSettings {
+            load(): ConditionalVisibilitySettings;
+            load(callback: (element: ConditionalVisibilitySettings) => void): any;
+        }
+        class ConditionalVisibilitySettings extends ConditionalSettings implements IConditionalVisibilitySettings {
+            static typeName: string;
+            moduleRoles: instances.IList<security.IModuleRole>;
+            moduleRolesQualifiedNames: string[];
+            ignoreSecurity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalEditabilitySettings extends IConditionalSettings {
+            container: IConditionallyEditableWidget;
+            load(): ConditionalEditabilitySettings;
+            load(callback: (element: ConditionalEditabilitySettings) => void): any;
+        }
+        class ConditionalEditabilitySettings extends ConditionalSettings implements IConditionalEditabilitySettings {
+            static typeName: string;
+            container: ConditionallyEditableWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
+         */
+        interface ITable extends IConditionallyVisibleWidget {
+            load(): Table;
+            load(callback: (element: Table) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
+         */
+        class Table extends ConditionallyVisibleWidget implements ITable {
+            static typeName: string;
+            cells: instances.IList<TableCell>;
+            columns: instances.IList<TableColumn>;
+            widthUnit: UnitEnum;
+            rows: instances.IList<TableRow>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableCell extends elements.IElement {
+            container: ITable;
+            load(): TableCell;
+            load(callback: (element: TableCell) => void): any;
+        }
+        class TableCell extends elements.Element implements ITableCell {
+            static typeName: string;
+            container: Table;
+            class: string;
+            style: string;
+            isHeader: boolean;
+            widget: Widget;
+            leftColumnIndex: number;
+            topRowIndex: number;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableColumn extends elements.IElement {
+            container: ITable;
+            load(): TableColumn;
+            load(callback: (element: TableColumn) => void): any;
+        }
+        class TableColumn extends elements.Element implements ITableColumn {
+            static typeName: string;
+            container: Table;
+            width: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableRow extends elements.IElement {
+            container: ITable;
+            load(): TableRow;
+            load(callback: (element: TableRow) => void): any;
+        }
+        class TableRow extends elements.Element implements ITableRow {
+            static typeName: string;
+            container: Table;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEntityWidget extends IConditionallyVisibleWidget {
+            load(): EntityWidget;
+            load(callback: (element: EntityWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityWidget extends ConditionallyVisibleWidget implements IEntityWidget {
+            static typeName: string;
+            dataSource: DataSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
+         */
+        interface IDataSource extends elements.IElement {
+            container: IEntityWidget;
+            load(): DataSource;
+            load(callback: (element: DataSource) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSource extends elements.Element implements IDataSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IEntityPathSource extends IDataSource {
+            container: IEntityWidget;
+            load(): EntityPathSource;
+            load(callback: (element: EntityPathSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityPathSource extends DataSource implements IEntityPathSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            entityPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowSource extends IDataSource {
+            container: IEntityWidget;
+            load(): MicroflowSource;
+            load(callback: (element: MicroflowSource) => void): any;
+        }
+        class MicroflowSource extends DataSource implements IMicroflowSource {
+            static typeName: string;
+            container: EntityWidget;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListenTargetWidget extends IEntityWidget {
+            load(): ListenTargetWidget;
+            load(callback: (element: ListenTargetWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ListenTargetWidget extends EntityWidget implements IListenTargetWidget {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): AssociationSource;
+            load(callback: (element: AssociationSource) => void): any;
+        }
+        class AssociationSource extends EntityPathSource implements IAssociationSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
+         */
+        interface IDataView extends IEntityWidget {
+            load(): DataView;
+            load(callback: (element: DataView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
+         */
+        class DataView extends EntityWidget implements IDataView {
+            static typeName: string;
+            widget: Widget;
+            editable: boolean;
+            showControlBar: boolean;
+            closeOnSaveOrCancel: boolean;
+            useSchema: boolean;
+            noEntityMessage: texts.Text;
+            labelWidth: number;
+            controlBar: DataViewControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBar extends elements.IElement {
+            load(): ControlBar;
+            load(callback: (element: ControlBar) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBar extends elements.Element implements IControlBar {
+            static typeName: string;
+            items: instances.IList<ControlBarItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
+         */
+        interface IDataViewControlBar extends IControlBar {
+            container: IDataView;
+            load(): DataViewControlBar;
+            load(callback: (element: DataViewControlBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
+         */
+        class DataViewControlBar extends ControlBar implements IDataViewControlBar {
+            static typeName: string;
+            container: DataView;
+            closeButton: ControlBarItem;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataViewSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): DataViewSource;
+            load(callback: (element: DataViewSource) => void): any;
+        }
+        class DataViewSource extends EntityPathSource implements IDataViewSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListenTargetSource extends IDataSource {
+            container: IEntityWidget;
+            load(): ListenTargetSource;
+            load(callback: (element: ListenTargetSource) => void): any;
+        }
+        class ListenTargetSource extends DataSource implements IListenTargetSource {
+            static typeName: string;
+            container: EntityWidget;
+            listenTarget: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBarItem extends elements.IElement {
+            load(): ControlBarItem;
+            load(callback: (element: ControlBarItem) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBarItem extends elements.Element implements IControlBarItem {
+            static typeName: string;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBarButton extends IControlBarItem {
+            load(): ControlBarButton;
+            load(callback: (element: ControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBarButton extends ControlBarItem implements IControlBarButton {
+            static typeName: string;
+            caption: ClientTemplate;
+            tooltip: texts.Text;
+            icon: Icon;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            buttonStyle: ButtonStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataViewControlBarButton extends IControlBarButton {
+            container: IControlBar;
+            load(): DataViewControlBarButton;
+            load(callback: (element: DataViewControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataViewControlBarButton extends ControlBarButton implements IDataViewControlBarButton {
+            static typeName: string;
+            container: ControlBar;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
+         */
+        interface IDataViewCancelButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewCancelButton;
+            load(callback: (element: DataViewCancelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
+         */
+        class DataViewCancelButton extends DataViewControlBarButton implements IDataViewCancelButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
+         */
+        interface IDataViewCloseButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewCloseButton;
+            load(callback: (element: DataViewCloseButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
+         */
+        class DataViewCloseButton extends DataViewControlBarButton implements IDataViewCloseButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
+         */
+        interface IDataViewActionButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewActionButton;
+            load(callback: (element: DataViewActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
+         */
+        class DataViewActionButton extends DataViewControlBarButton implements IDataViewActionButton {
+            static typeName: string;
+            container: ControlBar;
+            action: ClientAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
+         */
+        interface IDataViewSaveButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewSaveButton;
+            load(callback: (element: DataViewSaveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
+         */
+        class DataViewSaveButton extends DataViewControlBarButton implements IDataViewSaveButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
+         */
+        interface IListView extends IListenTargetWidget {
+            load(): ListView;
+            load(callback: (element: ListView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
+         */
+        class ListView extends ListenTargetWidget implements IListView {
+            static typeName: string;
+            widget: Widget;
+            pageSize: number;
+            clickAction: ClientAction;
+            editable: boolean;
+            templates: instances.IList<ListViewTemplate>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListViewTemplate extends elements.IElement {
+            container: IListView;
+            load(): ListViewTemplate;
+            load(callback: (element: ListViewTemplate) => void): any;
+        }
+        class ListViewTemplate extends elements.Element implements IListViewTemplate {
+            static typeName: string;
+            container: ListView;
+            specialization: domainmodels.IEntity;
+            specializationQualifiedName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListViewDatabaseSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): ListViewDatabaseSource;
+            load(callback: (element: ListViewDatabaseSource) => void): any;
+        }
+        class ListViewDatabaseSource extends EntityPathSource implements IListViewDatabaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            searchPaths: instances.IList<string>;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        interface IGridSortBar extends elements.IElement {
+            load(): GridSortBar;
+            load(callback: (element: GridSortBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        class GridSortBar extends elements.Element implements IGridSortBar {
+            static typeName: string;
+            sortItems: instances.IList<GridSortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridSortItem extends elements.IElement {
+            container: IGridSortBar;
+            load(): GridSortItem;
+            load(callback: (element: GridSortItem) => void): any;
+        }
+        class GridSortItem extends elements.Element implements IGridSortItem {
+            static typeName: string;
+            container: GridSortBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            sortDirection: SortDirection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
+         */
+        interface IButton extends IConditionallyVisibleWidget {
+            load(): Button;
+            load(callback: (element: Button) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Button extends ConditionallyVisibleWidget implements IButton {
+            static typeName: string;
+            caption: ClientTemplate;
+            tooltip: texts.Text;
+            icon: Icon;
+            renderType: RenderType;
+            buttonStyle: ButtonStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IStaticOrDynamicString extends elements.IElement {
+            container: ILinkButton;
+            load(): StaticOrDynamicString;
+            load(callback: (element: StaticOrDynamicString) => void): any;
+        }
+        class StaticOrDynamicString extends elements.Element implements IStaticOrDynamicString {
+            static typeName: string;
+            container: LinkButton;
+            isDynamic: boolean;
+            value: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attribute: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
+         */
+        interface IBackButton extends IButton {
+            load(): BackButton;
+            load(callback: (element: BackButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
+         */
+        class BackButton extends Button implements IBackButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
+         */
+        interface ICancelButton extends IButton {
+            load(): CancelButton;
+            load(callback: (element: CancelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
+         */
+        class CancelButton extends Button implements ICancelButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
+         */
+        interface ILogoutButton extends IButton {
+            load(): LogoutButton;
+            load(callback: (element: LogoutButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
+         */
+        class LogoutButton extends Button implements ILogoutButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
+         */
+        interface IActionButton extends IButton {
+            load(): ActionButton;
+            load(callback: (element: ActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
+         */
+        class ActionButton extends Button implements IActionButton {
+            static typeName: string;
+            action: ClientAction;
+            disabledDuringAction: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
+         */
+        interface INewButton extends IButton {
+            load(): NewButton;
+            load(callback: (element: NewButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
+         */
+        class NewButton extends Button implements INewButton {
+            static typeName: string;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
+         */
+        interface ISaveButton extends IButton {
+            load(): SaveButton;
+            load(callback: (element: SaveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
+         */
+        class SaveButton extends Button implements ISaveButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientTemplate extends elements.IElement {
+            load(): ClientTemplate;
+            load(callback: (element: ClientTemplate) => void): any;
+        }
+        class ClientTemplate extends elements.Element implements IClientTemplate {
+            static typeName: string;
+            template: texts.Text;
+            parameters: instances.IList<ClientTemplateParameter>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientTemplateParameter extends elements.IElement {
+            container: IClientTemplate;
+            load(): ClientTemplateParameter;
+            load(callback: (element: ClientTemplateParameter) => void): any;
+        }
+        class ClientTemplateParameter extends elements.Element implements IClientTemplateParameter {
+            static typeName: string;
+            container: ClientTemplate;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGrid extends IListenTargetWidget {
+            load(): Grid;
+            load(callback: (element: Grid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Grid extends ListenTargetWidget implements IGrid {
+            static typeName: string;
+            isControlBarVisible: boolean;
+            isPagingEnabled: boolean;
+            selectionMode: GridSelectionMode;
+            selectFirst: boolean;
+            defaultButtonTrigger: ClickTypeType;
+            refreshTime: number;
+            controlBar: GridControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IColumnGrid extends IGrid {
+            load(): ColumnGrid;
+            load(callback: (element: ColumnGrid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ColumnGrid extends Grid implements IColumnGrid {
+            static typeName: string;
+            columns: instances.IList<GridColumn>;
+            numberOfRows: number;
+            showEmptyRows: boolean;
+            widthUnit: UnitEnum;
+            tooltipPage: IPage;
+            tooltipPageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISearchField extends IControlBarItem {
+            container: IControlBar;
+            load(): SearchField;
+            load(callback: (element: SearchField) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SearchField extends ControlBarItem implements ISearchField {
+            static typeName: string;
+            container: ControlBar;
+            caption: texts.Text;
+            type: SearchFieldType;
+            defaultValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISingleSearchField extends ISearchField {
+            container: IControlBar;
+            load(): SingleSearchField;
+            load(callback: (element: SingleSearchField) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SingleSearchField extends SearchField implements ISingleSearchField {
+            static typeName: string;
+            container: ControlBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            operator: SearchFieldOperator;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
+         */
+        interface IComparisonSearchField extends ISingleSearchField {
+            container: IControlBar;
+            load(): ComparisonSearchField;
+            load(callback: (element: ComparisonSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
+         */
+        class ComparisonSearchField extends SingleSearchField implements IComparisonSearchField {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridBaseSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): GridBaseSource;
+            load(callback: (element: GridBaseSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GridBaseSource extends EntityPathSource implements IGridBaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            sortBar: GridSortBar;
+            searchBar: SearchBar;
+            searchBarType: SearchBarTypeEnum;
+            waitForSearch: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridDatabaseSource extends IGridBaseSource {
+            container: IEntityWidget;
+            load(): GridDatabaseSource;
+            load(callback: (element: GridDatabaseSource) => void): any;
+        }
+        class GridDatabaseSource extends GridBaseSource implements IGridDatabaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            applyContext: boolean;
+            removeAllFromContext: boolean;
+            removeFromContextIds: instances.IList<domainmodels.IEntity>;
+            removeFromContextIdsQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
+         */
+        interface IDataGrid extends IColumnGrid {
+            load(): DataGrid;
+            load(callback: (element: DataGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
+         */
+        class DataGrid extends ColumnGrid implements IDataGrid {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridControlBarButton extends IControlBarButton {
+            load(): GridControlBarButton;
+            load(callback: (element: GridControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GridControlBarButton extends ControlBarButton implements IGridControlBarButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
+         */
+        interface IDataGridAddButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridAddButton;
+            load(callback: (element: DataGridAddButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
+         */
+        class DataGridAddButton extends GridControlBarButton implements IDataGridAddButton {
+            static typeName: string;
+            container: ControlBar;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
+         */
+        interface IDataGridExportToCSVButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridExportToCSVButton;
+            load(callback: (element: DataGridExportToCSVButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
+         */
+        class DataGridExportToCSVButton extends GridControlBarButton implements IDataGridExportToCSVButton {
+            static typeName: string;
+            container: ControlBar;
+            maxNumberOfRows: number;
+            decimalSeparator: string;
+            groupSeparator: string;
+            delimiter: string;
+            generateExcelHint: boolean;
+            useGridDateFormat: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
+         */
+        interface IDataGridExportToExcelButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridExportToExcelButton;
+            load(callback: (element: DataGridExportToExcelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
+         */
+        class DataGridExportToExcelButton extends GridControlBarButton implements IDataGridExportToExcelButton {
+            static typeName: string;
+            container: ControlBar;
+            maxNumberOfRows: number;
+            useExcelDateType: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
+         */
+        interface IDataGridRemoveButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridRemoveButton;
+            load(callback: (element: DataGridRemoveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
+         */
+        class DataGridRemoveButton extends GridControlBarButton implements IDataGridRemoveButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
+         */
+        interface IDropDown extends IAttributeWidget {
+            load(): DropDown;
+            load(callback: (element: DropDown) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
+         */
+        class DropDown extends AttributeWidget implements IDropDown {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
+         */
+        interface IDropDownButton extends IButton {
+            load(): DropDownButton;
+            load(callback: (element: DropDownButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
+         */
+        class DropDownButton extends Button implements IDropDownButton {
+            static typeName: string;
+            items: instances.IList<DropDownButtonItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IActionItem extends elements.IElement {
+            container: IConditionallyVisibleWidget;
+            load(): ActionItem;
+            load(callback: (element: ActionItem) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ActionItem extends elements.Element implements IActionItem {
+            static typeName: string;
+            container: ConditionallyVisibleWidget;
+            action: ClientAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDropDownButtonItem extends IActionItem {
+            container: IDropDownButton;
+            load(): DropDownButtonItem;
+            load(callback: (element: DropDownButtonItem) => void): any;
+        }
+        class DropDownButtonItem extends ActionItem implements IDropDownButtonItem {
+            static typeName: string;
+            container: DropDownButton;
+            caption: texts.Text;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
+         */
+        interface IDropDownSearchField extends ISingleSearchField {
+            container: IControlBar;
+            load(): DropDownSearchField;
+            load(callback: (element: DropDownSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
+         */
+        class DropDownSearchField extends SingleSearchField implements IDropDownSearchField {
+            static typeName: string;
+            container: ControlBar;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            allowMultipleSelect: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
+         */
+        interface IDynamicImageViewer extends IEntityWidget {
+            load(): DynamicImageViewer;
+            load(callback: (element: DynamicImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
+         */
+        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
+            static typeName: string;
+            defaultImage: images.IImage;
+            defaultImageQualifiedName: string;
+            widthUnit: ImageSizeUnit;
+            heightUnit: ImageSizeUnit;
+            width: number;
+            height: number;
+            responsive: boolean;
+            showAsThumbnail: boolean;
+            onClickBehavior: OnClickBehavior;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
+         */
+        interface IDynamicText extends IConditionallyVisibleWidget {
+            load(): DynamicText;
+            load(callback: (element: DynamicText) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
+         */
+        class DynamicText extends ConditionallyVisibleWidget implements IDynamicText {
+            static typeName: string;
+            content: ClientTemplate;
+            renderMode: TextRenderMode;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
+         */
+        interface IFileManager extends IInputWidget {
+            load(): FileManager;
+            load(callback: (element: FileManager) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
+         */
+        class FileManager extends InputWidget implements IFileManager {
+            static typeName: string;
+            allowedExtensions: string;
+            type: FileManagerType;
+            maxFileSize: number;
+            showFileInBrowser: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPageForSpecialization extends elements.IElement {
+            container: IGridEditButton;
+            load(): PageForSpecialization;
+            load(callback: (element: PageForSpecialization) => void): any;
+        }
+        class PageForSpecialization extends elements.Element implements IPageForSpecialization {
+            static typeName: string;
+            container: GridEditButton;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
+         */
+        interface IIcon extends elements.IElement {
+            load(): Icon;
+            load(callback: (element: Icon) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Icon extends elements.Element implements IIcon {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IGlyphIcon extends IIcon {
+            load(): GlyphIcon;
+            load(callback: (element: GlyphIcon) => void): any;
+        }
+        class GlyphIcon extends Icon implements IGlyphIcon {
+            static typeName: string;
+            code: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
+         */
+        interface IGridActionButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridActionButton;
+            load(callback: (element: GridActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
+         */
+        class GridActionButton extends GridControlBarButton implements IGridActionButton {
+            static typeName: string;
+            container: ControlBar;
+            action: ClientAction;
+            maintainSelectionAfterMicroflow: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
+         */
+        interface IGridColumn extends elements.IElement {
+            container: IColumnGrid;
+            load(): GridColumn;
+            load(callback: (element: GridColumn) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
+         */
+        class GridColumn extends elements.Element implements IGridColumn {
+            static typeName: string;
+            container: ColumnGrid;
+            name: string;
+            caption: texts.Text;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            formattingInfo: FormattingInfo;
+            showTooltip: boolean;
+            aggregateCaption: texts.Text;
+            aggregateFunction: AggregateFunction;
+            editable: boolean;
+            width: number;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
+         */
+        interface IGridControlBar extends IControlBar {
+            container: IGrid;
+            load(): GridControlBar;
+            load(callback: (element: GridControlBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
+         */
+        class GridControlBar extends ControlBar implements IGridControlBar {
+            static typeName: string;
+            container: Grid;
+            searchButton: GridSearchButton;
+            defaultButton: ControlBarItem;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
+         */
+        interface IGridDeleteButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridDeleteButton;
+            load(callback: (element: GridDeleteButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
+         */
+        class GridDeleteButton extends GridControlBarButton implements IGridDeleteButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
+         */
+        interface IGridDeselectAllButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridDeselectAllButton;
+            load(callback: (element: GridDeselectAllButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
+         */
+        class GridDeselectAllButton extends GridControlBarButton implements IGridDeselectAllButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
+         */
+        interface IGridEditButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridEditButton;
+            load(callback: (element: GridEditButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
+         */
+        class GridEditButton extends GridControlBarButton implements IGridEditButton {
+            static typeName: string;
+            container: ControlBar;
+            pageSettings: PageSettings;
+            pagesForSpecializations: instances.IList<PageForSpecialization>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
+         */
+        interface IGridNewButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridNewButton;
+            load(callback: (element: GridNewButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
+         */
+        class GridNewButton extends GridControlBarButton implements IGridNewButton {
+            static typeName: string;
+            container: ControlBar;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            editLocation: NewButtonEditLocation;
+            pageSettings: PageSettings;
+            isPersistent: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
+         */
+        interface IGridSearchButton extends IGridControlBarButton {
+            load(): GridSearchButton;
+            load(callback: (element: GridSearchButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
+         */
+        class GridSearchButton extends GridControlBarButton implements IGridSearchButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
+         */
+        interface IGridSelectAllButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridSelectAllButton;
+            load(callback: (element: GridSelectAllButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
+         */
+        class GridSelectAllButton extends GridControlBarButton implements IGridSelectAllButton {
+            static typeName: string;
+            container: ControlBar;
+            selectionType: SelectionType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
+         */
+        interface IGroupBox extends IConditionallyVisibleWidget {
+            load(): GroupBox;
+            load(callback: (element: GroupBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
+         */
+        class GroupBox extends ConditionallyVisibleWidget implements IGroupBox {
+            static typeName: string;
+            caption: ClientTemplate;
+            collapsible: GroupBoxCollapsible;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
+         */
+        interface IHeader extends IWidget {
+            load(): Header;
+            load(callback: (element: Header) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
+         */
+        class Header extends Widget implements IHeader {
+            static typeName: string;
+            leftWidget: Widget;
+            rightWidget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISplitPane extends IWidget {
+            load(): SplitPane;
+            load(callback: (element: SplitPane) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SplitPane extends Widget implements ISplitPane {
+            static typeName: string;
+            firstWidget: Widget;
+            secondWidget: Widget;
+            animatedResize: boolean;
+            height: number;
+            position: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
+         */
+        interface IHorizontalSplitPane extends ISplitPane {
+            load(): HorizontalSplitPane;
+            load(callback: (element: HorizontalSplitPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
+         */
+        class HorizontalSplitPane extends SplitPane implements IHorizontalSplitPane {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageIcon extends IIcon {
+            load(): ImageIcon;
+            load(callback: (element: ImageIcon) => void): any;
+        }
+        class ImageIcon extends Icon implements IImageIcon {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
+         */
+        interface IImageUploader extends IInputWidget {
+            load(): ImageUploader;
+            load(callback: (element: ImageUploader) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
+         */
+        class ImageUploader extends InputWidget implements IImageUploader {
+            static typeName: string;
+            allowedExtensions: string;
+            thumbnailSize: common.ISize;
+            maxFileSize: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageViewerSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): ImageViewerSource;
+            load(callback: (element: ImageViewerSource) => void): any;
+        }
+        class ImageViewerSource extends EntityPathSource implements IImageViewerSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationWidget extends IMemberWidget {
+            load(): AssociationWidget;
+            load(callback: (element: AssociationWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AssociationWidget extends MemberWidget implements IAssociationWidget {
+            static typeName: string;
+            selectorSource: SelectorSource;
+            selectPageSettings: PageSettings;
+            onChangeMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
+         */
+        interface IInputReferenceSetSelector extends IAssociationWidget {
+            load(): InputReferenceSetSelector;
+            load(callback: (element: InputReferenceSetSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
+         */
+        class InputReferenceSetSelector extends AssociationWidget implements IInputReferenceSetSelector {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
+         */
+        interface ILayoutGrid extends IConditionallyVisibleWidget {
+            load(): LayoutGrid;
+            load(callback: (element: LayoutGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
+         */
+        class LayoutGrid extends ConditionallyVisibleWidget implements ILayoutGrid {
+            static typeName: string;
+            width: ContainerWidth;
+            rows: instances.IList<LayoutGridRow>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutGridColumn extends elements.IElement {
+            container: ILayoutGridRow;
+            load(): LayoutGridColumn;
+            load(callback: (element: LayoutGridColumn) => void): any;
+        }
+        class LayoutGridColumn extends elements.Element implements ILayoutGridColumn {
+            static typeName: string;
+            container: LayoutGridRow;
+            weight: number;
+            widget: Widget;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutGridRow extends elements.IElement {
+            container: ILayoutGrid;
+            load(): LayoutGridRow;
+            load(callback: (element: LayoutGridRow) => void): any;
+        }
+        class LayoutGridRow extends elements.Element implements ILayoutGridRow {
+            static typeName: string;
+            container: LayoutGrid;
+            columns: instances.IList<LayoutGridColumn>;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
+         */
+        interface ILinkButton extends IButton {
+            load(): LinkButton;
+            load(callback: (element: LinkButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
+         */
+        class LinkButton extends Button implements ILinkButton {
+            static typeName: string;
+            linkType: LinkType;
+            address: StaticOrDynamicString;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
+         */
+        interface IMenuWidget extends IWidget {
+            load(): MenuWidget;
+            load(callback: (element: MenuWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuWidget extends Widget implements IMenuWidget {
+            static typeName: string;
+            menuSource: MenuSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
+         */
+        interface IMenuBar extends IMenuWidget {
+            load(): MenuBar;
+            load(callback: (element: MenuBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
+         */
+        class MenuBar extends MenuWidget implements IMenuBar {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuSource extends elements.IElement {
+            container: IMenuWidget;
+            load(): MenuSource;
+            load(callback: (element: MenuSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuSource extends elements.Element implements IMenuSource {
+            static typeName: string;
+            container: MenuWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IMenuDocumentSource extends IMenuSource {
+            container: IMenuWidget;
+            load(): MenuDocumentSource;
+            load(callback: (element: MenuDocumentSource) => void): any;
+        }
+        class MenuDocumentSource extends MenuSource implements IMenuDocumentSource {
+            static typeName: string;
+            container: MenuWidget;
+            menu: menus.IMenuDocument;
+            menuQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
+         */
+        interface INavigationList extends IConditionallyVisibleWidget {
+            load(): NavigationList;
+            load(callback: (element: NavigationList) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
+         */
+        class NavigationList extends ConditionallyVisibleWidget implements INavigationList {
+            static typeName: string;
+            items: instances.IList<NavigationListItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationListItem extends IActionItem {
+            container: INavigationList;
+            load(): NavigationListItem;
+            load(callback: (element: NavigationListItem) => void): any;
+        }
+        class NavigationListItem extends ActionItem implements INavigationListItem {
+            static typeName: string;
+            container: NavigationList;
+            widget: Widget;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationSource extends IMenuSource {
+            container: IMenuWidget;
+            load(): NavigationSource;
+            load(callback: (element: NavigationSource) => void): any;
+        }
+        class NavigationSource extends MenuSource implements INavigationSource {
+            static typeName: string;
+            container: MenuWidget;
+            deviceType: navigation.DeviceType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
+         */
+        interface INavigationTree extends IMenuWidget {
+            load(): NavigationTree;
+            load(callback: (element: NavigationTree) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
+         */
+        class NavigationTree extends MenuWidget implements INavigationTree {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOnClickBehavior extends elements.IElement {
+            container: IDynamicImageViewer;
+            load(): OnClickBehavior;
+            load(callback: (element: OnClickBehavior) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class OnClickBehavior extends elements.Element implements IOnClickBehavior {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IOnClickEnlarge extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickEnlarge;
+            load(callback: (element: OnClickEnlarge) => void): any;
+        }
+        class OnClickEnlarge extends OnClickBehavior implements IOnClickEnlarge {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IOnClickMicroflow extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickMicroflow;
+            load(callback: (element: OnClickMicroflow) => void): any;
+        }
+        class OnClickMicroflow extends OnClickBehavior implements IOnClickMicroflow {
+            static typeName: string;
+            container: DynamicImageViewer;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOnClickNothing extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickNothing;
+            load(callback: (element: OnClickNothing) => void): any;
+        }
+        class OnClickNothing extends OnClickBehavior implements IOnClickNothing {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
+         */
+        interface IRangeSearchField extends ISearchField {
+            container: IControlBar;
+            load(): RangeSearchField;
+            load(callback: (element: RangeSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
+         */
+        class RangeSearchField extends SearchField implements IRangeSearchField {
+            static typeName: string;
+            container: ControlBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            lowerBound: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            upperBound: string;
+            includeLower: boolean;
+            includeUpper: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
+         */
+        interface IReferenceSelector extends IAssociationWidget {
+            load(): ReferenceSelector;
+            load(callback: (element: ReferenceSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
+         */
+        class ReferenceSelector extends AssociationWidget implements IReferenceSelector {
+            static typeName: string;
+            required: boolean;
+            requiredMessage: texts.Text;
+            renderMode: ReferenceSelectorRenderModeType;
+            gotoPageSettings: PageSettings;
+            formattingInfo: FormattingInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
+         */
+        interface IReferenceSetSelector extends IColumnGrid {
+            load(): ReferenceSetSelector;
+            load(callback: (element: ReferenceSetSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
+         */
+        class ReferenceSetSelector extends ColumnGrid implements IReferenceSetSelector {
+            static typeName: string;
+            onChangeMicroflowSettings: MicroflowSettings;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            constrainedBy: instances.IList<string>;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            removeAllFromContext: boolean;
+            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
+            removeFromContextEntitiesQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReferenceSetSource extends IGridBaseSource {
+            container: IEntityWidget;
+            load(): ReferenceSetSource;
+            load(callback: (element: ReferenceSetSource) => void): any;
+        }
+        class ReferenceSetSource extends GridBaseSource implements IReferenceSetSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
+         */
+        interface IScrollContainer extends IWidget {
+            load(): ScrollContainer;
+            load(callback: (element: ScrollContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
+         */
+        class ScrollContainer extends Widget implements IScrollContainer {
+            static typeName: string;
+            center: ScrollContainerRegion;
+            left: ScrollContainerRegion;
+            right: ScrollContainerRegion;
+            top: ScrollContainerRegion;
+            bottom: ScrollContainerRegion;
+            layoutMode: LayoutModeType;
+            widthMode: SizeMode;
+            width: number;
+            alignment: AlignmentEnum;
+            scrollBehavior: ScrollBehavior;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IScrollContainerRegion extends elements.IElement {
+            container: IScrollContainer;
+            load(): ScrollContainerRegion;
+            load(callback: (element: ScrollContainerRegion) => void): any;
+        }
+        class ScrollContainerRegion extends elements.Element implements IScrollContainerRegion {
+            static typeName: string;
+            container: ScrollContainer;
+            widget: Widget;
+            sizeMode: SizeMode;
+            size: number;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
+         */
+        interface ISearchBar extends IControlBar {
+            container: IGridBaseSource;
+            load(): SearchBar;
+            load(callback: (element: SearchBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
+         */
+        class SearchBar extends ControlBar implements ISearchBar {
+            static typeName: string;
+            container: GridBaseSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
+         */
+        interface ISelectButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): SelectButton;
+            load(callback: (element: SelectButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
+         */
+        class SelectButton extends GridControlBarButton implements ISelectButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISelectorSource extends elements.IElement {
+            container: IAssociationWidget;
+            load(): SelectorSource;
+            load(callback: (element: SelectorSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SelectorSource extends elements.Element implements ISelectorSource {
+            static typeName: string;
+            container: AssociationWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ISelectorDatabaseSource extends ISelectorSource {
+            container: IAssociationWidget;
+            load(): SelectorDatabaseSource;
+            load(callback: (element: SelectorDatabaseSource) => void): any;
+        }
+        class SelectorDatabaseSource extends SelectorSource implements ISelectorDatabaseSource {
+            static typeName: string;
+            container: AssociationWidget;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            constrainedBy: instances.IList<string>;
+            applyContext: boolean;
+            removeAllFromContext: boolean;
+            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
+            removeFromContextEntitiesQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISelectorMicroflowSource extends ISelectorSource {
+            container: IAssociationWidget;
+            load(): SelectorMicroflowSource;
+            load(callback: (element: SelectorMicroflowSource) => void): any;
+        }
+        class SelectorMicroflowSource extends SelectorSource implements ISelectorMicroflowSource {
+            static typeName: string;
+            container: AssociationWidget;
+            dataSourceMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
+         */
+        interface ISidebarToggleButton extends IButton {
+            load(): SidebarToggleButton;
+            load(callback: (element: SidebarToggleButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
+         */
+        class SidebarToggleButton extends Button implements ISidebarToggleButton {
+            static typeName: string;
+            region: SidebarToggleRegion;
+            mode: SidebarToggleMode;
+            initiallyOpen: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
+         */
+        interface ISimpleMenuBar extends IMenuWidget {
+            load(): SimpleMenuBar;
+            load(callback: (element: SimpleMenuBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
+         */
+        class SimpleMenuBar extends MenuWidget implements ISimpleMenuBar {
+            static typeName: string;
+            orientation: SimpleMenuBarOrientation;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
+         */
+        interface ISnippet extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Snippet;
+            load(callback: (element: Snippet) => void): any;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
+         */
+        class Snippet extends FormBase implements ISnippet {
+            static typeName: string;
+            container: projects.FolderBase;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            widget: Widget;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISnippetCall extends elements.IElement {
+            container: ISnippetCallWidget;
+            load(): SnippetCall;
+            load(callback: (element: SnippetCall) => void): any;
+        }
+        class SnippetCall extends elements.Element implements ISnippetCall {
+            static typeName: string;
+            container: SnippetCallWidget;
+            snippet: ISnippet;
+            snippetQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
+         */
+        interface ISnippetCallWidget extends IWidget {
+            load(): SnippetCallWidget;
+            load(callback: (element: SnippetCallWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
+         */
+        class SnippetCallWidget extends Widget implements ISnippetCallWidget {
+            static typeName: string;
+            snippetCall: SnippetCall;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
+         */
+        interface ITabContainer extends IConditionallyVisibleWidget {
+            load(): TabContainer;
+            load(callback: (element: TabContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
+         */
+        class TabContainer extends ConditionallyVisibleWidget implements ITabContainer {
+            static typeName: string;
+            tabPages: instances.IList<TabPage>;
+            defaultPage: TabPage;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
+         */
+        interface ITabPage extends elements.IElement {
+            container: ITabContainer;
+            load(): TabPage;
+            load(callback: (element: TabPage) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
+         */
+        class TabPage extends elements.Element implements ITabPage {
+            static typeName: string;
+            container: TabContainer;
+            name: string;
+            caption: texts.Text;
+            refreshOnShow: boolean;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
+         */
+        interface ITemplateGrid extends IGrid {
+            load(): TemplateGrid;
+            load(callback: (element: TemplateGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
+         */
+        class TemplateGrid extends Grid implements ITemplateGrid {
+            static typeName: string;
+            contents: TemplateGridContents;
+            numberOfRows: number;
+            numberOfColumns: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITemplateGridContents extends elements.IElement {
+            container: ITemplateGrid;
+            load(): TemplateGridContents;
+            load(callback: (element: TemplateGridContents) => void): any;
+        }
+        class TemplateGridContents extends elements.Element implements ITemplateGridContents {
+            static typeName: string;
+            container: TemplateGrid;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
+         */
+        interface ITitle extends IConditionallyVisibleWidget {
+            load(): Title;
+            load(callback: (element: Title) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
+         */
+        class Title extends ConditionallyVisibleWidget implements ITitle {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
+         */
+        interface IVerticalSplitPane extends ISplitPane {
+            load(): VerticalSplitPane;
+            load(callback: (element: VerticalSplitPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
+         */
+        class VerticalSplitPane extends SplitPane implements IVerticalSplitPane {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectSettingsPart extends elements.IElement {
+            container: settings.IProjectSettings;
+            load(): ProjectSettingsPart;
+            load(callback: (element: ProjectSettingsPart) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IWebUIProjectSettingsPart extends settings.IProjectSettingsPart {
+            container: settings.IProjectSettings;
+            load(): WebUIProjectSettingsPart;
+            load(callback: (element: WebUIProjectSettingsPart) => void): any;
+        }
+        class WebUIProjectSettingsPart extends settings.ProjectSettingsPart implements IWebUIProjectSettingsPart {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            theme: string;
+            feedbackWidgetUpdated: boolean;
+            useModernUI: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class FormLocation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Content: FormLocation;
+            static Popup: FormLocation;
+            static ModalPopup: FormLocation;
+        }
+        class ProgressBarType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: ProgressBarType;
+            static NonBlocking: ProgressBarType;
+            static Blocking: ProgressBarType;
+        }
+        class FormValidations extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: FormValidations;
+            static Widget: FormValidations;
+            static All: FormValidations;
+        }
+        class EnumFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Text: EnumFormat;
+            static Image: EnumFormat;
+        }
+        class DateFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Date: DateFormat;
+            static Time: DateFormat;
+            static DateTime: DateFormat;
+            static Custom: DateFormat;
+        }
+        class EditableEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Always: EditableEnum;
+            static Never: EditableEnum;
+            static Conditional: EditableEnum;
+        }
+        class UnitEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Weight: UnitEnum;
+            static Pixels: UnitEnum;
+        }
+        class SortDirection extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Ascending: SortDirection;
+            static Descending: SortDirection;
+        }
+        class RenderType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Button: RenderType;
+            static Link: RenderType;
+        }
+        class ButtonStyle extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ButtonStyle;
+            static Inverse: ButtonStyle;
+            static Primary: ButtonStyle;
+            static Info: ButtonStyle;
+            static Success: ButtonStyle;
+            static Warning: ButtonStyle;
+            static Danger: ButtonStyle;
+        }
+        class AggregateFunction extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: AggregateFunction;
+            static Average: AggregateFunction;
+            static Maximum: AggregateFunction;
+            static Minimum: AggregateFunction;
+            static Sum: AggregateFunction;
+            static Count: AggregateFunction;
+        }
+        class AlignmentEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: AlignmentEnum;
+            static Center: AlignmentEnum;
+            static Right: AlignmentEnum;
+        }
+        class ClickTypeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Single: ClickTypeType;
+            static Double: ClickTypeType;
+        }
+        class ContainerWidth extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static FullWidth: ContainerWidth;
+            static FixedWidth: ContainerWidth;
+        }
+        class FileManagerType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Upload: FileManagerType;
+            static Download: FileManagerType;
+            static Both: FileManagerType;
+        }
+        class GridSelectionMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: GridSelectionMode;
+            static Single: GridSelectionMode;
+            static SingleAndMaintain: GridSelectionMode;
+            static Multi: GridSelectionMode;
+            static SimpleMulti: GridSelectionMode;
+        }
+        class GroupBoxCollapsible extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static No: GroupBoxCollapsible;
+            static YesInitiallyExpanded: GroupBoxCollapsible;
+            static YesInitiallyCollapsed: GroupBoxCollapsible;
+        }
+        class ImageSizeUnit extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Auto: ImageSizeUnit;
+            static Pixels: ImageSizeUnit;
+            static Percentage: ImageSizeUnit;
+        }
+        class LayoutModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Headline: LayoutModeType;
+            static Sidebar: LayoutModeType;
+        }
+        class LayoutType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Responsive: LayoutType;
+            static Tablet: LayoutType;
+            static Phone: LayoutType;
+            static ModalPopup: LayoutType;
+            static Popup: LayoutType;
+            static Legacy: LayoutType;
+        }
+        class LinkType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Web: LinkType;
+            static Email: LinkType;
+            static Call: LinkType;
+            static Text: LinkType;
+        }
+        class MobileFooterType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: MobileFooterType;
+            static MenuBar: MobileFooterType;
+            static Custom: MobileFooterType;
+        }
+        class NewButtonEditLocation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static InlineAtTop: NewButtonEditLocation;
+            static InlineAtBottom: NewButtonEditLocation;
+            static Form: NewButtonEditLocation;
+        }
+        class ReferenceSelectorRenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Form: ReferenceSelectorRenderModeType;
+            static DropDown: ReferenceSelectorRenderModeType;
+        }
+        class RenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Button: RenderModeType;
+            static Link: RenderModeType;
+        }
+        class ScrollBehavior extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static PerRegion: ScrollBehavior;
+            static FullWidget: ScrollBehavior;
+        }
+        class SearchBarTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: SearchBarTypeEnum;
+            static FoldableOpen: SearchBarTypeEnum;
+            static FoldableClosed: SearchBarTypeEnum;
+            static AlwaysOpen: SearchBarTypeEnum;
+        }
+        class SearchFieldOperator extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Contains: SearchFieldOperator;
+            static StartsWith: SearchFieldOperator;
+            static Greater: SearchFieldOperator;
+            static GreaterOrEqual: SearchFieldOperator;
+            static Equal: SearchFieldOperator;
+            static NotEqual: SearchFieldOperator;
+            static SmallerOrEqual: SearchFieldOperator;
+            static Smaller: SearchFieldOperator;
+        }
+        class SearchFieldType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Normal: SearchFieldType;
+            static Hidden: SearchFieldType;
+            static ReadOnly: SearchFieldType;
+        }
+        class SelectionType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SelectPage: SelectionType;
+            static SelectAll: SelectionType;
+        }
+        class SidebarToggleMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static PushContentAside: SidebarToggleMode;
+            static SlideOverContent: SidebarToggleMode;
+            static ShrinkContent: SidebarToggleMode;
+        }
+        class SidebarToggleRegion extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: SidebarToggleRegion;
+            static Right: SidebarToggleRegion;
+        }
+        class SimpleMenuBarOrientation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Horizontal: SimpleMenuBarOrientation;
+            static Vertical: SimpleMenuBarOrientation;
+        }
+        class SizeMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Auto: SizeMode;
+            static Pixels: SizeMode;
+            static Percentage: SizeMode;
+        }
+        class TableCellRenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: TableCellRenderModeType;
+            static Header: TableCellRenderModeType;
+            static Title: TableCellRenderModeType;
+        }
+        class TextRenderMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Text: TextRenderMode;
+            static Paragraph: TextRenderMode;
+            static H1: TextRenderMode;
+            static H2: TextRenderMode;
+            static H3: TextRenderMode;
+            static H4: TextRenderMode;
+            static H5: TextRenderMode;
+            static H6: TextRenderMode;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `CustomWidgets`.
+     */
+    module customwidgets {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomWidget extends pages.IWidget {
+            load(): CustomWidget;
+            load(callback: (element: CustomWidget) => void): any;
+        }
+        class CustomWidget extends pages.Widget implements ICustomWidget {
+            static typeName: string;
+            type: CustomWidgetType;
+            object: WidgetObject;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomWidgetType extends elements.IElement {
+            container: ICustomWidget;
+            load(): CustomWidgetType;
+            load(callback: (element: CustomWidgetType) => void): any;
+        }
+        class CustomWidgetType extends elements.Element implements ICustomWidgetType {
+            static typeName: string;
+            container: CustomWidget;
+            widgetId: string;
+            needsEntityContext: boolean;
+            name: string;
+            description: string;
+            phoneGapEnabled: boolean;
+            objectType: WidgetObjectType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetEnumerationValue extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetEnumerationValue;
+            load(callback: (element: WidgetEnumerationValue) => void): any;
+        }
+        class WidgetEnumerationValue extends elements.Element implements IWidgetEnumerationValue {
+            static typeName: string;
+            container: WidgetValueType;
+            key: string;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetObject extends elements.IElement {
+            load(): WidgetObject;
+            load(callback: (element: WidgetObject) => void): any;
+        }
+        class WidgetObject extends elements.Element implements IWidgetObject {
+            static typeName: string;
+            type: WidgetObjectType;
+            properties: instances.IList<WidgetProperty>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetObjectType extends elements.IElement {
+            load(): WidgetObjectType;
+            load(callback: (element: WidgetObjectType) => void): any;
+        }
+        class WidgetObjectType extends elements.Element implements IWidgetObjectType {
+            static typeName: string;
+            propertyTypes: instances.IList<WidgetPropertyType>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetProperty extends elements.IElement {
+            container: IWidgetObject;
+            load(): WidgetProperty;
+            load(callback: (element: WidgetProperty) => void): any;
+        }
+        class WidgetProperty extends elements.Element implements IWidgetProperty {
+            static typeName: string;
+            container: WidgetObject;
+            type: WidgetPropertyType;
+            value: WidgetValue;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetPropertyType extends elements.IElement {
+            container: IWidgetObjectType;
+            load(): WidgetPropertyType;
+            load(callback: (element: WidgetPropertyType) => void): any;
+        }
+        class WidgetPropertyType extends elements.Element implements IWidgetPropertyType {
+            static typeName: string;
+            container: WidgetObjectType;
+            key: string;
+            category: string;
+            caption: string;
+            description: string;
+            isDefault: boolean;
+            valueType: WidgetValueType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetReturnType extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetReturnType;
+            load(callback: (element: WidgetReturnType) => void): any;
+        }
+        class WidgetReturnType extends elements.Element implements IWidgetReturnType {
+            static typeName: string;
+            container: WidgetValueType;
+            type: WidgetReturnTypeEnum;
+            isList: boolean;
+            entityProperty: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetTranslation extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetTranslation;
+            load(callback: (element: WidgetTranslation) => void): any;
+        }
+        class WidgetTranslation extends elements.Element implements IWidgetTranslation {
+            static typeName: string;
+            container: WidgetValueType;
+            languageCode: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetValue extends elements.IElement {
+            container: IWidgetProperty;
+            load(): WidgetValue;
+            load(callback: (element: WidgetValue) => void): any;
+        }
+        class WidgetValue extends elements.Element implements IWidgetValue {
+            static typeName: string;
+            container: WidgetProperty;
+            type: WidgetValueType;
+            primitiveValue: string;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            entityPath: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            page: pages.IPage;
+            pageQualifiedName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            translatableValue: texts.Text;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            objects: instances.IList<WidgetObject>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetValueType extends elements.IElement {
+            container: IWidgetPropertyType;
+            load(): WidgetValueType;
+            load(callback: (element: WidgetValueType) => void): any;
+        }
+        class WidgetValueType extends elements.Element implements IWidgetValueType {
+            static typeName: string;
+            container: WidgetPropertyType;
+            type: WidgetValueTypeEnum;
+            isList: boolean;
+            entityProperty: string;
+            allowNonPersistableEntities: boolean;
+            isPath: IsPath;
+            pathType: PathType;
+            parameterIsList: boolean;
+            multiline: boolean;
+            defaultValue: string;
+            required: boolean;
+            attributeTypes: instances.IList<CustomWidgetAttributeType>;
+            enumerationValues: instances.IList<WidgetEnumerationValue>;
+            objectType: WidgetObjectType;
+            returnType: WidgetReturnType;
+            translations: instances.IList<WidgetTranslation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class CustomWidgetAttributeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static AutoNumber: CustomWidgetAttributeType;
+            static Binary: CustomWidgetAttributeType;
+            static Boolean: CustomWidgetAttributeType;
+            static Currency: CustomWidgetAttributeType;
+            static DateTime: CustomWidgetAttributeType;
+            static Enum: CustomWidgetAttributeType;
+            static Float: CustomWidgetAttributeType;
+            static HashString: CustomWidgetAttributeType;
+            static Integer: CustomWidgetAttributeType;
+            static Long: CustomWidgetAttributeType;
+            static String: CustomWidgetAttributeType;
+            static Decimal: CustomWidgetAttributeType;
+        }
+        class IsPath extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static No: IsPath;
+            static Optional: IsPath;
+            static Yes: IsPath;
+        }
+        class PathType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: PathType;
+            static Reference: PathType;
+            static ReferenceSet: PathType;
+        }
+        class WidgetReturnTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Void: WidgetReturnTypeEnum;
+            static Boolean: WidgetReturnTypeEnum;
+            static Integer: WidgetReturnTypeEnum;
+            static Float: WidgetReturnTypeEnum;
+            static DateTime: WidgetReturnTypeEnum;
+            static String: WidgetReturnTypeEnum;
+            static Object: WidgetReturnTypeEnum;
+            static Decimal: WidgetReturnTypeEnum;
+        }
+        class WidgetValueTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Attribute: WidgetValueTypeEnum;
+            static Boolean: WidgetValueTypeEnum;
+            static Entity: WidgetValueTypeEnum;
+            static EntityConstraint: WidgetValueTypeEnum;
+            static Enumeration: WidgetValueTypeEnum;
+            static Form: WidgetValueTypeEnum;
+            static Image: WidgetValueTypeEnum;
+            static Integer: WidgetValueTypeEnum;
+            static Microflow: WidgetValueTypeEnum;
+            static Object: WidgetValueTypeEnum;
+            static String: WidgetValueTypeEnum;
+            static TranslatableString: WidgetValueTypeEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DocumentTemplates`.
+     */
+    module documenttemplates {
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidget extends IWidget {
+            load(): AttributeWidget;
+            load(callback: (element: AttributeWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidget extends Widget implements IAttributeWidget {
+            static typeName: string;
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionSettings extends elements.IElement {
+            container: IMxTableRow;
+            load(): ConditionSettings;
+            load(callback: (element: ConditionSettings) => void): any;
+        }
+        class ConditionSettings extends elements.Element implements IConditionSettings {
+            static typeName: string;
+            container: MxTableRow;
+            conditions: instances.IList<enumerations.Condition>;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        interface IDataGridCell extends elements.IElement {
+            container: IDataGridColumn;
+            load(): DataGridCell;
+            load(callback: (element: DataGridCell) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        class DataGridCell extends elements.Element implements IDataGridCell {
+            static typeName: string;
+            container: DataGridColumn;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        interface IDataGridColumn extends elements.IElement {
+            container: IMxDataGrid;
+            load(): DataGridColumn;
+            load(callback: (element: DataGridColumn) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        class DataGridColumn extends elements.Element implements IDataGridColumn {
+            static typeName: string;
+            container: MxDataGrid;
+            oddRowsCell: DataGridCell;
+            evenRowsCell: DataGridCell;
+            caption: texts.Text;
+            formattingInfo: pages.FormattingInfo;
+            style: MxStyle;
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        interface IDocGridSortBar extends elements.IElement {
+            container: IMxGrid;
+            load(): DocGridSortBar;
+            load(callback: (element: DocGridSortBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        class DocGridSortBar extends elements.Element implements IDocGridSortBar {
+            static typeName: string;
+            container: MxGrid;
+            sortItems: instances.IList<DocGridSortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDocGridSortItem extends elements.IElement {
+            container: IDocGridSortBar;
+            load(): DocGridSortItem;
+            load(callback: (element: DocGridSortItem) => void): any;
+        }
+        class DocGridSortItem extends elements.Element implements IDocGridSortItem {
+            static typeName: string;
+            container: DocGridSortBar;
+            attributePath: string;
+            sortOrder: pages.SortDirection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
+         */
+        interface IDocumentTemplate extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): DocumentTemplate;
+            load(callback: (element: DocumentTemplate) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
+         */
+        class DocumentTemplate extends projects.Document implements IDocumentTemplate {
+            static typeName: string;
+            container: projects.FolderBase;
+            toplevels: instances.IList<Widget>;
+            header: MxHeaderDropZone;
+            footer: MxFooterDropZone;
+            style: MxStyle;
+            canvasWidth: number;
+            pageWidth: string;
+            pageHeight: string;
+            pPI: number;
+            marginLeftInInch: number;
+            marginRightInInch: number;
+            marginTopInInch: number;
+            marginBottomInInch: number;
+            showHeaderAndFooterOnFirstPage: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEntityWidget extends IWidget {
+            load(): EntityWidget;
+            load(callback: (element: EntityWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityWidget extends Widget implements IEntityWidget {
+            static typeName: string;
+            entityPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
+         */
+        interface IDynamicImageViewer extends IEntityWidget {
+            load(): DynamicImageViewer;
+            load(callback: (element: DynamicImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
+         */
+        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            useThumbnail: boolean;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxGrid extends IEntityWidget {
+            load(): MxGrid;
+            load(callback: (element: MxGrid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MxGrid extends EntityWidget implements IMxGrid {
+            static typeName: string;
+            style: MxStyle;
+            sortBar: DocGridSortBar;
+            cellSpacing: number;
+            cellPadding: number;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataGrid extends IMxGrid {
+            load(): MxDataGrid;
+            load(callback: (element: MxDataGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxDataGrid extends MxGrid implements IMxDataGrid {
+            static typeName: string;
+            columns: instances.IList<DataGridColumn>;
+            weights: instances.IList<number>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataView extends IEntityWidget {
+            load(): MxDataView;
+            load(callback: (element: MxDataView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        class MxDataView extends EntityWidget implements IMxDataView {
+            static typeName: string;
+            contents: MxDataViewDropZone;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataViewDropZone extends elements.IElement {
+            container: IMxDataView;
+            load(): MxDataViewDropZone;
+            load(callback: (element: MxDataViewDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        class MxDataViewDropZone extends elements.Element implements IMxDataViewDropZone {
+            static typeName: string;
+            container: MxDataView;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
+         */
+        interface IMxDynamicLabel extends IAttributeWidget {
+            load(): MxDynamicLabel;
+            load(callback: (element: MxDynamicLabel) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
+         */
+        class MxDynamicLabel extends AttributeWidget implements IMxDynamicLabel {
+            static typeName: string;
+            style: MxStyle;
+            formattingInfo: pages.FormattingInfo;
+            renderXHTML: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
+         */
+        interface IMxFooterDropZone extends elements.IElement {
+            container: IDocumentTemplate;
+            load(): MxFooterDropZone;
+            load(callback: (element: MxFooterDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
+         */
+        class MxFooterDropZone extends elements.Element implements IMxFooterDropZone {
+            static typeName: string;
+            container: DocumentTemplate;
+            widget: Widget;
+            bottomMargin: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
+         */
+        interface IMxHeaderDropZone extends elements.IElement {
+            container: IDocumentTemplate;
+            load(): MxHeaderDropZone;
+            load(callback: (element: MxHeaderDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
+         */
+        class MxHeaderDropZone extends elements.Element implements IMxHeaderDropZone {
+            static typeName: string;
+            container: DocumentTemplate;
+            widget: Widget;
+            topMargin: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
+         */
+        interface IMxLineBreak extends IWidget {
+            load(): MxLineBreak;
+            load(callback: (element: MxLineBreak) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
+         */
+        class MxLineBreak extends Widget implements IMxLineBreak {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
+         */
+        interface IMxPageBreak extends IWidget {
+            load(): MxPageBreak;
+            load(callback: (element: MxPageBreak) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
+         */
+        class MxPageBreak extends Widget implements IMxPageBreak {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
+         */
+        interface IMxStaticLabel extends IWidget {
+            load(): MxStaticLabel;
+            load(callback: (element: MxStaticLabel) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
+         */
+        class MxStaticLabel extends Widget implements IMxStaticLabel {
+            static typeName: string;
+            caption: texts.Text;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxStyle extends elements.IElement {
+            load(): MxStyle;
+            load(callback: (element: MxStyle) => void): any;
+        }
+        class MxStyle extends elements.Element implements IMxStyle {
+            static typeName: string;
+            fontFamily: FontFamily;
+            fontSize: number;
+            bold: boolean;
+            italic: boolean;
+            fontColor: string;
+            backgroundColor: string;
+            overrideFontFamily: boolean;
+            overrideFontSize: boolean;
+            overrideBold: boolean;
+            overrideItalic: boolean;
+            overrideFontColor: boolean;
+            overrideBackgroundColor: boolean;
+            textAlign: TextAlign;
+            customStyles: string;
+            borderStyleTop: BorderStyle;
+            borderStyleBottom: BorderStyle;
+            borderStyleLeft: BorderStyle;
+            borderStyleRight: BorderStyle;
+            borderWidthTop: number;
+            borderWidthBottom: number;
+            borderWidthLeft: number;
+            borderWidthRight: number;
+            borderColorTop: string;
+            borderColorBottom: string;
+            borderColorLeft: string;
+            borderColorRight: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
+         */
+        interface IMxTable extends IWidget {
+            load(): MxTable;
+            load(callback: (element: MxTable) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
+         */
+        class MxTable extends Widget implements IMxTable {
+            static typeName: string;
+            rows: instances.IList<MxTableRow>;
+            style: MxStyle;
+            columnWeights: instances.IList<number>;
+            cellSpacing: number;
+            cellPadding: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
+         */
+        interface IMxTableCell extends elements.IElement {
+            container: IMxTableRow;
+            load(): MxTableCell;
+            load(callback: (element: MxTableCell) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
+         */
+        class MxTableCell extends elements.Element implements IMxTableCell {
+            static typeName: string;
+            container: MxTableRow;
+            style: MxStyle;
+            widget: Widget;
+            colSpan: number;
+            rowSpan: number;
+            isPartOfSpan: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
+         */
+        interface IMxTableRow extends elements.IElement {
+            container: IMxTable;
+            load(): MxTableRow;
+            load(callback: (element: MxTableRow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
+         */
+        class MxTableRow extends elements.Element implements IMxTableRow {
+            static typeName: string;
+            container: MxTable;
+            cells: instances.IList<MxTableCell>;
+            conditionSettings: ConditionSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxTemplateGrid extends IMxGrid {
+            load(): MxTemplateGrid;
+            load(callback: (element: MxTemplateGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxTemplateGrid extends MxGrid implements IMxTemplateGrid {
+            static typeName: string;
+            oddRowsDropZone: MxTemplateGridDropZone;
+            evenRowsDropZone: MxTemplateGridDropZone;
+            numberOfColumns: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxTemplateGridDropZone extends elements.IElement {
+            container: IMxTemplateGrid;
+            load(): MxTemplateGridDropZone;
+            load(callback: (element: MxTemplateGridDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxTemplateGridDropZone extends elements.Element implements IMxTemplateGridDropZone {
+            static typeName: string;
+            container: MxTemplateGrid;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
+         */
+        interface IMxTitle extends IWidget {
+            load(): MxTitle;
+            load(callback: (element: MxTitle) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
+         */
+        class MxTitle extends Widget implements IMxTitle {
+            static typeName: string;
+            caption: texts.Text;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
+         */
+        interface IStaticImageViewer extends IWidget {
+            load(): StaticImageViewer;
+            load(callback: (element: StaticImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
+         */
+        class StaticImageViewer extends Widget implements IStaticImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class BorderStyle extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: BorderStyle;
+            static Dotted: BorderStyle;
+            static Dashed: BorderStyle;
+            static Solid: BorderStyle;
+        }
+        class FontFamily extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Courier: FontFamily;
+            static Tahoma: FontFamily;
+            static Times: FontFamily;
+            static Helvetica: FontFamily;
+            static Arial: FontFamily;
+        }
+        class TextAlign extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: TextAlign;
+            static Right: TextAlign;
+            static Center: TextAlign;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Navigation`.
+     */
+    module navigation {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
+         */
+        interface INavigationDocument extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): NavigationDocument;
+            load(callback: (element: NavigationDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
+         */
+        class NavigationDocument extends projects.ProjectDocument implements INavigationDocument {
+            static typeName: string;
+            container: projects.Project;
+            phoneProfile: NavigationProfile;
+            tabletProfile: NavigationProfile;
+            desktopProfile: NavigationProfile;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationProfile extends elements.IElement {
+            container: INavigationDocument;
+            load(): NavigationProfile;
+            load(callback: (element: NavigationProfile) => void): any;
+        }
+        class NavigationProfile extends elements.Element implements INavigationProfile {
+            static typeName: string;
+            container: NavigationDocument;
+            type: DeviceType;
+            enabled: boolean;
+            homePage: HomePage;
+            roleBasedHomePages: instances.IList<RoleBasedHomePage>;
+            applicationTitle: string;
+            menuItemCollection: menus.MenuItemCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHomePageBase extends elements.IElement {
+            container: INavigationProfile;
+            load(): HomePageBase;
+            load(callback: (element: HomePageBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class HomePageBase extends elements.Element implements IHomePageBase {
+            static typeName: string;
+            container: NavigationProfile;
+            page: pages.IPage;
+            pageQualifiedName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHomePage extends IHomePageBase {
+            container: INavigationProfile;
+            load(): HomePage;
+            load(callback: (element: HomePage) => void): any;
+        }
+        class HomePage extends HomePageBase implements IHomePage {
+            static typeName: string;
+            container: NavigationProfile;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRoleBasedHomePage extends IHomePageBase {
+            container: INavigationProfile;
+            load(): RoleBasedHomePage;
+            load(callback: (element: RoleBasedHomePage) => void): any;
+        }
+        class RoleBasedHomePage extends HomePageBase implements IRoleBasedHomePage {
+            static typeName: string;
+            container: NavigationProfile;
+            userRole: security.IUserRole;
+            userRoleQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class DeviceType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Desktop: DeviceType;
+            static Tablet: DeviceType;
+            static Phone: DeviceType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Reports`.
+     */
+    module reports {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
+         */
+        interface IReportWidget extends pages.IWidget {
+            load(): ReportWidget;
+            load(callback: (element: ReportWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ReportWidget extends pages.Widget implements IReportWidget {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
+         */
+        interface IBasicReport extends IReportWidget {
+            load(): BasicReport;
+            load(callback: (element: BasicReport) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
+         */
+        class BasicReport extends ReportWidget implements IBasicReport {
+            static typeName: string;
+            dataSet: datasets.IDataSet;
+            dataSetQualifiedName: string;
+            columns: instances.IList<BasicReportColumn>;
+            aggregates: instances.IList<BasicReportAggregate>;
+            showExportButton: boolean;
+            zoomInfo: ReportZoomInfo;
+            isPagingEnabled: boolean;
+            pageSize: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBasicReportAggregate extends elements.IElement {
+            container: IBasicReport;
+            load(): BasicReportAggregate;
+            load(callback: (element: BasicReportAggregate) => void): any;
+        }
+        class BasicReportAggregate extends elements.Element implements IBasicReportAggregate {
+            static typeName: string;
+            container: BasicReport;
+            caption: texts.Text;
+            aggregateFunction: AggregateFunctionEnum;
+            applicablePerColumn: instances.IList<boolean>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBasicReportColumn extends elements.IElement {
+            container: IBasicReport;
+            load(): BasicReportColumn;
+            load(callback: (element: BasicReportColumn) => void): any;
+        }
+        class BasicReportColumn extends elements.Element implements IBasicReportColumn {
+            static typeName: string;
+            container: BasicReport;
+            caption: texts.Text;
+            dataSetColumnName: string;
+            width: number;
+            alignment: pages.AlignmentEnum;
+            format: ColumnFormat;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
+         */
+        interface IReportButton extends pages.IWidget {
+            load(): ReportButton;
+            load(callback: (element: ReportButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
+         */
+        class ReportButton extends pages.Widget implements IReportButton {
+            static typeName: string;
+            caption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
+         */
+        interface IReportChart extends pages.IWidget {
+            load(): ReportChart;
+            load(callback: (element: ReportChart) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
+         */
+        class ReportChart extends pages.Widget implements IReportChart {
+            static typeName: string;
+            dataSet: datasets.IDataSet;
+            dataSetQualifiedName: string;
+            type: ChartType;
+            seriess: instances.IList<ReportChartSeries>;
+            xAxisCaption: texts.Text;
+            yAxisCaption: texts.Text;
+            xAxisColumn: string;
+            xAxisFormat: ColumnFormat;
+            yAxisPrecision: number;
+            yAxisUseMinMax: boolean;
+            yAxisMinimum: number;
+            yAxisMaximum: number;
+            aspectRatio: AspectRatio;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportChartSeries extends elements.IElement {
+            container: IReportChart;
+            load(): ReportChartSeries;
+            load(callback: (element: ReportChartSeries) => void): any;
+        }
+        class ReportChartSeries extends elements.Element implements IReportChartSeries {
+            static typeName: string;
+            container: ReportChart;
+            caption: texts.Text;
+            dataSetColumn: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
+         */
+        interface IReportDateRangeField extends elements.IElement {
+            container: IReportDateRangeSelector;
+            load(): ReportDateRangeField;
+            load(callback: (element: ReportDateRangeField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
+         */
+        class ReportDateRangeField extends elements.Element implements IReportDateRangeField {
+            static typeName: string;
+            container: ReportDateRangeSelector;
+            caption: texts.Text;
+            type: DateRangeFieldEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportParameter extends pages.IWidget {
+            load(): ReportParameter;
+            load(callback: (element: ReportParameter) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ReportParameter extends pages.Widget implements IReportParameter {
+            static typeName: string;
+            parameterName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
+         */
+        interface IReportDateRangeSelector extends IReportParameter {
+            load(): ReportDateRangeSelector;
+            load(callback: (element: ReportDateRangeSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
+         */
+        class ReportDateRangeSelector extends ReportParameter implements IReportDateRangeSelector {
+            static typeName: string;
+            fields: instances.IList<ReportDateRangeField>;
+            minYear: number;
+            maxYear: number;
+            fieldsPerRow: number;
+            showFromToRange: boolean;
+            fromCaption: texts.Text;
+            toCaption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
+         */
+        interface IReportDropDown extends IReportParameter {
+            load(): ReportDropDown;
+            load(callback: (element: ReportDropDown) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
+         */
+        class ReportDropDown extends ReportParameter implements IReportDropDown {
+            static typeName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
+         */
+        interface IReportPane extends pages.IWidget {
+            load(): ReportPane;
+            load(callback: (element: ReportPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
+         */
+        class ReportPane extends pages.Widget implements IReportPane {
+            static typeName: string;
+            parameterWidget: pages.Widget;
+            reportWidget: pages.Widget;
+            generateOnLoad: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportZoomInfo extends elements.IElement {
+            container: IBasicReport;
+            load(): ReportZoomInfo;
+            load(callback: (element: ReportZoomInfo) => void): any;
+        }
+        class ReportZoomInfo extends elements.Element implements IReportZoomInfo {
+            static typeName: string;
+            container: BasicReport;
+            targetPage: pages.IPage;
+            targetPageQualifiedName: string;
+            mappings: instances.IList<ReportZoomMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportZoomMapping extends elements.IElement {
+            container: IReportZoomInfo;
+            load(): ReportZoomMapping;
+            load(callback: (element: ReportZoomMapping) => void): any;
+        }
+        class ReportZoomMapping extends elements.Element implements IReportZoomMapping {
+            static typeName: string;
+            container: ReportZoomInfo;
+            targetParameterName: string;
+            sourceReportColumnName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class AggregateFunctionEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Sum: AggregateFunctionEnum;
+            static Average: AggregateFunctionEnum;
+            static Count: AggregateFunctionEnum;
+            static Minimum: AggregateFunctionEnum;
+            static Maximum: AggregateFunctionEnum;
+        }
+        class ColumnFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ColumnFormat;
+            static MonthName: ColumnFormat;
+            static WeekdayName: ColumnFormat;
+        }
+        class ChartType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static VerticalBars: ChartType;
+            static VerticalBars3D: ChartType;
+            static HorizontalBars: ChartType;
+            static Lines: ChartType;
+            static Area: ChartType;
+        }
+        class AspectRatio extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SixteenToNine: AspectRatio;
+            static ThreeToTwo: AspectRatio;
+            static FourToThree: AspectRatio;
+            static OneToOne: AspectRatio;
+            static ThreeToFour: AspectRatio;
+            static TwoToThree: AspectRatio;
+            static NineToSixteen: AspectRatio;
+        }
+        class DateRangeFieldEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Year: DateRangeFieldEnum;
+            static Month: DateRangeFieldEnum;
+            static Week: DateRangeFieldEnum;
+            static Period: DateRangeFieldEnum;
+            static Quarter: DateRangeFieldEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Menus`.
+     */
+    module menus {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
+         */
+        interface IMenuDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MenuDocument;
+            load(callback: (element: MenuDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
+         */
+        class MenuDocument extends projects.Document implements IMenuDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            itemCollection: MenuItemCollection;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuItemContainer extends elements.IElement {
+            load(): MenuItemContainer;
+            load(callback: (element: MenuItemContainer) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuItemContainer extends elements.Element implements IMenuItemContainer {
+            static typeName: string;
+            items: instances.IList<MenuItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuItemCollection extends IMenuItemContainer {
+            load(): MenuItemCollection;
+            load(callback: (element: MenuItemCollection) => void): any;
+        }
+        class MenuItemCollection extends MenuItemContainer implements IMenuItemCollection {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
+         */
+        interface IMenuItem extends IMenuItemContainer {
+            container: IMenuItemContainer;
+            load(): MenuItem;
+            load(callback: (element: MenuItem) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
+         */
+        class MenuItem extends MenuItemContainer implements IMenuItem {
+            static typeName: string;
+            container: MenuItemContainer;
+            caption: texts.Text;
+            icon: pages.Icon;
+            action: pages.ClientAction;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DataSets`.
+     */
+    module datasets {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
+         */
+        interface IDataSet extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): DataSet;
+            load(callback: (element: DataSet) => void): any;
+            parameters: instances.IList<IDataSetParameter>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
+         */
+        class DataSet extends projects.Document implements IDataSet {
+            static typeName: string;
+            container: projects.FolderBase;
+            source: DataSetSource;
+            parameters: instances.IList<DataSetParameter>;
+            dataSetAccess: DataSetAccess;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetAccess extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetAccess;
+            load(callback: (element: DataSetAccess) => void): any;
+        }
+        class DataSetAccess extends elements.Element implements IDataSetAccess {
+            static typeName: string;
+            container: DataSet;
+            moduleRoleAccessList: instances.IList<DataSetModuleRoleAccess>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetColumn extends elements.IElement {
+            container: IJavaDataSetSource;
+            load(): DataSetColumn;
+            load(callback: (element: DataSetColumn) => void): any;
+        }
+        class DataSetColumn extends elements.Element implements IDataSetColumn {
+            static typeName: string;
+            container: JavaDataSetSource;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetConstraintAccess extends elements.IElement {
+            container: IDataSetParameterAccess;
+            load(): DataSetConstraintAccess;
+            load(callback: (element: DataSetConstraintAccess) => void): any;
+        }
+        class DataSetConstraintAccess extends elements.Element implements IDataSetConstraintAccess {
+            static typeName: string;
+            container: DataSetParameterAccess;
+            constraintText: string;
+            enabled: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameterConstraint extends elements.IElement {
+            container: IDataSetParameter;
+            load(): DataSetParameterConstraint;
+            load(callback: (element: DataSetParameterConstraint) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSetParameterConstraint extends elements.Element implements IDataSetParameterConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDataSetDateTimeConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetDateTimeConstraint;
+            load(callback: (element: DataSetDateTimeConstraint) => void): any;
+        }
+        class DataSetDateTimeConstraint extends DataSetParameterConstraint implements IDataSetDateTimeConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            modifier: DateTimeIntervalModifier;
+            length: DateTimeIntervalLength;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetModuleRoleAccess extends elements.IElement {
+            container: IDataSetAccess;
+            load(): DataSetModuleRoleAccess;
+            load(callback: (element: DataSetModuleRoleAccess) => void): any;
+        }
+        class DataSetModuleRoleAccess extends elements.Element implements IDataSetModuleRoleAccess {
+            static typeName: string;
+            container: DataSetAccess;
+            parameterAccessList: instances.IList<DataSetParameterAccess>;
+            moduleRole: security.IModuleRole;
+            moduleRoleQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetNumericConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetNumericConstraint;
+            load(callback: (element: DataSetNumericConstraint) => void): any;
+        }
+        class DataSetNumericConstraint extends DataSetParameterConstraint implements IDataSetNumericConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            begin: string;
+            applyBegin: boolean;
+            end: string;
+            applyEnd: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetObjectConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetObjectConstraint;
+            load(callback: (element: DataSetObjectConstraint) => void): any;
+        }
+        class DataSetObjectConstraint extends DataSetParameterConstraint implements IDataSetObjectConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            name: string;
+            constraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameter extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetParameter;
+            load(callback: (element: DataSetParameter) => void): any;
+            name: string;
+        }
+        class DataSetParameter extends elements.Element implements IDataSetParameter {
+            static typeName: string;
+            container: DataSet;
+            constraints: instances.IList<DataSetParameterConstraint>;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameterAccess extends elements.IElement {
+            container: IDataSetModuleRoleAccess;
+            load(): DataSetParameterAccess;
+            load(callback: (element: DataSetParameterAccess) => void): any;
+        }
+        class DataSetParameterAccess extends elements.Element implements IDataSetParameterAccess {
+            static typeName: string;
+            container: DataSetModuleRoleAccess;
+            constraintAccessList: instances.IList<DataSetConstraintAccess>;
+            parameterName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetSource extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetSource;
+            load(callback: (element: DataSetSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSetSource extends elements.Element implements IDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IJavaDataSetSource extends IDataSetSource {
+            container: IDataSet;
+            load(): JavaDataSetSource;
+            load(callback: (element: JavaDataSetSource) => void): any;
+        }
+        class JavaDataSetSource extends DataSetSource implements IJavaDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            columns: instances.IList<DataSetColumn>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOqlDataSetSource extends IDataSetSource {
+            container: IDataSet;
+            load(): OqlDataSetSource;
+            load(callback: (element: OqlDataSetSource) => void): any;
+        }
+        class OqlDataSetSource extends DataSetSource implements IOqlDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            query: string;
+            ignoreErrorsInQuery: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class DateTimeIntervalLength extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Day: DateTimeIntervalLength;
+            static Week: DateTimeIntervalLength;
+            static Period: DateTimeIntervalLength;
+            static Month: DateTimeIntervalLength;
+            static Quarter: DateTimeIntervalLength;
+            static Year: DateTimeIntervalLength;
+        }
+        class DateTimeIntervalModifier extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Last: DateTimeIntervalModifier;
+            static This: DateTimeIntervalModifier;
+            static Next: DateTimeIntervalModifier;
+            static Past: DateTimeIntervalModifier;
+            static Future: DateTimeIntervalModifier;
+            static Always: DateTimeIntervalModifier;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Texts`.
+     */
+    module texts {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
+         */
+        interface IText extends elements.IElement {
+            load(): Text;
+            load(callback: (element: Text) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
+         */
+        class Text extends elements.Element implements IText {
+            static typeName: string;
+            translations: instances.IList<Translation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITranslation extends elements.IElement {
+            container: IText;
+            load(): Translation;
+            load(callback: (element: Translation) => void): any;
+        }
+        class Translation extends elements.Element implements ITranslation {
+            static typeName: string;
+            container: Text;
+            languageCode: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        interface ILanguage extends elements.IElement {
+            container: settings.IProjectSettings;
+            load(): Language;
+            load(callback: (element: Language) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        class Language extends elements.Element implements ILanguage {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            code: string;
+            checkCompleteness: boolean;
+            customDateFormat: string;
+            customTimeFormat: string;
+            customDateTimeFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISystemText extends elements.IElement {
+            container: ISystemTextCollection;
+            load(): SystemText;
+            load(callback: (element: SystemText) => void): any;
+        }
+        class SystemText extends elements.Element implements ISystemText {
+            static typeName: string;
+            container: SystemTextCollection;
+            text: Text;
+            key: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
+         */
+        interface ISystemTextCollection extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): SystemTextCollection;
+            load(callback: (element: SystemTextCollection) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
+         */
+        class SystemTextCollection extends projects.ProjectDocument implements ISystemTextCollection {
+            static typeName: string;
+            container: projects.Project;
+            systemTexts: instances.IList<SystemText>;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `JavaActions`.
+     */
+    module javaactions {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
+         */
+        interface IJavaAction extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): JavaAction;
+            load(callback: (element: JavaAction) => void): any;
+            parameters: instances.IList<IJavaActionParameter>;
+            returnType: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
+         */
+        class JavaAction extends projects.Document implements IJavaAction {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameters: instances.IList<JavaActionParameter>;
+            returnType: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IJavaActionParameter extends elements.IElement {
+            container: IJavaAction;
+            load(): JavaActionParameter;
+            load(callback: (element: JavaActionParameter) => void): any;
+            name: string;
+            type: string;
+        }
+        class JavaActionParameter extends elements.Element implements IJavaActionParameter {
+            static typeName: string;
+            container: JavaAction;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Constants`.
+     */
+    module constants {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
+         */
+        interface IConstant extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): Constant;
+            load(callback: (element: Constant) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
+         */
+        class Constant extends projects.Document implements IConstant {
+            static typeName: string;
+            container: projects.FolderBase;
+            dataType: string;
+            defaultValue: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ScheduledEvents`.
+     */
+    module scheduledevents {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
+         */
+        interface IScheduledEvent extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ScheduledEvent;
+            load(callback: (element: ScheduledEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
+         */
+        class ScheduledEvent extends projects.Document implements IScheduledEvent {
+            static typeName: string;
+            container: projects.FolderBase;
+            startDateTime: string;
+            timeZone: TimeZoneEnum;
+            interval: number;
+            intervalType: IntervalType;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            enabled: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class IntervalType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Second: IntervalType;
+            static Minute: IntervalType;
+            static Hour: IntervalType;
+            static Day: IntervalType;
+            static Week: IntervalType;
+            static Month: IntervalType;
+            static Year: IntervalType;
+        }
+        class TimeZoneEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static UTC: TimeZoneEnum;
+            static Server: TimeZoneEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `RegularExpressions`.
+     */
+    module regularexpressions {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
+         */
+        interface IRegularExpression extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): RegularExpression;
+            load(callback: (element: RegularExpression) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
+         */
+        class RegularExpression extends projects.Document implements IRegularExpression {
+            static typeName: string;
+            container: projects.FolderBase;
+            regEx: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Images`.
+     */
+    module images {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
+         */
+        interface IImageCollection extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ImageCollection;
+            load(callback: (element: ImageCollection) => void): any;
+            images: instances.IList<IImage>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
+         */
+        class ImageCollection extends projects.Document implements IImageCollection {
+            static typeName: string;
+            container: projects.FolderBase;
+            images: instances.IList<Image>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImage extends elements.IElement {
+            container: IImageCollection;
+            load(): Image;
+            load(callback: (element: Image) => void): any;
+            name: string;
+        }
+        class Image extends elements.Element implements IImage {
+            static typeName: string;
+            container: ImageCollection;
+            name: string;
+            /**
+             * ?
+             */
+            imageData: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Security`.
+     */
+    module security {
+        interface IAccessRuleContainerBase extends elements.IElement {
+            container: IProjectSecurity;
+            load(): AccessRuleContainerBase;
+            load(callback: (element: AccessRuleContainerBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AccessRuleContainerBase extends elements.Element implements IAccessRuleContainerBase {
+            static typeName: string;
+            container: ProjectSecurity;
+            accessRules: instances.IList<domainmodels.AccessRule>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDemoUser extends elements.IElement {
+            container: IProjectSecurity;
+            load(): DemoUser;
+            load(callback: (element: DemoUser) => void): any;
+        }
+        class DemoUser extends elements.Element implements IDemoUser {
+            static typeName: string;
+            container: ProjectSecurity;
+            userName: string;
+            password: string;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            userRoleIds: instances.IList<IUserRole>;
+            userRoleIdsQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFileDocumentAccessRuleContainer extends IAccessRuleContainerBase {
+            container: IProjectSecurity;
+            load(): FileDocumentAccessRuleContainer;
+            load(callback: (element: FileDocumentAccessRuleContainer) => void): any;
+        }
+        class FileDocumentAccessRuleContainer extends AccessRuleContainerBase implements IFileDocumentAccessRuleContainer {
+            static typeName: string;
+            container: ProjectSecurity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageAccessRuleContainer extends IAccessRuleContainerBase {
+            container: IProjectSecurity;
+            load(): ImageAccessRuleContainer;
+            load(callback: (element: ImageAccessRuleContainer) => void): any;
+        }
+        class ImageAccessRuleContainer extends AccessRuleContainerBase implements IImageAccessRuleContainer {
+            static typeName: string;
+            container: ProjectSecurity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
+         */
+        interface IModuleRole extends elements.IElement {
+            container: IModuleSecurity;
+            load(): ModuleRole;
+            load(callback: (element: ModuleRole) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
+         */
+        class ModuleRole extends elements.Element implements IModuleRole {
+            static typeName: string;
+            container: ModuleSecurity;
+            name: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
+         */
+        interface IModuleSecurity extends units.IModelUnit {
+            container: projects.IModule;
+            load(): ModuleSecurity;
+            load(callback: (element: ModuleSecurity) => void): any;
+            moduleRoles: instances.IList<IModuleRole>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
+         */
+        class ModuleSecurity extends units.ModelUnit implements IModuleSecurity {
+            static typeName: string;
+            container: projects.Module;
+            moduleRoles: instances.IList<ModuleRole>;
+            constructor(container: projects.IModule);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPasswordPolicySettings extends elements.IElement {
+            container: IProjectSecurity;
+            load(): PasswordPolicySettings;
+            load(callback: (element: PasswordPolicySettings) => void): any;
+        }
+        class PasswordPolicySettings extends elements.Element implements IPasswordPolicySettings {
+            static typeName: string;
+            container: ProjectSecurity;
+            minimumLength: number;
+            requireMixedCase: boolean;
+            requireSymbol: boolean;
+            requireDigit: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
+         */
+        interface IProjectSecurity extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): ProjectSecurity;
+            load(callback: (element: ProjectSecurity) => void): any;
+            userRoles: instances.IList<IUserRole>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
+         */
+        class ProjectSecurity extends projects.ProjectDocument implements IProjectSecurity {
+            static typeName: string;
+            container: projects.Project;
+            fileDocumentAccess: FileDocumentAccessRuleContainer;
+            imageAccess: ImageAccessRuleContainer;
+            passwordPolicySettings: PasswordPolicySettings;
+            userRoles: instances.IList<UserRole>;
+            demoUsers: instances.IList<DemoUser>;
+            securityLevel: projects.SecurityLevel;
+            checkSecurity: boolean;
+            adminUserName: string;
+            adminPassword: string;
+            adminUserRoleName: string;
+            enableDemoUsers: boolean;
+            enableGuestAccess: boolean;
+            guestUserRoleName: string;
+            signInMicroflow: microflows.IMicroflow;
+            signInMicroflowQualifiedName: string;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
+         */
+        interface IUserRole extends elements.IElement {
+            container: IProjectSecurity;
+            load(): UserRole;
+            load(callback: (element: UserRole) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
+         */
+        class UserRole extends elements.Element implements IUserRole {
+            static typeName: string;
+            container: ProjectSecurity;
+            guid: string;
+            name: string;
+            description: string;
+            moduleRoleIds: instances.IList<IModuleRole>;
+            moduleRoleIdsQualifiedNames: string[];
+            manageAllRoles: boolean;
+            manageableRoleIds: instances.IList<IUserRole>;
+            manageableRoleIdsQualifiedNames: string[];
+            manageUsersWithoutRoles: boolean;
+            checkSecurity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DomainModels`.
+     */
+    module domainmodels {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
+         */
+        interface IDomainModel extends projects.IModuleDocument {
+            container: projects.IModule;
+            load(): DomainModel;
+            load(callback: (element: DomainModel) => void): any;
+            entities: instances.IList<IEntity>;
+            associations: instances.IList<IAssociation>;
+            crossAssociations: instances.IList<ICrossAssociation>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
+         */
+        class DomainModel extends projects.ModuleDocument implements IDomainModel {
+            static typeName: string;
+            container: projects.Module;
+            documentation: string;
+            entities: instances.IList<Entity>;
+            annotations: instances.IList<Annotation>;
+            associations: instances.IList<Association>;
+            crossAssociations: instances.IList<CrossAssociation>;
+            constructor(container: projects.IModule);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
+         */
+        interface IEntity extends elements.IElement {
+            container: IDomainModel;
+            load(): Entity;
+            load(callback: (element: Entity) => void): any;
+            name: string;
+            generalization: IGeneralizationBase;
+            attributes: instances.IList<IAttribute>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
+         */
+        class Entity extends elements.Element implements IEntity {
+            static typeName: string;
+            container: DomainModel;
+            name: string;
+            dataStorageGuid: string;
+            location: common.IPoint;
+            documentation: string;
+            generalization: GeneralizationBase;
+            attributes: instances.IList<Attribute>;
+            validationRules: instances.IList<ValidationRule>;
+            eventHandlers: instances.IList<EventHandler>;
+            indexes: instances.IList<Index>;
+            accessRules: instances.IList<AccessRule>;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGeneralizationBase extends elements.IElement {
+            container: IEntity;
+            load(): GeneralizationBase;
+            load(callback: (element: GeneralizationBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GeneralizationBase extends elements.Element implements IGeneralizationBase {
+            static typeName: string;
+            container: Entity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGeneralization extends IGeneralizationBase {
+            container: IEntity;
+            load(): Generalization;
+            load(callback: (element: Generalization) => void): any;
+            generalization: IEntity;
+            generalizationQualifiedName: string;
+        }
+        class Generalization extends GeneralizationBase implements IGeneralization {
+            static typeName: string;
+            container: Entity;
+            generalization: IEntity;
+            generalizationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INoGeneralization extends IGeneralizationBase {
+            container: IEntity;
+            load(): NoGeneralization;
+            load(callback: (element: NoGeneralization) => void): any;
+            persistable: boolean;
+        }
+        class NoGeneralization extends GeneralizationBase implements INoGeneralization {
+            static typeName: string;
+            container: Entity;
+            hasChangedDate: boolean;
+            hasCreatedDate: boolean;
+            hasOwner: boolean;
+            hasChangedBy: boolean;
+            persistable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
+         */
+        interface IAttribute extends elements.IElement {
+            container: IEntity;
+            load(): Attribute;
+            load(callback: (element: Attribute) => void): any;
+            name: string;
+            type: IAttributeType;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
+         */
+        class Attribute extends elements.Element implements IAttribute {
+            static typeName: string;
+            container: Entity;
+            name: string;
+            dataStorageGuid: string;
+            type: AttributeType;
+            documentation: string;
+            value: ValueType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueType extends elements.IElement {
+            container: IAttribute;
+            load(): ValueType;
+            load(callback: (element: ValueType) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueType extends elements.Element implements IValueType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IStoredValue extends IValueType {
+            container: IAttribute;
+            load(): StoredValue;
+            load(callback: (element: StoredValue) => void): any;
+        }
+        class StoredValue extends ValueType implements IStoredValue {
+            static typeName: string;
+            container: Attribute;
+            defaultValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICalculatedValue extends IValueType {
+            container: IAttribute;
+            load(): CalculatedValue;
+            load(callback: (element: CalculatedValue) => void): any;
+        }
+        class CalculatedValue extends ValueType implements ICalculatedValue {
+            static typeName: string;
+            container: Attribute;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            passEntity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeType extends elements.IElement {
+            container: IAttribute;
+            load(): AttributeType;
+            load(callback: (element: AttributeType) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeType extends elements.Element implements IAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IBinaryAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): BinaryAttributeType;
+            load(callback: (element: BinaryAttributeType) => void): any;
+        }
+        class BinaryAttributeType extends AttributeType implements IBinaryAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IBooleanAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): BooleanAttributeType;
+            load(callback: (element: BooleanAttributeType) => void): any;
+        }
+        class BooleanAttributeType extends AttributeType implements IBooleanAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDateTimeAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): DateTimeAttributeType;
+            load(callback: (element: DateTimeAttributeType) => void): any;
+        }
+        class DateTimeAttributeType extends AttributeType implements IDateTimeAttributeType {
+            static typeName: string;
+            container: Attribute;
+            localizeDate: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEnumerationAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): EnumerationAttributeType;
+            load(callback: (element: EnumerationAttributeType) => void): any;
+            enumeration: enumerations.IEnumeration;
+            enumerationQualifiedName: string;
+        }
+        class EnumerationAttributeType extends AttributeType implements IEnumerationAttributeType {
+            static typeName: string;
+            container: Attribute;
+            enumeration: enumerations.IEnumeration;
+            enumerationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHashedStringAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): HashedStringAttributeType;
+            load(callback: (element: HashedStringAttributeType) => void): any;
+        }
+        class HashedStringAttributeType extends AttributeType implements IHashedStringAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IStringAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): StringAttributeType;
+            load(callback: (element: StringAttributeType) => void): any;
+        }
+        class StringAttributeType extends AttributeType implements IStringAttributeType {
+            static typeName: string;
+            container: Attribute;
+            length: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INumericAttributeTypeBase extends IAttributeType {
+            container: IAttribute;
+            load(): NumericAttributeTypeBase;
+            load(callback: (element: NumericAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class NumericAttributeTypeBase extends AttributeType implements INumericAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDecimalAttributeTypeBase extends INumericAttributeTypeBase {
+            container: IAttribute;
+            load(): DecimalAttributeTypeBase;
+            load(callback: (element: DecimalAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DecimalAttributeTypeBase extends NumericAttributeTypeBase implements IDecimalAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDecimalAttributeType extends IDecimalAttributeTypeBase {
+            container: IAttribute;
+            load(): DecimalAttributeType;
+            load(callback: (element: DecimalAttributeType) => void): any;
+        }
+        class DecimalAttributeType extends DecimalAttributeTypeBase implements IDecimalAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFloatAttributeTypeBase extends IDecimalAttributeTypeBase {
+            container: IAttribute;
+            load(): FloatAttributeTypeBase;
+            load(callback: (element: FloatAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FloatAttributeTypeBase extends DecimalAttributeTypeBase implements IFloatAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFloatAttributeType extends IFloatAttributeTypeBase {
+            container: IAttribute;
+            load(): FloatAttributeType;
+            load(callback: (element: FloatAttributeType) => void): any;
+        }
+        class FloatAttributeType extends FloatAttributeTypeBase implements IFloatAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ICurrencyAttributeType extends IFloatAttributeTypeBase {
+            container: IAttribute;
+            load(): CurrencyAttributeType;
+            load(callback: (element: CurrencyAttributeType) => void): any;
+        }
+        class CurrencyAttributeType extends FloatAttributeTypeBase implements ICurrencyAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegerAttributeTypeBase extends INumericAttributeTypeBase {
+            container: IAttribute;
+            load(): IntegerAttributeTypeBase;
+            load(callback: (element: IntegerAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class IntegerAttributeTypeBase extends NumericAttributeTypeBase implements IIntegerAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegerAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): IntegerAttributeType;
+            load(callback: (element: IntegerAttributeType) => void): any;
+        }
+        class IntegerAttributeType extends IntegerAttributeTypeBase implements IIntegerAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ILongAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): LongAttributeType;
+            load(callback: (element: LongAttributeType) => void): any;
+        }
+        class LongAttributeType extends IntegerAttributeTypeBase implements ILongAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IAutoNumberAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): AutoNumberAttributeType;
+            load(callback: (element: AutoNumberAttributeType) => void): any;
+        }
+        class AutoNumberAttributeType extends IntegerAttributeTypeBase implements IAutoNumberAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
+         */
+        interface IAssociationBase extends elements.IElement {
+            container: IDomainModel;
+            load(): AssociationBase;
+            load(callback: (element: AssociationBase) => void): any;
+            name: string;
+            type: AssociationType;
+            owner: AssociationOwner;
+            parent: IEntity;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AssociationBase extends elements.Element implements IAssociationBase {
+            static typeName: string;
+            container: DomainModel;
+            name: string;
+            dataStorageGuid: string;
+            type: AssociationType;
+            owner: AssociationOwner;
+            deleteBehavior: AssociationDeleteBehavior;
+            parent: Entity;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
+         */
+        interface IAssociation extends IAssociationBase {
+            container: IDomainModel;
+            load(): Association;
+            load(callback: (element: Association) => void): any;
+            child: IEntity;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
+         */
+        class Association extends AssociationBase implements IAssociation {
+            static typeName: string;
+            container: DomainModel;
+            child: Entity;
+            parentConnection: common.IPoint;
+            childConnection: common.IPoint;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICrossAssociation extends IAssociationBase {
+            container: IDomainModel;
+            load(): CrossAssociation;
+            load(callback: (element: CrossAssociation) => void): any;
+            child: IEntity;
+            childQualifiedName: string;
+        }
+        class CrossAssociation extends AssociationBase implements ICrossAssociation {
+            static typeName: string;
+            container: DomainModel;
+            child: IEntity;
+            childQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationDeleteBehavior extends elements.IElement {
+            container: IAssociationBase;
+            load(): AssociationDeleteBehavior;
+            load(callback: (element: AssociationDeleteBehavior) => void): any;
+        }
+        class AssociationDeleteBehavior extends elements.Element implements IAssociationDeleteBehavior {
+            static typeName: string;
+            container: AssociationBase;
+            parentDeleteBehavior: DeletingBehavior;
+            childDeleteBehavior: DeletingBehavior;
+            parentErrorMessage: texts.Text;
+            childErrorMessage: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
+         */
+        interface IAnnotation extends elements.IElement {
+            container: IDomainModel;
+            load(): Annotation;
+            load(callback: (element: Annotation) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
+         */
+        class Annotation extends elements.Element implements IAnnotation {
+            static typeName: string;
+            container: DomainModel;
+            caption: string;
+            location: common.IPoint;
+            width: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
+         */
+        interface IAccessRule extends elements.IElement {
+            load(): AccessRule;
+            load(callback: (element: AccessRule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
+         */
+        class AccessRule extends elements.Element implements IAccessRule {
+            static typeName: string;
+            memberAccesses: instances.IList<MemberAccess>;
+            moduleRoles: instances.IList<security.IModuleRole>;
+            moduleRolesQualifiedNames: string[];
+            documentation: string;
+            allowCreate: boolean;
+            allowDelete: boolean;
+            defaultMemberAccessRights: MemberAccessRights;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMemberAccess extends elements.IElement {
+            container: IAccessRule;
+            load(): MemberAccess;
+            load(callback: (element: MemberAccess) => void): any;
+        }
+        class MemberAccess extends elements.Element implements IMemberAccess {
+            static typeName: string;
+            container: AccessRule;
+            attribute: IAttribute;
+            attributeQualifiedName: string;
+            association: IAssociationBase;
+            associationQualifiedName: string;
+            accessRights: MemberAccessRights;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
+         */
+        interface IEventHandler extends elements.IElement {
+            container: IEntity;
+            load(): EventHandler;
+            load(callback: (element: EventHandler) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
+         */
+        class EventHandler extends elements.Element implements IEventHandler {
+            static typeName: string;
+            container: Entity;
+            moment: ActionMoment;
+            event: EventType;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            raiseErrorOnFalse: boolean;
+            passEventObject: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
+         */
+        interface IIndex extends elements.IElement {
+            container: IEntity;
+            load(): Index;
+            load(callback: (element: Index) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
+         */
+        class Index extends elements.Element implements IIndex {
+            static typeName: string;
+            container: Entity;
+            dataStorageGuid: string;
+            attributes: instances.IList<IndexedAttribute>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IIndexedAttribute extends elements.IElement {
+            container: IIndex;
+            load(): IndexedAttribute;
+            load(callback: (element: IndexedAttribute) => void): any;
+        }
+        class IndexedAttribute extends elements.Element implements IIndexedAttribute {
+            static typeName: string;
+            container: Index;
+            type: IndexedAttributeType;
+            attribute: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
+         */
+        interface IValidationRule extends elements.IElement {
+            container: IEntity;
+            load(): ValidationRule;
+            load(callback: (element: ValidationRule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
+         */
+        class ValidationRule extends elements.Element implements IValidationRule {
+            static typeName: string;
+            container: Entity;
+            attribute: IAttribute;
+            attributeQualifiedName: string;
+            errorMessage: texts.Text;
+            ruleInfo: RuleInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRuleInfo extends elements.IElement {
+            container: IValidationRule;
+            load(): RuleInfo;
+            load(callback: (element: RuleInfo) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RuleInfo extends elements.Element implements IRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IEqualsToRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): EqualsToRuleInfo;
+            load(callback: (element: EqualsToRuleInfo) => void): any;
+        }
+        class EqualsToRuleInfo extends RuleInfo implements IEqualsToRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            useValue: boolean;
+            equalsToValue: string;
+            equalsToAttribute: IAttribute;
+            equalsToAttributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMaxLengthRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): MaxLengthRuleInfo;
+            load(callback: (element: MaxLengthRuleInfo) => void): any;
+        }
+        class MaxLengthRuleInfo extends RuleInfo implements IMaxLengthRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            maxLength: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRangeRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RangeRuleInfo;
+            load(callback: (element: RangeRuleInfo) => void): any;
+        }
+        class RangeRuleInfo extends RuleInfo implements IRangeRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            typeOfRange: RangeType;
+            useMinValue: boolean;
+            useMaxValue: boolean;
+            minValue: string;
+            maxValue: string;
+            minAttribute: IAttribute;
+            minAttributeQualifiedName: string;
+            maxAttribute: IAttribute;
+            maxAttributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRegExRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RegExRuleInfo;
+            load(callback: (element: RegExRuleInfo) => void): any;
+        }
+        class RegExRuleInfo extends RuleInfo implements IRegExRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            regularExpression: regularexpressions.IRegularExpression;
+            regularExpressionQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRequiredRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RequiredRuleInfo;
+            load(callback: (element: RequiredRuleInfo) => void): any;
+        }
+        class RequiredRuleInfo extends RuleInfo implements IRequiredRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IUniqueRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): UniqueRuleInfo;
+            load(callback: (element: UniqueRuleInfo) => void): any;
+        }
+        class UniqueRuleInfo extends RuleInfo implements IUniqueRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        class AssociationType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Reference: AssociationType;
+            static ReferenceSet: AssociationType;
+        }
+        class AssociationOwner extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: AssociationOwner;
+            static Both: AssociationOwner;
+        }
+        class DeletingBehavior extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static DeleteMeAndReferences: DeletingBehavior;
+            static DeleteMeButKeepReferences: DeletingBehavior;
+            static DeleteMeIfNoReferences: DeletingBehavior;
+        }
+        class MemberAccessRights extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: MemberAccessRights;
+            static ReadOnly: MemberAccessRights;
+            static ReadWrite: MemberAccessRights;
+        }
+        class ActionMoment extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Before: ActionMoment;
+            static After: ActionMoment;
+        }
+        class EventType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: EventType;
+            static Commit: EventType;
+            static Delete: EventType;
+            static RollBack: EventType;
+        }
+        class IndexedAttributeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Normal: IndexedAttributeType;
+            static CreatedDate: IndexedAttributeType;
+            static ChangedDate: IndexedAttributeType;
+        }
+        class RangeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static GreaterThanOrEqualTo: RangeType;
+            static SmallerThanOrEqualTo: RangeType;
+            static Between: RangeType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Enumerations`.
+     */
+    module enumerations {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        interface IEnumeration extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): Enumeration;
+            load(callback: (element: Enumeration) => void): any;
+            values: instances.IList<IEnumerationValue>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        class Enumeration extends projects.Document implements IEnumeration {
+            static typeName: string;
+            container: projects.FolderBase;
+            values: instances.IList<EnumerationValue>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        interface IEnumerationValue extends elements.IElement {
+            container: IEnumeration;
+            load(): EnumerationValue;
+            load(callback: (element: EnumerationValue) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        class EnumerationValue extends elements.Element implements IEnumerationValue {
+            static typeName: string;
+            container: Enumeration;
+            name: string;
+            caption: texts.Text;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICondition extends elements.IElement {
+            load(): Condition;
+            load(callback: (element: Condition) => void): any;
+        }
+        class Condition extends elements.Element implements ICondition {
+            static typeName: string;
+            attributeValue: string;
+            editableVisible: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            module model {
+                interface IBaseModel {
+                    allMicroflows(): microflows.IMicroflow[];
+                    allMicroflowBases(): microflows.IMicroflowBase[];
+                    allRules(): microflows.IRule[];
+                    allImportedWebServices(): webservices.IImportedWebService[];
+                    allPublishedAppServices(): webservices.IPublishedAppService[];
+                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
+                    allPublishedWebServices(): webservices.IPublishedWebService[];
+                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
+                    allConsumedAppServices(): appservices.IConsumedAppService[];
+                    allMappingDocuments(): mappings.IMappingDocument[];
+                    allExportMappings(): exportmappings.IExportMapping[];
+                    allImportMappings(): importmappings.IImportMapping[];
+                    allPublishedOdataServices(): rest.IPublishedOdataService[];
+                    allPublishedRestServices(): rest.IPublishedRestService[];
+                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
+                    allFormBases(): pages.IFormBase[];
+                    allPages(): pages.IPage[];
+                    allLayouts(): pages.ILayout[];
+                    allSnippets(): pages.ISnippet[];
+                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
+                    allNavigationDocuments(): navigation.INavigationDocument[];
+                    allMenuDocuments(): menus.IMenuDocument[];
+                    allDataSets(): datasets.IDataSet[];
+                    allSystemTextCollections(): texts.ISystemTextCollection[];
+                    allJavaActions(): javaactions.IJavaAction[];
+                    allProjects(): projects.IProject[];
+                    allProjectDocuments(): projects.IProjectDocument[];
+                    allFolderBases(): projects.IFolderBase[];
+                    allFolders(): projects.IFolder[];
+                    allModules(): projects.IModule[];
+                    allModuleDocuments(): projects.IModuleDocument[];
+                    allDocuments(): projects.IDocument[];
+                    allProjectConversions(): projects.IProjectConversion[];
+                    allConstants(): constants.IConstant[];
+                    allProjectSettings(): settings.IProjectSettings[];
+                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
+                    allRegularExpressions(): regularexpressions.IRegularExpression[];
+                    allImageCollections(): images.IImageCollection[];
+                    allModuleSecurities(): security.IModuleSecurity[];
+                    allProjectSecurities(): security.IProjectSecurity[];
+                    allDomainModels(): domainmodels.IDomainModel[];
+                    allEnumerations(): enumerations.IEnumeration[];
+                }
+                /**
+                 * Class to find generated model units.
+                 */
+                class BaseModel {
+                    allMicroflows(): microflows.IMicroflow[];
+                    allMicroflowBases(): microflows.IMicroflowBase[];
+                    allRules(): microflows.IRule[];
+                    allImportedWebServices(): webservices.IImportedWebService[];
+                    allPublishedAppServices(): webservices.IPublishedAppService[];
+                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
+                    allPublishedWebServices(): webservices.IPublishedWebService[];
+                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
+                    allConsumedAppServices(): appservices.IConsumedAppService[];
+                    allMappingDocuments(): mappings.IMappingDocument[];
+                    allExportMappings(): exportmappings.IExportMapping[];
+                    allImportMappings(): importmappings.IImportMapping[];
+                    allPublishedOdataServices(): rest.IPublishedOdataService[];
+                    allPublishedRestServices(): rest.IPublishedRestService[];
+                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
+                    allFormBases(): pages.IFormBase[];
+                    allPages(): pages.IPage[];
+                    allLayouts(): pages.ILayout[];
+                    allSnippets(): pages.ISnippet[];
+                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
+                    allNavigationDocuments(): navigation.INavigationDocument[];
+                    allMenuDocuments(): menus.IMenuDocument[];
+                    allDataSets(): datasets.IDataSet[];
+                    allSystemTextCollections(): texts.ISystemTextCollection[];
+                    allJavaActions(): javaactions.IJavaAction[];
+                    allProjects(): projects.IProject[];
+                    allProjectDocuments(): projects.IProjectDocument[];
+                    allFolderBases(): projects.IFolderBase[];
+                    allFolders(): projects.IFolder[];
+                    allModules(): projects.IModule[];
+                    allModuleDocuments(): projects.IModuleDocument[];
+                    allDocuments(): projects.IDocument[];
+                    allProjectConversions(): projects.IProjectConversion[];
+                    allConstants(): constants.IConstant[];
+                    allProjectSettings(): settings.IProjectSettings[];
+                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
+                    allRegularExpressions(): regularexpressions.IRegularExpression[];
+                    allImageCollections(): images.IImageCollection[];
+                    allModuleSecurities(): security.IModuleSecurity[];
+                    allProjectSecurities(): security.IProjectSecurity[];
+                    allDomainModels(): domainmodels.IDomainModel[];
+                    allEnumerations(): enumerations.IEnumeration[];
+                }
+                interface IByNameReferenceResolver {
+                    findLayoutByQualifiedName(qname: string): pages.ILayout;
+                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
+                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
+                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
+                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
+                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
+                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
+                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
+                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
+                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
+                    findPageByQualifiedName(qname: string): pages.IPage;
+                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
+                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
+                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
+                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
+                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
+                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
+                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
+                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
+                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
+                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
+                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
+                    findRuleByQualifiedName(qname: string): microflows.IRule;
+                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
+                    findConstantByQualifiedName(qname: string): constants.IConstant;
+                    findImageByQualifiedName(qname: string): images.IImage;
+                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
+                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `deltas` module does not contain the interfaces for all deltas,
+             * but it does contain (all) objects required for building and handling these.
+             */
+            module deltas {
+                const DeltaTypes: {
+                    CREATE_ELEMENT: string;
+                    UPDATE_PROPERTY_VALUE: string;
+                    MOVE_ELEMENT: string;
+                    DELETE_ELEMENT: string;
+                    CREATE_UNIT: string;
+                };
+                const MutatorTypes: {
+                    CHANGE: string;
+                    ADD: string;
+                    REMOVE: string;
+                    MOVE: string;
+                };
+                /**
+                * A POTSO that wraps a delta and success/failure callbacks.
+                */
+                class DeltaRequest {
+                    delta: transport.IDelta;
+                    onSuccess: common.IVoidCallback;
+                    onFailure: common.IErrorCallback;
+                    constructor(delta: transport.IDelta, onSuccess?: common.IVoidCallback, onFailure?: common.IErrorCallback);
+                }
+                /**
+                 * A simple queue implementation for deltas.
+                 */
+                class DeltaQueue {
+                    private model;
+                    private logToConsole;
+                    private delay;
+                    private maxDeltasPerBatch;
+                    private queue;
+                    private pending;
+                    isClosing: boolean;
+                    private closeCallback;
+                    constructor(model: model.Model, logToConsole?: boolean);
+                    /**
+                     * Closes the "connection" with the Model API Server in the sense that
+                     * pending delta requests are processed, and that afterwards the given
+                     * `callback` will be called.
+                     * This function can only be called once.
+                     */
+                    closeConnection(callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    /**
+                     * Pushes the given `delta` on the queue for scheduling/processing.
+                     */
+                    push(delta: DeltaRequest): void;
+                    /**
+                     * Schedules the next delta for processing using JS's event queue/loop.
+                     */
+                    private schedule();
+                    private processNext();
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        /**
+         * Internal API of the mendixmodelsdk.
+         *
+         * DISCLAIMER: End-users of the sdk should never instantiate classes in this module, or in submodules of this module.
+         * Anything in this module, or its submodules, can be removed, or have changed signature, between sdk-versions.
+         */
+        module internal {
+            /**
+             * The `modelapiclient` module provides typed communication with the Model API Server.
+             */
+            module modelapiclient {
+                /**
+                 * The IModelApiClient interface is used for forwarding calls to the underlying Mendix Model API.
+                 * Implementations of this interface serve as fully-typed clients for the Model API Server.
+                 * Default implementation: {@link ModelApiClientImpl}.
+                 * Note that all its methods are asynchronous, with the last two arguments always being a (success) callback and an error callback,
+                 * and we will only explain the "essential" arguments in their documentation.
+                 */
+                interface IModelApiClient {
+                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Loads all unit interfaces of the working copy indicated with `workingCopyId` as an array of normalised model JSON.
+                     */
+                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Retrieves the top-level working copy information/meta data for the working copy with given `workingCopyId`.
+                     */
+                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
+                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): any;
+                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Retrieves a unit, as normalised model JSON, by working copy and unit ID.
+                     */
+                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Sends a sequence of deltas on the working copy with the given `workingCopyId` to the Model API Server;
+                     * batched if more than one is passed, as a single delta otherwise.
+                     */
+                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): any;
+                }
+                class ModelApiClientImpl implements IModelApiClient {
+                    private transportation;
+                    constructor(transportation: transportation.ITransportation);
+                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): void;
+                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
+                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): void;
+                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): void;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        /**
+         * The `configuration` module allows the Model SDK user to configure
+         * how to communicate with the Model API Server;
+         * in particular w.r.t.: authentication, success/error handling, etc.
+         */
+        module configuration {
+            /**
+             * The credentials with which a trusted backend client (such as sprintr) connects to the Model API Server.
+             */
+            interface IBackendCredentials {
+                username: string;
+                password: string;
+                /** The OpenID on behalf which the trusted backend service operates. */
+                openid?: string;
+            }
+            interface ISdkCredentials {
+                username: string;
+                apikey: string;
+            }
+            /**
+             * All the details of the connection that's been set up to the Model API Server.
+             */
+            interface ISdkConfig {
+                credentials?: IBackendCredentials | ISdkCredentials;
+                endPoint?: string;
+                transportation?: internal.transportation.ITransportation;
+                client?: sdk.internal.modelapiclient.IModelApiClient;
+            }
+            interface ICreateWorkingCopyParameters {
+                name: string;
+                description?: string;
+                avatarUrl?: string;
+                /**
+                 * Path to the (template) MPK file.
+                 */
+                template: string;
+            }
+            function assertBackendAccess(config: ISdkConfig): void;
+            function checkWorkingCopyId(workingCopyId: string): void;
+            function checkCallbacks(callback: Function, errorCallback: Function): void;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    /**
+     * This interface exposes a single Mendix Model.
+     * This interface contains the parts of the {@link Model} that are exposed through the SDK.
+     */
+    interface IModel extends model.IBaseModel, model.IByNameReferenceResolver {
+        /**
+         * Working copy id of the current opened model (read only)
+         */
+        id: string;
+        /**
+         * The actual contents of the model.
+         */
+        root: projects.IProject;
+        /**
+         * The meta data of the model.
+         */
+        metadata: internal.transport.IWorkingCopy;
+        /**
+         * Ends the connection with the Model API client.
+         * Flushes any pending deltas and invokes the callback once complete.
+         * (Errors will be handled through the default modelstore error handler.)
+         */
+        closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Deletes this model from the server, and the (SDK) client.
+         * If you are altering the model before deleting it, make sure to call this method in the callback of {@link closeConnection}.
+         *
+         */
+        deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Exports this model as MPK.
+         * If you are altering the model before running an export make sure to call this method in the callback of {@link closeConnection}.
+         */
+        exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Given a moduleName, returns a module name
+         * (For modules, their qualified name equals their name)
+         */
+        findModuleByQualifiedName(qname: string): any;
+        /**
+         * Given an id, fetches a complete unit. The result might be returned from the cache.
+         * Use this method if you have just a unit Id, otherwise, unit.fetch() is a simpler alternative.
+         */
+        fetchUnitById<T extends sdk.internal.units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): any;
+    }
+    module sdk {
+        module internal {
+            module model {
+                interface IUnitsCache {
+                    [id: string]: units.IAbstractUnit;
+                }
+                /**
+                 * Implementation of {@link IModel}.
+                 */
+                class Model extends BaseModel implements IModel {
+                    metadata: transport.IWorkingCopy;
+                    /**
+                     * Map unitId -> unit, containing all units of this model, which could be partial(ly loaded).
+                     */
+                    /**
+                     * Map unitType -> units[], containing all units of this model, per type, but not sorted in any particular order.
+                     * Please extend the type whenever applicable, for convenience of the programmer.
+                     */
+                    constructor(_client: modelapiclient.IModelApiClient, _errorHandler: common.IErrorCallback, _connectionConfig: configuration.ISdkConfig);
+                    closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Instantiates a new Model that can communicate with the server for sending and receiving documents.
+                     * Loading a Model will automatically fetches all unit interfaces for this working copy and invokes the (success) callback,
+                     * or calls the errorHandler if this fails.
+                     */
+                    static create(client: modelapiclient.IModelApiClient, workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    /**
+                     * Instantiates a new working copy that can communicate with the server for sending and receiving documents.
+                     * Reading a working copy will automatically fetch all unit interfaces for this working copy and invoke callback, or call the errorHandler if this fails.
+                     */
+                    static read(client: modelapiclient.IModelApiClient, workingCopyId: string, callback: (model: IModel) => void, errorCallback: common.IErrorCallback, connectionConfig: configuration.ISdkConfig): void;
+                    id: string;
+                    /**
+                     * Returns the structural unit of type "Projects$Project" which is the project's root,
+                     * cast to the appropriate type.
+                     */
+                    root: projects.IProject;
+                    /**
+                     * Registers the given `unit` in the cache(s).
+                     */
+                    /**
+                     * Unregisters the given `unit` from the cache(s).
+                     */
+                    /**
+                     * Fetches a complete unit. The result might be returned from the cache.
+                     */
+                    fetchUnitById<T extends units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Loads all unit interfaces and caches them.
+                     * This function cannot be called twice.
+                     */
+                    /**
+                     * If a reference is broken, it should be registered here, so that it can be restored once model elements are renamed.
+                     */
+                    /**
+                     * If a reference is no longer broken, it should be unregistered here.
+                     */
+                    /**
+                     * If a model element changes its name, broken by-name references should be attempted to resolve.
+                     *
+                     * In the future this might be made smarter and less expensive, once that becomes an issue.
+                     */
+                    /**
+                     * Deletes this working copy from the server, and the (SDK) client.
+                     */
+                    deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Given an object type name and a qualified name, finds the corresponding element (or null if the reference is broken).
+                     * Will always succeed for unbroken references,
+                     * since all objects that are referred by name should be part of the public interface of the model.
+                     *
+                     * Example usage:
+                     * 	`modelStore.resolveName(domainmodels.Attribute.typeName, "Expenses.Expense.Price");`
+                     */
+                    /**
+                     * Resolver methods for references by name
+                     */
+                    /**
+                     * Finds an item in a colleciton
+                     */
+                    findModuleByQualifiedName(name: string): projects.IModule;
+                    findLayoutByQualifiedName(qname: string): pages.ILayout;
+                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
+                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
+                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
+                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
+                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
+                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
+                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
+                    findPageByQualifiedName(qname: string): pages.IPage;
+                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
+                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
+                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
+                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
+                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
+                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
+                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
+                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
+                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
+                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
+                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
+                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
+                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
+                    findRuleByQualifiedName(qname: string): microflows.IRule;
+                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
+                    findConstantByQualifiedName(qname: string): constants.IConstant;
+                    findImageByQualifiedName(qname: string): images.IImage;
+                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
+                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import configuration = sdk.configuration;
+    /**
+     * Client class of the Mendix Model Sdk.
+     * By instantiating this class with appropriate configuration, you can create and read working copies.
+     */
+    class ModelSdkClient {
+        private connectionConfig;
+        private client;
+        constructor(connectionConfig: configuration.ISdkConfig);
+        /**
+         * Create a new working copy on the model server, and reads it for immediate editing.
+         */
+        createWorkingCopy(workingCopyParameters: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Reads a working copy on the model server so it can be edited.
+         */
+        openWorkingCopy(workingCopyId: string, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Deletes this working copy from the server, and the (SDK) client.
+         */
+        deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Grants access to the member specified to his/her OpenID on this working copy.
+         */
+        grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Revokes access of the member specified to his/her OpenID on this working copy.
+         */
+        revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Returns whether the member specified to his/her OpenID has (been granted) access to this working copy.
+         */
+        checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Exports this working copy as MPK.
+         */
+        exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module extras {
+            function serializeToJs(unit: internal.units.AbstractUnit): string;
+            /**
+             * Class which allows to serialise a given model part as TypeScript code that constructs that model piece.
+             * Limitations:
+             *  - Can only do elements in one (model) unit.
+             */
+            class JavaScriptSerialiser {
+                private unit;
+                private unitVarName;
+                private creations;
+                private creationsById;
+                private varNames;
+                constructor(unit: internal.units.IAbstractUnit, unitVarName: string);
+                schedule(structure: internal.structures.IStructure): void;
+                source(): string;
+                private creationAsSource(creation);
+                private settingAsSource(varName, setting);
+                private singleValueAsTsExpr(varName, setting, singleValue);
+                private asCreation(structure);
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    module sdk {
+        module internal {
+            /**
+             * The `transportation` module is responsible for performing requests on the (/a) Model API Server.
+             */
+            module transportation {
+                /**
+                 * Implementations of this interface are capable of placing a request with the Model API Server over HTTP.
+                 * Default implementation: {@link RestTransportation}.
+                 */
+                interface ITransportation {
+                    /**
+                     * Fire off a HTTP request, with specified method, url, data, and success and failure callbacks.
+                     */
+                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                }
+                /**
+                 * Default implementation of {@link ITransportation} that communicates with the Model API Server over
+                 * HTTP using Restler.
+                 */
+                class RestTransportation implements ITransportation {
+                    private config;
+                    constructor(config: configuration.ISdkConfig);
+                    private sanitizedMethod(method);
+                    private url(urlEndpoint);
+                    private generateStandardOptions();
+                    private handleRequest<T>(request, url, data, success, failure);
+                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                }
+            }
+        }
+    }
+}
+declare var mobservable: IMobservableStatic;
+declare var global: any;
+declare var require: {
+    (id: string): any;
+    resolve(id: string): string;
+    cache: any;
+    extensions: any;
+    main: any;
+};
+declare var module: {
+    exports: any;
+    require(id: string): any;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: any;
+    children: any[];
+};
+
diff --git a/merge2/merge2-tests.ts b/merge2/merge2-tests.ts
index bba0dd0a3..b1c4b4e54 100644
--- a/merge2/merge2-tests.ts
+++ b/merge2/merge2-tests.ts
@@ -2,7 +2,7 @@
 /// <reference path="../gulp/gulp.d.ts" />
 
 import gulp = require('gulp');
-import merge2 = require('merge2');
+import * as merge2 from "merge2"; 
 
 gulp.task('app-js', () =>
   merge2(
diff --git a/merge2/merge2.d.ts b/merge2/merge2.d.ts
index ebf1df758..095af7a2c 100644
--- a/merge2/merge2.d.ts
+++ b/merge2/merge2.d.ts
@@ -12,10 +12,13 @@ declare module 'merge2' {
     }
 
     interface IMerge2Stream extends NodeJS.ReadWriteStream {
-      add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
+        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;
+    interface IMerge2 {
+        (...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
+    }
 
-    export = merge2;
+    var _tmp: IMerge2;
+    export = _tmp;
 }
diff --git a/meshblu/meshblu-tests.ts b/meshblu/meshblu-tests.ts
new file mode 100644
index 000000000..1c4bc0fb0
--- /dev/null
+++ b/meshblu/meshblu-tests.ts
@@ -0,0 +1,123 @@
+/// <reference path="meshblu.d.ts" />
+
+import Meshblu = require('meshblu');
+
+var UUID = "26de691f-8068-4cdc-907a-4cb5961a1aba";
+var TOKEN = "4cb5961a1aba26de691f80684cdc907a";  
+
+var meshblu = Meshblu.createConnection({
+    uuid: UUID,
+    token: TOKEN 
+});
+
+meshblu.data({
+    uuid: UUID,
+    online: true,
+    x: -53,
+    y: 234
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.device({
+    uuid: UUID
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.devices({
+    color: "green"
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.generateAndStoreToken({
+    uuid: UUID
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.getdata({
+    uuid: UUID,
+    start: "2015-04-23T18:25:43.511Z",
+    finish: "2015-04-24T18:25:43.511Z",
+    limit: 10
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.identify();
+
+meshblu.message({
+    devices: [UUID],
+    topic: "status",
+    payload: {
+        online: true
+    }
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.register({
+    type: "drone"
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.revokeToken({
+    uuid: UUID,
+    token: TOKEN
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.subscribe({
+    uuid: UUID
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.subscribe({
+  uuid: UUID,
+  types: ["sent", "received"]
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.subscribe({
+  uuid: UUID,
+  types: ["sent", "received"],
+  topics: ["device*", "-*status"]
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.unsubscribe({
+    uuid: UUID
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.unsubscribe({
+    uuid: UUID,
+    types: ["sent", "broadcast"]
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.update({
+    uuid: UUID,
+    color: "blue"
+}, function(result) {
+    console.log(result);
+});
+
+meshblu.whoami({}, function(result) {
+    console.log(result);
+});
+
+meshblu.unregister({
+    uuid: UUID
+}, function(result) {
+    console.log(result);
+});
\ No newline at end of file
diff --git a/meshblu/meshblu.d.ts b/meshblu/meshblu.d.ts
new file mode 100644
index 000000000..f3b9684f2
--- /dev/null
+++ b/meshblu/meshblu.d.ts
@@ -0,0 +1,281 @@
+// Type definitions for meshblu.js 1.30.1 
+// Project: https://github.com/octoblu/meshblu-npm
+// Definitions by: Felipe Nipo <https://github.com/fnipo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../node/node.d.ts' />
+
+declare module 'meshblu' {
+	var Meshblu: MeshbluStatic;
+
+	export = Meshblu;
+}
+
+interface MeshbluStatic {
+
+	/**
+	 * Establish a secure socket.io connection to Meshblu.
+	 * @param opt
+	 * @returns A Meshblu Connection.
+	 */
+	createConnection(opt: Meshblu.ConnectionOptions): Meshblu.Connection;
+
+}
+
+declare module Meshblu {
+	
+	interface Connection {
+		
+		/**
+		 * Authenticate with Meshblu.
+		 * @returns This Connection.
+		 */
+		identify(): Connection;
+		
+		/**
+		 * @param data {string|number|object|array|Buffer} - data for signing. 
+		 */
+		sign(data: any): string;
+		
+		/**
+		 * @param message {string|number|object|array|Buffer} - signed data.
+		 * @param signature
+		 * @returns {*}
+		 */
+		verify(message: any, signature: any): any;
+		
+		/**
+		 * @param uuid
+		 * @param message {string|number|object|array|Buffer} - data for encrypting.
+		 * @param options
+		 * @param fn The callback to be called. It should take one parameter, result,
+		 * 	which is an object containing a property "error".
+		 * @returns This Connection.
+		 */
+		encryptMessage(uuid: string, message: any, options: Meshblu.ConnectionOptions, fn:(result: any) => void): Connection;
+		
+		/**
+		 * Send a meshblu message.
+		 * @param payload An array of devices UUIDs.
+		 * @param fn The callback to be called. It should take one parameter, result,
+		 * 	which is an object containing a property "error".
+		 * @returns This Connection.
+		 */
+		message(payload: MessagePayload, fn:(result: any) => void): Connection;
+		
+		/**
+		 * Update a device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		update(data: UpdateData, fn:(result: UpdateSuccess) => void): Connection;
+		
+		/**
+		 * Register a new device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		register(data: RegisterData, fn:(result: RegisterResponse) => void): Connection;
+		
+		/**
+		 * Removes a device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		unregister(data: Device, fn:(result: Device) => void): Connection;
+		
+		/**
+		 * Get my device info.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		whoami(data: any, fn:(result: DeviceResponse) => void): Connection;
+		
+		/**
+		 * Find a Meshblu device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		device(data: Device, fn:(result: DeviceResponse) => void): Connection
+		
+		/**
+		 * Find Meshblu devices.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		devices(data: Color, fn:(result: DeviceResponse[]) => void): Connection
+		
+		/**
+		 * Returns device messages as they are sent and received.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		subscribe(data: SubscribeData, fn:(result: any) => void): Connection
+		
+		/**
+		 * Cancels device subscription.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		unsubscribe(data: UnsubscribeData, fn:(result: any) => void): Connection
+		
+		/**
+		 * Send a meshblu data message.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		data(data: DataInput, fn:(result: any) => void): Connection
+		
+		/**
+		 * Get a meshblu data for a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		getdata(data: GetDataInput, fn:(result: any) => void): Connection
+		
+		/**
+		 * Generate a new session token for a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 */
+		generateAndStoreToken(data: Device, fn:(result: ConnectionOptions) => void): void
+		
+		/**
+		 * Remove a session token from a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 */
+		revokeToken(data: ConnectionOptions, fn:(result: Device) => void): void
+		
+		/**
+		 * 
+		 * @param uuid
+		 * @param fn The callback to be called. It should take one parameter, err,
+		 * 	which will be null if there was no problem, and one parameter, publicKey,
+		 * 	of type NodeRSA.
+		 */
+		getPublicKey(uuid: string, fn:(err: Error, publicKey: any) => void): void;
+		
+		/*
+		 * Lack of documentation about these api functions.
+		 */
+		send(text: string): Connection;
+		bufferedSocketEmit(): void;
+		parseUrl(serverUrl: string, port: string): string;
+		generateKeyPair(): KeyPair;
+		setPrivateKey(privateKey: string): void;
+		setup(): Connection;
+		connect(): void;
+		reconnect(): void;
+		claimdevice(data: Device, fn:(result: Device) => void): Connection;
+		mydevices(data: any, fn:(result: any) => void): Connection
+		status(data: any): Connection
+		authenticate(data: any, fn:(result: any) => void): Connection
+		events(data: any, fn:(result: any) => void): Connection
+		localdevices(fn:(result: any) => void): Connection
+		unclaimeddevices(data: any, fn:(result: any) => void): Connection
+		textBroadcast(data: any): Connection
+		directText(data: any): Connection
+		subscribeText(data: any, fn:(result: any) => void): Connection
+		unsubscribeText(data: any, fn:(result: any) => void): Connection
+		close(fn:(result: any) => void): Connection
+		resetToken(data: any, fn:(result: any) => void): void
+	}
+	
+	/**
+	 * Contains the primary means of identifying a device.
+	 */
+	interface ConnectionOptions {
+		uuid: string;
+		token: string;
+	}
+
+	interface KeyPair {
+		privateKey: string;
+		publicKey: string;
+	}
+
+	interface MessagePayload {
+		devices: string[];
+		topic: string;
+		payload: any;
+		qos?: number;
+	}
+	
+	interface UpdateData {
+		uuid: string;
+		color: string;
+	}
+
+	interface UpdateSuccess {
+		uuid: string;
+		token: string;
+		status: string;
+	}
+
+	interface RegisterData {
+		type: string;
+	}
+	
+	interface RegisterResponse {
+		uuid: string;
+		token: string;
+		type: string;
+	}
+	
+	interface Device {
+		uuid: string;
+	}
+	
+	interface DeviceResponse {
+		uuid: string;
+		online: boolean;
+		color: string;
+	}
+	
+	interface Color {
+		color: string;
+	}
+	
+	interface SubscribeData {
+		uuid: string;
+		types?: string[];
+		topics?: string[];
+	}
+	
+	interface UnsubscribeData {
+		uuid: string;
+		types?: string[];
+	}
+	
+	interface DataInput {
+		uuid: string;
+		online: boolean;
+		x: number;
+		y: number;
+	}
+	
+	interface GetDataInput {
+		uuid: string;
+		start: string;
+		finish: string;
+		limit: number;
+	}
+	
+	interface IdentifySuccess {
+		uuid: string;
+		token: string;
+		status: string;
+	}
+
+}
diff --git a/meteor/meteor.d.ts b/meteor/meteor.d.ts
index ed0c97b29..9b5dacbe2 100644
--- a/meteor/meteor.d.ts
+++ b/meteor/meteor.d.ts
@@ -134,7 +134,7 @@ declare module Meteor {
 }
 
 declare module Mongo {
-	interface Selector extends Object {}
+	interface Selector {}
 	interface Modifier {}
 	interface SortSpecifier {}
 	interface FieldSpecifier {
@@ -576,7 +576,7 @@ declare module Mongo {
 
 	var ObjectID: ObjectIDStatic;
 	interface ObjectIDStatic {
-		new(hexString: string): ObjectID;
+		new(hexString?: string): ObjectID;
 	}
 	interface ObjectID {
 	}
diff --git a/minimist/minimist-tests.ts b/minimist/minimist-tests.ts
index 1f714fd3e..2266d2739 100644
--- a/minimist/minimist-tests.ts
+++ b/minimist/minimist-tests.ts
@@ -9,8 +9,12 @@ var strArr: string[];
 var args: string[];
 var obj: minimist.ParsedArgs;
 var opts: Opts;
+var arg: any;
 
+opts.string = str;
 opts.string = strArr;
+opts.boolean = true;
+opts.boolean = str;
 opts.boolean = strArr;
 opts.alias = {
 	foo: strArr
@@ -21,8 +25,19 @@ opts.default = {
 opts.default = {
 	foo: num
 };
+opts.unknown = (arg: string) => {
+	if(/xyz/.test(arg)){
+		return true;
+	}
+	
+	return false;
+};
+opts.stopEarly = true;
+opts['--'] = true;
 
 obj = minimist();
 obj = minimist(strArr);
 obj = minimist(strArr, opts);
 var remainingArgCount = obj._.length;
+
+arg = obj['foo'];
diff --git a/minimist/minimist.d.ts b/minimist/minimist.d.ts
index 98d0f37a8..abbc5f028 100644
--- a/minimist/minimist.d.ts
+++ b/minimist/minimist.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for minimist 0.0.8
+// Type definitions for minimist 1.1.3
 // Project: https://github.com/substack/minimist
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Necroskillz <https://github.com/Necroskillz>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module 'minimist' {
@@ -10,18 +10,26 @@ declare module 'minimist' {
 		export interface Opts {
 			// a string or array of strings argument names to always treat as strings
 			// string?: string;
-			string?: string[];
+			string?: string|string[];
 			// a string or array of strings to always treat as booleans
 			// boolean?: string;
-			boolean?: string[];
+			boolean?: boolean|string|string[];
 			// an object mapping string names to strings or arrays of string argument names to use
 			// alias?: {[key:string]: string};
 			alias?: {[key:string]: string[]};
 			// an object mapping string argument names to default values
 			default?: {[key:string]: any};
+			// when true, populate argv._ with everything after the first non-option
+			stopEarly?: boolean;
+			// a function which is invoked with a command line parameter not defined in the opts configuration object.
+			// If the function returns false, the unknown option is not added to argv			
+			unknown?: (arg: string) => boolean;
+			// when true, populate argv._ with everything before the -- and argv['--'] with everything after the --
+			'--'?: boolean;
 		}
 
 		export interface ParsedArgs {
+			[arg: string]: any;
 			_: string[];
 		}
 	}
diff --git a/mithril/mithril.d.ts b/mithril/mithril.d.ts
index e01dbcc02..3cd0e21e4 100644
--- a/mithril/mithril.d.ts
+++ b/mithril/mithril.d.ts
@@ -8,19 +8,15 @@
 interface MithrilStatic {
 	(selector: string, attributes: Object, children?: any): MithrilVirtualElement;
 	(selector: string, children?: any): MithrilVirtualElement;
-    prop<T>(value?: T): (value?: T) => T;
-    prop<T>(promise: MithrilPromise<T>): MithrilPromiseProperty<T>;
+	prop<T>(value?: T): (value?: T) => T;
+	prop<T>(promise: MithrilPromise<T>): MithrilPromiseProperty<T>;
 	withAttr(property: string, callback: (value: any) => void): (e: Event) => any;
 	module(rootElement: Node, module: MithrilModule): void;
 	trust(html: string): String;
 	render(rootElement: Element, children?: any): void;
 	render(rootElement: HTMLDocument, children?: any): void;
 	redraw: MithrilRedraw;
-	route(rootElement: Element, defaultRoute: string, routes: { [key: string]: MithrilModule }): void;
-	route(rootElement: HTMLDocument, defaultRoute: string, routes: { [key: string]: MithrilModule }): void;
-	route(path: string, params?: any, shouldReplaceHistory?: boolean): void;
-	route(): string;
-	route(element: Element, isInitialized: boolean): void;
+	route: MithrilRoute;
 	request(options: MithrilXHROptions): MithrilPromise<any>;
 	deferred<T>(): MithrilDeferred<T>;
 	sync<T>(promises: MithrilPromise<T>[]): MithrilPromise<T>;
@@ -28,6 +24,22 @@ interface MithrilStatic {
 	endComputation(): void;
 }
 
+interface MithrilRoute {
+	(rootElement: Element, defaultRoute: string, routes: { [key: string]: MithrilModule }): void;
+	(rootElement: HTMLDocument, defaultRoute: string, routes: { [key: string]: MithrilModule }): void;
+	(path: string, params?: any, shouldReplaceHistory?: boolean): void;
+	(element: Element, isInitialized: boolean): void;
+	(): string;
+	mode: string;
+	param: MithrilParam;
+	buildQueryString(data: Object): string;
+	parseQueryString(queryString: string): Object;
+}
+
+interface MithrilParam {
+	(param: string): string;
+}
+
 interface MithrilRedraw {
 	(): void;
 	strategy: (value?: string) => string;
@@ -40,26 +52,26 @@ interface MithrilVirtualElement {
 }
 
 interface MithrilModule {
-    controller: Function;
-    view: (controller?: any) => MithrilVirtualElement;
+	controller: Function;
+	view: (controller?: any) => MithrilVirtualElement;
 }
 
 interface MithrilDeferred<T> {
-    resolve(value?: T): void;
-    reject(value?: any): void;
-    promise: MithrilPromise<T>;
+	resolve(value?: T): void;
+	reject(value?: any): void;
+	promise: MithrilPromise<T>;
 }
 
 interface MithrilPromise<T> {
-    (value?: T): T;
-    then<R>(successCallback?: (value: T) => R, errorCallback?: (value: any) => any): MithrilPromise<R>;
-    then<R>(successCallback?: (value: T) => MithrilPromise<R>, errorCallback?: (value: any) => any): MithrilPromise<R>;
+	(value?: T): T;
+	then<R>(successCallback?: (value: T) => R, errorCallback?: (value: any) => any): MithrilPromise<R>;
+	then<R>(successCallback?: (value: T) => MithrilPromise<R>, errorCallback?: (value: any) => any): MithrilPromise<R>;
 }
 
 interface MithrilPromiseProperty<T> extends MithrilPromise<T> {
-    (): T;
-    (value: T): T;
-    toJSON(): T;
+	(): T;
+	(value: T): T;
+	toJSON(): T;
 }
 
 interface MithrilXHROptions {
diff --git a/mobservable-react/mobservable-react-tests.ts b/mobservable-react/mobservable-react-tests.ts
new file mode 100644
index 000000000..7b39dbb7f
--- /dev/null
+++ b/mobservable-react/mobservable-react-tests.ts
@@ -0,0 +1,61 @@
+/// <reference path="./mobservable-react.d.ts"/>
+/// <reference path="../react/react-global.d.ts" />
+
+import {reactiveComponent} from 'mobservable-react';
+
+{
+    let c1 = reactiveComponent(React.createClass({
+        getDefaultProps() {
+            return {
+                test: "hi"
+            };
+        },
+
+        render: function() {
+            return React.createElement("div");
+        }
+    }));
+
+    let c1Factory = React.createFactory(c1);
+    React.render(c1Factory({
+        test: "hello"
+    }), null);
+}
+
+@reactiveComponent
+class TestComponent extends React.Component<{ test: string },{}> {
+    render() {
+        return React.createElement("div");
+    }
+}
+
+{
+    let c2Factory = React.createFactory(TestComponent);
+    React.render(c2Factory({
+        test: "hello" 
+    }) , null);
+}
+
+{
+    var c3 = reactiveComponent((props: { test: string }) => React.createElement("div"));
+    var c3Factory = React.createFactory(c3); //without JSX
+    React.render(c3Factory({
+        test: "hello"
+    }), null);
+}
+
+
+class TestComponent2 extends React.Component<{ test: string },{}> {
+    render() {
+        return React.createElement("div");
+    }
+}
+{
+    // Does not work properly in typescript 1.6.2 without cast :'(
+    // Argument of type 'typeof TestComponent2 | void' is not assignable to parameter of type 'ComponentClass<{ test: string; }>'.
+    // Type 'void' is not assignable to type 'ComponentClass<{ test: string; }>'.
+    let c4Factory = React.createFactory(<React.ClassicComponentClass<{test:string}>><any> reactiveComponent(TestComponent2));
+    React.render(c4Factory({
+        test: "hello" 
+    }) , null);
+}
\ No newline at end of file
diff --git a/mobservable-react/mobservable-react-tests.ts.tscparams b/mobservable-react/mobservable-react-tests.ts.tscparams
new file mode 100644
index 000000000..3f1358357
--- /dev/null
+++ b/mobservable-react/mobservable-react-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs --target es5 --experimentalDecorators
\ No newline at end of file
diff --git a/mobservable-react/mobservable-react.d.ts b/mobservable-react/mobservable-react.d.ts
new file mode 100644
index 000000000..f42627a85
--- /dev/null
+++ b/mobservable-react/mobservable-react.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for mobservable v0.1.8
+// Project: https://github.com/mweststrate/mobservable-react
+// Definitions by: Michel Weststrate <https://github.com/mweststrate/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react-global.d.ts" />
+
+declare module "mobservable-react" {
+    /**
+     * Turns a React component or stateless render function into a reactive component.
+     */
+    export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
+    export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
+    export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): TFunction | void; // decorator signature
+    export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
+}
\ No newline at end of file
diff --git a/mobservable/mobservable-tests.ts b/mobservable/mobservable-tests.ts
new file mode 100644
index 000000000..2966128fe
--- /dev/null
+++ b/mobservable/mobservable-tests.ts
@@ -0,0 +1,57 @@
+/// <reference path="./mobservable.d.ts"/>
+import mobservable = require('mobservable');
+import {observable} from "mobservable";
+
+var v = mobservable(3);
+v.observe(() => {});
+
+var a = mobservable([1,2,3]);
+
+class Order {
+    @observable price:number = 3;
+    @observable amount:number = 2;
+    @observable orders:string[] = [];
+
+    @observable get total() {
+        return this.amount * this.price * (1 + this.orders.length);
+    }
+}
+
+export function testObservable() {
+    var a = mobservable(3);
+    var b = mobservable(() => a() * 2);
+}
+
+export function testAnnotations() {
+    var order1totals:number[] = [];
+    var order1 = new Order();
+    var order2 = new Order();
+
+    var disposer = mobservable.observe(() => {
+        order1totals.push(order1.total)
+    });
+
+    order2.price = 4;
+    order1.amount = 1;
+
+    order2.orders.push('bla');
+
+    order1.orders.splice(0,0,'boe', 'hoi');
+
+    disposer();
+    order1.orders.pop();
+};
+
+export function testTyping() {
+    var ar:Mobservable.IObservableArray<number> = mobservable.makeReactive([1,2]);
+    ar.observe((d:Mobservable.IArrayChange<number>|Mobservable.IArraySplice<number>) => {
+        console.log(d.type);
+    });
+
+    var ar2:Mobservable.IObservableArray<number> = mobservable([1,2]);
+    ar2.observe((d:Mobservable.IArrayChange<number>|Mobservable.IArraySplice<number>) => {
+        console.log(d.type);
+    });
+
+    var x:Mobservable.IObservableValue<number> = mobservable(3);
+}
\ No newline at end of file
diff --git a/mobservable/mobservable-tests.ts.tscparams b/mobservable/mobservable-tests.ts.tscparams
new file mode 100644
index 000000000..64e543982
--- /dev/null
+++ b/mobservable/mobservable-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs --target es5 --experimentalDecorators
diff --git a/mobservable/mobservable.d.ts b/mobservable/mobservable.d.ts
new file mode 100644
index 000000000..d98c34454
--- /dev/null
+++ b/mobservable/mobservable.d.ts
@@ -0,0 +1,189 @@
+// Type definitions for mobservable v0.6.10
+// Project: https://mweststrate.github.io/mobservable
+// Definitions by: Michel Weststrate <https://github.com/mweststrate/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+interface _IMobservableStatic {
+    /**
+     * Turns an object, array or function into a reactive structure.
+     * @param value the value which should become observable.
+     */
+    makeReactive: IMakeReactive;
+
+    /**
+     * Extends an object with reactive capabilities.
+     * @param target the object to which reactive properties should be added
+     * @param properties the properties that should be added and made reactive
+     * @returns targer
+     */
+    extendReactive(target: Object, properties: Object):Object;
+
+    /**
+     * Returns true if the provided value is reactive.
+     * @param value object, function or array
+     * @param propertyName if propertyName is specified, checkes whether value.propertyName is reactive.
+     */
+    isReactive(value: any, propertyName?:string): boolean;
+
+    /**
+     * Can be used in combination with makeReactive / extendReactive.
+     * Enforces that a reference to 'value' is stored as property,
+     * but that 'value' itself is not turned into something reactive.
+     * Future assignments to the same property will inherit this behavior.
+     * @param value initial value of the reactive property that is being defined.
+     */
+    asReference<T>(value: any):{value:T};
+
+    /**
+     * ES6 / Typescript decorator which can to make class properties and getter functions reactive.
+     */
+    observable(target: Object, key: string):any; // decorator / annotation
+
+    /**
+     * Creates a reactive view and keeps it alive, so that the view is always
+     * updated if one of the dependencies changes, even when the view is not further used by something else.
+     * @param func The reactive view
+     * @param scope (optional)
+     * @returns disposer function, which can be used to stop the view from being updated in the future.
+     */
+    observe(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+    
+    /**
+     * Deprecated, use mobservable.observe instead.
+     */
+    sideEffect(func: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+
+    /**
+     * Similar to 'observer', observes the given predicate until it returns true.
+     * Once it returns true, the 'effect' function is invoked an the observation is cancelled.
+     * @param predicate
+     * @param effect
+     * @param scope (optional)
+     * @returns disposer function to prematurely end the observer.
+     */
+    observeUntil(predicate: ()=>boolean, effect: Mobservable.Lambda, scope?: any): Mobservable.Lambda;
+
+    /**
+     * During a transaction no views are updated until the end of the transaction.
+     * The transaction will be run synchronously nonetheless.
+     * @param action a function that updates some reactive state
+     * @returns any value that was returned by the 'action' parameter.
+     */
+    transaction<T>(action: ()=>T): T;
+
+    /**
+     * Converts a reactive structure into a non-reactive structure.
+     * Basically a deep-clone.
+     */
+    toJSON<T>(value: T): T;
+
+    /**
+     * Sets the reporting level Defaults to 1. Use 0 for production or 2 for increased verbosity.
+     */
+    logLevel:  number;  // 0 = production, 1 = development, 2 = debugging
+
+    extras: {
+        getDependencyTree(thing:any, property?:string): Mobservable.IDependencyTree;
+
+        getObserverTree(thing:any, property?:string): Mobservable.IObserverTree;
+
+        trackTransitions(extensive?:boolean, onReport?:(lines:Mobservable.ITransitionEvent) => void) : Mobservable.Lambda;
+    }
+}
+
+interface IMakeReactive {
+    <T>(value: T[], opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableArray<T>;
+    <T>(value: ()=>T, opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableValue<T>;
+    <T extends string|number|boolean|Date|RegExp|Function|void>(value: T, opts?: Mobservable.IMakeReactiveOptions): Mobservable.IObservableValue<T>;
+    <T extends Object>(value: Object, opts?: Mobservable.IMakeReactiveOptions): T;
+}
+
+interface IMobservableStatic extends _IMobservableStatic, IMakeReactive {
+}
+
+declare module Mobservable {
+    interface IMakeReactiveOptions {
+        as?:  string /* "auto" | "reference" | TODO:  see #8 "structure" */
+        scope?:  Object,
+        context?: Object,
+        recurse?:  boolean;
+        name?: string;
+        // protected:  boolean TODO:  see #9
+    }
+
+    export interface IContextInfoStruct {
+        object: Object;
+        name: string;
+    }
+
+    export type IContextInfo = IContextInfoStruct | string;
+
+    interface Lambda {
+        (): void;
+        name?: string;
+    }
+
+    interface IObservable {
+        observe(callback: (...args: any[])=>void, fireImmediately?: boolean): Lambda;
+    }
+
+    interface IObservableValue<T> extends IObservable {
+        (): T;
+        (value: T):void;
+        observe(callback: (newValue: T, oldValue: T)=>void, fireImmediately?: boolean): Lambda;
+    }
+
+    interface IObservableArray<T> extends IObservable, Array<T> {
+        spliceWithArray(index: number, deleteCount?: number, newItems?: T[]): T[];
+        observe(listener: (changeData: IArrayChange<T>|IArraySplice<T>)=>void, fireImmediately?: boolean): Lambda;
+        clear(): T[];
+        replace(newItems: T[]): T[];
+        find(predicate: (item: T,index: number,array: IObservableArray<T>)=>boolean,thisArg?: any,fromIndex?: number): T;
+        remove(value: T): boolean;
+    }
+
+    interface IArrayChange<T> {
+        type:  string; // Always:  'update'
+        object:  IObservableArray<T>;
+        index:  number;
+        oldValue:  T;
+    }
+
+    interface IArraySplice<T> {
+        type:  string; // Always:  'splice'
+        object:  IObservableArray<T>;
+        index:  number;
+        removed:  T[];
+        addedCount:  number;
+    }
+
+    interface IDependencyTree {
+        id: number;
+        name: string;
+        context: any;
+        dependencies?: IDependencyTree[];
+    }
+
+    interface IObserverTree {
+        id: number;
+        name: string;
+        context: any;
+        observers?: IObserverTree[];
+        listeners?: number; // amount of functions manually attached using an .observe method
+    }
+
+    interface ITransitionEvent {
+        id: number;
+        name: string;
+        context: Object;
+        state: string;
+        changed: boolean;
+        newValue: string;
+    }
+}
+
+declare module "mobservable" {
+	var m : IMobservableStatic;
+	export = m;
+}
\ No newline at end of file
diff --git a/moment-timezone/moment-timezone-tests.ts b/moment-timezone/moment-timezone-tests.ts
index b7624b63a..d2cee664d 100644
--- a/moment-timezone/moment-timezone-tests.ts
+++ b/moment-timezone/moment-timezone-tests.ts
@@ -75,3 +75,5 @@ moment.tz.load({
 });
 
 moment.tz.names();
+
+moment.tz.setDefault('America/Los_Angeles');
diff --git a/moment-timezone/moment-timezone.d.ts b/moment-timezone/moment-timezone.d.ts
index 2ac473057..5e1ea09be 100644
--- a/moment-timezone/moment-timezone.d.ts
+++ b/moment-timezone/moment-timezone.d.ts
@@ -68,6 +68,8 @@ interface MomentTimezone {
     }): void;
 
     names(): string[];
+
+    setDefault(timezone: string): void;
 }
 
 declare module 'moment-timezone' {
diff --git a/moment/moment-node.d.ts b/moment/moment-node.d.ts
index 48f00ed98..93be9f6d4 100644
--- a/moment/moment-node.d.ts
+++ b/moment/moment-node.d.ts
@@ -6,7 +6,6 @@
 declare module moment {
 
     interface MomentInput {
-
         /** Year */
         years?: number;
         /** Year */
@@ -20,6 +19,13 @@ declare module moment {
         month?: number;
         /** Month */
         M?: number;
+        
+        /** Week */
+        weeks?: number;
+        /** Week */
+        week?: number;
+        /** Week */
+        w?: number;
 
         /** Day/Date */
         days?: number;
@@ -57,11 +63,9 @@ declare module moment {
         millisecond?: number;
         /** Millisecond */
         ms?: number;
-
     }
 
     interface Duration {
-
         humanize(withSuffix?: boolean): string;
 
         as(units: string): number;
@@ -97,11 +101,9 @@ declare module moment {
 
         toISOString(): string;
         toJSON(): string;
-
     }
 
     interface Moment {
-
         format(format: string): string;
         format(): string;
 
@@ -180,6 +182,7 @@ declare module moment {
 
         calendar(): string;
         calendar(start: Moment): string;
+        calendar(start: Moment, formats: MomentCalendar): string;
 
         clone(): Moment;
 
@@ -246,6 +249,7 @@ declare module moment {
 
         from(f: Moment|string|number|Date|number[], suffix?: boolean): string;
         to(f: Moment|string|number|Date|number[], suffix?: boolean): string;
+        toNow(withoutPrefix?: boolean): string;
 
         diff(b: Moment): number;
         diff(b: Moment, unitOfTime: string): number;
@@ -299,18 +303,17 @@ declare module moment {
 
         get(unit: string): number;
         set(unit: string, value: number): Moment;
-
     }
 
+    type formatFunction = () => string;
+
     interface MomentCalendar {
-
-      lastDay: any;
-      sameDay: any;
-      nextDay: any;
-      lastWeek: any;
-      nextWeek: any;
-      sameElse: any;
-
+      lastDay?: string | formatFunction;
+      sameDay?: string | formatFunction;
+      nextDay?: string | formatFunction;
+      lastWeek?: string | formatFunction;
+      nextWeek?: string | formatFunction;
+      sameElse?: string | formatFunction;
     }
 
     interface BaseMomentLanguage {
@@ -337,7 +340,6 @@ declare module moment {
     }
 
     interface MomentLongDateFormat {
-
       L: string;
       LL: string;
       LLL: string;
@@ -348,11 +350,9 @@ declare module moment {
       lll?: string;
       llll?: string;
       lt?: string;
-
     }
 
     interface MomentRelativeTime {
-
       future: any;
       past: any;
       s: any;
@@ -366,11 +366,9 @@ declare module moment {
       MM: any;
       y: any;
       yy: any;
-
     }
 
     interface MomentStatic {
-
         version: string;
         fn: Moment;
 
@@ -467,6 +465,7 @@ declare module moment {
          */
         ISO_8601(): void;
 
+        defaultFormat: string;
     }
 
 }
diff --git a/moment/moment-tests.ts b/moment/moment-tests.ts
index 04c075352..29712c115 100644
--- a/moment/moment-tests.ts
+++ b/moment/moment-tests.ts
@@ -459,3 +459,5 @@ moment.locale('en', {
 });
 
 console.log(moment.version);
+
+moment.defaultFormat = 'YYYY-MM-DD HH:mm';
diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
index 84d0098e7..2fc3f0227 100644
--- a/mongodb/mongodb.d.ts
+++ b/mongodb/mongodb.d.ts
@@ -527,6 +527,7 @@ declare module "mongodb" {
   export interface MongoCollectionOptions {
     safe?: any;
     serializeFunctions?: any;
+    strict?: boolean;
     raw?: boolean;
     pkFactory?: any;
     readPreference?: string;
diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index ce4be964f..e840d8e05 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -6,10 +6,10 @@
 ///<reference path="../node/node.d.ts" />
 
 declare module "mongoose" {
-  function connect(uri: string, options?: ConnectionOption, callback?: (err: any) => void): Mongoose;
+  function connect(uri: string, options?: ConnectionOptions , callback?: (err: any) => void): Mongoose;
   function createConnection(): Connection;
-  function createConnection(uri: string, options?: ConnectionOption): Connection;
-  function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOption): Connection;
+  function createConnection(uri: string, options?: ConnectionOptions): Connection;
+  function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
   function disconnect(callback?: (err?: any) => void): Mongoose;
 
   function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
@@ -25,10 +25,10 @@ declare module "mongoose" {
   var connection: Connection;
 
   export class Mongoose {
-    connect(uri: string, options?: ConnectionOption, callback?: (err: any) => void): Mongoose;
+    connect(uri: string, options?: ConnectOpenOptionsBase, callback?: (err: any) => void): Mongoose;
     createConnection(): Connection;
     createConnection(uri: string, options?: Object): Connection;
-    createConnection(host: string, database_name: string, port?: number, options?: ConnectionOption): Connection;
+    createConnection(host: string, database_name: string, port?: number, options?: ConnectOpenOptionsBase): Connection;
     disconnect(callback?: (err?: any) => void): Mongoose;
     get(key: string): any;
     model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
@@ -49,23 +49,66 @@ declare module "mongoose" {
     collection(name: string, options?: Object): Collection;
     model<T extends Document>(name: string, schema?: Schema, collection?: string): Model<T>;
     modelNames(): string[];
-    open(host: string, database?: string, port?: number, options?: ConnectionOption, callback?: (err: any) => void): Connection;
-    openSet(uris: string, database?: string, options?: ConnectionSetOption, callback?: (err: any) => void): Connection;
+    open(host: string, database?: string, port?: number, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
+    openSet(uris: string, database?: string, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
 
     db: any;
     collections: {[index: string]: Collection};
     readyState: number;
   }
-  export interface ConnectionOption {
+
+  export interface ConnectOpenOptionsBase {
     db?: any;
     server?: any;
     replset?: any;
+    /** Username for authentication if not supplied in the URI. */
     user?: string;
+    /** Password for authentication if not supplied in the URI. */
     pass?: string;
+    /** Options for authentication */
     auth?: any;
   }
-  export interface ConnectionSetOption extends ConnectionOption {
-    mongos?: boolean;
+
+  export interface ConnectionOptions extends ConnectOpenOptionsBase {
+    /** Passed to the underlying driver's Mongos instance. */
+    mongos?: MongosOptions;
+  }
+
+  interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
+      /** If true, enables High Availability support for mongos */
+      mongos?: boolean;
+  }
+
+  interface MongosOptions {
+      /** Turn on high availability monitoring. (default: true) */
+      ha?: boolean;
+      /** Time between each replicaset status check. (default: 5000) */
+      haInterval?: number;
+      /**
+       * Number of connections in the connection pool for each
+       * server instance. (default: 5 (for legacy reasons)) */
+      poolSize?: number;
+      /**
+       * Use ssl connection (needs to have a mongod server with
+       * ssl support). (default: false).
+       */
+      ssl?: boolean;
+      /**
+       * Validate mongod server certificate against ca
+       * (needs to have a mongod server with ssl support, 2.4 or higher)
+       * (default: true)
+       */
+      sslValidate?: boolean;
+      /** Turn on high availability monitoring. */
+      sslCA?: (Buffer|string)[];
+      sslKey?: Buffer|string;
+      sslPass?: Buffer|string;
+      socketOptions?: {
+          noDelay?: boolean;
+          keepAlive?: number;
+          connectionTimeoutMS?: number;
+          socketTimeoutMS?: number;
+      };
   }
 
   export interface Collection {
diff --git a/mousetrap/mousetrap-global-bind-tests.ts b/mousetrap/mousetrap-global-bind-tests.ts
index 92374d862..79620e24c 100644
--- a/mousetrap/mousetrap-global-bind-tests.ts
+++ b/mousetrap/mousetrap-global-bind-tests.ts
@@ -1,14 +1,14 @@
 /// <reference path="mousetrap-global-bind.d.ts"/>
 
-Mousetrap.globalBind('4', function() { console.log('4'); });
-Mousetrap.globalBind("?", function() { console.log('show shortcuts!'); });
-Mousetrap.globalBind('esc', function() { console.log('escape'); }, 'keyup');
+Mousetrap.bindGlobal('4', function() { console.log('4'); });
+Mousetrap.bindGlobal("?", function() { console.log('show shortcuts!'); });
+Mousetrap.bindGlobal('esc', function() { console.log('escape'); }, 'keyup');
 
 // combinations
-Mousetrap.globalBind('command+shift+K', function() { console.log('command shift k'); });
+Mousetrap.bindGlobal('command+shift+K', function() { console.log('command shift k'); });
 
 // map multiple combinations to the same callback
-Mousetrap.globalBind(['command+k', 'ctrl+k'], function() {
+Mousetrap.bindGlobal(['command+k', 'ctrl+k'], function() {
     console.log('command k or control k');
 
     // return false to prevent default browser behavior
@@ -17,15 +17,15 @@ Mousetrap.globalBind(['command+k', 'ctrl+k'], function() {
 });
 
 // gmail style sequences
-Mousetrap.globalBind('g i', function() { console.log('go to inbox'); });
-Mousetrap.globalBind('* a', function() { console.log('select all'); });
+Mousetrap.bindGlobal('g i', function() { console.log('go to inbox'); });
+Mousetrap.bindGlobal('* a', function() { console.log('select all'); });
 
 // konami code!
-Mousetrap.globalBind('up up down down left right left right b a enter', function() {
+Mousetrap.bindGlobal('up up down down left right left right b a enter', function() {
     console.log('konami code');
 });
 
-Mousetrap.globalBind(['ctrl+s', 'meta+s'], (e, combo) => {
+Mousetrap.bindGlobal(['ctrl+s', 'meta+s'], (e, combo) => {
     if (e.preventDefault) {
         e.preventDefault();
     } else {
diff --git a/mousetrap/mousetrap-global-bind.d.ts b/mousetrap/mousetrap-global-bind.d.ts
index ecfdd2ff2..5e56d2107 100644
--- a/mousetrap/mousetrap-global-bind.d.ts
+++ b/mousetrap/mousetrap-global-bind.d.ts
@@ -6,6 +6,6 @@
 /// <reference path="./mousetrap.d.ts" />
 
 interface MousetrapStatic {
-    globalBind(keys: string, callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
-    globalBind(keyArray: string[], callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
+    bindGlobal(keys: string, callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
+    bindGlobal(keyArray: string[], callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
 }
diff --git a/msportalfx-test/msportalfx-test-tests.ts b/msportalfx-test/msportalfx-test-tests.ts
new file mode 100644
index 000000000..7d647106d
--- /dev/null
+++ b/msportalfx-test/msportalfx-test-tests.ts
@@ -0,0 +1,142 @@
+
+/// <reference path="msportalfx-test.d.ts" />
+
+import testFx = require('MsPortalFx-Test');
+
+var galleryPackageName = "My.Package";
+var bladeTitle = "A Service";
+var resourceProvider = 'My.Provider';
+var resourceType = 'myResourceType';
+var resourceName = 'myResource';
+var userName = 'johndoe@johndoe.com';
+var password = '123';
+var resourceId = '/subscriptions/123/resourceGroups/456/providers/My.Provider/myResourceType/myResource';
+var extensionName = 'LocalExtension';
+var label = 'Field label';
+var extensionUrl = 'https://localhost:44300/';
+var voidPromise: Q.Promise<void>;
+var boolPromise: Q.Promise<boolean>;
+var anyPromise: Q.Promise<any>;
+var stringPromise: Q.Promise<string>;
+
+var summaryBlade = new testFx.Blades.Blade(resourceName);
+
+function TestPortal() {    
+    testFx.portal.portalContext.signInEmail = userName;
+    testFx.portal.portalContext.signInPassword = password;
+    testFx.portal.portalContext.features = [{ name: "greatfeature", value: "true" }];
+    testFx.portal.portalContext.testExtensions = [{ name: extensionName, uri: extensionUrl }];
+
+    anyPromise = testFx.portal.waitForElementLocated(summaryBlade.getLocator(), 30000);
+    anyPromise = testFx.portal.quit();
+    var createBladePromise = testFx.portal.openGalleryCreateBlade(galleryPackageName, bladeTitle, 20000);
+    var browseResourcePromise = testFx.portal.openBrowseBlade(resourceProvider, resourceType, bladeTitle, 20000);
+    var bladePromise = testFx.portal.openResourceBlade(resourceId, summaryBlade.title, 20000)
+    var stringPromise = testFx.portal.takeScreenshot("TestPortal");
+    var stringArrayPromise = testFx.portal.getBrowserLogs(testFx.LogLevel.All);
+    anyPromise = testFx.portal.waitUntilElementDoesNotContainAttribute(testFx.Locators.By.className('part'), 'class', 'invalid');
+    voidPromise = testFx.portal.goHome();
+    boolPromise = testFx.portal.waitForElementVisible(summaryBlade.getLocator());
+    var anyArrayPromise = testFx.portal.waitForElementsLocated(summaryBlade.getLocator());
+    var voidPromise = testFx.portal.executeScript<void>("console.log('hello from script');");
+    stringPromise = testFx.portal.getCurrentUrl();
+}
+
+function TestBlades() {
+    var blade = new testFx.Blades.Blade(resourceName);
+    var bladePromise = blade.clickCommand('Delete');
+    var tilesPromise = blade.getTiles();
+
+    var createBlade = new testFx.Blades.CreateBlade(bladeTitle);
+    voidPromise = createBlade.actionBar.createButton.click();
+
+    var browseBlade = new testFx.Blades.BrowseResourceBlade(bladeTitle);
+    voidPromise = browseBlade.selectResource(resourceName);
+
+    var pickerBlade = new testFx.Blades.PickerBlade(bladeTitle);
+    pickerBlade.pickItem('abc');
+
+    var specPickerBlade = new testFx.Blades.SpecPickerBlade(bladeTitle);
+    specPickerBlade.pickSpec('S2');
+
+    var quickStartBlade = new testFx.Blades.QuickStartBlade();
+    voidPromise = quickStartBlade.clickLink('Learn more');
+
+    var usersBlade = new testFx.Blades.UsersBlade();
+}
+
+function TestParts() {
+    var part = new testFx.Parts.Part(summaryBlade.getLocator(), "Roles");
+    voidPromise = part.click();
+    boolPromise = part.isSelected();
+    boolPromise = part.waitUntilLoaded();
+    boolPromise = part.isLoaded();
+    boolPromise = part.isClickable();
+    boolPromise = part.hasError();
+
+    var resourceSummary = new testFx.Parts.ResourceSummaryPart(summaryBlade.getLocator());
+    var count = resourceSummary.properties.length;
+    voidPromise = resourceSummary.quickStartHotSpot.click();
+    voidPromise = resourceSummary.accessHotSpot.click();
+
+    var pricingTier = new testFx.Parts.PricingTierPart(summaryBlade.getLocator());
+    voidPromise = pricingTier.click();
+
+    var tile = new testFx.Parts.Tile(summaryBlade.getLocator());
+    voidPromise = tile.tryPin();
+    var part: testFx.Parts.Part = tile.getPart();
+    voidPromise = tile.waitUntilLoaded();
+}
+
+function TestControls() {
+    var selector = new testFx.Controls.SelectorField(summaryBlade.getLocator(), label);
+    voidPromise = selector.openPicker();
+
+    var creatorAndSelector = new testFx.Controls.CreatorAndSelectorField(summaryBlade.getLocator(), label, label);
+    var creatorAndSelectorPromise = creatorAndSelector.clickCreateNew();
+    creatorAndSelectorPromise = creatorAndSelector.enterNewValue('XYZ');
+
+    var textField = new testFx.Controls.TextField(summaryBlade.getLocator(), "Resource name");
+    var textFieldPromise = textField.sendKeys(resourceName);
+
+    var hotSpot = new testFx.Controls.HotSpot(summaryBlade.getLocator());
+    boolPromise = hotSpot.isSelected();
+}
+
+function TestActionBars() {
+    var createBar = new testFx.ActionBars.CreateActionBar(summaryBlade.getLocator());
+    voidPromise = createBar.createButton.click();
+    
+    var deleteBar = new testFx.ActionBars.DeleteActionBar(summaryBlade.getLocator());
+    voidPromise = deleteBar.deleteButton.click();
+    voidPromise = deleteBar.cancelButton.click();
+
+    var pickerBar = new testFx.ActionBars.PickerActionBar(summaryBlade.getLocator());
+    voidPromise = pickerBar.selectButton.click();
+}
+
+function TestCommands() {
+    var menu = new testFx.Commands.ContextMenu();
+    var itemName = "Pin";
+    boolPromise = menu.hasItem(itemName);
+    voidPromise = menu.clickItem(itemName);
+
+    var item = new testFx.Commands.ContextMenuItem(menu.getLocator(), itemName);
+    voidPromise = item.click();
+}
+
+function TestStartBoard() {
+    var board = new testFx.StartBoard();
+    var tilesPromise = board.getTiles();
+}
+
+function TestNotifications() {
+    var menu = new testFx.Notifications.NotificationsMenu();
+    menu.waitForNewNotification("success").then((notification) => {
+        stringPromise = notification.getDescription();
+    });
+}
+
+function TestTests() {
+    boolPromise = testFx.Tests.Parts.canPinAllBladeParts(resourceId, bladeTitle);
+}
\ No newline at end of file
diff --git a/msportalfx-test/msportalfx-test.d.ts b/msportalfx-test/msportalfx-test.d.ts
new file mode 100644
index 000000000..626038786
--- /dev/null
+++ b/msportalfx-test/msportalfx-test.d.ts
@@ -0,0 +1,314 @@
+// Type definitions for msportalfx-test
+// Project: https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test
+// Definitions by: Julio Casal <https://github.com/julioct>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../q/Q.d.ts" />
+
+declare module MsPortalTestFx {
+
+    export module Locators {
+        export class Locator {
+            seleniumLocator: any;
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class ContentLocator extends Locator {
+            locators: Array<Locator>;
+            constructor(innerLocators: Locator[]);
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class ChainedLocator extends Locator {
+            locators: Array<Locator>;
+            constructor(innerLocators: Locator[]);
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class By {
+            static className(value: string): Locator;
+            static css(value: string): Locator;
+            static id(value: string): Locator;
+            static js(script: any, ...var_args: any[]): Locator;
+            static linkText(value: string): Locator;
+            static name(value: string): Locator;
+            static partialLinkText(value: string): Locator;
+            static tagName(value: string): Locator;
+            static xpath(value: string): Locator;
+            static text(value: string): Locator;
+            static chained(...values: Locator[]): Locator;
+            static content(...values: Locator[]): Locator;
+        }
+    }
+
+    export module ActionBars {
+        export class ActionBarButton extends PortalElement {
+            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
+            click(): Q.Promise<void>;
+        }
+
+        export class CreateActionBar extends PortalElement {
+            public createButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class DeleteActionBar extends PortalElement {
+            public deleteButton: ActionBarButton;
+            public cancelButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class PickerActionBar extends PortalElement {
+            public selectButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+    }
+
+    export module Blades {
+        export class Blade extends MsPortalTestFx.PortalElement {
+            public title: string;
+
+            constructor(title: string);
+            clickCommand(commandText: string): Q.Promise<Blade>;
+            getTiles(): Q.Promise<Parts.Tile[]>;
+        }
+
+        export class CreateBlade extends Blade {
+            public actionBar: ActionBars.CreateActionBar;
+        }
+
+        export class BrowseResourceBlade extends Blade {
+            constructor(title: string);
+            selectResource(resourceName: string): Q.Promise<void>;
+            filterItems(filter: string): Q.Promise<BrowseResourceBlade>;
+        }
+
+        export class PickerBlade extends Blade {
+            pickItem(item: string): Q.Promise<void>;
+        }
+
+        export class SpecPickerBlade extends Blade {
+            pickSpec(specCode: string): Q.Promise<void>;
+        }
+
+        export class QuickStartBlade extends Blade {            
+            constructor();
+            clickLink(linkText: string): Q.Promise<void>;
+        }
+
+        export class UsersBlade extends Blade {
+            constructor();
+        }
+    }
+
+    export module Controls {
+        export class FormElement extends MsPortalTestFx.PortalElement {
+            protected label: string;
+
+            constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator, label?: string);
+        }
+
+        export class CheckBoxField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string);
+        }
+
+        export class SelectorField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string);
+            openPicker(): Q.Promise<void>;
+        }
+
+        export class CreatorAndSelectorField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, selectModeLabel?: string, createModeLabel?: string);
+            openPicker(): Q.Promise<void>;
+            clickCreateNew(): Q.Promise<CreatorAndSelectorField>;
+            enterNewValue(...var_args: string[]): Q.Promise<CreatorAndSelectorField>;
+        }
+
+        export class GridCell extends MsPortalTestFx.PortalElement {
+            constructor(text: string, parentLocator?: Locators.Locator);
+            getLocator(): Locators.Locator;
+        }
+
+        export class TextField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string, baseLocator?: Locators.Locator);
+            sendKeys(...var_args: string[]): Q.Promise<void>;
+        }
+
+        export class ResourceFilterTextField extends TextField {
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class HotSpot extends PortalElement {
+            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
+            isSelected(): Q.Promise<boolean>;
+        }
+    }
+
+    export module Parts {
+        export class Part extends MsPortalTestFx.PortalElement {
+            public innerText: string;
+
+            constructor(parentLocator?: Locators.Locator, innerText?: string, baseLocator?: Locators.Locator);
+            isSelected(): Q.Promise<boolean>;
+            isLoaded(): Q.Promise<boolean>;
+            waitUntilLoaded(timeout?: number): Q.Promise<boolean>;
+            isClickable(): Q.Promise<boolean>;
+            hasError(): Q.Promise<boolean>;
+        }
+
+        export class PartProperty extends MsPortalTestFx.PortalElement {
+            public name: string;
+
+            constructor(name: string, parentLocator?: Locators.Locator);
+            getValue(): Q.Promise<string>;
+        }
+
+        export class ResourceSummaryPart extends Part {
+            public properties: Array<PartProperty>;
+            public resourceGroupProperty: PartProperty;
+            public quickStartHotSpot: Controls.HotSpot;
+            public accessHotSpot: Controls.HotSpot;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        class PricingTierPart extends Part {
+        }
+
+        export class Tile extends MsPortalTestFx.PortalElement {
+            public progressLocator: Locators.Locator;
+
+            constructor(parentLocator?: Locators.Locator);
+            tryPin(): Q.Promise<void>;
+            getPart(): Part;
+            waitUntilLoaded(timeout?: number): Q.Promise<void>;
+        }
+    }
+
+    export module Commands {
+        export class ContextMenu extends PortalElement {
+            constructor();
+            public hasItem(text: string): Q.Promise<boolean>;
+            public clickItem(text: string): Q.Promise<void>;
+        }
+
+        export class ContextMenuItem extends PortalElement {
+            constructor(parentLocator: Locators.Locator, text?: string);
+        }
+    }
+
+    export module Notifications {
+        export class Notification extends PortalElement {
+            constructor();
+            getTitle(): Q.Promise<string>;
+            getDescription(): Q.Promise<string>;
+        }
+
+        export class NotificationsMenu extends PortalElement {
+            constructor();
+            waitForNewNotification(title?: string, description?: string, timeout?: number): Q.Promise<Notification>;
+        }
+    }
+
+    export module Tests {
+        export module Parts {
+            export function canPinAllBladeParts(targetBladeDeepLink: string, targetBladeTitle: string, timeout?: number): Q.Promise<boolean>;
+        }
+    }
+
+    export class PortalElement {
+        public baseLocator: Locators.Locator;
+        protected parentLocator: Locators.Locator;
+
+        constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator);
+        click(): Q.Promise<void>;
+        rightClick(): Q.Promise<void>;
+        getAttribute(attributeName: string): Q.Promise<string>;
+        sendKeys(...var_args: string[]): Q.Promise<void>;
+        getText(): Q.Promise<string>;
+        isPresent(): Q.Promise<boolean>;
+        isElementPresent(subLocator: Locators.Locator): Q.Promise<boolean>;
+        isDisplayed(): Q.Promise<boolean>;
+        getLocator(): Locators.Locator;
+    }
+
+    export interface TestExtension {
+        name: string;
+        uri: string;
+    }
+
+    export interface Feature {
+        name: string;
+        value: string;
+    }
+
+    export interface PortalContext {
+        capabilities: {
+            browserName: string;
+            chromeOptions: {
+                args: string[]
+            }
+        },
+        chromeDriverPath?: string,
+        portalUrl: string;
+        signInUrl?: string;
+        signInEmail?: string;
+        signInPassword?: string;
+        features?: Feature[];
+        testExtensions?: TestExtension[];
+    }
+
+    export enum LogLevel {
+        All,
+        Debug,
+        Info,
+        Warning,
+        Severe,
+        Off
+    }
+
+    export class Portal {
+        portalContext: PortalContext;
+
+        goHome(timeout?: number): Q.Promise<void>;
+        openGalleryCreateBlade(galleryPackageName: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.CreateBlade>;
+        openBrowseBlade(resourceProvider: string, resourceType: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.BrowseResourceBlade>;
+        openResourceBlade(resourceId: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.Blade>;
+        navigateToDeepLink(deepLink: string, timeout?: number): Q.Promise<any>;
+        waitForElementVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
+        waitForElementNotVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
+        waitUntilElementContainsAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
+        waitUntilElementDoesNotContainAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
+        waitForElementLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any>;
+        waitForElementsLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any[]>;
+        takeScreenshot(filePrefix?: string): Q.Promise<string>;
+        getBrowserLogs(level: LogLevel): Q.Promise<string[]>;
+        executeScript<T>(script: string): Q.Promise<T>;
+        applyFeature(name: string, value: string): void;
+        getCurrentUrl(): Q.Promise<string>;
+        quit(): Q.Promise<any>;
+    }
+
+    export class SplashScreen extends PortalElement {
+        clickUntrustedExtensionsOkButton(): Q.Promise<void>;
+    }
+
+    export class StartBoard extends PortalElement {
+        constructor();
+        getTiles(): Q.Promise<Parts.Tile[]>;
+    }
+
+    export var portal: Portal;
+}
+
+
+
+declare module "MsPortalFx-Test" {
+    export = MsPortalTestFx;
+}
\ No newline at end of file
diff --git a/mssql/mssql-tests.ts b/mssql/mssql-tests.ts
index 453b2b4e3..e508ec354 100644
--- a/mssql/mssql-tests.ts
+++ b/mssql/mssql-tests.ts
@@ -71,8 +71,74 @@ var connection: sql.Connection = new sql.Connection(config, function (err: any)
                 console.error('Error happened calling Query: ' + err.name + " " + err.message);
             }
             else {
-                console.info(requestStoredProcedureWithOutput.parameters.output.value);
+                console.info(requestStoredProcedureWithOutput.parameters['output'].value);
             }
         });
     }
 });
+
+function test_table() {
+    var table = new sql.Table('#temp_table');
+
+    table.create = true;
+
+    table.columns.add('name', sql.VarChar(sql.MAX), { nullable: false });
+    table.columns.add('type', sql.Int, { nullable: false });
+    table.columns.add('amount', sql.Decimal(7, 2), { nullable: false });
+
+    table.rows.add('name', 42, 3.50);
+    table.rows.add('name2', 7, 3.14);
+}
+
+
+function test_promise_returns() {
+    // Methods return a promises if the callback is omitted.
+    var connection: sql.Connection = new sql.Connection(config);
+    connection.connect().then(() => { });
+    connection.close().then(() => { });
+
+    var preparedStatment = new sql.PreparedStatement(connection);
+    preparedStatment.prepare("SELECT @myValue").then(() => { });
+    preparedStatment.execute({ myValue: 1 }).then((recordSet) => { });
+    preparedStatment.unprepare().then(() => { });
+
+    var transaction = new sql.Transaction(connection);
+    transaction.begin().then(() => { });
+    transaction.commit().then(() => { });
+    transaction.rollback().then(() => { });
+
+    var request = new sql.Request();
+    request.batch('create procedure #temporary as select * from table').then((recordset) => { });
+    request.bulk(new sql.Table("table_name")).then(() => { });
+    request.query('SELECT 1').then((recordset) => { });
+    request.execute('procedure_name').then((recordset) => { });
+}
+
+
+function test_request_constructor() {
+    // Request can be constructed with a connection, preparedStatment, transaction or no arguments
+    var connection: sql.Connection = new sql.Connection(config);
+    var preparedStatment = new sql.PreparedStatement(connection);
+    var transaction = new sql.Transaction(connection);
+    
+    var request1 = new sql.Request(connection);
+    var request2 = new sql.Request(preparedStatment);
+    var request3 = new sql.Request(transaction);
+    var request4 = new sql.Request();
+}
+
+function test_classes_extend_eventemitter() {
+    var connection: sql.Connection = new sql.Connection(config);
+    var transaction = new sql.Transaction();
+    var request = new sql.Request();
+    var preparedStatment = new sql.PreparedStatement();
+
+    connection.on('connect', () => { });
+    transaction.on('begin', () => { });
+    transaction.on('commit', () => { });
+    transaction.on('rollback', () => { });
+    request.on('done', () => { });
+    request.on('error', () => { });
+
+    preparedStatment.on('error', () => { })
+}
\ No newline at end of file
diff --git a/mssql/mssql.d.ts b/mssql/mssql.d.ts
index 880eb716c..c434444d3 100644
--- a/mssql/mssql.d.ts
+++ b/mssql/mssql.d.ts
@@ -1,53 +1,131 @@
-// Type definitions for mssql
+// Type definitions for mssql v2.2.0
 // Project: https://www.npmjs.com/package/mssql
-// Definitions by: COLSA Corporation <http://www.colsa.com/>
+// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
 declare module "mssql" {
+    import events = require('events'); 
 
-    export var Date: any;
-    export var DateTime: any;
-    export var DateTime2: any;
-    export var DateTimeOffset: any;
-    export var SmallDateTime: any;
-    export var Time: any;
-    export var Char: any;
-    export var VarChar:any;
-    export var NChar: any;
-    export var NVarChar: any;
-    export var Text:any;
-    export var NText:any;
-    export var Xml: any;
-    export var TinyInt:any;
-    export var SmallInt:any;
-    export var Int: any;
-    export var BigInt:any;
-    export var Decimal:any;
-    export var Float:any;
-    export var Real:any;
-    export var SmallMoney:any;
-    export var Money:any;
-    export var Numeric:any;
-    export var Bit: any;
-    export var Binary: any;
-    export var VarBinary: any;
-    export var TVP: any;
-    export var UniqueIdentifier: any;
-    export var Image: any;
-    export var UDT: any;
-    export var Geography: any;
-    export var Geometry: any;
+    type sqlTypeWithNoParams       = { type: sqlTypeFactoryWithNoParams }
+    type sqlTypeWithLength         = { type: sqlTypeFactoryWithLength, length: number }
+    type sqlTypeWithScale          = { type: sqlTypeFactoryWithScale, scale: number }
+    type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
+    type sqlTypeWithTvpType        = { type: sqlTypeFactoryWithTvpType, tvpType: any }
 
-    export interface options {
+    type sqlTypeFactoryWithNoParams       = ()                                   => sqlTypeWithNoParams;
+    type sqlTypeFactoryWithLength         = (length?: number)                    => sqlTypeWithLength;
+    type sqlTypeFactoryWithScale          = (scale?: number)                     => sqlTypeWithScale;
+    type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
+    type sqlTypeFactoryWithTvpType        = (tvpType: any)                       => sqlTypeWithTvpType;
+
+    export var VarChar:          sqlTypeFactoryWithLength;
+    export var NVarChar:         sqlTypeFactoryWithLength;
+    export var Text:             sqlTypeFactoryWithNoParams;
+    export var Int:              sqlTypeFactoryWithNoParams;
+    export var BigInt:           sqlTypeFactoryWithNoParams;
+    export var TinyInt:          sqlTypeFactoryWithNoParams;
+    export var SmallInt:         sqlTypeFactoryWithNoParams;
+    export var Bit:              sqlTypeFactoryWithNoParams;
+    export var Float:            sqlTypeFactoryWithNoParams;
+    export var Numeric:          sqlTypeFactoryWithPrecisionScale;
+    export var Decimal:          sqlTypeFactoryWithPrecisionScale;
+    export var Real:             sqlTypeFactoryWithNoParams;
+    export var Date:             sqlTypeFactoryWithNoParams;
+    export var DateTime:         sqlTypeFactoryWithNoParams;
+    export var DateTime2:        sqlTypeFactoryWithScale;
+    export var DateTimeOffset:   sqlTypeFactoryWithScale;
+    export var SmallDateTime:    sqlTypeFactoryWithNoParams;
+    export var Time:             sqlTypeFactoryWithScale;
+    export var UniqueIdentifier: sqlTypeFactoryWithNoParams;
+    export var SmallMoney:       sqlTypeFactoryWithNoParams;
+    export var Money:            sqlTypeFactoryWithNoParams;
+    export var Binary:           sqlTypeFactoryWithNoParams;
+    export var VarBinary:        sqlTypeFactoryWithLength;
+    export var Image:            sqlTypeFactoryWithNoParams;
+    export var Xml:              sqlTypeFactoryWithNoParams;
+    export var Char:             sqlTypeFactoryWithLength;
+    export var NChar:            sqlTypeFactoryWithLength;
+    export var NText:            sqlTypeFactoryWithNoParams;
+    export var TVP:              sqlTypeFactoryWithTvpType;
+    export var UDT:              sqlTypeFactoryWithNoParams;
+    export var Geography:        sqlTypeFactoryWithNoParams;
+    export var Geometry:         sqlTypeFactoryWithNoParams;
+
+    export var TYPES: {
+        VarChar:          sqlTypeFactoryWithLength;
+        NVarChar:         sqlTypeFactoryWithLength;
+        Text:             sqlTypeFactoryWithNoParams;
+        Int:              sqlTypeFactoryWithNoParams;
+        BigInt:           sqlTypeFactoryWithNoParams;
+        TinyInt:          sqlTypeFactoryWithNoParams;
+        SmallInt:         sqlTypeFactoryWithNoParams;
+        Bit:              sqlTypeFactoryWithNoParams;
+        Float:            sqlTypeFactoryWithNoParams;
+        Numeric:          sqlTypeFactoryWithPrecisionScale;
+        Decimal:          sqlTypeFactoryWithPrecisionScale;
+        Real:             sqlTypeFactoryWithNoParams;
+        Date:             sqlTypeFactoryWithNoParams;
+        DateTime:         sqlTypeFactoryWithNoParams;
+        DateTime2:        sqlTypeFactoryWithScale;
+        DateTimeOffset:   sqlTypeFactoryWithScale;
+        SmallDateTime:    sqlTypeFactoryWithNoParams;
+        Time:             sqlTypeFactoryWithScale;
+        UniqueIdentifier: sqlTypeFactoryWithNoParams;
+        SmallMoney:       sqlTypeFactoryWithNoParams;
+        Money:            sqlTypeFactoryWithNoParams;
+        Binary:           sqlTypeFactoryWithNoParams;
+        VarBinary:        sqlTypeFactoryWithLength;
+        Image:            sqlTypeFactoryWithNoParams;
+        Xml:              sqlTypeFactoryWithNoParams;
+        Char:             sqlTypeFactoryWithLength;
+        NChar:            sqlTypeFactoryWithLength;
+        NText:            sqlTypeFactoryWithNoParams;
+        TVP:              sqlTypeFactoryWithTvpType;
+        UDT:              sqlTypeFactoryWithNoParams;
+        Geography:        sqlTypeFactoryWithNoParams;
+        Geometry:         sqlTypeFactoryWithNoParams;
+    };
+
+    export var MAX: number;
+    export var fix: boolean;
+    export var Promise: any;
+
+
+    interface IMap extends Array<{js: any, sql: any }> {
+        register(jstype: any, sql: any): void;
+    }
+
+    export var map: IMap;
+
+    export var DRIVERS: string[];
+
+    type recordSet = any;
+    type IIsolationLevel = number;
+
+    export var ISOLATION_LEVEL: {
+        READ_UNCOMMITTED: IIsolationLevel
+        READ_COMMITTED: IIsolationLevel
+        REPEATABLE_READ: IIsolationLevel
+        SERIALIZABLE: IIsolationLevel
+        SNAPSHOT: IIsolationLevel
+    }
+
+    export interface IOptions {
         encrypt: boolean;
     }
 
-    export interface pool {
+
+    export interface IPool {
         min: number;
         max: number;
         idleTimeoutMillis: number;
     }
 
+    export var pool: IPool;
+
     export interface config {
         driver?: string;
         user?: string;
@@ -59,18 +137,26 @@ declare module "mssql" {
         connectionTimeout?: number;
         requestTimeout?: number;
         stream?: boolean;
-        options?: options;
-        pool?: pool;
-
+        options?: IOptions;
+        pool?: IPool;
     }
 
-    export class Connection {
-
+    export class Connection extends events.EventEmitter {
+        public connected: boolean;
+        public connecting: boolean;
+        public driver: string;
         public constructor(config: config, callback?: (err?: any) => void);
+        public connect(): Promise<void>;
+        public connect(callback: (err: any) => void): void;
+        public close(): Promise<void>;
+        public close(callback: (err: any) => void): void;
+    }
 
-        public connect(callback?: (err?: any) => void): void;
-
-        public close(): void;
+    export class ConnectionError implements Error {
+        constructor(message: string, code?: any)
+        public name: string;
+        public message: string;
+        public code: string;
     }
 
     class columns {
@@ -78,7 +164,7 @@ declare module "mssql" {
     }
 
     class rows {
-        public add(row: any): void;
+        public add(...row: any[]): void;
     }
 
     export class Table {
@@ -86,37 +172,97 @@ declare module "mssql" {
         public columns: columns;
         public rows: rows;
         public constructor(tableName: string);
-
     }
 
-    export class Request {
+    interface IRequestParameters {
+        [name: string]: {
+            name: string;
+            type: any;
+            io: number;
+            value: any;
+            length: number;
+            scale: number;
+            precision: number;
+            tvpType: any;
+        }
+    }
+
+    export class Request extends events.EventEmitter {
+        public connection: Connection;
+        public transaction: Transaction;
+        public pstatement: PreparedStatement;
+        public parameters: IRequestParameters;
+        public verbose: boolean;
+        public multiple: boolean;
+        public canceled: boolean;
+        public stream: any;
         public constructor(connection?: Connection);
-        public execute(procedure: string, callback?: (err?: any, recordsets?: any, returnValue?: any) => void): void;
+        public constructor(transaction: Transaction);
+        public constructor(preparedStatement: PreparedStatement);
+        public execute(procedure: string): Promise<recordSet>;
+        public execute(procedure: string, callback: (err?: any, recordsets?: any, returnValue?: any) => void): void;
         public input(name: string, value: any): void;
         public input(name: string, type: any, value: any): void;
         public output(name: string, type: any, value?: any): void;
-        public pipe(stream: any): void;
-        public query(command: string, callback?: (err?: any, recordset?: any) => void): void;
-        public batch(batch: string, callback?: (err?: any, recordset?: any) => void): void;
-        public bulk(table: Table, callback?: (err?: any, rowCount?: any) => void): void;
+        public pipe(stream: NodeJS.WritableStream): void;
+        public query(command: string): Promise<void>;
+        public query(command: string, callback: (err?: any, recordset?: any) => void): void;
+        public batch(batch: string): Promise<recordSet>;
+        public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
+        public bulk(table: Table): Promise<void>;
+        public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
         public cancel(): void;
-        public parameters: any;
     }
 
-    export class Transaction {
+    export class RequestError implements Error {
+        constructor(message: string, code?: any)
+        public name: string;
+        public message: string;
+        public code: string;
+    }
+
+    export class Transaction extends events.EventEmitter {
+        public connection: Connection;
+        public isolationLevel: IIsolationLevel;
         public constructor(connection?: Connection);
-        public begin(isolationLevel?: any, callback?: (err?: any) => void): void;
-        public begin(callback?: (err?: any) => void): void;
-        public commit(callback?: (err?: any) => void): void;
-        public rollback(callback?: (err?: any) => void): void;
+        public begin(isolationLevel?: IIsolationLevel): Promise<void>;
+        public begin(isolationLevel?: IIsolationLevel, callback?: (err?: any) => void): void;
+        public commit(): Promise<void>;
+        public commit(callback: (err?: any) => void): void;
+        public rollback(): Promise<void>;
+        public rollback(callback: (err?: any) => void): void;
     }
 
-    export class PreparedStatement {
+    export class TransactionError implements Error {
+        constructor(message: string, code?: any)
+        public name: string;
+        public message: string;
+        public code: string;
+    }
+
+    export class PreparedStatement extends events.EventEmitter {
+        public connection: Connection;
+        public transaction: Transaction;
+        public prepared: boolean;
+        public statement: string;
+        public parameters: IRequestParameters;
+        public multiple: boolean;
+        public stream: any;
         public constructor(connection?: Connection);
         public input(name: string, type: any): void;
         public output(name: string, type: any): void;
-        public prepare(statement: string, callback?: (err?: any) => void): void;
-        public execute(values: any, callback?: (err?: any) => void): void;
-        public unprepare(callback?: (err?: any) => void): void;
+        public prepare(statement?: string): Promise<void>;
+        public prepare(statement?: string, callback?: (err?: any) => void): void;
+        public execute(values: Object): Promise<recordSet>;
+        public execute(values: Object, callback: (err: any, recordSet: recordSet) => void): void;
+        public unprepare(): Promise<void>;
+        public unprepare(callback: (err?: any) => void): void;
+    }
+
+    export class PreparedStatementError implements Error {
+        constructor(message: string, code?: any)
+        public name: string;
+        public message: string;
+        public code: string;
     }
 }
diff --git a/mustache/mustache.d.ts b/mustache/mustache.d.ts
index 3f0a83dfa..f130b791e 100644
--- a/mustache/mustache.d.ts
+++ b/mustache/mustache.d.ts
@@ -47,3 +47,7 @@ interface MustacheStatic {
 }
 
 declare var Mustache: MustacheStatic;
+
+declare module 'mustache' {
+	export = Mustache;
+}
diff --git a/mysql/mysql-tests.ts b/mysql/mysql-tests.ts
index f671a6372..97df14dbf 100644
--- a/mysql/mysql-tests.ts
+++ b/mysql/mysql-tests.ts
@@ -109,6 +109,10 @@ var sql = "SELECT * FROM ?? WHERE ?? = ?";
 var inserts = ['users', 'id', userId];
 sql = mysql.format(sql, inserts);
 
+var sql = "INSERT INTO posts SET ?";
+var post = { id: 1, title: 'Hello MySQL' };
+sql = mysql.format(sql, post);
+
 connection.config.queryFormat = function (query, values) {
     if (!values) return query;
     return query.replace(/\:(\w+)/g, function (txt: string, key: string) {
diff --git a/mysql/mysql.d.ts b/mysql/mysql.d.ts
index 9b6ed7998..715c799a2 100644
--- a/mysql/mysql.d.ts
+++ b/mysql/mysql.d.ts
@@ -15,6 +15,7 @@ declare module "mysql" {
 	function escape(value: any): string;
 	function format(sql: string): string;
 	function format(sql: string, values: Array<any>): string;
+	function format(sql: string, values: any): string;
 
 	interface IMySql {
 		createConnection(connectionUri: string): IConnection;
@@ -24,6 +25,7 @@ declare module "mysql" {
 		escape(value: any): string;
 		format(sql: string): string;
 		format(sql: string, values: Array<any>): string;
+		format(sql: string, values: any): string;
 	}
 
     interface IConnectionStatic {
@@ -69,6 +71,7 @@ declare module "mysql" {
 
         format(sql: string): string;
         format(sql: string, values: Array<any>): string;
+        format(sql: string, values: any): string;
 
         on(ev: string, callback: (...args: any[]) => void): IConnection;
         on(ev: 'error', callback: (err: IError) => void): IConnection;
diff --git a/needle/needle-tests.ts b/needle/needle-tests.ts
index 24d9701b5..106d46a71 100644
--- a/needle/needle-tests.ts
+++ b/needle/needle-tests.ts
@@ -22,7 +22,7 @@ function ResponsePipeline() {
 
     var options = {
         compressed: true,
-        follow: true,
+        follow: 5,
         rejectUnauthorized: true
     };
 
diff --git a/needle/needle.d.ts b/needle/needle.d.ts
index 741cf5fe3..e7a67387d 100644
--- a/needle/needle.d.ts
+++ b/needle/needle.d.ts
@@ -15,13 +15,21 @@ declare module Needle {
 
     interface RequestOptions {
         timeout?: number;
-        follow?: any; // number | string
+        follow?: number;
+        follow_max?: number;
         multipart?: boolean;
         proxy?: string;
         agent?: string;
-        headers?: any;
+        headers?: HttpHeaderOptions;
         auth?: string; // auto | digest | basic (default)
         json?: boolean;
+
+        // These properties are overwritten by those in the 'headers' field
+        compressed?: boolean;
+        cookies?: { [name: string]: any; };
+        // Overwritten if present in the URI
+        username?: string;
+        password?: string;
     }
 
     interface ResponseOptions {
@@ -31,12 +39,15 @@ declare module Needle {
     }
 
     interface HttpHeaderOptions {
+        cookies?: { [name: string]: any; };
         compressed?: boolean;
-        username?: string;
-        password?: string;
         accept?: string;
         connection?: string;
         user_agent?: string;
+
+        // Overwritten if present in the URI
+        username?: string;
+        password?: string;
     }
 
     interface TLSOptions {
diff --git a/netmask/netmask-tests.ts b/netmask/netmask-tests.ts
new file mode 100644
index 000000000..519e1722e
--- /dev/null
+++ b/netmask/netmask-tests.ts
@@ -0,0 +1,16 @@
+
+///<reference path="netmask.d.ts" />
+
+import netmask = require('netmask');
+
+var address: string = '127.0.0.1';
+
+var nm = new netmask.Netmask(address, '255.255.255.0');
+
+var nm2 = new netmask.Netmask('127.0.0.1/255.255.255.0');
+
+if (nm.contains('127.0.0.123')) {}
+
+nm.forEach((ip: string): void => console.log(ip));
+
+var adjacent: netmask.Netmask = nm.next();
diff --git a/netmask/netmask.d.ts b/netmask/netmask.d.ts
new file mode 100644
index 000000000..32afa25ae
--- /dev/null
+++ b/netmask/netmask.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for Netmask 1.0.5
+// Project: https://github.com/rs/node-netmask
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// netmask.d.ts
+
+declare module 'netmask' {
+
+  export function long2ip(long: number): string;
+  export function ip2long(ip: string): number;
+
+  export class Netmask {
+    maskLong: number;
+    bitmask: number;
+    netLong: number;
+    // The number of IP address in the block (eg.: 254)
+    size: number;
+    // The address of the network block as a string (eg.: 216.240.32.0)
+    base: string;
+    // The netmask as a string (eg.: 255.255.255.0)
+    mask: string;
+    // The host mask, the opposite of the netmask (eg.: 0.0.0.255)
+    hostmask: string;
+    // The first usable address of the block
+    first: string;
+    // The last  usable address of the block
+    last: string;
+    // The block's broadcast address: the last address of the block (eg.: 192.168.1.255)
+    broadcast: string;
+
+    constructor (netmask: string);
+    constructor (net: string, mask: string);
+
+    // Returns true if the given ip or netmask is contained in the block
+    contains(ip: string | Netmask | number): boolean;
+
+    // Returns the Netmask object for the block which follow this one
+    next(count?: number): Netmask;
+
+    // Evaluate a function on each IP address
+    forEach(fn: (ip: string, long: number, index: number) => void): void;
+
+    // Returns the complete netmask formatted as `base/bitmask`
+    toString(): string;
+  }
+}
diff --git a/ng-dialog/ng-dialog-tests.ts b/ng-dialog/ng-dialog-tests.ts
new file mode 100644
index 000000000..6d68111a6
--- /dev/null
+++ b/ng-dialog/ng-dialog-tests.ts
@@ -0,0 +1,56 @@
+/// <reference path="ng-dialog.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+
+var app = angular.module('testModule', ['ngDialog']);
+
+class DialogTestController {
+
+	constructor(ngDialog: angular.dialog.IDialogService) {
+
+		ngDialog.close("login-popup", "bye");
+		ngDialog.closeAll("bye");
+
+		var defaults = ngDialog.getDefaults();
+
+		var dialogs = ngDialog.getOpenDialogs();
+
+		ngDialog.isOpen("bye");
+
+		var loginDialog = ngDialog.open({
+			template: "login.html",
+			className: "default flat-ui",
+			closeByEscape: false,
+			name: "login-popup"
+		});
+
+		loginDialog.closePromise.then((result) => {
+			var val: any = result.value;
+		});
+
+		if (loginDialog.id === "login-popup") {
+			loginDialog.close("closing");
+		}
+
+		var deleteConfirm = ngDialog.openConfirm({
+			template: "confirm.html"
+		});
+	}
+}
+
+class LoginDialogController {
+
+	constructor($scope: angular.dialog.IDialogScope) {
+
+		$scope.closeThisDialog("bye");
+	}
+}
+
+app.controller('TestController', DialogTestController);
+
+app.config((ngDialogProvider: angular.dialog.IDialogProvider) => {
+
+	ngDialogProvider.setDefaults({
+		className: "flat-ui"
+	})
+
+});
diff --git a/ng-dialog/ng-dialog.d.ts b/ng-dialog/ng-dialog.d.ts
new file mode 100644
index 000000000..3ad5c4d09
--- /dev/null
+++ b/ng-dialog/ng-dialog.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for ngDialog
+// Project: https://github.com/likeastore/ngDialog
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module angular.dialog {
+
+	interface IDialogService {
+		getDefaults(): IDialogOptions;
+		open(options: IDialogOpenOptions): IDialogOpenResult;
+		openConfirm(options: IDialogOpenOptions): IPromise<any>;
+
+		/**
+		 * Determine whether the specified dialog is open or not.
+		 * @param id Dialog id to check for.
+		 * @returns {boolean} Indicating whether it exists or not.
+		 */
+		isOpen(id: string): boolean;
+		close(id: string, value?: any): void;
+		closeAll(value?: any): void;
+		getOpenDialogs(): string[];
+	}
+
+	interface IDialogOpenResult {
+		id: string;
+		close: (value?: string) => void;
+		closePromise: IPromise<IDialogClosePromise>;
+	}
+
+	interface IDialogClosePromise {
+		id: string;
+		value: any;
+	}
+
+	interface IDialogProvider extends angular.IServiceProvider {
+		/**
+		 * Default options for the dialogs.
+		 * @param defaultOptions
+		 * @returns {}
+		 */
+		setDefaults(defaultOptions: IDialogOptions): void;
+	}
+
+	/**
+	 * Dialog Scope which extends the $scope.
+	 */
+	interface IDialogScope extends angular.IScope {
+		/**
+		 * This allows you to close dialog straight from handler in a popup element.
+		 * @param value Any value passed to this function will be attached to the object which resolves on the close promise for this dialog.
+		 * For dialogs opened with the openConfirm() method the value is used as the reject reason.
+		 */
+		closeThisDialog(value?: any): void;
+	}
+
+	interface IDialogOptions {
+		/**
+		 * This option allows you to control the dialog's look, you can use built-in themes or create your own styled modals.
+		 * It will be appended with the "ngdialog" class e.g. className is "default-theme flat-ui" it will be class="ngdialog default-theme flat-ui".
+		 */
+		className?: string;
+		/**
+		 * If false it allows to hide overlay div behind the modals, default true.
+		 */
+		overlay?: boolean;
+
+		/**
+		 * If false it allows to hide close button on modals, default true.
+		 */
+		showClose?: boolean;
+
+		/**
+		 * It allows to close modals by clicking Esc button, default true.
+		 * This will close all open modals if there several of them open at the same time.
+		 */
+		closeByEscape?: boolean;
+
+		/**
+		 * It allows to close modals by clicking on overlay background, default true. If @see Hammer.js is loaded, it will listen for tap instead of click.
+		 */
+		closeByDocument?: boolean;
+
+		/**
+		 * If true allows to use plain string as template, default false.
+		 */
+		plain?: boolean;
+
+		/**
+		 * Give a name for a dialog instance. It is useful for identifying specific dialog if there are multiple dialog boxes opened.
+		 */
+		name?: string | number;
+
+		preCloseCallback?: string|Function;
+	}
+
+	/**
+	 * Options which are provided to open a dialog.
+	 */
+	interface IDialogOpenOptions extends IDialogOptions {
+		template: string;
+		controller?: string|any;
+		controllerAs?: string;
+		/**
+		 * Scope object that will be passed to dialog. If you use controller with separate $scope service this object will be passed to $scope.$parent param.
+		 */
+		scope?: ng.IScope;
+	}
+}
diff --git a/ng-flow/ng-flow-tests.ts b/ng-flow/ng-flow-tests.ts
new file mode 100644
index 000000000..beca6583c
--- /dev/null
+++ b/ng-flow/ng-flow-tests.ts
@@ -0,0 +1,4 @@
+/// <reference path="ng-flow.d.ts" />
+
+var flowFactory: ng.flow.IFlowFactory;
+flowFactory.create(<flowjs.IFlowOptions> {});
diff --git a/ng-flow/ng-flow.d.ts b/ng-flow/ng-flow.d.ts
new file mode 100644
index 000000000..bc8521b68
--- /dev/null
+++ b/ng-flow/ng-flow.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for ng-flow
+// Project: https://github.com/flowjs/ng-flow
+// Definitions by: Ryan McNamara <https://github.com/ryan10132>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+/// <reference path="../flowjs/flowjs.d.ts" />
+
+declare module ng.flow {
+    interface IFlowFactory {
+        create(options?: flowjs.IFlowOptions): flowjs.IFlow;
+    }
+}
diff --git a/nock/nock.d.ts b/nock/nock.d.ts
index 3cd92e65a..44d7080a0 100644
--- a/nock/nock.d.ts
+++ b/nock/nock.d.ts
@@ -56,6 +56,7 @@ declare module "nock" {
 			reply(responseCode: number, body?: Object, headers?: Object): Scope;
 			reply(responseCode: number, callback: (uri: string, body: string) => string, headers?: Object): Scope;
 			replyWithFile(responseCode: number, fileName: string): Scope;
+			replyWithError(errorMessage: string): Scope;
 
 			defaultReplyHeaders(headers: Object): Scope;
 
diff --git a/node-azure/azure.d.ts b/node-azure/azure.d.ts
index 7e52a8be3..c7818d0b6 100644
--- a/node-azure/azure.d.ts
+++ b/node-azure/azure.d.ts
@@ -1627,6 +1627,7 @@ declare module "azure" {
         RowKey: string;
         Timestamp?: Date;
         etag?: string;
+        [property: string]: string | number | boolean | Date;
     }
     //#endregion
     //#region BlobService Interfaces
diff --git a/node-cache/node-cache-tests.ts b/node-cache/node-cache-tests.ts
new file mode 100644
index 000000000..a61ec6c89
--- /dev/null
+++ b/node-cache/node-cache-tests.ts
@@ -0,0 +1,98 @@
+/// <reference path="./node-cache.d.ts" />
+
+import NodeCache = require('node-cache');
+
+import Options = NodeCacheTypes.Options;
+import Stats = NodeCacheTypes.Stats;
+import Callback = NodeCacheTypes.Callback;
+
+interface TypeSample {
+	a: number;
+	b: string;
+	c: boolean;
+}
+
+{
+	let options: Options;
+	let cache: NodeCacheTypes.NodeCache;
+	cache = new NodeCache();
+	cache = new NodeCache(options);
+}
+
+{
+	let cache: NodeCache;
+	let key: string;
+	let cb: Callback<TypeSample>;
+	let result: TypeSample;
+	result = cache.get<TypeSample>(key);
+	result = cache.get<TypeSample>(key, cb);
+}
+
+{
+	let cache: NodeCache;
+	let keys: string[];
+	let cb: Callback<{[key: string]: TypeSample}>;
+	let result: {[key: string]: TypeSample};
+	result = cache.mget<TypeSample>(keys);
+	result = cache.mget<TypeSample>(keys, cb);
+}
+
+{
+	let cache: NodeCache;
+	let key: string;
+	let value: TypeSample;
+	let ttl: number|string;
+	let cb: Callback<boolean>;
+	let result: boolean;
+	result = cache.set<TypeSample>(key, value);
+	result = cache.set<TypeSample>(key, value, ttl);
+	result = cache.set<TypeSample>(key, value, ttl, cb);
+	result = cache.set<TypeSample>(key, value, cb);
+}
+
+{
+	let cache: NodeCache;
+	let keys: string|string[];
+	let cb: Callback<number>;
+	let result: number;
+	result = cache.del(keys);
+	result = cache.del(keys, cb);
+}
+
+{
+	let cache: NodeCache;
+	let key: string;
+	let ttl: number;
+	let cb: Callback<boolean>;
+	let result: boolean;
+	result = cache.ttl(key);
+	result = cache.ttl(key, ttl);
+	result = cache.ttl(key, ttl, cb);
+	result = cache.ttl(key, cb);
+}
+
+{
+	let cache: NodeCache;
+	let cb: Callback<string[]>;
+	let result: string[];
+	result = cache.keys();
+	result = cache.keys(cb);
+}
+
+{
+	let cache: NodeCache;
+	let result: Stats;
+	result = cache.getStats();
+}
+
+{
+	let cache: NodeCache;
+	let result: void;
+	result = cache.flushAll();
+}
+
+{
+	let cache: NodeCache;
+	let result: void;
+	result = cache.close();
+}
diff --git a/node-cache/node-cache.d.ts b/node-cache/node-cache.d.ts
new file mode 100644
index 000000000..8e2710a42
--- /dev/null
+++ b/node-cache/node-cache.d.ts
@@ -0,0 +1,263 @@
+// Type definitions for node-cache v3.0.0
+// Project: https://github.com/tcs-de/nodecache
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module NodeCacheTypes {
+	interface NodeCache {
+		/** container for cached data */
+		data: Data;
+
+		/** module options */
+		options: Options;
+
+		/** statistics container */
+		stats: Stats;
+
+		/**
+		 * get a cached key and change the stats
+		 *
+		 * @param key cache key or an array of keys
+		 * @param cb Callback function
+		 */
+		get<T>(
+			key: string,
+			cb?: Callback<T>
+		): T;
+
+		/**
+		 * get multiple cached keys at once and change the stats
+		 *
+		 * @param keys an array of keys
+		 * @param cb Callback function
+		 */
+		mget<T>(
+			keys: string[],
+			cb?: Callback<{[key: string]: T}>
+		): {[key: string]: T};
+
+		/**
+		 * set a cached key and change the stats
+		 *
+		 * @param key cache key
+		 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
+		 * it to a serialized JSON
+		 * @param ttl The time to live in seconds.
+		 * @param cb Callback function
+		 */
+		set<T>(
+			key: string,
+			value: T,
+			ttl: number|string,
+			cb?: Callback<boolean>
+		): boolean;
+
+		set<T>(
+			key: string,
+			value: T,
+			cb?: Callback<boolean>
+		): boolean;
+
+		/**
+		 * remove keys
+		 * @param keys cache key to delete or a array of cache keys
+		 * @param cb Callback function
+		 * @returns Number of deleted keys
+		 */
+		del(
+			keys: string|string[],
+			cb?: Callback<number>
+		): number;
+
+		/**
+		 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+		 */
+		ttl(
+			key: string,
+			ttl: number,
+			cb?: Callback<boolean>
+		): boolean;
+
+		ttl(
+			key: string,
+			cb?: Callback<boolean>,
+			ttl?: number
+		): boolean;
+
+		/**
+		 * list all keys within this cache
+		 * @param cb Callback function
+		 * @returns An array of all keys
+		 */
+		keys(cb?: Callback<string[]>): string[];
+
+		/**
+		 * get the stats
+		 *
+		 * @returns Stats data
+		 */
+		getStats(): Stats;
+
+		/**
+		 * flush the hole data and reset the stats
+		 */
+		flushAll(): void;
+
+		/**
+		 * This will clear the interval timeout which is set on checkperiod option.
+		 */
+		close(): void;
+	}
+
+	interface Data {
+		[key: string]: WrappedValue<any>;
+	}
+
+	interface Options {
+		forceString: boolean;
+		objectValueSize: number;
+		arrayValueSize: number;
+		stdTTL: number;
+		checkperiod: number;
+		useClones: boolean;
+	}
+
+	interface Stats {
+		hits: number;
+		misses: number;
+		keys: number;
+		ksize: number;
+		vsize: number;
+	}
+
+	interface WrappedValue<T> {
+		// ttl
+		t: number;
+		// value
+		v: T;
+	}
+
+	interface Callback<T> {
+		(err: any, data: T): void;
+	}
+}
+
+declare module "node-cache" {
+	import events = require("events");
+
+	import Data = NodeCacheTypes.Data;
+	import Options = NodeCacheTypes.Options;
+	import Stats = NodeCacheTypes.Stats;
+	import Callback = NodeCacheTypes.Callback;
+
+	class NodeCache extends events.EventEmitter implements NodeCacheTypes.NodeCache {
+		/** container for cached data */
+		data: Data;
+
+		/** module options */
+		options: Options;
+
+		/** statistics container */
+		stats: Stats;
+
+		constructor(options?: Options);
+
+		/**
+		 * get a cached key and change the stats
+		 *
+		 * @param key cache key or an array of keys
+		 * @param cb Callback function
+		 */
+		get<T>(
+			key: string,
+			cb?: Callback<T>
+		): T;
+
+		/**
+		 * get multiple cached keys at once and change the stats
+		 *
+		 * @param keys an array of keys
+		 * @param cb Callback function
+		 */
+		mget<T>(
+			keys: string[],
+			cb?: Callback<{[key: string]: T}>
+		): {[key: string]: T};
+
+		/**
+		 * set a cached key and change the stats
+		 *
+		 * @param key cache key
+		 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
+		 * it to a serialized JSON
+		 * @param ttl The time to live in seconds.
+		 * @param cb Callback function
+		 */
+		set<T>(
+			key: string,
+			value: T,
+			ttl: number|string,
+			cb?: Callback<boolean>
+		): boolean;
+
+		set<T>(
+			key: string,
+			value: T,
+			cb?: Callback<boolean>
+		): boolean;
+
+		/**
+		 * remove keys
+		 * @param keys cache key to delete or a array of cache keys
+		 * @param cb Callback function
+		 * @returns Number of deleted keys
+		 */
+		del(
+			keys: string|string[],
+			cb?: Callback<number>
+		): number;
+
+		/**
+		 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+		 */
+		ttl(
+			key: string,
+			ttl: number,
+			cb?: Callback<boolean>
+		): boolean;
+
+		ttl(
+			key: string,
+			cb?: Callback<boolean>,
+			ttl?: number
+		): boolean;
+
+		/**
+		 * list all keys within this cache
+		 * @param cb Callback function
+		 * @returns An array of all keys
+		 */
+		keys(cb?: Callback<string[]>): string[];
+
+		/**
+		 * get the stats
+		 *
+		 * @returns Stats data
+		 */
+		getStats(): Stats;
+
+		/**
+		 * flush the hole data and reset the stats
+		 */
+		flushAll(): void;
+
+		/**
+		 * This will clear the interval timeout which is set on checkperiod option.
+		 */
+		close(): void;
+	}
+
+	export = NodeCache;
+}
diff --git a/node-config-manager/node-config-manager-tests.ts b/node-config-manager/node-config-manager-tests.ts
new file mode 100644
index 000000000..e46bc8431
--- /dev/null
+++ b/node-config-manager/node-config-manager-tests.ts
@@ -0,0 +1,25 @@
+/// <reference path="node-config-manager.d.ts" />
+
+import cfgManager = require('node-config-manager');
+var options = {
+    configDir: './config',
+    env: 'test',
+    camelCase: true
+};
+
+cfgManager.init(options);
+cfgManager.addConfig('db')
+    .addConfig('logger');
+
+var appCfgByGetConfig = cfgManager.getConfig('app');
+
+cfgManager.set('configDir', './config')
+    .set('camelCase', true);
+
+console.log(cfgManager.get('env'));
+cfgManager.removeConfig('app')
+    .removeConfig('logger');
+
+console.log(cfgManager.count());
+
+var appCfgByMethod = cfgManager.method.App();
diff --git a/node-config-manager/node-config-manager.d.ts b/node-config-manager/node-config-manager.d.ts
new file mode 100644
index 000000000..0c7abbd09
--- /dev/null
+++ b/node-config-manager/node-config-manager.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for node-config-manager 1.0.2
+// Project: https://www.npmjs.com/package/node-config-manager
+// Definitions by: TANAKA Koichi <https://gitnub.com/mugeso/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "node-config-manager" {
+    interface Options {
+        configDir: string;
+        env: string;
+        camelCase: boolean;
+    }
+
+    interface ConfigManager {
+        init(options: Options): ConfigManager;
+        set(key: string, value: string|boolean): ConfigManager;
+        get(key: string): string|boolean;
+        addConfig(configName: string): ConfigManager;
+        getConfig(configName: string): any;
+        removeConfig(configName: string): ConfigManager;
+        count(): number;
+        method: any;
+    }
+
+    var cfgManager: ConfigManager;
+    export = cfgManager;
+}
diff --git a/node-gcm/node-gcm.d.ts b/node-gcm/node-gcm.d.ts
index 3272acac4..cac54f31a 100644
--- a/node-gcm/node-gcm.d.ts
+++ b/node-gcm/node-gcm.d.ts
@@ -10,6 +10,9 @@ declare module "node-gcm" {
         delayWhileIdle?: boolean;
         timeToLive?: number;
         dryRun?: boolean;
+        data: {
+            [key: string]: string;
+        };
     }
 
     export class Message {
@@ -20,7 +23,7 @@ declare module "node-gcm" {
         dryRun: boolean;
 
         addData(key: string, value: string): void;
-        addData(data: any): void;
+        addData(data: { [key: string]: string }): void;
     }
 
 
diff --git a/node-imap/imap-tests.ts b/node-imap/imap-tests.ts
index 61f4b2e0c..3c124ca46 100644
--- a/node-imap/imap-tests.ts
+++ b/node-imap/imap-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./imap.d.ts" />
+
 import Imap = require('imap');
 var inspect = require('util').inspect;
 
diff --git a/node-jsfl-runner/node-jsfl-runner-tests.ts b/node-jsfl-runner/node-jsfl-runner-tests.ts
new file mode 100644
index 000000000..31202b9f7
--- /dev/null
+++ b/node-jsfl-runner/node-jsfl-runner-tests.ts
@@ -0,0 +1,23 @@
+/// <reference path="node-jsfl-runner.d.ts" />
+
+import * as jsfl from 'node-jsfl-runner';
+
+let myJSFL: jsfl.JSFL = {
+  init: (param: string): void => {
+
+  }
+}
+
+let flashLocation: string = '';
+
+jsfl.createJSFL(myJSFL, 'fileName.jsfl', ['Hello!'], (err: NodeJS.ErrnoException) => {
+
+});
+
+jsfl.runJSFL(flashLocation, 'fileName.jsfl', (err: NodeJS.ErrnoException) => {
+
+});
+
+jsfl.deleteJSFL('fileName.jsfl', (err: NodeJS.ErrnoException) => {
+
+});
\ No newline at end of file
diff --git a/node-jsfl-runner/node-jsfl-runner.d.ts b/node-jsfl-runner/node-jsfl-runner.d.ts
new file mode 100644
index 000000000..f1d11561a
--- /dev/null
+++ b/node-jsfl-runner/node-jsfl-runner.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for node-jsfl-runner v0.2.4
+// Project: https://www.npmjs.com/package/node-jsfl-runner
+// Definitions by: Michael Randolph <https://github.com/mrand01>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+declare module "node-jsfl-runner" {
+  interface JSFL {
+    init: (...args: any[]) => void;
+    [index: string]: any;
+  }
+  
+  /**
+   * Creates a JSFL file from a JSFL object
+   * @param jsfl A valid JSFL object
+   * @param fileName Path to output JSFL file location
+   * @param initParams Parameters to pass to JSFL init function
+   * @param callback Callback
+   */
+  function createJSFL(jsfl: JSFL, fileName: string, initParams: Array<any>, callback: (err: NodeJS.ErrnoException) => void): void;
+  
+  /**
+   * Deletes a JSFL file
+   * @param fileName Path to JSFL file to delete
+   * @param callback Callback
+   */
+  function deleteJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+  
+  /**
+   * Runs a JSFL file
+   * @param flashLocation Path to Flash executable
+   * @param fileName Path to JSFL file to run
+   * @param callback Callback
+   */
+  function runJSFL(flashLocation:string, fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+}
\ No newline at end of file
diff --git a/node-mysql-wrapper/my-meteor.d.ts b/node-mysql-wrapper/my-meteor.d.ts
new file mode 100644
index 000000000..18ec6dde9
--- /dev/null
+++ b/node-mysql-wrapper/my-meteor.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for meteorjs for node-mysql-wrapper which helps in development
+// Project: https://github.com/nodets/node-mysql-wrapper
+// Definitions by: Makis Maropoulos <https://github.com/kataras>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module Mongo {
+	var Collection: CollectionStatic;
+	interface CollectionStatic {
+		new <T>(name: string, options?: {
+			connection?: Object;
+			idGeneration?: string;
+			transform?: Function;
+		}): Collection<T>;
+	}
+	interface Collection<T> {
+		allow(options: {
+			insert?: (userId: string, doc: T) => boolean;
+			update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+			remove?: (userId: string, doc: T) => boolean;
+			fetch?: string[];
+			transform?: Function;
+		}): boolean;
+		deny(options: {
+			insert?: (userId: string, doc: T) => boolean;
+			update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+			remove?: (userId: string, doc: T) => boolean;
+			fetch?: string[];
+			transform?: Function;
+		}): boolean;
+		find(selector?: any, options?: {
+			sort?: any;
+			skip?: number;
+			limit?: number;
+			fields?: any;
+			reactive?: boolean;
+			transform?: Function;
+		}): Mongo.Cursor<T>;
+		findOne(selector?: any, options?: {
+			sort?: any;
+			skip?: number;
+			fields?: any;
+			reactive?: boolean;
+			transform?: Function;
+		}): T;
+		insert(doc: T, callback?: Function): string;
+		rawCollection():any;
+		rawDatabase():any;
+		remove(selector: any, callback?: Function): void;
+		update(selector: any, modifier: any, options?: {
+			multi?: boolean;
+			upsert?: boolean;
+		}, callback?: Function): number;
+		upsert(selector: any, modifier: any, options?: {
+			multi?: boolean;
+		}, callback?: Function): { numberAffected?: number; insertedId?: string; };
+		_ensureIndex(indexName: string, options?: { [key: string]: any }): void;
+	}
+
+	var Cursor: CursorStatic;
+	interface CursorStatic {
+		new <T>(): Cursor<T>;
+	}
+	interface Cursor<T> {
+		count(): number;
+		fetch(): Array<T>;
+		forEach(callback: <T>(doc: T, index: number, cursor: Mongo.Cursor<T>) => void, thisArg?: any): void;
+		map<U>(callback: (doc: T, index: number, cursor: Mongo.Cursor<T>) => U, thisArg?: any): Array<U>;
+		observe(callbacks: Object): any;
+		observeChanges(callbacks: Object): any;
+	}
+
+	var ObjectID: ObjectIDStatic;
+	interface ObjectIDStatic {
+		new (hexString: string): ObjectID;
+	}
+	interface ObjectID {
+	}
+
+}
+
+declare module Meteor {
+    var isServer: boolean;
+    var isClient: boolean;
+}
diff --git a/node-mysql-wrapper/node-mysql-wrapper-tests.ts b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
index 700c1ee6e..3d26b6e8b 100644
--- a/node-mysql-wrapper/node-mysql-wrapper-tests.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
@@ -1,18 +1,199 @@
-///<reference path='./node-mysql-wrapper.d.ts' />
+/// <reference path="./node-mysql-wrapper.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../bluebird/bluebird.d.ts" />
 
-import wrapper = require("node-mysql-wrapper");
-var db = wrapper("mysql://kataras:pass@127.0.0.1/taglub?debug=false&charset=utf8");
+var express = require('express');
+var app = express();
+var server = require('http').createServer(app);
+import wrapper2 = require("node-mysql-wrapper");
+var db = wrapper2.wrap("mysql://kataras:pass@127.0.0.1/taglub?debug=false&charset=utf8");
+
+class User { //or interface
+    userId: number;
+    username: string;
+    mail: string;
+    password:string;
+    comments: Comment[];
+    myComments: Comment[];
+    info: UserInfo;
+}
+
+interface Comment {
+    commentId: number;
+    content: string;
+    likes: CommentLike[];
+
+}
+interface CommentLike {
+    commentLikeId: number;
+    userId: number;
+    commentId: number;
+}
+
+interface UserInfo {
+    userInfoId: number;
+    userId: number;
+    hometown: string;
+}
 
 db.ready(() => {
-    db.table("users").on("insert", (parsedResults) => {
+
+
+    var usersDb = db.table<User>("users");
+    
+    //or var usersDb = db.table("users"); if you don't want intel auto complete from your ide/editor
+
+    usersDb.findById(16, (_user) => {
+
+        console.log("TEST1: \n");
+        console.log("FOUND USER WITH USERNAME: " + _user.username);
+    });
+
+    /* OR   usersDb.findById(18).then(_user=> {
+         console.log("FOUND USER WITH USERNAME: " + _user.username);
+     }, (err) => { console.log("ERROR ON FETCHING FINDBY ID: " + err) });
+   */
+
+    usersDb.findSingle(
+        {
+            userId: 18,
+            myComments: {
+                userId: '=',
+                tableRules: { //NEW: SET rules to joined tables too!
+                    table: "comments", //NEW SET table name inside any property u want!
+                    limit: 50,
+                    orderByDesc: "commentId" //give me the first 50 comments ordered by -commentId (DESC) from table 'comments' and put them at 'myComments' property inside the result object.
+                }
+            }
+        }).then(_user=> { // to get this promise use : .promise() 
+        console.log("\n-------------TEST 2 ------------\n");
+            console.log(_user.username + " with ");
+            console.log(_user.myComments.length + " comments ");
+            _user.myComments.forEach(_comment=> {
+                console.log("--------------\n" + _comment.content);
+            });
+        });
+
+    usersDb.remove(5620, answer=> {
+        console.log("TEST 3: \n");
+        console.log(answer.affectedRows + ' (1) has removed from table:  ' + answer.table);
 
     });
 
-    db.table("users").findAll().then((results) => {
-        console.dir(results);
+    var auser = new User();
+    auser.username = ' just a username';
+    auser.mail = ' just an email';
+
+    usersDb.save(auser, newUser=> {
+        console.log("TEST 4: \n");
+        console.log("NEW USER HAS CREATED WITH NEW USER ID: " + newUser.userId);
+
     });
 
-    db.table("users").find({ userId: 18 }, (results) => {
-        console.dir(results[0]);
+
+
+    usersDb.find(
+        {
+            yearsOld: 22,
+            comments: {
+                userId: "=",
+                tableRules: {
+                    limit: 2
+                }
+            }
+
+        }, (_users) => {
+         
+            console.log("---------------TEST 6----------------------------------------");
+            _users.forEach(_user=> {
+                console.log(_user.userId + " " + _user.username + " found with " + _user.comments.length + " comments");
+
+            });
+
+        });
+    //if no rules setted to find method  it's uses the table's rules ( if exists)
+    
+    
+    
+    let _criteriaFromBuilder = usersDb.criteria
+        .except("password") // or .exclude(...columns). the only column you cannot except/exclude is the primary key (because it is used at where clause), be careful.
+        .where("userId", 24)
+        .joinAs("info", "userInfos", "userId") 
+        .at("info")
+        .limit(1) //because we make it limit 1 it will return this result as object not as array.
+        .parent()
+        .joinAs("myComments", "comments", "userId")  
+        .at("myComments").limit(2)
+        .joinAs("likes", "commentLikes", "commentId")
+        .original().orderBy("userId", true).build();
+        
+    /* console.dir(_criteriaFromBuilder);
+     prints this object: ( of course you can create your own in order to pass it on .find table methods )
+    {
+        userId:23,
+        
+        myComments:{
+            userId: '=',
+            
+            tableRules:{
+                table: 'comments',
+                limit:2
+               
+            },
+            
+            likes:{
+                commentId: '=',
+                
+                tableRules:{
+                    table: 'commentLikes'
+                }
+               
+            }
+        },
+        
+        tableRules:{ 
+            orderByDesc: 'userId',
+            except: ['password']
+        }
+        
+    }
+    
+    
+    */
+    
+
+
+    usersDb.find(_criteriaFromBuilder).then(_users=> {
+        console.log("\n----------------\nTEST ADVANCED 1\n-------------------\n ");
+        _users.forEach(_user=> {
+            console.log(_user.userId + " " + _user.username);
+
+            if (_user.info !== undefined) {
+                console.log(' from ' + _user.info.hometown);
+                //console.dir(_user.userInfos);
+            }
+
+            if (_user.myComments !== undefined) {
+                _user.myComments.forEach(_comment=> {
+                    console.log(_comment.commentId + " " + _comment.content);
+
+                    if (_comment.likes !== undefined) {
+                        console.log(' with ' + _comment.likes.length + ' likes!');
+                    }
+                });
+            }
+        });
+
     });
+
+
+});
+
+server.on('uncaughtException', function(err:any) {
+    console.log(err);
+})
+
+var httpPort = 1193;//config.get('Server.port') || 1193;
+server.listen(httpPort, function() {
+    console.log("Server is running on " + httpPort);
 });
diff --git a/node-mysql-wrapper/node-mysql-wrapper.d.ts b/node-mysql-wrapper/node-mysql-wrapper.d.ts
index 55cd039e8..1de3ca1b2 100644
--- a/node-mysql-wrapper/node-mysql-wrapper.d.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper.d.ts
@@ -1,131 +1,830 @@
 // Type definitions for node-mysql-wrapper
-// Project: https://github.com/kataras/node-mysql-wrapper
+// Project: https://github.com/nodets/node-mysql-wrapper
 // Definitions by: Makis Maropoulos <https://github.com/kataras>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-///<reference path='../mysql/mysql.d.ts' />
+///<reference path='./../mysql/mysql.d.ts' />
 ///<reference path='./../bluebird/bluebird.d.ts' />
+///<reference path="./my-meteor.d.ts" />
+
 
 declare module "node-mysql-wrapper" {
-    import Mysql = require("mysql");
+    import * as Mysql from 'mysql';
+    import * as Promise from 'bluebird';
+    import {EventEmitter} from 'events';
 
-    function MySQLWrapperBuilder(connection: string | Mysql.IConnection, ...useOnlyTables: string[]): MySQLWrapper;
+    var EQUAL_TO_PROPERTY_SYMBOL: string;
+    var TABLE_RULES_PROPERTY: string;
 
-    enum EVENT_TYPES {
-        INSERT, UPDATE, DELETE, SAVE
+    type DeleteAnswer = {
+        affectedRows: number;
+        table: string;
+    };
+
+    type RawRules = {
+        table: string,
+        begin: string,
+        orderBy: string,
+        orderByDesc: string,
+        groupBy: string,
+        limit: number, // limit = limitStart  =0 and limitEnd = limit.
+        limitStart: number,
+        limitEnd: number,
+        end: string
+
+    };
+
+    type TableToSearchPart = { tableName: string, propertyName: string };
+
+    type PropertyChangedCallback = (args: PropertyChangedArgs) => any;
+
+    interface Map<T> {
+        [index: string]: T;
     }
 
-    interface MySQLConnection {
-        new (connection: string | Mysql.IConnection): MySQLConnection;
-
-        create(connectionUri: string): void;
-        create(connection: Mysql.IConnection): void;
-
-        attach(connection: Mysql.IConnection): void;
-        end(callback: () => void): void;
-        destroy(): void;
-        link<U>(callback?: () => void): Promise<U>;
-        connect<U>(callback?: () => void): Promise<U>;
-
-        useOnly(...useOnlyTables: string[]): void;
-
-        fetchDatabaseInfornation<U>(): Promise<U>;
-
-        escape(val: string): string;
-        notice(tableWhichCalled: string, queryStr: string, parsedResults: Object[]): void;
-        fireEvent(tableWhichCalled: string, queryStr: string, parsedResults: Object[]): void;
-
-        watch(tableName: string, evtType: EVENT_TYPES | string, callback: (parsedResults: Object[]) => void): void;
-        on(tableName: string, evtType: EVENT_TYPES | string, callback: (parsedResults: Object[]) => void): void;
-        unwatch(tableName: string, evtType: EVENT_TYPES | string, callbackToRemove: () => void): void;
-        off(tableName: string, evtType: EVENT_TYPES | string, callbackToRemove: () => void): void;
-
-        query(mysqlQuery: Mysql.IQueryFunction): void;
-
-        table(tableName: string): MySQLTable;
+    interface IQuery<T> {
+        _table: Table<T>;
+        execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
     }
 
-    interface MySQLTable {
-        new (tableName: string, connection: MySQLConnection): MySQLTable;
+    interface IQueryConstructor<T> {
+        new (_table: Table<T>): IQuery<T>;
+    }
 
-        setColumns(columns: string[]): void;
 
-        setPrimaryKey(primaryKeyColumnName: string): void;
+    class Helper {
+        /** 
+         * Callback like forEach
+         * @name valueCallback
+         * @function
+         * @param {T} the value of the object's key 
+         * @returnTye {U}
+         * @return {U}
+        */
+        
+        /**
+         * Callback like forEach
+         * @name keyCallback
+         * @function
+         * @param {string} the name of the object's key 
+         * @returnTye {U}
+         * @return {U}
+        */
 
+        constructor();
+        
+        /**
+         * Create and return a copy of an object.
+         * @param {T} object the object you want to copy.
+         * @returnType {T}
+         * @return {T}
+         */
+        static copyObject<T>(object: T): T;
+        
+        /**
+         * Converts any_string to anyString and returns it.
+         * @param {string} columnKey the string you want to convert.
+         * @returnType {string}
+         * @return {string}
+         */
+        static toObjectProperty(columnKey: string): string;
+        
+        /**
+         * Converts anyString to any_string and returns it.
+         * @param {string} objectKey the string you want to convert.
+         * @returnType {string}
+         * @return {string}
+         */
+        static toRowProperty(objectKey: string): string;
+    
+        /**
+         * Iterate object's keys and return their values to the callback.
+         * @param {<T>} map the object.
+         * @param {valueCallback}
+         * @returnType {U}
+         * @return {U}
+         */
+        static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
+
+        /**
+        * Iterate object's keys and return their names to the callback.
+        * @param {Map<T>} map the object.
+        * @param {keyCallback}
+        * @returnType {U}
+        * @return {U}
+        */
+
+        static forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U;
+        
+        /**
+         * Checks if anything is a function.
+         * @param {functionToCheck} the object or function to pass
+         * @return boolean
+         */
+        static isFunction(functionToCheck: any): boolean;
+        
+        /**
+         * Checks if an object has 'tableRules' property.
+         * @param {obj} the object to pass
+         * @return boolean
+         */
+        static hasRules(obj: any): boolean;
+    }
+
+
+    interface ICriteriaParts {
+        rawCriteriaObject: any;
+        tables: TableToSearchPart[];
+        noDatabaseProperties: string[];
+        whereClause: string;
+
+        selectFromClause<T>(_table: Table<T>): string;
+
+    }
+
+
+
+    class CriteriaParts implements ICriteriaParts {
+        
+        /**
+         * The raw format of the criteria eg: {yearsOld:22}.
+         */
+        rawCriteriaObject: any;
+        
+        /**
+         * Which tables to search after the find method of the proto table finish.
+         */
+        tables: TableToSearchPart[];
+        
+        /**
+         * The properties of the criteria which don't belong to the database's table.
+         */
+        noDatabaseProperties: string[];
+        
+        /**
+         * The converted/exported where clause. 
+         */
+        whereClause: string;
+
+        constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
+
+        selectFromClause<T>(_table: Table<T>): string;
+    }
+
+    class CriteriaDivider<T> {
+        private _table;
+        constructor(table: Table<T>);
+        
+        /**
+         * Builds the criteria raw object to Criteria object.
+         * @param {any} rawCriteriaObject the criteria at raw format you pass eg: {yearsOld:18}.
+         * @returnType {Criteria}
+         * @return {Criteria}
+         */
+        build(rawCriteriaObject: any): CriteriaParts;
+    }
+
+    class SelectQueryRules {
+        private lastPropertyClauseName: string;
+        manuallyEndClause: string;
+        manuallyBeginClause: string;
+        exceptColumns: string[];
+        orderByColumn: string;
+        orderByDescColumn: string;
+        groupByColumn: string;
+        limitStart: number;
+        limitEnd: number;
+        public tableName: string; //auto den benei oute sto last, oute sto from.
+        static build(): SelectQueryRules;
+        private last(propertyClauseName);
+        except(...columns: string[]): SelectQueryRules;
+        
+        /**
+         * Same as .except(...columns)
+         */
+        exclude(...columns: string[]): SelectQueryRules;
+
+        orderBy(columnKey: string, descending?: boolean): SelectQueryRules;
+        groupBy(columnKey: string): SelectQueryRules;
+        limit(limitRowsOrStart: number, limitEnd?: number): SelectQueryRules;
+        appendToBegin(manualAfterWhereString: string): SelectQueryRules;
+        appendToEnd(manualAfterWhereString: string): SelectQueryRules;
+        append(appendToCurrent: string): SelectQueryRules;
+        clearOrderBy(): SelectQueryRules;
+        clearGroupBy(): SelectQueryRules;
+        clearLimit(): SelectQueryRules;
+        clearEndClause(): SelectQueryRules;
+        clearBeginClause(): SelectQueryRules;
+        clear(): SelectQueryRules;
+        from(parentRule: SelectQueryRules): SelectQueryRules;
+        isEmpty(): boolean;
         toString(): string;
+        toRawObject(): RawRules;
+        static toString(rules: SelectQueryRules): string;
+        static toRawObject(rules: SelectQueryRules): RawRules;
+        static fromRawObject(obj: RawRules): SelectQueryRules;
+    }
 
-        model(jsObject: Object): MySQLModel;
+    class CriteriaBuilder<T>{
 
-        watch(evtType: EVENT_TYPES | string, callback: (parsedResults: Object[]) => void): void;
-        on(evtType: EVENT_TYPES | string, callback: (parsedResults: Object[]) => void): void;
-        unwatch(evtType: EVENT_TYPES|string, callbackToRemove: () => void): void;
-        off(evtType: EVENT_TYPES|string, callbackToRemove: () => void): void;
+        private rawCriteria: any;
+        private primaryTable: Table<T>;
+        private parentBuilder: CriteriaBuilder<any>;
 
-        ///START DYNAMIC METHODS FOR TABLES CANNOT BE PRE-DEFINED WITH DYNAMIC WAY, YET, SO:
-        find<U>(jsObject: Object, callback?: (results: Object[]) => void): Promise<U>;
-        save<U>(jsObject: Object, callback?: (results: Object[]) => void): Promise<U>;
-        remove<U>(jsObject: Object, callback?: (results: Object[]) => void): Promise<U>;
-        delete<U>(jsObject: Object, callback?: (results: Object[]) => void): Promise<U>;
-        safeDelete<U>(jsObject: Object, callback?: (results: Object[]) => void): Promise<U>;
-        ///END
-        findAll<U>(callback?: (results: Object[]) => void): Promise<U>;
+        constructor(primaryTable: Table<T>); //to arxiko apo to Table.ts 9a benei
+        constructor(primaryTable: Table<T>, tableName: string, parentBuilder: CriteriaBuilder<any>);// auta 9a benoun apo to parent select query.
+        constructor(primaryTable: Table<T>, tablePropertyName?: string, parentBuilder?: CriteriaBuilder<any>);
 
-        extend(functionName: string, functionToBeSupported: () => any): void;
+        except(...columns: string[]): CriteriaBuilder<T>;
+        
+        /**
+	    * Same as .except(...columns)
+	    */
+        exclude(...columns: string[]): CriteriaBuilder<T>;
 
-        has(extendedFunctionName: string): boolean;
+        where(key: string, value: any): CriteriaBuilder<T>;
+
+        private createRulesIfNotExists(): void;
+
+        orderBy(column: string, desceding?: boolean): CriteriaBuilder<T>;
+
+        limit(start: number, end?: number): CriteriaBuilder<T>;
+
+        join(realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+        joinAs(tableNameProperty: string, realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+        at(tableNameProperty: string): CriteriaBuilder<T>;
+
+        parent(): CriteriaBuilder<T>;
+
+        original(): CriteriaBuilder<T>;
+        
+        /**
+         * Auto kanei kuklous mexri na paei sto primary table kai ekei na epistrepsei to sunoliko raw criteria gia execute i kati allo.
+         */
+        build(): any;
+
+        static from<T>(table: Table<T>): CriteriaBuilder<T>
 
     }
 
-    interface MySQLModel {
+    class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
+       
+        _table: Table<T>
+        constructor(_table: Table<T>);
 
-        new (table: MySQLTable, jsObject: Object): MySQLModel;
+        private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
 
-        toObjectProperty(columnKey: string): string;
-        toRowProperty(objectKey: string): string;
+        /**
+         * Executes the select and returns the Promise.
+         */
+        promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
 
-        create(jsObject: Object): MySQLModel;
-        reUse(jsObject: Object): MySQLModel;
+        /**
+         * Exactly the same thing as promise().
+         * Executes the select and returns the Promise.
+        */
+        execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+    }
 
-        toRow(): void;
-        getRawObject(): Object;
+    class SaveQuery<T> implements IQuery<T> {
+        _table: Table<T>
+        constructor(_table: Table<T>);
+        execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
+    }
 
-        parseTable<U>(mysqlTableToSearch: String, parentObject: Object): Promise<U>;
-        parseResult<U>(result: Object, tablesToSearch: string[]): Promise<U>;
+    class DeleteQuery<T> implements IQuery<T>{
+        _table: Table<T>
+        constructor(_table: Table<T>);
+        execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+    }
 
-        find<U>(parentObj?: Object): Promise<U>;
-        findAll<U>(): Promise<U>;
-        save<U>(): Promise<U>;
-        safeDelete<U>(): Promise<U>;
-        remove<U>(): Promise<U>;
-        delete<U>(): Promise<U>;
+
+    class PropertyChangedArgs {
+        propertyName: string;
+        oldValue: any;
+        constructor(propertyName: string, oldValue: any);
+    }
+
+    class ObservableObject {
+
+        /** Property names that your row couldn't have:
+         * "propertyChangedListeners", "notifyPropertyChanged", "onPropertyChanged", "toJSON", "makeObservable", "_forget"
+         */
+        static RESERVED_PROPERTY_NAMES: string[];
+
+        private propertyChangedListeners: PropertyChangedCallback[];
+        
+        /** Make the obj observable. Used in constructor or extend this class and use it. */
+        private makeObservable(obj: any): void;
+
+        constructor();
+        constructor(obj?: any);
+
+        /**Add a listener/observer to watch for changes in this object's properties */
+        onPropertyChanged(listener: PropertyChangedCallback): void;
+        
+        /** If developer wants manualy notify for property changed */
+        notifyPropertyChanged(propertyName: string, oldValue: any): void;
+
+        /**Remove property changed listeners  */
+        _forget(): void;
+
+        toJSON(...excludeProperties: string[]): any;
 
     }
 
-    interface MySQLWrapper {
-        new (connection?: MySQLConnection): MySQLWrapper;
+    enum CollectionChangedAction {
+        INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
+    }
 
-        setConnection(connection: MySQLConnection): void;
+    class CollectionChangedEventArgs<T> {
+        action: CollectionChangedAction;
+        oldItems: (T | (T & ObservableObject))[];
+        newItems: (T | (T & ObservableObject))[];
+        oldStartingIndex: number;
+        newStartingIndex: number;
 
-        useOnly(...useOnlyTables: string[]): void;
+        constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
+    }
 
-        has(tableName: string): boolean;
-        has(tableName: string, methodName: string): boolean;
 
-        ready(callback: () => void): void;
-        noticeReady(): void;
-        removeReadyListener(callback: () => any): void;
+    class BaseCollection<T> {//T=result type of Table
+        private list: (T | (T & ObservableObject))[];
+        listeners: ((eventArgs: CollectionChangedEventArgs<T>) => void)[];
+        constructor(table: Table<T>);
+        length: number;
+        items: (T | (T & ObservableObject))[];
+        indexOf(item: T | string | number): number;
+        findItem(itemId: string | number): T;
+        getItem(index: number): T;
+        getItemObservable(index: number): T & ObservableObject;
+        addItem(...items: (T | (T & ObservableObject))[]): (T | (T & ObservableObject));
+        removeItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+        removeItemById(id: number | string): BaseCollection<T>;
+        forgetItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+        reset(): BaseCollection<T>;
+        notifyCollectionChanged(evtArgs: CollectionChangedEventArgs<T>): void;
+        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+    }
 
-        query: Mysql.IQueryFunction;
+    class ObservableCollection<T> { //auti i klasi 9a xrisimopoieite ws Collection me kapoies paralages mesa sto index.ts.
+        local: BaseCollection<T>;
+        private _items: (T & ObservableObject)[];
 
+        constructor(table: Table<T>, fetchAllFromDatabase?: boolean, callbackWhenReady?: Function);
+
+        items: (T & ObservableObject)[];
+
+        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+
+        startListeningToDatabase(): void;
+
+        find(criteriaRawJsObject?: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+        findOne(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+    
+        /**
+         * .insert() and .update() do the same thing:  .save();
+         */
+        insert(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+        update(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+	
+        /**
+         * same thing as .remove();
+         */
+        delete(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+
+    }
+
+    class MeteorCollection<T> {
+        private collection: Mongo.Collection<T>;
+        protected table: Table<T>;
+
+        constructor(table: Table<T>, name?: string);
+
+        startListeningToDatabase(): void;
+
+        rawCollection: Mongo.Collection<T>;
+
+        fill(criteriaRawJsObject: any): void;
+
+        fillAll(): void;
+
+        fillOne(criteriaRawJsObject: any): void;
+    
+        //ONLY MONGO/METEOR COLLECTION METHODS START
+        allow(options: {
+            insert?: (userId: string, doc: T) => boolean;
+            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+            remove?: (userId: string, doc: T) => boolean;
+            fetch?: string[];
+            transform?: Function;
+        }): boolean;
+
+        deny(options: {
+            insert?: (userId: string, doc: T) => boolean;
+            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+            remove?: (userId: string, doc: T) => boolean;
+            fetch?: string[];
+            transform?: Function;
+        }): boolean;
+
+        find(selector?: any, options?: {
+            sort?: any;
+            skip?: number;
+            limit?: number;
+            fields?: any;
+            reactive?: boolean;
+            transform?: Function;
+        }): Mongo.Cursor<T>;
+
+        findOne(selector?: any, options?: {
+            sort?: any;
+            skip?: number;
+            fields?: any;
+            reactive?: boolean;
+            transform?: Function;
+        }): T;
+    
+        //ONLY MONGO/METEOR COLLECTION METHODS FINISH.
+
+    }
+
+
+    class Connection extends EventEmitter {
+        
+        /**
+         * The real database connection socket.
+         */
+        connection: Mysql.IConnection;
+        
+        /**
+         * Collection of the supported event types for the tables.
+         */
+        eventTypes: string[];
+        
+        /**
+         * Force to fetch ONLY these Database table names {array of string}.  
+         */
+        tableNamesToUseOnly: any[];
+        
+        /**
+         * All tables {MysqlTable} inside this connection's database.
+         */
+        tables: Table<any>[];
+
+        constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
+        
+        /**
+         * Creates the MysqlConnection from the connection url or the real connection object.
+         * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
+        
+        /**
+         * Attach a real connection.
+         * @param {Mysql.IConnection} connection the real connection object.
+         * @returnType {nothing}
+         * @return {nothing} 
+         */
+        attach(connection: Mysql.IConnection): void;
+        
+        /**
+         * Close the entire real connection and remove all event's listeners (if exist).
+         * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
+         * @returnType {nothing}
+         * @return {nothing} 
+         */
+        end(callback?: (error: any) => void): void;
+        
+        /**
+         * Close the entire real connection and remove all event's listeners (if exist).
+         * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+         */
         destroy(): void;
-        end(callback?: () => void): void;
-
-        when<U>(): Promise<U[]>;
-
-        ///START: WE CANNOT PRE-DEFINE THE DYNAMIC TABLES INTO PROPERTIES, SO WE USE INDEX(STRING-TABLENAME) TO GET A TABLE
-        table(tableName: string): MySQLTable;
-        ///END
+        
+        /**
+         * Clear all binary logs from the whole database.
+         * When finish returns a promise, use it with .then(function(){});
+         * @return Promise
+         */
+        clearBinaryLogs(): Promise<void>;
+        
+        /**
+         * Link the real connection with this MysqlConnection object.
+         * @param {function} readyCallback when the link operation is done this callback is executed.
+         * @returnType {Promise}
+         * @return {Promise}
+         */
+        link(readyCallback?: () => void): Promise<void>;
+        
+        /**
+         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+         * @param {Array} tables the array of the tables  {string}
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        useOnly(...tables: any[]): void;
+        
+        /**
+         * This method has the resposibility of fetching the correct tables from the database ( table = columns' names, primary key name).
+         * @returnType {Promise}
+         * @return {Promise}
+         */
+        fetchDatabaseInformation(): Promise<void>;
+        
+        /**
+         * Escape the query column's value  and return it.
+         * @param {string} val the value which will be escaped. 
+         * @returnType {string}
+         * @return {string}
+         */
+        escape(val: string): string;
+        
+        /**
+         * Call when must notify the Database events, SAVE(INSERT,UPDATE), REMOVE(DELETE).
+         * @param {string} tableWhichCalled the table name which event is coming from.
+         * @param {string} queryStr the full parsed query string which used to determinate the type of event to notify.
+         * @param {any[]} rawRows the raw rows results (results before a method parse/edit/export them as objects), these are passing to the watch listener(s).
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        notice(tableWhichCalled: string, queryStr: string, rawRows: any[]): void;
+        
+        /**
+         * Adds an event listener/watcher on a table for a 'database event'.
+         * @param {string} tableName the table name which you want to add the event listener.
+         * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+         * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
+        
+        /**
+         * Removes an event listener/watcher from a table for a specific event type.
+         * @param {string} tableName the table name which you want to remove the event listener. 
+         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+         * @param {function} callbackToRemove the callback that you were used for watch this event type.
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+        
+        /**
+         * Executes a database query.
+         * @param {string} queryStr the query text/string to be executed.
+         * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
+         * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
+         * @returnType {nothing}
+         * @return {nothing} 
+         */
+        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+        
+        /**
+         * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
+         * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
+         * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
+         * @returnType {MysqlTable}
+         * @return {MysqlTable}
+         */
+        table<T>(tableName: string): Table<T>;
     }
 
-    export = MySQLWrapperBuilder;
+    class Table<T>  {
+        /** Private keywords here are useless but I put them. 
+         * If the developer wants to see the properties of the Table class, he/she just comes here.
+        */
+
+        private _name: string;
+        private _connection: Connection;
+        private _columns: string[];
+        private _primaryKey: string;
+        private _criteriaDivider: CriteriaDivider<T>;
+        private _rules: SelectQueryRules;
+        private _selectQuery: SelectQuery<T>
+        private _saveQuery: SaveQuery<T>;
+        private _deleteQuery: DeleteQuery<T>;
+        constructor(tableName: string, connection: Connection);
+
+
+      
+        /**
+         * An array of all columns' names inside this table.
+         */
+        columns: string[];
+        
+        /**
+         * The name of the primary key column which this table is using.
+         */
+        primaryKey: string;
+        
+        /**
+         * The MysqlConnection object which this MysqlTable belongs. 
+         */
+        connection: Connection;
+        
+        /**
+         * The real database name of the table. Autofilled by library. 
+         */
+        name: string;
+        
+        /**
+         * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
+         * @return {SelectQueryRules}
+         */
+        rules: SelectQueryRules;
+        
+        /**
+         * Returns this table's criteria divider class.
+         * @return {CriteriaDivider}
+         */
+        criteriaDivider: CriteriaDivider<T>;
+        
+        /**
+         * Returns new Criteria Builder each time.
+         * Helps you  to make criteria raw js objects ready to use in find,remove and save methods.
+         * @return {CriteriaBuilder}
+         */
+        criteria: CriteriaBuilder<T>;
+        
+        /**
+        * Adds or turn on an event listener/watcher on a table for a 'database event'.
+        * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+        * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
+        * @returnType {nothing}
+        * @return {nothing}
+        */
+        on(evtType: string, callback: (rawResults: any[]) => void): void;
+            
+        /**
+         * Removes or turn off an event listener/watcher from a table for a specific event type.
+         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+         * @param {function} callbackToRemove the callback that you were used for watch this event type.
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        off(evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+         
+        /**
+         * Use it when you want to check if extended function is exists here.
+         * @param {string} extendedFunctionName the name of the function you want to check.
+         * @returnType {boolean}
+         * @return {boolean}
+         */
+        has(extendedFunctionName: string): boolean;
+        
+        /**
+         * Extends this table's capabilities with a function.
+         * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
+         * @param {function} theFunction the function with any optional parameters you want to pass along.
+         * @returnType {nothing}
+         * @return {nothing} 
+         */
+        extend(functionName: string, theFunction: (...args: any[]) => any): void;
+        
+        /**
+         * Converts and returns an object from this form: { a_property:'dsda', other_property:something, any_property_name:true } to { aProperty:..., otherProperty...,anyPropertyName...}
+         * @param {any} row the raw row object.
+         * @returnType {any}
+         * @return {any}
+         */
+        objectFromRow(row: any): any;
+           
+        /**
+         * Converts and returns an object from this form: { aProperty:'dsda', otherProperty:something, anyPropertyName:true } to { a_property:..., other_property...,any_property_name...}
+         * @param {any} row the raw row object.
+         * @returnType {any}
+         * @return {any}
+         */
+        rowFromObject(obj: any): any;
+        
+        /**
+         * Returns and array of [columns[],values[]]
+         * @param {any} jsObject the raw row object.
+         * @returnType {array}
+         * @return {array}
+         */
+        getRowAsArray(jsObject: any): Array<any>;
+        
+        /**
+         * Returns the primary key's value from an object.
+         * @param {any} jsObject the object which you want to find and return the value of the primary key.
+         * @returnType {number | string}
+         * @return {number | string}
+         */
+        getPrimaryKeyValue(jsObject: any): number | string;
+        
+        /**
+         * 
+         */
+        find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
+        find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
+        find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+        findSingle(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+        findById(id: number | string): Promise<T>; // without callback
+        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+        findAll(): Promise<T[]>; // only criteria and promise
+        findAll(tableRules: RawRules): Promise<T[]> // only rules and promise
+        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+
+
+        save(criteriaRawJsObject: any): Promise<any>; //without callback
+        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<any>;
+
+        remove(id: number | string): Promise<DeleteAnswer>; // ID without callback
+        remove(criteriaRawObject: any): Promise<DeleteAnswer>; // criteria obj without callback
+        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+    }
+
+    class MeteorTable<T>{
+        public table: Table<T>;
+        constructor(table: Table<T>);
+
+        insert(doc: T, callback?: (_result: T) => void): T;
+
+        remove(selector: any, callback?: () => DeleteAnswer): DeleteAnswer;
+
+        update(selector: any, modifier: any, options?: {
+            multi?: boolean;
+            upsert?: boolean;
+        }, callback?: (result: T) => any): number;
+
+        collection(nameOfCollection?: string, fillWithCriteria?: any): Mongo.Collection<T>;
+    }
+
+    class Database {
+        connection: Connection;
+        isReady: boolean;
+        readyListenerCallbacks: Function[];
+        constructor(connection?: Connection);
+        static when(..._promises: Promise<any>[]): Promise<any>;
+        setConnection(connection: Connection): void;
+            
+        /**
+         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+         * @param {Array} tables the array of the tables  {string}
+         * @returnType {nothing}
+         * @return {nothing}
+         */
+        useOnly(...useTables: any[]): void;
+
+        has(tableName: string, functionName?: string): boolean;
+        ready(callback?: () => void): void;
+        table<T>(tableName: string): Table<T>;
+        noticeReady(): void;
+        removeReadyListener(callback: () => void): void;
+        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+        
+        /**
+        * Close the entire real connection and remove all event's listeners (if exist).
+        * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+        */
+        destroy(): void;
+        
+        /**
+       * Close the entire real connection and remove all event's listeners (if exist).
+       * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
+       * @returnType {nothing}
+       * @return {nothing} 
+       */
+        end(maybeAcallbackError: (err: any) => void): void;
+
+        newTableRules(tableName: string): SelectQueryRules;
+
+        buildRules(): SelectQueryRules;
+        buildRules(parentRules?: SelectQueryRules): SelectQueryRules;
+
+        collection<T>(tableName: string, callbackWhenReady?: Function): ObservableCollection<T>;
+
+        /**Meteor js feature only: Returns a table which it's collection can make synchronization with the client */
+        meteorTable<T>(tableName: string): MeteorTable<T>;
+    }
+
+    function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+    
+    /** For meteor js only
+     * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
+     */
+    function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+
+    function observable<T>(obj: T): T & ObservableObject;
 }
diff --git a/node-notifier/node-notifier-tests.ts b/node-notifier/node-notifier-tests.ts
new file mode 100644
index 000000000..dfc4963ac
--- /dev/null
+++ b/node-notifier/node-notifier-tests.ts
@@ -0,0 +1,162 @@
+/// <reference path="node-notifier.d.ts" />
+'use strict';
+
+import notifier = require('node-notifier');
+import * as path from 'path';
+
+notifier.notify({
+    title: 'My awesome title',
+    message: 'Hello from node, Mr. User!',
+    icon: path.join(__dirname, 'coulson.jpg'), // absolute path (not balloons)
+    sound: true, // Only Notification Center or Windows Toasters
+    wait: true // wait with callback until user action is taken on notification
+}, function (err: any, response: any) {
+    // response is response from notification
+});
+
+notifier.on('click', function (notifierObject: any, options: any) {
+    // Happens if `wait: true` and user clicks notification
+});
+
+notifier.on('timeout', function (notifierObject: any, options: any) {
+    // Happens if `wait: true` and notification closes
+});
+
+const options = { };
+
+
+import NotificationCenter = require('node-notifier/notifiers/notificationcenter');
+new NotificationCenter(options).notify();
+
+import NotifySend = require('node-notifier/notifiers/notifysend');
+new NotifySend(options).notify();
+
+import WindowsToaster = require('node-notifier/notifiers/toaster');
+new WindowsToaster(options).notify();
+
+import Growl = require('node-notifier/notifiers/growl');
+new Growl(options).notify();
+
+import WindowsBalloon = require('node-notifier/notifiers/balloon');
+new WindowsBalloon(options).notify();
+
+
+var nn = require('node-notifier');
+
+new nn.NotificationCenter(options).notify();
+new nn.NotifySend(options).notify();
+new nn.WindowsToaster(options).notify(options);
+new nn.WindowsBalloon(options).notify(options);
+new nn.Growl(options).notify(options);
+
+
+//
+// All notification options with their defaults:
+//
+
+var NotificationCenter2 = require('node-notifier').NotificationCenter;
+
+var notifier2 = new NotificationCenter2({
+    withFallback: false, // use Growl if <= 10.8?
+    customPath: void 0 // Relative path if you want to use your fork of terminal-notifier
+});
+
+notifier2.notify({
+    'title': void 0,
+    'subtitle': void 0,
+    'message': void 0,
+    'sound': false, // Case Sensitive string of sound file (see below)
+    'icon': 'Terminal Icon', // Set icon? (Absolute path to image)
+    'contentImage': void 0, // Attach image? (Absolute path)
+    'open': void 0, // URL to open on click
+    'wait': false // if wait for notification to end
+}, function(error: any, response: any) {
+    console.log(response);
+});
+
+//
+// Usage WindowsToaster
+//
+
+var WindowsToaster2 = require('node-notifier').WindowsToaster;
+
+var notifier3 = new WindowsToaster2({
+    withFallback: false, // Fallback to Growl or Balloons?
+    customPath: void 0 // Relative path if you want to use your fork of toast.exe
+});
+
+notifier3.notify({
+    title: void 0,
+    message: void 0,
+    icon: void 0, // absolute path to an icon
+    sound: false, // true | false.
+    wait: false, // if wait for notification to end
+}, function(error: any, response: any) {
+    console.log(response);
+});
+
+//
+// Usage Growl
+//
+
+var Growl2 = require('node-notifier').Growl;
+import * as fs from 'fs';
+
+var notifier4 = new Growl2({
+    name: 'Growl Name Used', // Defaults as 'Node'
+    host: 'localhost',
+    port: 23053
+});
+
+notifier4.notify({
+    title: 'Foo',
+    message: 'Hello World',
+    icon: fs.readFileSync(__dirname + "/coulson.jpg"),
+    wait: false, // if wait for user interaction
+
+    // and other growl options like sticky etc.
+    sticky: false,
+    label: void 0,
+    priority: void 0
+});
+
+//
+// Usage WindowsBalloon
+//
+
+var WindowsBalloon2 = require('node-notifier').WindowsBalloon;
+
+var notifier5 = new WindowsBalloon2({
+    withFallback: false, // Try Windows 8 and Growl first?
+    customPath: void 0 // Relative path if you want to use your fork of notifu
+});
+
+notifier5.notify({
+    title: void 0,
+    message: void 0,
+    sound: false, // true | false.
+    time: 5000, // How long to show balloons in ms
+    wait: false, // if wait for notification to end
+}, function(error: any, response: any) {
+    console.log(response);
+});
+
+//
+// Usage NotifySend
+//
+
+var NotifySend2 = require('node-notifier').NotifySend;
+
+var notifier6 = new NotifySend2();
+
+notifier6.notify({
+    title: 'Foo',
+    message: 'Hello World',
+    icon: __dirname + "/coulson.jpg",
+
+    // .. and other notify-send flags:
+    urgency: void 0,
+    time: void 0,
+    category: void 0,
+    hint: void 0,
+});
diff --git a/node-notifier/node-notifier.d.ts b/node-notifier/node-notifier.d.ts
new file mode 100644
index 000000000..9e612453e
--- /dev/null
+++ b/node-notifier/node-notifier.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for node-notifier
+// Project: https://github.com/mikaelbr/node-notifier
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "node-notifier" {
+    import NotificationCenter = require('node-notifier/notifiers/notificationcenter');
+    import NotifySend = require("node-notifier/notifiers/notifysend");
+    import WindowsToaster = require("node-notifier/notifiers/toaster");
+    import WindowsBalloon = require("node-notifier/notifiers/balloon");
+    import Growl = require("node-notifier/notifiers/growl");
+
+    namespace nodeNotifier {
+        interface NodeNotifier extends NodeJS.EventEmitter {
+            notify(notification?: Notification, callback?: NotificationCallback): NodeNotifier;
+            NotificationCenter: NotificationCenter;
+            NotifySend: NotifySend;
+            WindowsToaster: WindowsToaster;
+            WindowsBalloon: WindowsBalloon;
+            Growl: Growl;
+        }
+
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Absolute path (not balloons) */
+            icon?: string;
+            /** Only Notification Center or Windows Toasters */
+            sound?: boolean;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+        }
+
+        interface NotificationCallback {
+            (err: any, response: any): any;
+        }
+
+        interface Option {
+            withFallback?: boolean;
+            customPath?: string;
+        }
+    }
+
+    var nodeNotifier: nodeNotifier.NodeNotifier;
+
+    export = nodeNotifier;
+}
+
+declare module "node-notifier/notifiers/notificationcenter" {
+    import notifier = require('node-notifier');
+
+    class NotificationCenter {
+        constructor(option?: notifier.Option);
+        notify(notification?: NotificationCenter.Notification, callback?: notifier.NotificationCallback): NotificationCenter;
+    }
+
+    namespace NotificationCenter {
+        interface Notification extends notifier.Notification {
+            subtitle?: string;
+            /** Attach image? (Absolute path) */
+            contentImage?: string;
+            /** URL to open on click */
+            open?: string;
+        }
+    }
+
+    export = NotificationCenter;
+}
+
+declare module "node-notifier/notifiers/notifysend" {
+    import notifier = require('node-notifier');
+
+    class NotifySend {
+        constructor(option?: notifier.Option);
+        notify(notification?: NotifySend.Notification, callback?: notifier.NotificationCallback): NotifySend;
+    }
+
+    namespace NotifySend {
+        interface Notification {
+            title?: string;
+            message?: string;
+            icon?: string;
+            /** Specifies the urgency level  (low,  normal,  critical). */
+            urgency?: string;
+            /** Specifies  the  timeout  in  milliseconds at which to expire the notification */
+            time?: number;
+            /** Specifies the notification category */
+            category?: string;
+            /** Specifies basic extra data to pass. Valid types are int, double, string and byte. */
+            hint?: string;
+        }
+    }
+
+    export = NotifySend;
+}
+
+declare module "node-notifier/notifiers/toaster" {
+    import notifier = require('node-notifier');
+
+    class WindowsToaster {
+        constructor(option?: notifier.Option);
+        notify(notification?: notifier.Notification, callback?: notifier.NotificationCallback): WindowsToaster;
+    }
+
+    export = WindowsToaster;
+}
+
+declare module "node-notifier/notifiers/growl" {
+    import notifier = require('node-notifier');
+
+    class Growl {
+        constructor(option?: Growl.Option);
+        notify(notification?: Growl.Notification, callback?: notifier.NotificationCallback): Growl;
+    }
+
+    namespace Growl {
+        interface Option {
+            name?: string;
+            host?: string;
+            port?: number;
+        }
+
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Absolute path (not balloons) */
+            icon?: string;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+            /** whether or not to sticky the notification (defaults to false) */
+             sticky?: boolean;
+            /** type of notification to use (defaults to the first registered type) */
+            label: string;
+            /** the priority of the notification from lowest (-2) to highest (2) */
+            priority: number;
+        }
+    }
+
+    export = Growl;
+}
+
+declare module "node-notifier/notifiers/balloon" {
+    import notifier = require('node-notifier');
+
+    class WindowsBalloon {
+        constructor(option?: notifier.Option);
+        notify(notification?: WindowsBalloon.Notification, callback?: notifier.NotificationCallback): WindowsBalloon;
+    }
+
+    namespace WindowsBalloon {
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Only Notification Center or Windows Toasters */
+            sound?: boolean;
+            /** How long to show balloons in ms */
+            time?: number;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+        }
+    }
+
+    export = WindowsBalloon;
+}
diff --git a/node-polyglot/node-polyglot-tests.ts b/node-polyglot/node-polyglot-tests.ts
index fee07d79e..249be9577 100644
--- a/node-polyglot/node-polyglot-tests.ts
+++ b/node-polyglot/node-polyglot-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./node-polyglot.d.ts" />
+
 import Polyglot = require("node-polyglot");
 
 function instantiatePolyglot(): void {
diff --git a/node-polyglot/node-polyglot.d.ts b/node-polyglot/node-polyglot.d.ts
index 0f5bd8922..7c29b745c 100644
--- a/node-polyglot/node-polyglot.d.ts
+++ b/node-polyglot/node-polyglot.d.ts
@@ -6,8 +6,10 @@
 declare module "node-polyglot" {
 	module Polyglot {
 		interface InterpolationOptions {
-			smart_count?: number;
+			smart_count?: number | { length: number };
 			_?: string;
+
+			[interpolationKey: string]: any;
 		}
 
 		interface PolyglotOptions {
diff --git a/node-slack/node-slack-tests.ts b/node-slack/node-slack-tests.ts
new file mode 100644
index 000000000..e0c6e23b9
--- /dev/null
+++ b/node-slack/node-slack-tests.ts
@@ -0,0 +1,46 @@
+/// <reference path="../express/express.d.ts" />
+/// <reference path="node-slack.d.ts" />
+
+import express = require('express');
+import Slack = require('node-slack');
+let app = express();
+
+var hook_url: string = 'foo_hook';
+var options: Slack.Option = { proxy: '' };
+
+var slack = new Slack(hook_url, options);
+
+slack.send({
+    text: 'Howdy!',
+    channel: '#foo',
+    username: 'Bot'
+});
+
+var attachment_array: any[] = [];
+
+slack.send({
+    text: 'Howdy!',
+    channel: '#foo',
+    username: 'Bot',
+    icon_emoji: 'taco',
+    attachments: attachment_array,
+    unfurl_links: true,
+    link_names: 1
+});
+
+
+app.post('/yesman', function(req, res) {
+
+    var reply = slack.respond(req.body, function(hook: any) {
+
+        return {
+            text: 'Good point, ' + hook.user_name,
+            username: 'Bot'
+        };
+
+    });
+
+    res.json(reply);
+
+});
+
diff --git a/node-slack/node-slack.d.ts b/node-slack/node-slack.d.ts
new file mode 100644
index 000000000..8243be565
--- /dev/null
+++ b/node-slack/node-slack.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for node-slack
+// Project: https://github.com/xoxco/node-slack
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../request/request.d.ts" />
+
+declare module "node-slack" {
+    import request = require('request');
+
+    class Slack {
+        constructor(hookUrl: string, option?: Slack.Option);
+        send(message: Slack.Message): any; //TODO: Here comes deferred's promise as a return type
+        send(message: Slack.Message, callback: Slack.SendCallback): request.Request;
+        respond(query: Slack.Query): Slack.TextResponse;
+        respond(query: Slack.Query, callback: Slack.ResponseCallback): Slack.TextResponse;
+    }
+
+    namespace Slack {
+
+        interface Option {
+            proxy: string;
+        }
+
+        interface Message {
+            text: string;
+            channel?: string;
+            username?: string;
+            icon_emoji?: string;
+            attachments?: any[];
+            unfurl_links?: boolean;
+            link_names?: number;
+        }
+
+        interface SendCallback {
+            (err: any, body: any): any;
+        }
+
+        interface Query {
+            token?: string;
+            team_id?: string;
+            channel_id?: string;
+            channel_name?: string;
+            timestamp?: number;
+            user_id?: string;
+            user_name?: string;
+            text: string;
+        }
+
+        interface TextResponse {
+            text: string;
+        }
+
+        interface ResponseCallback {
+            (err: any, query: Query): any;
+        }
+    }
+
+    export = Slack;
+}
+
diff --git a/node-uuid/README.md b/node-uuid/README.md
new file mode 100644
index 000000000..234d608e8
--- /dev/null
+++ b/node-uuid/README.md
@@ -0,0 +1,8 @@
+This folder contains definitions for the node-uuid library in 3 flavors:
+
+- node-uuid.d.ts
+    - for use in node environment (default)
+- node-uuid-global.d.ts
+    - for use in browser environment as a global variable
+- node-uuid-cjs.d.ts
+    - for use in browser environment as a CommonJS module (using a loader such as webpack)
\ No newline at end of file
diff --git a/node-uuid/node-uuid-base.d.ts b/node-uuid/node-uuid-base.d.ts
new file mode 100644
index 000000000..255bb6b33
--- /dev/null
+++ b/node-uuid/node-uuid-base.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for node-uuid.js
+// Project: https://github.com/broofa/node-uuid
+// Definitions by: Jeff May <https://github.com/jeffmay>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/** Common definitions for all environments */
+declare namespace __NodeUUID {
+    interface UUIDOptions {
+
+        /**
+         * Node id as Array of 6 bytes (per 4.1.6).
+         * Default: Randomly generated ID. See note 1.
+         */
+        node?: any[];
+
+        /**
+         * (Number between 0 - 0x3fff) RFC clock sequence.
+         * Default: An internally maintained clockseq is used.
+         */
+        clockseq?: number;
+
+        /**
+         * (Number | Date) Time in milliseconds since unix Epoch.
+         * Default: The current time is used.
+         */
+        msecs?: number|Date;
+
+        /**
+         * (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if msecs is unspecified.
+         * Default: internal uuid counter is used, as per 4.2.1.2.
+         */
+        nsecs?: number;
+    }
+
+    interface UUID {
+        v1(options?: UUIDOptions): string;
+        v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+        v2(options?: UUIDOptions): string;
+        v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+        v3(options?: UUIDOptions): string;
+        v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+        v4(options?: UUIDOptions): string;
+        v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+        parse(id: string, buffer?: number[], offset?: number): number[];
+
+        unparse(buffer: number[], offset?: number): string;
+    }
+}
diff --git a/node-uuid/node-uuid-cjs-tests.ts b/node-uuid/node-uuid-cjs-tests.ts
new file mode 100644
index 000000000..197e4b384
--- /dev/null
+++ b/node-uuid/node-uuid-cjs-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="node-uuid-cjs.d.ts" />
+
+import nodeUuid = require('node-uuid');
+
+var uid1: string = nodeUuid.v1();
+var uid2: string = nodeUuid.v2();
+var uid3: string = nodeUuid.v3();
+var uid4: string = nodeUuid.v4();
+
+var options: __NodeUUID.UUIDOptions = {
+  node: [],
+  clockseq: 2,
+  nsecs: 3,
+  msecs: new Date()
+};
+
+var padding: number[] = [0, 1, 2];
+
+var offset: number = 15;
+
+var buf : number[] = [];
+
+nodeUuid.parse(uid4, buf, offset);
+nodeUuid.unparse(buf, offset);
+
+var uid21: number[] = nodeUuid.v1(options, padding, offset);
+var uid22: number[] = nodeUuid.v2(options, padding, offset);
+var uid23: number[] = nodeUuid.v3(options, padding, offset);
+var uid24: number[] = nodeUuid.v4(options, padding, offset);
diff --git a/node-uuid/node-uuid-cjs.d.ts b/node-uuid/node-uuid-cjs.d.ts
new file mode 100644
index 000000000..1c765abd7
--- /dev/null
+++ b/node-uuid/node-uuid-cjs.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for node-uuid.js
+// Project: https://github.com/broofa/node-uuid
+// Definitions by: Jeff May <https://github.com/jeffmay>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./node-uuid-base.d.ts" />
+
+/**
+ * Expose as CommonJS module
+ * For use in node environment or browser environment (using webpack or other module loaders)
+ */
+declare module "node-uuid" {
+    var uuid: __NodeUUID.UUID;
+    export = uuid;
+}
\ No newline at end of file
diff --git a/node-uuid/node-uuid-global-tests.ts b/node-uuid/node-uuid-global-tests.ts
new file mode 100644
index 000000000..ad98519aa
--- /dev/null
+++ b/node-uuid/node-uuid-global-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="node-uuid-global.d.ts" />
+
+var uid1: string = uuid.v1();
+var uid2: string = uuid.v2();
+var uid3: string = uuid.v3();
+var uid4: string = uuid.v4();
+
+var options: __NodeUUID.UUIDOptions = {
+  node: [],
+  clockseq: 2,
+  nsecs: 3,
+  msecs: new Date()
+};
+
+var padding: number[] = [0, 1, 2];
+
+var offset: number = 15;
+
+var buf : number[] = [];
+
+uuid.parse(uid4, buf, offset);
+uuid.unparse(buf, offset);
+
+var uid21: number[] = uuid.v1(options, padding, offset);
+var uid22: number[] = uuid.v2(options, padding, offset);
+var uid23: number[] = uuid.v3(options, padding, offset);
+var uid24: number[] = uuid.v4(options, padding, offset);
diff --git a/node-uuid/node-uuid-global.d.ts b/node-uuid/node-uuid-global.d.ts
new file mode 100644
index 000000000..908f01dc9
--- /dev/null
+++ b/node-uuid/node-uuid-global.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for node-uuid.js
+// Project: https://github.com/broofa/node-uuid
+// Definitions by: Jeff May <https://github.com/jeffmay>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./node-uuid-base.d.ts" />
+
+/** Expose as global variable */
+declare var uuid: __NodeUUID.UUID;
diff --git a/node-uuid/node-uuid-tests.ts b/node-uuid/node-uuid-tests.ts
index e922c04de..0c9c31109 100644
--- a/node-uuid/node-uuid-tests.ts
+++ b/node-uuid/node-uuid-tests.ts
@@ -1,36 +1,36 @@
 /// <reference path="node-uuid.d.ts" />
 
-import uuid = require('node-uuid');
+import nodeUuid = require('node-uuid');
 
-var uid1: string = uuid.v1()
-var uid2: string = uuid.v2()
-var uid3: string = uuid.v3()
-var uid4: string = uuid.v4()
+var uid1: string = nodeUuid.v1();
+var uid2: string = nodeUuid.v2();
+var uid3: string = nodeUuid.v3();
+var uid4: string = nodeUuid.v4();
 
-var options: UUIDOptions = {
+var options: __NodeUUID.UUIDOptions = {
   node: [],
   clockseq: 2,
   nsecs: 3,
   msecs: new Date()
-}
+};
 
-var padding: number[] = [0, 1, 2]
+var padding: number[] = [0, 1, 2];
 
-var offset: number = 15
+var offset: number = 15;
 
-var buf : number[] = []
+var buf : number[] = [];
 
-uuid.parse(uid4, buf, offset)
-uuid.unparse(buf, offset)
+nodeUuid.parse(uid4, buf, offset);
+nodeUuid.unparse(buf, offset);
 
-var uid21: number[] = uuid.v1(options, padding, offset)
-var uid22: number[] = uuid.v2(options, padding, offset)
-var uid23: number[] = uuid.v3(options, padding, offset)
-var uid24: number[] = uuid.v4(options, padding, offset)
+var uid21: number[] = nodeUuid.v1(options, padding, offset);
+var uid22: number[] = nodeUuid.v2(options, padding, offset);
+var uid23: number[] = nodeUuid.v3(options, padding, offset);
+var uid24: number[] = nodeUuid.v4(options, padding, offset);
 
 var buffer: Buffer;
 
-var uid31: Buffer = uuid.v1(options, buffer, offset)
-var uid32: Buffer = uuid.v2(options, buffer, offset)
-var uid33: Buffer = uuid.v3(options, buffer, offset)
-var uid34: Buffer = uuid.v4(options, buffer, offset)
+var uid31: Buffer = nodeUuid.v1(options, buffer, offset);
+var uid32: Buffer = nodeUuid.v2(options, buffer, offset);
+var uid33: Buffer = nodeUuid.v3(options, buffer, offset);
+var uid34: Buffer = nodeUuid.v4(options, buffer, offset);
diff --git a/node-uuid/node-uuid.d.ts b/node-uuid/node-uuid.d.ts
index aec39084f..bb7270809 100644
--- a/node-uuid/node-uuid.d.ts
+++ b/node-uuid/node-uuid.d.ts
@@ -4,60 +4,41 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
+/// <reference path="./node-uuid-base.d.ts" />
+/// <reference path="./node-uuid-cjs.d.ts" />
 
-interface UUIDOptions {
-
+/**
+ * Definitions for use in node environment
+ *
+ * !! For browser enviroments, use node-uuid-global or node-uuid-cjs
+ */
+declare module __NodeUUID {
     /**
-     * Node id as Array of 6 bytes (per 4.1.6).
-     * Default: Randomly generated ID. See note 1.
+     * Overloads for node environment
+     * We need to duplicate some declarations because
+     * interface merging doesn't work with overloads
      */
-    node?: any[]
+    interface UUID {
+        v1(options?: UUIDOptions): string;
+        v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+        v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
 
-    /**
-     * (Number between 0 - 0x3fff) RFC clock sequence.
-     * Default: An internally maintained clockseq is used.
-     */
-    clockseq?: number
+        v2(options?: UUIDOptions): string;
+        v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+        v2(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
 
-    /**
-     * (Number | Date) Time in milliseconds since unix Epoch.
-     * Default: The current time is used.
-     */
-    msecs?: number|Date
+        v3(options?: UUIDOptions): string;
+        v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+        v3(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
 
-    /**
-     * (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if msecs is unspecified.
-     * Default: internal uuid counter is used, as per 4.2.1.2.
-     */
-    nsecs?: number
-}
+        v4(options?: UUIDOptions): string;
+        v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+        v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
 
-interface UUID {
-    v1(options?: UUIDOptions): string
-    v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
-    v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
+        parse(id: string, buffer?: number[], offset?: number): number[];
+        parse(id: string, buffer?: Buffer, offset?: number): Buffer;
 
-    v2(options?: UUIDOptions): string
-    v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
-    v2(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
-
-    v3(options?: UUIDOptions): string
-    v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
-    v3(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
-
-    v4(options?: UUIDOptions): string
-    v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[]
-    v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer
-
-    parse(id: string, buffer?: number[], offset?: number): number[]
-    parse(id: string, buffer?: Buffer, offset?: number): Buffer
-
-    unparse(buffer: number[], offset?: number): string
-    unparse(buffer: Buffer, offset?: number): string
-}
-
-declare var uuid: UUID;
-
-declare module "node-uuid" {
-    export = uuid;
+        unparse(buffer: number[], offset?: number): string;
+        unparse(buffer: Buffer, offset?: number): string;
+    }
 }
diff --git a/node-validator/node-validator-tests.ts b/node-validator/node-validator-tests.ts
new file mode 100644
index 000000000..8f45c1685
--- /dev/null
+++ b/node-validator/node-validator-tests.ts
@@ -0,0 +1,23 @@
+/// <reference path="node-validator.d.ts"/>
+
+import { run, isObject, isString, isIsoDate, isArray } from 'node-validator';
+
+let checkChild = isObject()
+  .withRequired('prop', isString({ regex: /^[abc]+$/ }));
+
+let check = isObject()
+  .withRequired('_id', isString({ regex: /^[abc]+$/ }))
+  .withOptional('date', isIsoDate())
+  .withOptional('children', isArray(checkChild, {min: 1}));
+
+let toValidate = {
+  _id: 'abababa',
+  date: '2013-10-24',
+  children: [{
+    prop: 'zxzx'
+  }]
+};
+
+run(check, toValidate, function(errorCount, errors) {
+
+});
diff --git a/node-validator/node-validator.d.ts b/node-validator/node-validator.d.ts
new file mode 100644
index 000000000..90684a9dc
--- /dev/null
+++ b/node-validator/node-validator.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for node-validator
+// Project: https://www.npmjs.com/package/node-validator
+// Definitions by: Ken Gorab <https://github.com/kengorab>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module ValidatorOptions {
+    interface IsStringOptions {
+        regex?: RegExp,
+        message?: String
+    }
+
+    interface IsNumberOptions {
+        min?: Number,
+        max?: Number
+    }
+
+    interface IsDateOptions {
+        format?: String,
+        message?: String
+    }
+
+    type Options = IsStringOptions | IsNumberOptions | IsDateOptions;
+}
+
+declare module Validator {
+    type ValidateFn = (value: any, onError: (message: String, childName: String, childValie: any) => void) => void;
+
+    interface Validatable {
+        validate: ValidateFn
+    }
+
+    interface IsObjectValidator extends Validatable {
+        withRequired: (name: String, validator: Validatable) => IsObjectValidator,
+        withOptional: (name: String, validator: Validatable) => IsObjectValidator,
+        custom: (customValidator: Validatable) => IsObjectValidator,
+        validate: ValidateFn
+    }
+
+    function express(validator: Validatable): any;
+    function bodyValidator(validator: Validatable): any;
+    function expressParams(validator: Validatable): any;
+    function paramsValidator(validator: Validatable): any;
+    function expressQuery(validator: Validatable): any;
+    function queryValidator(validator: Validatable): any;
+
+    function run(validator: Validatable, value: any, callback: (errorCount: Number, errors: Array<any>) => void): void;
+
+    function isObject(): IsObjectValidator;
+    function isString(options?: ValidatorOptions.IsStringOptions): Validatable;
+    function isStringOrNull(options?: ValidatorOptions.IsStringOptions): Validatable;
+    function isBoolean(): Validatable;
+    function isNumber(options?: ValidatorOptions.IsNumberOptions): Validatable;
+    function isInteger(options?: ValidatorOptions.IsNumberOptions): Validatable;
+    function isDate(options?: ValidatorOptions.IsDateOptions): Validatable;
+    function isIsoDate(options?: ValidatorOptions.IsDateOptions): Validatable;
+    function isIsoDateTime(options?: ValidatorOptions.IsDateOptions): Validatable;
+
+    function isArray(validator?: Validatable, options?: ValidatorOptions.Options): Validatable;
+    function isAnyObject(): IsObjectValidator;
+}
+
+declare module 'node-validator' {
+    export = Validator;
+}
diff --git a/node/node-0.10.d.ts b/node/node-0.10.d.ts
index 2f3824462..9a8eac40e 100644
--- a/node/node-0.10.d.ts
+++ b/node/node-0.10.d.ts
@@ -1244,6 +1244,7 @@ declare module "stream" {
     export interface WritableOptions {
         highWaterMark?: number;
         decodeStrings?: boolean;
+        objectMode?: boolean;
     }
 
     export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
diff --git a/node/node-0.11.d.ts b/node/node-0.11.d.ts
index cd55bdfb1..e4bfa91dc 100644
--- a/node/node-0.11.d.ts
+++ b/node/node-0.11.d.ts
@@ -1089,14 +1089,15 @@ declare module "crypto" {
         setAutoPadding(auto_padding: boolean): void;
     }
     export function createSign(algorithm: string): Signer;
-    interface Signer {
+    interface Signer extends NodeJS.WritableStream {
         update(data: any): void;
         sign(private_key: string, output_format: string): string;
     }
     export function createVerify(algorith: string): Verify;
-    interface Verify {
+    interface Verify extends NodeJS.WritableStream {
         update(data: any): void;
         verify(object: string, signature: string, signature_format?: string): boolean;
+        objectMode?: boolean;
     }
     export function createDiffieHellman(prime_length: number): DiffieHellman;
     export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
@@ -1151,6 +1152,7 @@ declare module "stream" {
     export interface WritableOptions {
         highWaterMark?: number;
         decodeStrings?: boolean;
+        objectMode?: boolean;
     }
 
     export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 19f686ef5..a73a35e22 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -34,6 +34,8 @@ assert.doesNotThrow(() => {
 fs.writeFile("thebible.txt",
     "Do unto others as you would have them do unto you.",
     assert.ifError);
+    
+fs.write(1234, "test");
 
 fs.writeFile("Harry Potter",
     "\"You be wizzing, Harry,\" jived Dumbledore.",
diff --git a/node/node.d.ts b/node/node.d.ts
index 027c654ac..e90a4a146 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -9,6 +9,11 @@
 *                                               *
 ************************************************/
 
+interface Error {
+    stack?: string;
+}
+
+
 // compat for TypeScript 1.5.3
 // if you use with --target es3 or --target es5 and use below definitions,
 // use the lib.es6.d.ts that is bundled with TypeScript 1.5.3.
@@ -188,8 +193,7 @@ declare module NodeJS {
 
     export interface WritableStream extends EventEmitter {
         writable: boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
+        write(buffer: Buffer|string, cb?: Function): boolean;
         write(str: string, encoding?: string, cb?: Function): boolean;
         end(): void;
         end(buffer: Buffer, cb?: Function): void;
@@ -1062,6 +1066,7 @@ declare module "fs" {
         atime: Date;
         mtime: Date;
         ctime: Date;
+        birthtime: Date;
     }
 
     interface FSWatcher extends events.EventEmitter {
@@ -1214,6 +1219,9 @@ declare module "fs" {
     export function fsyncSync(fd: number): void;
     export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
     export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
     export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
     export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
     export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
@@ -1302,21 +1310,15 @@ declare module "fs" {
     export function createReadStream(path: string, options?: {
         flags?: string;
         encoding?: string;
-        fd?: string;
+        fd?: number;
         mode?: number;
-        bufferSize?: number;
-    }): ReadStream;
-    export function createReadStream(path: string, options?: {
-        flags?: string;
-        encoding?: string;
-        fd?: string;
-        mode?: string;
-        bufferSize?: number;
+        autoClose?: boolean;
     }): ReadStream;
     export function createWriteStream(path: string, options?: {
         flags?: string;
         encoding?: string;
-        string?: string;
+        fd?: number;
+        mode?: number;
     }): WriteStream;
 }
 
@@ -1622,12 +1624,12 @@ declare module "crypto" {
         setAutoPadding(auto_padding: boolean): void;
     }
     export function createSign(algorithm: string): Signer;
-    interface Signer {
+    interface Signer extends NodeJS.WritableStream {
         update(data: any): void;
         sign(private_key: string, output_format: string): string;
     }
     export function createVerify(algorith: string): Verify;
-    interface Verify {
+    interface Verify extends NodeJS.WritableStream {
         update(data: any): void;
         verify(object: string, signature: string, signature_format?: string): boolean;
     }
@@ -1671,14 +1673,13 @@ declare module "stream" {
         readable: boolean;
         constructor(opts?: ReadableOptions);
         _read(size: number): void;
-        read(size?: number): string|Buffer;
+        read(size?: number): any;
         setEncoding(encoding: string): void;
         pause(): void;
         resume(): void;
         pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
         unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: string): void;
-        unshift(chunk: Buffer): void;
+        unshift(chunk: any): void;
         wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
         push(chunk: any, encoding?: string): boolean;
     }
@@ -1686,20 +1687,18 @@ declare module "stream" {
     export interface WritableOptions {
         highWaterMark?: number;
         decodeStrings?: boolean;
+        objectMode?: boolean;
     }
 
     export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
         writable: boolean;
         constructor(opts?: WritableOptions);
-        _write(data: Buffer, encoding: string, callback: Function): void;
-        _write(data: string, encoding: string, callback: Function): void;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
         end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
     }
 
     export interface DuplexOptions extends ReadableOptions, WritableOptions {
@@ -1710,15 +1709,12 @@ declare module "stream" {
     export class Duplex extends Readable implements NodeJS.ReadWriteStream {
         writable: boolean;
         constructor(opts?: DuplexOptions);
-        _write(data: Buffer, encoding: string, callback: Function): void;
-        _write(data: string, encoding: string, callback: Function): void;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
+        _write(chunk: any, encoding: string, callback: Function): void;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
         end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
     }
 
     export interface TransformOptions extends ReadableOptions, WritableOptions {}
@@ -1728,8 +1724,7 @@ declare module "stream" {
         readable: boolean;
         writable: boolean;
         constructor(opts?: TransformOptions);
-        _transform(chunk: Buffer, encoding: string, callback: Function): void;
-        _transform(chunk: string, encoding: string, callback: Function): void;
+        _transform(chunk: any, encoding: string, callback: Function): void;
         _flush(callback: Function): void;
         read(size?: number): any;
         setEncoding(encoding: string): void;
@@ -1737,17 +1732,14 @@ declare module "stream" {
         resume(): void;
         pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
         unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: string): void;
-        unshift(chunk: Buffer): void;
+        unshift(chunk: any): void;
         wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
         push(chunk: any, encoding?: string): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
         end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
     }
 
     export class PassThrough extends Transform {}
@@ -1774,6 +1766,7 @@ declare module "util" {
     export function isDate(object: any): boolean;
     export function isError(object: any): boolean;
     export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key:string): (msg:string,...param: any[])=>void;
 }
 
 declare module "assert" {
diff --git a/node_redis/node_redis.d.ts b/node_redis/node_redis.d.ts
index 8505556fb..4328e299b 100644
--- a/node_redis/node_redis.d.ts
+++ b/node_redis/node_redis.d.ts
@@ -17,6 +17,11 @@ declare module 'redis' {
         socket_nodelay?: boolean;
         no_ready_check?: boolean;
         enable_offline_queue?: boolean;
+        retry_max_delay?: number;
+        connect_timeout?: boolean;
+        max_attempts?: number;
+        auth_pass?: string;
+        family?: string; // "IPv4" | "IPv6"
     }
 
     interface Command {
diff --git a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts b/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
index a12d66991..fa49fb54f 100644
--- a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
+++ b/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
@@ -18,6 +18,40 @@ declare module "nodemailer-smtp-transport" {
 		}
 
 		export interface SmtpOptions {
+			/**
+			 * Fills in certain SMTP configurations options (e.g. 'host', 'port', and 'secure') for
+			 * well-known services. Possible values:
+			 *   - '1und1'
+			 *   - 'AOL'
+			 *   - 'DebugMail.io'
+			 *   - 'DynectEmail'
+			 *   - 'FastMail'
+			 *   - 'GandiMail'
+			 *   - 'Gmail'
+			 *   - 'Godaddy'
+			 *   - 'GodaddyAsia'
+			 *   - 'GodaddyEurope'
+			 *   - 'hot.ee'
+			 *   - 'Hotmail'
+			 *   - 'iCloud'
+			 *   - 'mail.ee'
+			 *   - 'Mail.ru'
+			 *   - 'Mailgun'
+			 *   - 'Mailjet'
+			 *   - 'Mandrill'
+			 *   - 'Naver'
+			 *   - 'Postmark'
+			 *   - 'QQ'
+			 *   - 'QQex'
+			 *   - 'SendCloud'
+			 *   - 'SendGrid'
+			 *   - 'SES'
+			 *   - 'Sparkpost'
+			 *   - 'Yahoo'
+			 *   - 'Yandex'
+			 *   - 'Zoho'
+			 */
+			service?: string;
 			/**
 			 * is the port to connect to (defaults to 25 or 465)
 			 */
diff --git a/nouislider/nouislider-tests.ts b/nouislider/nouislider-tests.ts
index 837776dfa..2739e609c 100644
--- a/nouislider/nouislider-tests.ts
+++ b/nouislider/nouislider-tests.ts
@@ -49,17 +49,14 @@ noUiSlider.create(testHtmlElement, {
         min: 0,
         max: 10
     },
-	mode: 'steps',
-	density: 3,
-	filter: function(){return 1},
-	format: wNumb({
-		decimals: 2,
-		prefix: '$'
-	}),
     pips: {
-        mode: 'range',
+        mode: 'steps',
         density: 3,
-    	values: [50, 552, 4651, 4952, 5000, 7080, 9000]
+        filter: function () { return 1 },
+        format: wNumb({
+            decimals: 2,
+            prefix: '$'
+        }),
     }
 });
 
diff --git a/nouislider/nouislider.d.ts b/nouislider/nouislider.d.ts
index e382059fb..4b1068019 100644
--- a/nouislider/nouislider.d.ts
+++ b/nouislider/nouislider.d.ts
@@ -5,12 +5,10 @@
 /// <reference path="../wnumb/wnumb.d.ts"/>
 
 declare module noUiSlider {
-    interface Static {
-        /**
-         * To create a slider, call noUiSlider.create() with an element and your options.
-         */
-        create(target: HTMLElement, options: Options): void;
-    }
+    /**
+     * To create a slider, call noUiSlider.create() with an element and your options.
+     */
+    function create(target: HTMLElement, options: Options): void;
 
     interface Options {
         /**
@@ -76,24 +74,29 @@ declare module noUiSlider {
          */
         format?: Object | ((...args:any[]) => any);
 
+        /**
+         * Allows you to generate points along the slider.
+         */
+        pips?: PipsOptions;
     }
 
     interface PipsOptions {
         /**
-         * The range mode uses the slider range to determine where the pips should be. A pip is generated for every percentage specified.
+         * The 'range' mode uses the slider range to determine where the pips should be. A pip is generated for every percentage specified.
          *
-         * Like range, the steps mode uses the slider range. In steps mode, a pip is generated for every step.
-         * The filter option can be used to filter the generated pips.
+         * The 'steps', like 'range', uses the slider range. In steps mode, a pip is generated for every step.
+         * The 'filter' option can be used to filter the generated pips from the 'steps' options'
          * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
          *
-         * In positions mode, pips are generated at percentage-based positions on the slider. Optionally, the stepped option can be set to true to match the pips to the slider steps.
+         * In 'positions' mode, pips are generated at percentage-based positions on the slider.
+         * Optionally, the stepped option can be set to true to match the pips to the slider steps.
          *
-         * The count mode can be used to generate a fixed number of pips. As with positions mode, the stepped option can be used.
+         * The 'count' mode can be used to generate a fixed number of pips. As with positions mode, the stepped option can be used.
          *
-         * The values mode is similar to positions, but it accepts values instead of percentages. The stepped option can be used for this mode.
+         * The 'values' mode is similar to positions, but it accepts values instead of percentages. The stepped option can be used for this mode.
          *
          */
-        mode: string;
+        mode: string; // "range" | "steps" | "positions" | "count" | "values"
         /**
          * Range Mode: percentage for range mode
          * Step Mode: step number for steps
@@ -105,7 +108,7 @@ declare module noUiSlider {
          * Step Mode: The filter option can be used to filter the generated pips.
          * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
          */
-        filter?: (...args:any[]) => number;
+        filter?: (...args: any[]) => PipFilterResult;
         /**
          * format for step mode
          * see noUiSlider format
@@ -123,6 +126,12 @@ declare module noUiSlider {
         stepped?: boolean;
     }
 
+    const enum PipFilterResult {
+        NoValue,
+        LargeValue,
+        SmallValue,
+    }
+
     interface Callback {
         /**
          * Array for both one-handle and two-handle sliders. It contains the current slider values,
@@ -165,6 +174,3 @@ declare module noUiSlider {
         noUiSlider: noUiSlider
     }
 }
-
-declare var noUiSlider: noUiSlider.Static;
-
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d332a49ef..da07b4d07 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -3,14 +3,13 @@
   "version": "0.0.1",
   "dependencies": {
     "definition-tester": {
-      "version": "0.2.0",
-      "from": "definition-tester@0.2.0",
-      "resolved": "https://registry.npmjs.org/definition-tester/-/definition-tester-0.2.0.tgz",
+      "version": "0.3.0",
+      "from": "definition-tester@0.3.0",
       "dependencies": {
         "bluebird": {
-          "version": "2.9.34",
-          "from": "bluebird@>=2.5.3 <3.0.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"
+          "version": "2.10.1",
+          "from": "bluebird@>=2.10.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
         },
         "definition-header": {
           "version": "0.1.0",
@@ -23,24 +22,24 @@
               "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "2.14.0",
+                  "version": "2.16.3",
                   "from": "hoek@>=2.2.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                 },
                 "topo": {
-                  "version": "1.0.2",
+                  "version": "1.0.3",
                   "from": "topo@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz"
+                  "resolved": "https://registry.npmjs.org/topo/-/topo-1.0.3.tgz"
                 },
                 "isemail": {
-                  "version": "1.1.1",
+                  "version": "1.2.0",
                   "from": "isemail@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz"
+                  "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"
                 },
                 "moment": {
-                  "version": "2.10.3",
+                  "version": "2.10.6",
                   "from": "moment@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz"
+                  "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
                 }
               }
             },
@@ -76,71 +75,9 @@
           }
         },
         "findup-sync": {
-          "version": "0.2.1",
-          "from": "findup-sync@>=0.2.1 <0.3.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "4.3.5",
-              "from": "glob@>=4.3.0 <4.4.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "2.0.9",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.0",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.2.0",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
+          "version": "0.3.0",
+          "from": "findup-sync@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
         },
         "git-wrapper": {
           "version": "0.1.1",
@@ -148,9 +85,9 @@
           "resolved": "https://registry.npmjs.org/git-wrapper/-/git-wrapper-0.1.1.tgz"
         },
         "glob": {
-          "version": "4.5.3",
-          "from": "glob@>=4.3.2 <5.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "version": "5.0.14",
+          "from": "glob@>=5.0.14 <6.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
           "dependencies": {
             "inflight": {
               "version": "1.0.4",
@@ -170,9 +107,9 @@
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
-              "version": "2.0.9",
+              "version": "2.0.10",
               "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.9.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
@@ -204,13 +141,18 @@
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
+            },
+            "path-is-absolute": {
+              "version": "1.0.0",
+              "from": "path-is-absolute@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
             }
           }
         },
         "lazy.js": {
-          "version": "0.4.0",
-          "from": "lazy.js@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.0.tgz"
+          "version": "0.4.2",
+          "from": "lazy.js@>=0.4.2 <0.5.0",
+          "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.2.tgz"
         },
         "manticore": {
           "version": "0.2.4",
@@ -305,9 +247,9 @@
       }
     },
     "typescript": {
-      "version": "1.5.3",
-      "from": "typescript@1.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.5.3.tgz"
+      "version": "1.6.2",
+      "from": "typescript@1.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz"
     }
   }
 }
diff --git a/obelisk.js/obelisk.js-tests.ts b/obelisk.js/obelisk.js-tests.ts
new file mode 100644
index 000000000..bc706cec8
--- /dev/null
+++ b/obelisk.js/obelisk.js-tests.ts
@@ -0,0 +1,148 @@
+/// <reference path="obelisk.js.d.ts"/>
+
+function test_brick() {
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
+
+    var point = new obelisk.Point(500, 20);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    var color = new obelisk.SideColor().getByInnerColor(obelisk.ColorPattern.PINK);
+    var dimension = new obelisk.BrickDimension(300, 400);
+    var brick = new obelisk.Brick(dimension, color);
+
+    pixelView.renderObject(brick);
+    var p3D = new obelisk.Point3D(20, 20, 0);
+    pixelView.renderObject(brick, p3D);
+}
+
+function test_cube() {
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
+
+    var point = new obelisk.Point(500, 240);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    var dimension = new obelisk.CubeDimension(120, 200, 60);
+    var color = new obelisk.CubeColor().getByHorizontalColor(obelisk.ColorPattern.GRAY);
+    var cube = new obelisk.Cube(dimension, color, false);
+    pixelView.renderObject(cube);
+}
+
+function test_pyramid() {
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
+
+    var point = new obelisk.Point(500, 240);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    var dimension = new obelisk.PyramidDimension(120);
+    var color = new obelisk.PyramidColor().getByRightColor(obelisk.ColorPattern.YELLOW);
+    var pyramid = new obelisk.Pyramid(dimension, color);
+    pixelView.renderObject(pyramid);
+}
+
+function test_side() {
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
+
+    var point = new obelisk.Point(500, 200);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    var colorX = new obelisk.SideColor().getByInnerColor(obelisk.ColorPattern.PINK);
+    var colorY = new obelisk.SideColor().getByInnerColor(obelisk.ColorPattern.GRASS_GREEN);
+    var dimensionX = new obelisk.SideXDimension(300, 100);
+    var dimensionY = new obelisk.SideYDimension(300, 100);
+    var sideX = new obelisk.SideX(dimensionX, colorX);
+    var sideY = new obelisk.SideY(dimensionY, colorY);
+
+    pixelView.renderObject(sideX);
+
+    var p3DY = new obelisk.Point3D(0, 30, 0);
+    pixelView.renderObject(sideY, p3DY);
+}
+
+function test_slope() {
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
+
+    var point = new obelisk.Point(550, 50);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    var colorBrick = new obelisk.SideColor().getByInnerColor(obelisk.ColorPattern.GRAY);
+    var dimension = new obelisk.BrickDimension(150, 400);
+    var brick = new obelisk.Brick(dimension, colorBrick);
+
+    pixelView.renderObject(brick);
+
+    var color = new obelisk.SlopeColor().getByHorizontalColor(obelisk.ColorPattern.GRAY);
+
+    var dimensionNorth = new obelisk.SlopeDimension(50, 40);
+    var dimensionEast = new obelisk.SlopeDimension(40, 50);
+    var dimensionSouth = new obelisk.SlopeDimension(50, 40);
+    var dimensionWest = new obelisk.SlopeDimension(40, 50);
+
+    var slopeNorth = new obelisk.SlopeNorth(dimensionNorth, color, false);
+    var slopeEast = new obelisk.SlopeEast(dimensionEast, color);
+    var slopeSouth = new obelisk.SlopeSouth(dimensionSouth, color);
+    var slopeWest = new obelisk.SlopeWest(dimensionWest, color);
+
+    var p3dNorth = new obelisk.Point3D(50, 50, 0);
+    var p3dEast = new obelisk.Point3D(50, 200, 0);
+    var p3dSouth = new obelisk.Point3D(50, 125, 0);
+    var p3dWest = new obelisk.Point3D(50, 275, 0);
+
+    pixelView.renderObject(slopeNorth, p3dNorth);
+    pixelView.renderObject(slopeSouth, p3dSouth);
+    pixelView.renderObject(slopeEast, p3dEast);
+    pixelView.renderObject(slopeWest, p3dWest);
+
+    pixelView.clear();
+}
+
+function test_gif_rendering() {
+    var WIDTH = 64;
+    var HEIGHT = 28;
+
+    var img = <HTMLCanvasElement>document.getElementById('animation');
+    var ctx = <CanvasRenderingContext2D>document.createElement('canvas').getContext("2d");
+    var canvas = <HTMLCanvasElement>document.getElementById('canvas-uncle');
+
+    var stack: any[] = [];
+    var size = 8;
+    var point = new obelisk.Point(50, 120);
+    var pixelView = new obelisk.PixelView(canvas, point);
+
+    function draw() {
+        ctx.drawImage(img, 0, 0, WIDTH, HEIGHT);
+        var imgData = ctx.getImageData(0, 0, WIDTH, HEIGHT);
+        pixelView.clear();
+        for (var y = HEIGHT - 1; y >= 0; y--) {
+            for (var x = 0; x < WIDTH - 1; x++) {
+                var pixelColor = obelisk.CanvasTool.getPixel(imgData, x, y);
+                if (pixelColor !== 0xFFFFFF) {
+                    var cube: obelisk.Cube;
+                    var flag = false;
+                    for (var i in stack) {
+                        if (stack[i][1] === pixelColor) {
+                            cube = stack[i][0];
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if (!flag) {
+                        var fixedColor = obelisk.ColorGeom.applyBrightness(pixelColor, 50);
+                        var color = new obelisk.CubeColor().getByHorizontalColor(fixedColor);
+                        var dimension = new obelisk.CubeDimension(size, size + 2, size);
+                        cube = new obelisk.Cube(dimension, color, false);
+                        stack.push([cube, pixelColor]);
+                    }
+                    var p3d = new obelisk.Point3D(x * (size - 2), 0, (HEIGHT - 1 - y) * (size));
+                    pixelView.renderObject(cube, p3d);
+                }
+            }
+        }
+    }
+    window.setInterval(draw, 50);
+
+    var canvasFloor = <HTMLCanvasElement>document.getElementById('canvas-floor');
+    var pixelViewFloor = new obelisk.PixelView(canvasFloor, point);
+    var floorDimension = new obelisk.CubeDimension((size - 2) * (WIDTH + 2), (size - 2) * 9, size);
+    var floor = new obelisk.Cube(floorDimension, new obelisk.CubeColor(), false);
+    pixelViewFloor.renderObject(floor, new obelisk.Point3D(-20, -30, 0));
+}
\ No newline at end of file
diff --git a/obelisk.js/obelisk.js.d.ts b/obelisk.js/obelisk.js.d.ts
new file mode 100644
index 000000000..32a53ebce
--- /dev/null
+++ b/obelisk.js/obelisk.js.d.ts
@@ -0,0 +1,228 @@
+// Type definitions for obelisk.js v1.1.0
+// Project: https://github.com/nosir/obelisk.js/
+// Definitions by: Brian Drupieski <https://github.com/bdrupieski/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module obelisk {
+
+    export var version: string;
+    export var author: string;
+
+    export class Matrix {
+        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        tx: number;
+        ty: number;
+    }
+
+    export class Point {
+        constructor(x?: number, y?: number);
+
+        x: number;
+        y: number;
+    }
+
+    export class Point3D {
+        constructor(x?: number, y?: number, z?: number);
+
+        x: number;
+        y: number;
+        z: number;
+
+        toGlobalCoordinates(offset?: obelisk.Point): obelisk.Point;
+    }
+
+    export class ColorGeom {
+        static get32(color: number): number;
+        static applyBrightness(color: number, brightness: number, highlight?: boolean): number;
+    }
+
+    export class ColorPattern {
+        static GRASS_GREEN: number;
+        static YELLOW: number;
+        static WINE_RED: number;
+        static PINK: number;
+        static PURPLE: number;
+        static BLUE: number;
+        static GRAY: number;
+        static BLACK: number;
+        static FINE_COLORS: number[];
+
+        static getRandomComfortableColor(): number;
+    }
+
+    export class CanvasTool {
+        static getPixel(imageData: ImageData, x: number, y: number): number;
+    }
+
+    export class CanvasManager {
+        static defaultCanvas: HTMLCanvasElement;
+
+        static getDefaultCanvas(): HTMLCanvasElement;
+        static getNewCanvas(): HTMLCanvasElement;
+    }
+
+    export class AbstractColor {
+        constructor();
+
+        inner: number;
+        border: number;
+        borderHighlight: number;
+        left: number;
+        right: number;
+        horizontal: number;
+        leftSlope: number;
+        rightSlope: number;
+    }
+
+    export class CubeColor extends AbstractColor {
+        constructor(border?: number, borderHighlight?: number, left?: number, right?: number, horizontal?: number);
+
+        BRIGHTNESS_GAIN: number;
+
+        getByHorizontalColor(horizontal: number): CubeColor;
+    }
+
+    export class PyramidColor extends AbstractColor {
+        constructor(border?: number, borderHighlight?: number, left?: number, right?: number);
+
+        BRIGHTNESS_GAIN: number;
+
+        getByRightColor(horizontal: number): PyramidColor;
+    }
+
+    export class SideColor extends AbstractColor {
+        constructor(border?: number, inner?: number);
+
+        BRIGHTNESS_GAIN: number;
+
+        getByInnerColor(inner: number): SideColor;
+    }
+
+    export class SlopeColor extends AbstractColor {
+        constructor(border?: number, borderHighlight?: number, left?: number, right?: number, leftSlope?: number, rightSlope?: number);
+
+        BRIGHTNESS_GAIN: number;
+
+        getByHorizontalColor(horizontal: number): SlopeColor;
+    }
+
+    export class AbstractDimension {
+        constructor();
+
+        xAxis: number;
+        yAxis: number;
+        zAxis: number;
+        tall: boolean;
+    }
+
+    export class BrickDimension extends AbstractDimension {
+        constructor(xAxis?: number, yAxis?: number);
+    }
+
+    export class CubeDimension extends AbstractDimension {
+        constructor(xAxis?: number, yAxis?: number, zAxis?: number);
+    }
+
+    export class PyramidDimension extends AbstractDimension {
+        constructor(axis?: number, tall?: boolean);
+    }
+
+    export class SideXDimension extends AbstractDimension {
+        constructor(xAxis?: number, zAxis?: number);
+    }
+
+    export class SideYDimension extends AbstractDimension {
+        constructor(yAxis?: number, zAxis?: number);
+    }
+
+    export class SlopeDimension extends AbstractDimension {
+        constructor(xAxis?: number, yAxis?: number);
+    }
+
+    export class BitmapData {
+        constructor(w: number, h: number, useDefaultCanvas?: boolean);
+
+        imageData: ImageData;
+        canvas: HTMLCanvasElement;
+        context : CanvasRenderingContext2D;
+
+        setPixel(posX: number, posY: number, color: number): void;
+        setPixelByIndex(index: number, color: number): void;
+        checkPixelAvailable(x: number, y: number): boolean;
+        floodFill(posX: number, posY: number, color: number): void;
+    }
+
+    export class PixelObject {
+        constructor(primitive: AbstractPrimitive, point3D?: Point3D);
+
+        x: number;
+        y: number;
+        canvas: HTMLCanvasElement;
+    }
+
+    export class PixelView {
+        constructor(canvas: HTMLCanvasElement, point?: Point);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        point: Point;
+
+        renderObject(primitive: AbstractPrimitive, point3D?: Point3D): void;
+        clear(): void;
+    }
+
+    export class AbstractPrimitive {
+        constructor();
+
+        canvas: HTMLCanvasElement;
+        w: number;
+        h: number;
+        dimension: AbstractDimension;
+        color: AbstractColor;
+        border: boolean;
+        bitmapData: BitmapData;
+        useDefaultCanvas: boolean;
+        matrix: Matrix;
+    }
+
+    export class Brick extends AbstractPrimitive {
+        constructor(dimension?: BrickDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class Cube extends AbstractPrimitive {
+        constructor(dimension?: CubeDimension, color?: CubeColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class Pyramid extends AbstractPrimitive {
+        constructor(dimension?: PyramidDimension, color?: PyramidColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SideX extends AbstractPrimitive {
+        constructor(dimension?: SideXDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SideY extends AbstractPrimitive {
+        constructor(dimension?: SideYDimension, color?: SideColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SlopeEast extends AbstractPrimitive {
+        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SlopeNorth extends AbstractPrimitive {
+        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SlopeSouth extends AbstractPrimitive {
+        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+
+    export class SlopeWest extends AbstractPrimitive {
+        constructor(dimension?: SlopeDimension, color?: SlopeColor, border?: boolean, useDefaultCanvas?: boolean);
+    }
+}
\ No newline at end of file
diff --git a/object-assign/object-assign-tests.ts b/object-assign/object-assign-tests.ts
new file mode 100644
index 000000000..53dfd5e70
--- /dev/null
+++ b/object-assign/object-assign-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="object-assign.d.ts" />
+import objectAssign = require("object-assign");
+
+function assign1() {
+  var result = objectAssign({hello: "world"});
+  return result;
+}
+
+function assign2() {
+  var result = objectAssign({hello: "world"}, {hello: "worlds", second: "extra"});
+  return result;
+}
+
+function assign3() {
+  var result = objectAssign({hello: "world"}, {hello: "worlds", second: "extra"}, {hello: "stop", the: "spinning"});
+  return result;
+}
diff --git a/object-assign/object-assign.d.ts b/object-assign/object-assign.d.ts
new file mode 100644
index 000000000..76789d003
--- /dev/null
+++ b/object-assign/object-assign.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for object-assign 4.0.1
+// Project: https://github.com/sindresorhus/object-assign
+// Definitions by: Christopher Brown <https://github.com/chbrown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "object-assign" {
+  function objectAssign(target: any, ...sources: any[]): any;
+  export = objectAssign;
+}
diff --git a/oblo-util/oblo-util-tests.ts b/oblo-util/oblo-util-tests.ts
new file mode 100644
index 000000000..401611ce7
--- /dev/null
+++ b/oblo-util/oblo-util-tests.ts
@@ -0,0 +1,29 @@
+/// <reference path="oblo-util.d.ts" />
+
+util.debug = false;
+
+util.log('Log message');
+
+util.error('Error message');
+
+util.clip(0, 100, -15);
+
+util.square(3);
+
+util.replicate(10, 'x');
+
+util.pad(' ', 10, 'short');
+
+util.padZero(4, 247);
+
+util.addslashes('\\"\'');
+
+util.showJSON({name: 'Clyde', color: 'orange'}, '  ', 7);
+
+util.showTime(new Date());
+
+util.showDate(new Date());
+
+util.readDate('15-10-2004');
+
+util.setAttr($('#someElement'), 'attrName', false);
diff --git a/oblo-util/oblo-util.d.ts b/oblo-util/oblo-util.d.ts
new file mode 100644
index 000000000..431cf36b3
--- /dev/null
+++ b/oblo-util/oblo-util.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for oblo-util v0.6.4
+// Project: https://github.com/Oblosys/oblo-util
+// Definitions by: Martijn Schrage <https://github.com/Oblosys/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+interface ObloUtilStatic {
+  debug : boolean;
+  
+  log(...args: any[]) : void;
+  error(...args: any[]) : void;
+  clip(min : number, max : number, x : number) : number;
+  square(x : number) : number;
+  replicate<X>(n : number, x : X) : X[];
+  pad(c : string, l : number, str : any) : string;
+  padZero(l : number, n : number) : string;
+  addslashes(str : string) : string;
+  showJSON(json : any, indentStr? : string, maxDepth? : number) : string;
+  showTime(date : Date) : string;
+  showDate(date : Date) : string;
+  readDate(dateStr : string) : Date;
+  setAttr($elt : JQuery, attrName : string, isSet : boolean) : void;
+}
+
+declare var util: ObloUtilStatic;
+
+declare module "oblo-util" {
+	export = util;
+}
diff --git a/oboe/oboe-tests.ts b/oboe/oboe-tests.ts
index f98def75e..48939d418 100644
--- a/oboe/oboe-tests.ts
+++ b/oboe/oboe-tests.ts
@@ -32,3 +32,18 @@ oboe('/content')
 			console.error('no such content');
 		}
 	});
+
+oboe('friends.json')
+	.node('friend', function (parsedJson) {
+		console.log('friend parsed', parsedJson);
+	});
+
+oboe('friends.json')
+	.node({
+		'friend': function (parsedJson) {
+			console.log('friend parsed', parsedJson);
+		},
+		'!': function (parsedJson) {
+			console.log('root parsed', parsedJson);
+		}
+	});
diff --git a/oboe/oboe.d.ts b/oboe/oboe.d.ts
index 6e6ed650b..1f036ce8b 100644
--- a/oboe/oboe.d.ts
+++ b/oboe/oboe.d.ts
@@ -5,61 +5,65 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "oboe" {
-	import stream = require('stream');
-
-	function oboe(url: string): oboe.Oboe;
-	function oboe(options: oboe.Options): oboe.Oboe;
-	function oboe(stream: stream.Readable) : oboe.Oboe;
-
-	module oboe {
-
-		var drop: {};
-
-		interface Oboe {
-			done(callback: (result: any) => void): Oboe;
-
-			fail(callback: (result: FailReason) => void): Oboe;
-
-			node(pattern: string, callback: CallbackSignature): Oboe;
-
-			on(event: string, pattern: string, callback: CallbackSignature): Oboe;
-			on(eventPattern: string, callback: CallbackSignature): Oboe;
-
-			path(pattern: string, callback: CallbackSignature): Oboe;
-			path(listeners: any): Oboe;
-
-			removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
-			removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
-
-			start(callback: (status: number, headers: Object) => void): Oboe;
-			
-			abort():void;
-
-			source: string;
-		}
-
-		interface CallbackSignature {
-            (node: any, pathOrHeaders: any, ancestors: Object[]): any;
-		}
-
-		interface Options {
-			url: string;
-			method?: string;
-			headers?: Object;
-			body?: any;
-			cached?: boolean;
-			withCredentials?: boolean;
-		}
-
-		interface FailReason {
-			thrown?: Error;
-			statusCode?: number;
-			body?: string;
-			jsonBody?: Object;
-		}
+declare module oboe {
+	interface OboeFunction extends Function {
+		drop: Object;
+		(url: string): Oboe;
+		(options: Options): Oboe;
+		(stream: NodeJS.ReadableStream): Oboe;
 	}
 
-	export = oboe;
+	interface Oboe {
+		done(callback: (result: any) => void): Oboe;
+
+		fail(callback: (result: FailReason) => void): Oboe;
+
+		node(pattern: string, callback: CallbackSignature): Oboe;
+		node(patterns: PatternMap): Oboe;
+
+		on(event: string, pattern: string, callback: CallbackSignature): Oboe;
+		on(eventPattern: string, callback: CallbackSignature): Oboe;
+
+		path(pattern: string, callback: CallbackSignature): Oboe;
+		path(listeners: any): Oboe;
+
+		removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
+		removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
+
+		start(callback: (status: number, headers: Object) => void): Oboe;
+
+		abort():void;
+
+		source: string;
+	}
+
+	interface CallbackSignature {
+          (node: any, pathOrHeaders: any, ancestors: Object[]): any;
+	}
+
+	interface Options {
+		url: string;
+		method?: string;
+		headers?: Object;
+		body?: any;
+		cached?: boolean;
+		withCredentials?: boolean;
+	}
+
+	interface FailReason {
+		thrown?: Error;
+		statusCode?: number;
+		body?: string;
+		jsonBody?: Object;
+	}
+
+	interface PatternMap {
+	  [pattern: string]: CallbackSignature
+	}
 }
 
+declare var oboe: oboe.OboeFunction;
+
+declare module "oboe" {
+	export = oboe;
+}
diff --git a/observe-js/observe-js-test.ts b/observe-js/observe-js-test.ts
new file mode 100644
index 000000000..37ad0216c
--- /dev/null
+++ b/observe-js/observe-js-test.ts
@@ -0,0 +1,111 @@
+/// <reference path="observe-js.d.ts" />
+
+module observejs {
+	
+	function Test_PathObserver() {
+		var obj = { foo: { bar: 'baz' } };
+		var defaultValue = 42;
+		var observer = new PathObserver(obj, 'foo.bar', defaultValue);
+		observer.open(function(newValue, oldValue) {
+		// respond to obj.foo.bar having changed value.
+		});
+	}
+	
+	
+	function Test_ArrayObserver() {
+		var arr = [0, 1, 2, 4];
+		var observer = new ArrayObserver(arr);
+		observer.open(function(splices) {
+		// respond to changes to the elements of arr.
+		splices.forEach(function(splice) {
+			splice.index; // the index position that the change occurred.
+			splice.removed; // an array of values representing the sequence of removed elements
+			splice.addedCount; // the number of elements which were inserted.
+		});
+		});
+	}
+	
+	function Test_ObejctObserver() {
+		var myObj = { id: 1, foo: 'bar' };
+		var observer = new ObjectObserver(myObj);
+		observer.open(function(added, removed, changed, getOldValueFn) {
+		// respond to changes to the obj.
+		Object.keys(added).forEach(function(property) {
+			property; // a property which has been been added to obj
+			added[property]; // its value
+		});
+		Object.keys(removed).forEach(function(property) {
+			property; // a property which has been been removed from obj
+			getOldValueFn(property); // its old value
+		});
+		Object.keys(changed).forEach(function(property) {
+			property; // a property on obj which has changed value.
+			changed[property]; // its value
+			getOldValueFn(property); // its old value
+		});
+		});
+	}
+	
+	function Test_CompounObserver() {
+		var obj = {
+			a: 1,
+			b: 2,
+		};
+		
+		var otherObj = { c: 3 };
+		
+		var observer = new CompoundObserver();
+		observer.addPath(obj, 'a');
+		observer.addObserver(new PathObserver(obj, 'b'));
+		observer.addPath(otherObj, 'c');
+		var logTemplate = 'The %sth value before & after:';
+		observer.open(function(newValues, oldValues) {
+		// Use for-in to iterate which values have changed.
+		for (var i in oldValues) {
+			console.log(logTemplate, i, oldValues[i], newValues[i]);
+		}
+		});
+	}
+	
+	function Test_ObserverTransform_1() {
+		var obj = { value: 10 };
+		var observer = new PathObserver(obj, 'value');
+		function getValue(value:any) { return value * 2 };
+		function setValue(value:any) { return value / 2 };
+		
+		var transform = new ObserverTransform(observer, getValue, setValue);
+		
+		// returns 20.
+		transform.open(function(newValue, oldValue) {
+		console.log('new: ' + newValue + ', old: ' + oldValue);
+		});
+		
+		obj.value = 20;
+		transform.deliver(); // 'new: 40, old: 20'
+		transform.setValue(4); // obj.value === 2;
+	}
+	
+	function Test_ObserverTransform_2() {
+		var obj = { a: 1, b: 2, c: 3 };
+		var observer = new CompoundObserver();
+		observer.addPath(obj, 'a');
+		observer.addPath(obj, 'b');
+		observer.addPath(obj, 'c');
+		var transform = new ObserverTransform(observer, function(values) {
+		var value = 0;
+		for (var i = 0; i < values.length; i++)
+			value += values[i]
+		return value;
+		});
+		
+		// returns 6.
+		transform.open(function(newValue, oldValue) {
+		console.log('new: ' + newValue + ', old: ' + oldValue);
+		});
+		
+		obj.a = 2;
+		obj.c = 10;
+		transform.deliver(); // 'new: 14, old: 6'
+	}
+
+}
\ No newline at end of file
diff --git a/observe-js/observe-js.d.ts b/observe-js/observe-js.d.ts
new file mode 100644
index 000000000..abd2caa00
--- /dev/null
+++ b/observe-js/observe-js.d.ts
@@ -0,0 +1,250 @@
+// Type definitions for observe-js v0.5.5
+// Project: https://github.com/Polymer/observe-js
+// Definitions by: Oliver Herrmann <https://github.com/herrmanno/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module observejs {
+	
+	/*----------------------
+		Observable
+	----------------------*/
+		
+	interface Observable {
+		/**
+		 * Begins observation.
+		 * @param onChange the function that gets invoked if a change is detected
+		 * @param the target of observation
+		 */
+		open(onChange:(newValue:any, oldValue:any)=>any, receiver?:any):void
+
+		/**
+		 * Report any changes now (does nothing if there are no changes to report).
+		 */
+		deliver(): void
+		
+		/**
+		 * If there are changes to report, ignore them. Returns the current value of the observation.
+		 */
+		discardChanges():void
+		
+		/**
+		 * Ends observation. Frees resources and drops references to observed objects.
+		 */
+		close():void
+	}
+	
+	
+	/*----------------------
+		PathObserver
+	----------------------*/
+	
+	interface PathObserver_static {
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
+		 * @param defaultValue the defaultValue
+		 */
+		new(receiver:any, path:string, defaultValue?:any): PathObserver_instance
+	}
+	
+	interface PathObserver_instance extends Observable {
+		/**
+		 * sets the observed value without notifying about the change.
+		 * @param value the value to set
+		 */
+		setValue(value:any): void
+	}
+	
+	/**
+	 * Observes a "value-at-a-path" from a given object: 
+	 */
+	var PathObserver: PathObserver_static
+	
+	
+	/*----------------------
+		ArrayObserver
+	----------------------*/
+	
+	interface splice {
+		
+		/**
+		 * the index position that the change occured
+		 */
+		index:number
+		
+		/**
+		 * an array of values representing the sequence of removed elements
+		 */
+		removed: Array<any>
+		
+		/**
+		 * the number of element which were inserted 
+		 */
+		addedCount:number
+	}
+	
+	interface ArrayObserver_static {
+		
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 */
+		new(receiver:Array<any>): ArrayObserver_instance
+		
+		/**
+		 * transforms a copy of an old state of an array into a copy of its current state.
+		 * @param previous array of old state
+		 * @param current array of current state
+		 * @param splices  splices to apply
+		 */
+		applySplices(previous:Array<any>, current:Array<any>, splices:Array<splice>):void
+	}
+	
+	interface ArrayObserver_instance extends Observable {
+		open(onChange:(splices:Array<splice>)=>any):void
+	}
+	
+	/**
+	 * ArrayObserver observes the index-positions of an Array and reports changes as the minimal set of "splices" which would have had the same effect.
+	 */
+	var ArrayObserver: ArrayObserver_static
+	
+	
+	/*----------------------
+		ObjectObserver
+	----------------------*/
+	
+	interface Properties {
+		[key:string]:any
+	}
+	
+	interface ObjectObserver_static {
+		
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 */
+		new(receiver:any): ObjectObserver_instance
+	}
+	
+	interface ObjectObserver_instance extends Observable {
+		open(onChange:(added:Properties, removed:Properties, changed:Properties, getOldValueFn:(property:string)=>any)=>any):void
+	}
+	
+	/**
+	 * Observes the set of own-properties of an object and their values
+	 */
+	var ObjectObserver: ObjectObserver_static
+	
+	
+	/*----------------------
+		CompounObserver
+	----------------------*/
+	
+	interface CompoundObserver_static {
+		
+		/**
+		 * Constructor
+		 */
+		new(): CompoundObserver_instance
+	}
+	
+	interface CompoundObserver_instance extends Observable {
+		open(onChange:(newValues:Array<any>, oldValue:Array<any>)=>any):void
+		
+		/**
+		 * Adds the receivers property at the specified path to the list of observables.
+		 * @param receiver the target for observation
+		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
+		 */
+		addPath(receiver:any, path:string):void
+		
+		/**
+		 * Adds an Observer to the list of observables.
+		 */
+		addObserver(observer:Observable):void
+	
+	}
+	
+	/**
+	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
+	 */
+	var CompoundObserver: CompoundObserver_static
+	
+	
+	
+	/*----------------------
+		ObserverTransform
+	----------------------*/
+	
+	interface ObserverTransform_static {
+		
+		/**
+		 * Constructor
+		 * @param observer the observer to transform
+		 * @param getValue function that proxys getting a value
+		 * @param setValue function that proxys setting a value
+		 */
+		new(observer:Observable, getValue:(value:any)=>any, setValue:(value:any)=>any): ObserverTransform_instance
+		
+		/**
+		 * Constructor
+		 * @param observer the observer to transform
+		 * @param valueFn function that gets invoked with all observed values. May return a single new value.
+		 */
+		new(observer:Observable, valueFn:(values:Array<any>)=>any): ObserverTransform_instance
+	}
+	
+	interface ObserverTransform_instance extends Observable {
+		/**
+		 * sets the observed value without notifying about the change.
+		 * @param value the value to set
+		 */
+		setValue(value:any): void
+	}
+	
+	/**
+	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
+	 */
+	var ObserverTransform: ObserverTransform_static
+	
+	
+	/*----------------------
+		Path
+	----------------------*/
+	
+	interface Path {
+		
+		/**
+		 * Returns the current value of the path from the provided object. If eval() is available,
+  		 * a compiled getter will be used for better performance. Like PathObserver above, undefined
+  		 * is returned unless you provide an overriding defaultValue.
+		 */
+		getValueFrom(object:any, defaultValue:any): any
+		
+		/**
+		 * Attempts to set the value of the path from the provided object. Returns true IFF the path
+  		 * was reachable and set.
+		 */
+		getValueFrom(object:any, newValue:any): any
+	}
+}
+
+declare module "observejs" {
+	var PathObserver: typeof observejs.PathObserver;
+	var ArrayObserver: typeof observejs.ArrayObserver;
+	var ObjectObserver: typeof observejs.ObjectObserver;
+	var CompoundObserver: typeof observejs.CompoundObserver;
+	var ObserverTransform: typeof observejs.ObserverTransform;
+	var Path: observejs.Path;
+	
+	export {
+		PathObserver,
+		ArrayObserver,
+		ObjectObserver,
+		CompoundObserver,
+		ObserverTransform,
+		Path
+	};
+}
\ No newline at end of file
diff --git a/offline-js/offline-js-tests.ts b/offline-js/offline-js-tests.ts
new file mode 100644
index 000000000..d43f091fa
--- /dev/null
+++ b/offline-js/offline-js-tests.ts
@@ -0,0 +1,40 @@
+// Test file for offline-js.
+/// <reference path="offline-js.d.ts" />
+
+Offline.options = {
+    checkOnLoad: false,
+    interceptRequests: true,
+    checks: {
+        xhr: { url: '/connection-test' },
+        image: { url: 'my-image.gif' },
+        active: 'image'
+    },
+    reconnect: {
+        initialDelay: 3,
+        delay: 60
+    },
+    requests: true,
+    game: false
+};
+
+Offline.check();
+
+Offline.state;
+
+var handler = () => { },
+    context = {};
+
+Offline.on("up", handler, context);
+Offline.on("down", handler, context);
+Offline.on("confirmed-up", handler, context);
+Offline.on("confirmed-down", handler, context);
+Offline.on("checking", handler, context);
+Offline.on("reconnect:started", handler, context);
+Offline.on("reconnect:stopped", handler, context);
+Offline.on("reconnect:tick", handler, context);
+Offline.on("reconnect:connecting", handler, context);
+Offline.on("reconnect:failure", handler, context);
+Offline.on("requests:flush", handler, context);
+Offline.on("requests:hold", handler, context);
+
+Offline.off("up", handler);
diff --git a/offline-js/offline-js.d.ts b/offline-js/offline-js.d.ts
new file mode 100644
index 000000000..f52b47e0c
--- /dev/null
+++ b/offline-js/offline-js.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for Offline 0.7.14
+// Project: https://github.com/HubSpot/offline
+// Definitions by: Chris Wrench <https://github.com/cgwrench>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare var Offline: {
+    options: OfflineOptions;
+    check: () => void;
+    state: string;
+
+    on(event: "up", handler: (e: Event) => any, context?: any): void;
+    on(event: "down", handler: (e: Event) => any, context?: any): void;
+    on(event: "confirmed-up", handler: (e: Event) => any, context?: any): void;
+    on(event: "confirmed-down", handler: (e: Event) => any, context?: any): void;
+    on(event: "checking", handler: (e: Event) => any, context?: any): void;
+    on(event: "reconnect:started", handler: (e: Event) => any, context?: any): void;
+    on(event: "reconnect:stopped", handler: (e: Event) => any, context?: any): void;
+    on(event: "reconnect:tick", handler: (e: Event) => any, context?: any): void;
+    on(event: "reconnect:connecting", handler: (e: Event) => any, context?: any): void;
+    on(event: "reconnect:failure", handler: (e: Event) => any, context?: any): void;
+    on(event: "requests:flush", handler: (e: Event) => any, context?: any): void;
+    on(event: "requests:hold", handler: (e: Event) => any, context?: any): void;
+    on(event: string, handler: (e: Event) => any, context?: any): void;
+
+    off(event: "up", handler?: (e: Event) => any): void;
+    off(event: "down", handler?: (e: Event) => any): void;
+    off(event: "confirmed-up", handler?: (e: Event) => any): void;
+    off(event: "confirmed-down", handler?: (e: Event) => any): void;
+    off(event: "checking", handler?: (e: Event) => any): void;
+    off(event: "reconnect:started", handler?: (e: Event) => any): void;
+    off(event: "reconnect:stopped", handler?: (e: Event) => any): void;
+    off(event: "reconnect:tick", handler?: (e: Event) => any): void;
+    off(event: "reconnect:connecting", handler?: (e: Event) => any): void;
+    off(event: "reconnect:failure", handler?: (e: Event) => any): void;
+    off(event: "requests:flush", handler?: (e: Event) => any): void;
+    off(event: "requests:hold", handler?: (e: Event) => any): void;
+    off(event: string, handler?: (e: Event) => any): void;
+};
+
+interface OfflineOptions {
+    // TODO Should these types be `boolean|Function`?
+    // The project documentation is not clear here.
+    checkOnLoad?: boolean;
+    interceptRequests?: boolean;
+    requests?: boolean;
+    game?: boolean;
+    checks?: OfflineChecks;
+    reconnect: {
+        initialDelay: number;
+        delay: number;
+    };
+}
+
+interface OfflineChecks {
+    // TODO "xhr" and "image" probably have different options.
+    // However, this is not stated in the project documentation.
+    xhr?: OfflineCheck;
+    image?: OfflineCheck;
+    active?: string;
+}
+
+interface OfflineCheck {
+    url: string;
+}
diff --git a/openlayers/openlayers-tests.ts b/openlayers/openlayers-tests.ts
index 2e518e085..f60e45bd9 100644
--- a/openlayers/openlayers-tests.ts
+++ b/openlayers/openlayers-tests.ts
@@ -16,8 +16,11 @@ var featureLoader: ol.FeatureLoader;
 var easingFunction: (t: number) => number;
 
 // Type variables for OpenLayers
+var circle: ol.geom.Circle;
 var color: ol.Color;
 var coordinate: ol.Coordinate;
+var coordinatesArray: Array<ol.Coordinate>;
+var coordinatesArrayDim2: Array<Array<ol.Coordinate>>;
 var extent: ol.Extent;
 var boundingCoordinates: Array<ol.Coordinate>;
 var size: ol.Size;
@@ -27,12 +30,28 @@ var feature: ol.Feature;
 var featureArray: Array<ol.Feature>;
 var graticule: ol.Graticule
 var geometry: ol.geom.Geometry;
+var geometriesArray: Array<ol.geom.Geometry>;
 var feature: ol.Feature;
 var featureArray: Array<ol.Feature>;
 var featureFormat: ol.format.Feature;
 var geometry: ol.geom.Geometry;
+var geometryCollection: ol.geom.GeometryCollection;
+var geometryLayout: ol.geom.GeometryLayout;
+var geometryType: ol.geom.GeometryType;
+var linearRing: ol.geom.LinearRing;
+var lineString: ol.geom.LineString;
 var loadingstrategy: ol.LoadingStrategy;
+var multiLineString: ol.geom.MultiLineString;
+var multiPoint: ol.geom.MultiPoint;
+var multiPolygon: ol.geom.MultiPolygon;
+var point: ol.geom.Point;
+var polygon: ol.geom.Polygon;
+var simpleGeometry: ol.geom.SimpleGeometry;
 var tilegrid: ol.tilegrid.TileGrid;
+var vector: ol.source.Vector;
+var projection: ol.proj.Projection;
+var projectionLike: ol.proj.ProjectionLike;
+var transformFn: ol.TransformFunction;
 
 //
 // ol.Attribution
@@ -101,17 +120,179 @@ loadingstrategy = ol.loadingstrategy.all;
 loadingstrategy = ol.loadingstrategy.bbox;
 loadingstrategy = ol.loadingstrategy.tile(tilegrid);
 
+//
+//
+// ol.geom.Circle
+//
+booleanValue = circle.intersectsExtent(extent);
+circle = circle.transform(projectionLike, projectionLike);
+
 //
 //
 // ol.geom.Geometry
 //
-
 var geometryResult: ol.geom.Geometry;
 coordinate = geometryResult.getClosestPoint(coordinate);
 geometryResult.getClosestPoint(coordinate, coordinate);
 extent = geometryResult.getExtent();
 geometryResult.getExtent(extent);
 
+//
+//
+// ol.geom.GeometryCollection
+//
+geometryCollection = new ol.geom.GeometryCollection(geometriesArray)
+geometryCollection = new ol.geom.GeometryCollection();
+voidValue = geometryCollection.applyTransform(transformFn);
+geometryCollection = geometryCollection.clone();
+geometriesArray = geometryCollection.getGeometries();
+geometryType = geometryCollection.getType();
+booleanValue = geometryCollection.intersectsExtent(extent);
+voidValue = geometryCollection.setGeometries(geometriesArray);
+
+//
+//
+// ol.geom.LinearRing
+//
+linearRing = new ol.geom.LinearRing(coordinatesArray);
+linearRing = new ol.geom.LinearRing(coordinatesArray, geometryLayout);
+linearRing = linearRing.clone();
+numberValue = linearRing.getArea();
+coordinatesArray = linearRing.getCoordinates();
+geometryType = linearRing.getType();
+voidValue = linearRing.setCoordinates(coordinatesArray);
+voidValue = linearRing.setCoordinates(coordinatesArray, geometryLayout);
+
+//
+//
+// ol.geom.LineString
+//
+lineString = new ol.geom.LineString(coordinatesArray);
+lineString = new ol.geom.LineString(coordinatesArray, geometryLayout);
+voidValue = lineString.appendCoordinate(coordinate);
+lineString = lineString.clone();
+coordinate = lineString.getCoordinateAtM(numberValue);
+coordinate = lineString.getCoordinateAtM(numberValue, booleanValue);
+coordinatesArray = lineString.getCoordinates();
+numberValue = lineString.getLength();
+geometryType = lineString.getType();
+booleanValue = lineString.intersectsExtent(extent);
+voidValue = lineString.setCoordinates(coordinatesArray);
+voidValue = lineString.setCoordinates(coordinatesArray, geometryLayout);
+
+//
+//
+// ol.geom.MultiLineString
+//
+var lineStringsArray: Array<ol.geom.LineString>;
+
+multiLineString = new ol.geom.MultiLineString(coordinatesArrayDim2);
+multiLineString = new ol.geom.MultiLineString(coordinatesArrayDim2, geometryLayout);
+voidValue = multiLineString.appendLineString(lineString);
+multiLineString = multiLineString.clone();
+coordinate = multiLineString.getCoordinateAtM(numberValue);
+coordinate = multiLineString.getCoordinateAtM(numberValue, booleanValue);
+coordinate = multiLineString.getCoordinateAtM(numberValue, booleanValue, booleanValue);
+coordinatesArrayDim2 = multiLineString.getCoordinates();
+lineString = multiLineString.getLineString(numberValue);
+lineStringsArray = multiLineString.getLineStrings();
+geometryType = multiLineString.getType();
+booleanValue = multiLineString.intersectsExtent(extent);
+voidValue = multiLineString.setCoordinates(coordinatesArrayDim2);
+voidValue = multiLineString.setCoordinates(coordinatesArrayDim2, geometryLayout);
+
+//
+//
+// ol.geom.MultiPoint
+//
+var pointsArray: Array<ol.geom.Point>;
+
+multiPoint = new ol.geom.MultiPoint(coordinatesArray);
+multiPoint = new ol.geom.MultiPoint(coordinatesArray, geometryLayout);
+voidValue = multiPoint.appendPoint(point);
+multiPoint = multiPoint.clone();
+coordinatesArray = multiPoint.getCoordinates();
+point = multiPoint.getPoint(numberValue);
+pointsArray = multiPoint.getPoints();
+geometryType = multiPoint.getType();
+booleanValue = multiPoint.intersectsExtent(extent);
+voidValue = multiPoint.setCoordinates(coordinatesArray);
+voidValue = multiPoint.setCoordinates(coordinatesArray, geometryLayout);
+
+//
+//
+// ol.geom.MultiPolygon
+//
+var coordinatesArrayDim3: Array<Array<Array<ol.Coordinate>>>;
+var polygonsArray: Array<ol.geom.Polygon>;
+
+multiPolygon = new ol.geom.MultiPolygon(coordinatesArrayDim3);
+multiPolygon = new ol.geom.MultiPolygon(coordinatesArrayDim3, geometryLayout);
+voidValue = multiPolygon.appendPolygon(polygon);
+multiPolygon = multiPolygon.clone();
+numberValue = multiPolygon.getArea();
+coordinatesArrayDim3 = multiPolygon.getCoordinates();
+coordinatesArrayDim3 = multiPolygon.getCoordinates(booleanValue);
+multiPoint = multiPolygon.getInteriorPoints();
+polygon = multiPolygon.getPolygon(numberValue);
+polygonsArray = multiPolygon.getPolygons();
+geometryType = multiPolygon.getType();
+booleanValue = multiPolygon.intersectsExtent(extent);
+voidValue = multiPolygon.setCoordinates(coordinatesArrayDim3);
+voidValue = multiPolygon.setCoordinates(coordinatesArrayDim3, geometryLayout);
+
+//
+//
+// ol.geom.Point
+//
+point = new ol.geom.Point(coordinate);
+point = new ol.geom.Point(coordinate, geometryLayout);
+point = point.clone();
+coordinate = point.getCoordinates();
+geometryType = point.getType();
+booleanValue = point.intersectsExtent(extent);
+voidValue = point.setCoordinates(coordinate);
+voidValue = point.setCoordinates(coordinate, geometryLayout);
+
+//
+//
+// ol.geom.Polygon
+//
+var localSphere: ol.Sphere;
+var linearRingsArray: Array<ol.geom.LinearRing>;
+
+polygon = new ol.geom.Polygon(coordinatesArrayDim2);
+polygon = new ol.geom.Polygon(coordinatesArrayDim2, geometryLayout);
+polygon = ol.geom.Polygon.circular(localSphere, coordinate, numberValue);
+polygon = ol.geom.Polygon.circular(localSphere, coordinate, numberValue, numberValue);
+voidValue = polygon.appendLinearRing(linearRing);
+polygon = polygon.clone();
+numberValue = polygon.getArea();
+coordinatesArrayDim2 = polygon.getCoordinates();
+coordinatesArrayDim2 = polygon.getCoordinates(booleanValue);
+point = polygon.getInteriorPoint();
+linearRing = polygon.getLinearRing(numberValue);
+linearRingsArray = polygon.getLinearRings();
+geometryType = polygon.getType();
+booleanValue = polygon.intersectsExtent(extent);
+
+//
+//
+// ol.geom.SimpleGeometry
+//
+simpleGeometry.applyTransform(transformFn);
+coordinate = simpleGeometry.getFirstCoordinate();
+coordinate = simpleGeometry.getLastCoordinate();
+geometryLayout = simpleGeometry.getLayout();
+voidValue = simpleGeometry.translate(numberValue, numberValue);
+
+//
+// ol.source
+//
+vector = new ol.source.Vector({
+  features: [feature]
+});
+
 //
 // ol.Feature
 //
@@ -153,7 +334,9 @@ var tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.proj
 //
-var projection: ol.proj.Projection;
+projection = new ol.proj.Projection({
+    code:stringValue,    
+});
 
 //
 // ol.Map 
@@ -166,6 +349,21 @@ var map: ol.Map = new ol.Map({
 });
 map.beforeRender(preRenderFunction);
 
+//
+// ol.source.ImageWMS
+//
+var imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
+    serverType: stringValue,
+    url:stringValue
+});
+//
+// ol.source.TileWMS
+//
+var tileWMS: ol.source.TileWMS = new ol.source.TileWMS({
+    serverType: stringValue,
+    url:stringValue
+});
+
 //
 // ol.animation
 //
diff --git a/openlayers/openlayers.d.ts b/openlayers/openlayers.d.ts
index 39091a849..89680ac91 100644
--- a/openlayers/openlayers.d.ts
+++ b/openlayers/openlayers.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OpenLayers v3.6.0
+// Type definitions for OpenLayers v3.6.0
 // Project: http://openlayers.org/
 // Definitions by: Wouter Goedhart <https://github.com/woutergd>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -22,23 +22,23 @@ declare module olx {
     interface FrameState {
 
         /**
-         * 
+         *
          */
         pixelRatio: number;
 
         /**
-         * 
+         *
          */
         time: number;
 
         /**
-         * 
+         *
          */
         viewState: olx.ViewState;
     }
 
     interface FeatureOverlayOptions {
-        
+
         /**
          * Features
          */
@@ -88,6 +88,87 @@ declare module olx {
         targetSize?: number;
     }
 
+    interface BaseWMSOptions {
+
+        /** Attributions. */
+        attributions?: Array<ol.Attribution>;
+
+        /** WMS request parameters. At least a LAYERS param is required. STYLES is '' by default. VERSION is 1.3.0 by default. WIDTH, HEIGHT, BBOX and CRS (SRS for WMS version < 1.3.0) will be set dynamically. */
+        params?: any;
+
+        /** The crossOrigin attribute for loaded images. Note that you must provide a crossOrigin value if you are using the WebGL renderer or if you want to access pixel data with the Canvas renderer. See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail. */
+        crossOrigin?: string;
+
+        /** experimental Use the ol.Map#pixelRatio value when requesting the image from the remote server. Default is true. */
+        hidpi?: boolean;
+
+        /** experimental The type of the remote WMS server: mapserver, geoserver or qgis. Only needed if hidpi is true. Default is undefined. */
+        serverType?: ol.source.wms.ServerType;
+
+        /** WMS service URL. */
+        url?: string;
+
+        /** Logo. */
+        logo?: olx.LogoOptions;
+
+        /** experimental Projection. */
+        projection?: ol.proj.ProjectionLike;
+    }
+
+    interface ImageWMSOptions extends BaseWMSOptions {
+
+        /** experimental Optional function to load an image given a URL. */
+        imageLoadFunction?: ol.ImageLoadFunctionType;
+
+        /** Ratio. 1 means image requests are the size of the map viewport, 2 means twice the width and height of the map viewport, and so on. Must be 1 or higher. Default is 1.5. */
+        ratio?: number;
+
+        /** Resolutions. If specified, requests will be made for these resolutions only. */
+        resolutions?: Array<number>;
+    }
+
+    interface TileWMSOptions {
+
+        /** The size in pixels of the gutter around image tiles to ignore. By setting this property to a non-zero value, images will be requested that are wider and taller than the tile size by a value of 2 x gutter. Defaults to zero. Using a non-zero value allows artifacts of rendering at tile edges to be ignored. If you control the WMS service it is recommended to address "artifacts at tile edges" issues by properly configuring the WMS service. For example, MapServer has a tile_map_edge_buffer configuration parameter for this. See http://mapserver.org/output/tile_mode.html. */
+        gutter?: number;
+
+        /** Tile grid. Base this on the resolutions, tilesize and extent supported by the server. If this is not defined, a default grid will be used: if there is a projection extent, the grid will be based on that; if not, a grid based on a global extent with origin at 0,0 will be used. */
+        tileGrid?: ol.tilegrid.TileGrid;
+
+        /** experimental Maximum zoom. */
+        maxZoom?: number;
+
+        /** experimental Optional function to load a tile given a URL. */
+        tileLoadFunction?: ol.TileLoadFunctionType;
+
+        /** WMS service URL. */
+        url?: string;
+
+        /** WMS service urls. Use this instead of url when the WMS supports multiple urls for GetMap requests. */
+        urls?: Array<string>;
+
+        /** experimental The type of the remote WMS server. Currently only used when hidpi is true. Default is undefined. */
+        serverType?: ol.source.wms.ServerType;
+
+        /** experimental Whether to wrap the world horizontally. When set to false, only one world will be rendered. When true, tiles will be requested for one world only, but they will be wrapped horizontally to render multiple worlds. The default is true. */
+        wrapX?: boolean;
+    }
+    /**
+     * Object literal with config options for the map logo.
+     */
+    interface LogoOptions {
+      /**
+       * Link url for the logo. Will be followed when the logo is clicked.
+       */
+      href: string;
+
+      /**
+       * Image src for the logo
+       */
+      src: string;
+
+    }
+
     interface MapOptions {
 
         /** Controls initially added to the map. If not specified, ol.control.defaults() is used. */
@@ -223,30 +304,69 @@ declare module olx {
     interface ViewState {
 
         /**
-         * 
+         *
          */
         center: ol.Coordinate;
 
         /**
-         * 
+         *
          */
         projection: ol.proj.Projection;
 
         /**
-         * 
+         *
          */
         resolution: number;
 
         /**
-         * 
+         *
          */
         rotation: number;
     }
 
+    interface Projection {
+        /**
+         * The SRS identifier code, e.g. EPSG:4326.
+         */
+        code: string;
+
+        /**
+        * Units. Required unless a proj4 projection is defined for code.
+        */
+        units?: ol.proj.Units;
+
+        /**
+        * The validity extent for the SRS.
+        */
+        extent?: Array<number>;
+
+        /**
+        * The axis orientation as specified in Proj4. The default is enu.
+        */
+        axisOrientation?: string;
+
+        /**
+        * Whether the projection is valid for the whole globe. Default is false.
+        */
+        global?: boolean;
+
+        /**
+        * experimental The world extent for the SRS.
+        */
+        worldExtent?: ol.Extent;
+
+        /**
+        *  experimental Function to determine resolution at a point. The function is called with
+        *  a {number} view resolution and an {ol.Coordinate} as arguments, and returns the {number}
+        *  resolution at the passed coordinate.
+        */
+        getPointResolution?: (resolution: number, coordinate: ol.Coordinate) => number;
+    }
+
     module animation {
 
         interface BounceOptions {
-            
+
             /**
              * The resolution to start the bounce from, typically map.getView().getResolution().
              */
@@ -269,7 +389,7 @@ declare module olx {
         }
 
         interface PanOptions {
-            
+
             /**
              * The resolution to start the bounce from, typically map.getView().getResolution().
              */
@@ -292,7 +412,7 @@ declare module olx {
         }
 
         interface RotateOptions {
-            
+
             /**
              * The rotation value (in radians) to begin rotating from, typically map.getView().getRotation(). If undefined then 0 is assumed.
              */
@@ -320,7 +440,7 @@ declare module olx {
         }
 
         interface ZoomOptions {
-            
+
             /**
              * The resolution to begin zooming from, typically map.getView().getResolution().
              */
@@ -368,20 +488,35 @@ declare module olx {
              */
             //TODO: Replace with olx.control.RotateOptions
             rotateOptions?: any;
-            
+
             /**
              * Zoom. Default is true
              */
             zoom?: boolean;
 
             /**
-             * 
+             *
              */
             //TODO: Replace with olx.control.ZoomOptions
             zoomOptions?: any;
         }
     }
 
+    module interaction {
+        interface DefaultsOptions {
+            altShiftDragRotate?: boolean;
+            doubleClickZoom?: boolean;
+            keyboard?: boolean;
+            mouseWheelZoom?: boolean;
+            shiftDragZoom?: boolean;
+            dragPan?: boolean;
+            pinchRotate?: boolean;
+            pinchZoom?: boolean;
+            zoomDelta?: number;
+            zoomDuration?: number;
+          }
+    }
+
     module layer {
 
         interface BaseOptions {
@@ -527,6 +662,97 @@ declare module olx {
         }
     }
 
+    module source {
+
+        interface VectorOptions {
+            /**
+             * Attributions.
+             */
+            attributions?: Array<ol.Attribution>;
+
+            /**
+             * Features. If provided as {@link ol.Collection}, the features in the source
+             * and the collection will stay in sync.
+             */
+            features?: Array<ol.Feature> | ol.Collection<ol.Feature>;
+
+            /**
+             * The feature format used by the XHR feature loader when `url` is set.
+             * Required if `url` is set, otherwise ignored. Default is `undefined`.
+             */
+            format?: ol.format.Feature;
+
+            /**
+             * The loader function used to load features, from a remote source for example.
+             * Note that the source will create and use an XHR feature loader when `url` is
+             * set.
+             */
+            loader?: ol.FeatureLoader;
+
+            /**
+             * Logo.
+             */
+            logo?: string | olx.LogoOptions;
+
+            /**
+             * The loading strategy to use. By default an {@link ol.loadingstrategy.all}
+             * strategy is used, a one-off strategy which loads all features at once.
+             */
+            strategy?: ol.LoadingStrategy;
+
+            /**
+             * Setting this option instructs the source to use an XHR loader (see
+             * {@link ol.featureloader.xhr}) and an {@link ol.loadingstrategy.all} for a
+             * one-off download of all features from that URL.
+             * Requires `format` to be set as well.
+             */
+            url?: string;
+
+            /**
+             * By default, an RTree is used as spatial index. When features are removed and
+             * added frequently, and the total number of features is low, setting this to
+             * `false` may improve performance.
+             */
+            useSpatialIndex?: boolean;
+
+            /**
+             * Wrap the world horizontally. Default is `true`. For vector editing across the
+             * -180° and 180° meridians to work properly, this should be set to `false`. The
+             * resulting geometry coordinates will then exceed the world bounds.
+             */
+            wrapX?: boolean;
+        }
+    }
+
+    module style {
+
+        interface FillOptions {
+            color?: ol.Color | string;
+        }
+
+        interface StyleOptions {
+            geometry?: string | ol.geom.Geometry | ol.style.GeometryFunction;
+            fill?: ol.style.Fill;
+            image?: ol.style.Image;
+            stroke?: ol.style.Stroke;
+            text?: ol.style.Text;
+            zIndex?: number;
+        }
+
+        interface TextOptions {
+          font?: string;
+          offsetX?: number;
+          offsetY?: number;
+          scale?: number;
+          rotation?: number;
+          text?: string;
+          textAlign?: string;
+          textBaseline?: string;
+          fill?: ol.style.Fill;
+          stroke?: ol.style.Stroke;
+        }
+    }
+
     module tilegrid {
 
         interface TileGridOptions {
@@ -608,7 +834,7 @@ declare module olx {
              * Tile sizes. The length of this array needs to match the length of the resolutions array.
              */
             tileSizes?: Array<number | ol.Size>;
-            
+
             /**
              * Number of tile columns that cover the grid's extent for each zoom level. Only required when used with a source that has wrapX set to true, and only when the grid's origin differs from the one of the projection's extent. The array length has to match the length of the resolutions array, i.e. each resolution will have a matching entry here.
              */
@@ -731,6 +957,10 @@ declare module olx {
  */
 declare module ol {
 
+    interface TileLoadFunctionType{ (image: ol.Image, url: string): void }
+
+    interface ImageLoadFunctionType{ (image: ol.Image, url: string): void }
+
     /**
      * An attribution for a layer source.
      */
@@ -741,13 +971,13 @@ declare module ol {
          */
         constructor(options: olx.AttributionOptions);
 
-        /** 
-         * Get the attribution markup. 
+        /**
+         * Get the attribution markup.
          * @returns The attribution HTML.
          */
         getHTML(): string;
     }
-    
+
     /**
      * An expanded version of standard JS Array, adding convenience methods for manipulation. Add and remove changes to the Collection trigger a Collection event. Note that this does not cover changes to the objects within the Collection; they trigger events on the appropriate object, not on the Collection as a whole.
      */
@@ -804,7 +1034,7 @@ declare module ol {
          */
         item(index: number): T;
 
-        /** 
+        /**
          * Remove the last element of the collection and return it. Return undefined if the collection is empty.
          * @returns Element
          */
@@ -831,7 +1061,7 @@ declare module ol {
          */
         removeAt(index: number): T;
 
-        /** 
+        /**
          * Set the element at the provided index.
          * @param index Index.
          * @param elem Element.
@@ -863,7 +1093,7 @@ declare module ol {
 
         /**
          * Rotation around the device z-axis (in radians).
-         * @returns The euler angle in radians of the device from the standard Z axis. 
+         * @returns The euler angle in radians of the device from the standard Z axis.
          */
         getAlpha(): number;
 
@@ -875,7 +1105,7 @@ declare module ol {
 
         /**
          * Rotation around the device y-axis (in radians).
-         * @returns The euler angle in radians of the device from the planar Y axis. 
+         * @returns The euler angle in radians of the device from the planar Y axis.
          */
         getGamma(): number;
 
@@ -893,11 +1123,11 @@ declare module ol {
 
         /**
          * Enable or disable tracking of device orientation events.
-         * @param tracking The status of tracking changes to alpha, beta and gamma. If true, changes are tracked and reported immediately. 
+         * @param tracking The status of tracking changes to alpha, beta and gamma. If true, changes are tracked and reported immediately.
          */
         setTracking(tracking: boolean): void;
     }
-    
+
     /**
      * Events emitted by ol.interaction.DragBox instances are instances of this type.
      */
@@ -1024,7 +1254,7 @@ declare module ol {
 
         /**
          * Get the map associated with the overlay.
-         * @returns The map with which this feature overlay is associated. 
+         * @returns The map with which this feature overlay is associated.
          */
         getMap(): ol.Map;
 
@@ -1096,19 +1326,19 @@ declare module ol {
 
         /**
          * Get a geometry of the position accuracy.
-         * @returns A geometry of the position accuracy. 
+         * @returns A geometry of the position accuracy.
          */
         getAccuracyGeometry(): ol.geom.Geometry;
 
         /**
          * Get the altitude associated with the position.
-         * @returns The altitude of the position in meters above mean sea level. 
+         * @returns The altitude of the position in meters above mean sea level.
          */
         getAltitude(): number;
 
         /**
          * Get the altitude accuracy of the position.
-         * @returns The accuracy of the altitude measurement in meters. 
+         * @returns The accuracy of the altitude measurement in meters.
          */
         getAltitudeAccuracy(): number;
 
@@ -1126,7 +1356,7 @@ declare module ol {
 
         /**
          * Get the projection associated with the position.
-         * @returns The projection the position is reported in. 
+         * @returns The projection the position is reported in.
          */
         getProjection(): ol.proj.Projection;
 
@@ -1138,7 +1368,7 @@ declare module ol {
 
         /**
          * Determine if the device location is being tracked.
-         * @returns The device location is being tracked. 
+         * @returns The device location is being tracked.
          */
         getTracking(): boolean;
 
@@ -1177,33 +1407,33 @@ declare module ol {
          */
         constructor(options?: olx.GraticuleOptions);
 
-        /** 
-         * Get the map associated with this graticule. 
+        /**
+         * Get the map associated with this graticule.
          * @returns The map.
          */
         getMap(): Map;
 
-        /** 
-         * Get the list of meridians. Meridians are lines of equal longitude. 
+        /**
+         * Get the list of meridians. Meridians are lines of equal longitude.
          * @returns The meridians.
          */
         getMeridians(): Array<ol.geom.LineString>;
 
-        /** 
-         * Get the list of parallels. Pallels are lines of equal latitude. 
+        /**
+         * Get the list of parallels. Pallels are lines of equal latitude.
          * @returns The parallels.
          */
         getParallels(): Array<ol.geom.LineString>;
-    
-        /** 
-         * Set the map for this graticule.The graticule will be rendered on the provided map. 
+
+        /**
+         * Set the map for this graticule.The graticule will be rendered on the provided map.
          * @param map Map
          */
         setMap(map: Map): void;
     }
-    
+
     /**
-     * 
+     *
      */
     class Image extends ol.ImageBase {
 
@@ -1230,13 +1460,13 @@ declare module ol {
     }
 
     /**
-     * 
+     *
      */
     class ImageBase {
     }
 
     /**
-     * 
+     *
      */
     class ImageTile extends ol.Tile {
 
@@ -1325,7 +1555,7 @@ declare module ol {
          * @param ref Value to use as this when executing callback.
          * @param layerFilter Layer filter function. The filter function will receive one argument, the layer-candidate and it should return a boolean value. Only layers which are visible and for which this function returns true will be tested for features. By default, all visible layers will be tested. Feature overlays will always be tested.
          * @param ref2 Value to use as this when executing layerFilter.
-         * @returns Callback result, i.e. the return value of last callback execution, or the first truthy callback return value. 
+         * @returns Callback result, i.e. the return value of last callback execution, or the first truthy callback return value.
          */
         forEachFeatureAtPixel(pixel: ol.Pixel, callback: (feature: ol.Feature, layer: ol.layer.Layer) => any, ref?: any, layerFilter?: (layerCandidate: ol.layer.Layer) => boolean, ref2?: any): void;
 
@@ -1336,7 +1566,7 @@ declare module ol {
          * @param ref Value to use as this when executing callback.
          * @param layerFilter Layer filter function. The filter function will receive one argument, the layer-candidate and it should return a boolean value. Only layers which are visible and for which this function returns true will be tested for features. By default, all visible layers will be tested. Feature overlays will always be tested.
          * @param ref2 Value to use as this when executing layerFilter.
-         * @returns Callback result, i.e. the return value of last callback execution, or the first truthy callback return value. 
+         * @returns Callback result, i.e. the return value of last callback execution, or the first truthy callback return value.
          */
         forEachLayerAtPixel(pixel: ol.Pixel, callback: (layer: ol.layer.Layer) => any, ref?: any, layerFilter?: (layerCandidate: ol.layer.Layer) => boolean, ref2?: any): void;
 
@@ -1349,7 +1579,7 @@ declare module ol {
         /**
          * Get the coordinate for a given pixel. This returns a coordinate in the map view projection.
          * @param pixel Pixel position in the map viewport.
-         * @returns The coordinate for the pixel position. 
+         * @returns The coordinate for the pixel position.
          */
         getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
 
@@ -1375,7 +1605,7 @@ declare module ol {
 
         /**
          * Get the layergroup associated with this map.
-         * @returns A layer group containing the layers in this map. 
+         * @returns A layer group containing the layers in this map.
          */
         getLayerGroup(): ol.layer.Group;
 
@@ -1400,13 +1630,13 @@ declare module ol {
 
         /**
          * Get the size of this map.
-         * @returns The size in pixels of the map in the DOM. 
+         * @returns The size in pixels of the map in the DOM.
          */
         getSize(): ol.Size;
 
         /**
          * Get the target in which this map is rendered. Note that this returns what is entered as an option or in setTarget: if that was an element, it returns an element; if a string, it returns that.
-         * @returns The Element or id of the Element that the map is rendered in. 
+         * @returns The Element or id of the Element that the map is rendered in.
          */
         getTarget(): Element | string;
 
@@ -1416,8 +1646,8 @@ declare module ol {
          */
         getTargetElement(): Element;
 
-        /** 
-         * Get the view associated with this map. A view manages properties such as center and resolution. 
+        /**
+         * Get the view associated with this map. A view manages properties such as center and resolution.
          * @returns The view that controls this map.
          */
         getView(): View;
@@ -1440,21 +1670,21 @@ declare module ol {
         /**
          * Remove the given control from the map.
          * @param Control.
-         * @returns The removed control (or undefined if the control was not found). 
+         * @returns The removed control (or undefined if the control was not found).
          */
         removeControl(control: ol.control.Control): ol.control.Control;
 
         /**
          * Remove the given interaction from the map.
          * @param interaction Interaction to remove.
-         * @returns The removed interaction (or undefined if the interaction was not found). 
+         * @returns The removed interaction (or undefined if the interaction was not found).
          */
         removeInteraction(interaction: ol.interaction.Interaction): ol.interaction.Interaction;
 
         /**
          * Removes the given layer from the map.
          * @param Layer.
-         * @returns The removed layer (or undefined if the layer was not found). 
+         * @returns The removed layer (or undefined if the layer was not found).
          */
         removeLayer(layer: ol.layer.Base): ol.layer.Base;
 
@@ -1499,18 +1729,18 @@ declare module ol {
          */
         setTarget(target: string): void;
 
-        /** 
-         * Set the view for this map. 
+        /**
+         * Set the view for this map.
          * @param view The view that controls this map.
          */
         setView(view: View): void;
 
-        /** 
-         * Force a recalculation of the map viewport size. This should be called when third-party code changes the size of the map viewport. 
+        /**
+         * Force a recalculation of the map viewport size. This should be called when third-party code changes the size of the map viewport.
          * */
         updateSize(): void;
     }
-   
+
     /**
      * Events emitted as map browser events are instances of this type. See ol.Map for which events trigger a map browser event.
      */
@@ -1525,7 +1755,7 @@ declare module ol {
          * Indicates if the map is currently being dragged. Only set for POINTERDRAG and POINTERMOVE events. Default is false.
          */
         dragging: boolean;
-        
+
         /**
          * The frame state at the time of the event
          */
@@ -1541,12 +1771,12 @@ declare module ol {
          */
         originalEvent: Event;
 
-        /** 
+        /**
          * The pixel of the original browser event.
          */
         pixel: Pixel;
 
-        
+
         // Methods
 
         /**
@@ -1594,13 +1824,13 @@ declare module ol {
          */
         get(key: string): any;
 
-        /** 
+        /**
          * Get a list of object property names.
          * @returns List of property names.
          */
         getKeys(): Array<string>;
 
-        /** 
+        /**
          * Get an object of all property names and values.
          * @returns Object.
          */
@@ -1611,14 +1841,14 @@ declare module ol {
          */
         getRevision(): number;
 
-        /** 
+        /**
          * Sets a value.
          * @param key Key name.
          * @param value Value.
          */
         set(key: string, value: any): void;
 
-        /** 
+        /**
          * Sets a collection of key-value pairs. Note that this changes any existing properties and adds new ones (it does not remove any existing properties).
          * @param Values.
          */
@@ -1789,7 +2019,7 @@ declare module ol {
          */
         setPositioning(positioning: ol.OverlayPositioning): void;
     }
-    
+
     /**
      * Events emitted by ol.interaction.Select instances are instances of this type.
      */
@@ -1968,7 +2198,7 @@ declare module ol {
          */
         setZoom(zoom: number): void;
     }
-    
+
     // NAMESPACES
 
     /**
@@ -1981,7 +2211,7 @@ declare module ol {
          * @param options Bounce options.
          */
         function bounce(options: olx.animation.BounceOptions): ol.PreRenderFunction;
-        
+
         /**
          * Generate an animated transition while updating the view center.
          * @param options Pan options.
@@ -2039,7 +2269,7 @@ declare module ol {
          * @returns Control.s
          */
         function defaults(options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
-        
+
         /**
          * Units for the scale line. Supported values are 'degrees', 'imperial', 'nautical', 'metric', 'us'.
          */
@@ -2082,7 +2312,7 @@ declare module ol {
          * Add delta to coordinate. coordinate is modified in place and returned by the function.
          * @param coordinate Coordinate
          * @param delta Delta
-         * @returns The input coordinate adjusted by the given delta. 
+         * @returns The input coordinate adjusted by the given delta.
          */
         function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
 
@@ -2113,7 +2343,7 @@ declare module ol {
         /**
          * Format a geographic coordinate with the hemisphere, degrees, minutes, and seconds.
          * @param coordinate COordinate
-         * @returns Hemisphere, degrees, minutes and seconds. 
+         * @returns Hemisphere, degrees, minutes and seconds.
          */
         function toStringHDMS(coordinate?: ol.Coordinate): string;
 
@@ -2150,7 +2380,7 @@ declare module ol {
         * @param number Input between 0 and 1
         * @returns Output between 0 and 1
         */
-        function inAndOut (t: number): number;
+        function inAndOut(t: number): number;
 
         /**
         * Maintain a constant speed over time.
@@ -2220,7 +2450,7 @@ declare module ol {
          * @param extent Extent
          * @param x X coordinate
          * @param y Y coordinate
-         * @returns The x, y values are contained in the extent. 
+         * @returns The x, y values are contained in the extent.
          */
         function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
@@ -2357,7 +2587,7 @@ declare module ol {
          * Feature format for reading and writing data in the GeoJSON format.
          */
         class GeoJSON extends ol.format.JSONFeature {
-            
+
             /**
              * @constructor
              * @param Options
@@ -2371,7 +2601,7 @@ declare module ol {
              * @returns Feature
              */
             readFeature(source: Document | Node | JSON | string, options?: olx.format.ReadOptions): ol.Feature;
-    
+
             /**
              * Read all features from a GeoJSON source. Works with both Feature and FeatureCollection sources.
              * @param source Source
@@ -2507,8 +2737,37 @@ declare module ol {
         // Type definitions
         interface GeometryLayout extends String { }
         interface GeometryType extends String { }
+        
+        /**
+         * Abstract base class; only used for creating subclasses; do not instantiate
+         * in apps, as cannot be rendered.
+         */
+        class Circle extends ol.geom.SimpleGeometry {
 
-        class Circle {
+            /**
+            * Test if the geometry and the passed extent intersect.
+            * @param extent Extent
+            * @returns true if the geometry and the extent intersect. 
+            */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Transform each coordinate of the circle from one coordinate reference system
+             * to another. The geometry is modified in place.
+             * If you do not want the geometry modified in place, first clone() it and
+             * then use this function on the clone.
+             *
+             * Internally a circle is currently represented by two points: the center of
+             * the circle `[cx, cy]`, and the point to the right of the circle
+             * `[cx + r, cy]`. This `transform` function just transforms these two points.
+             * So the resulting geometry is also a circle, and that circle does not
+             * correspond to the shape that would be obtained by transforming every point
+             * of the original circle.
+             * @param source The current projection.  Can be a string identifier or a {@link ol.proj.Projection} object.
+             * @param destination The desired projection.  Can be a string identifier or a {@link ol.proj.Projection} object.
+             * @returns This geometry.  Note that original geometry is  modified in place.
+             */
+            transform(source: ol.proj.ProjectionLike, destination: ol.proj.ProjectionLike): ol.geom.Circle;
         }
 
         /**
@@ -2532,32 +2791,590 @@ declare module ol {
             getExtent(extent?: ol.Extent): ol.Extent;
         }
 
-        class GeometryCollection {
+        /**
+        * An array of ol.geom.Geometry objects.
+        */
+        class GeometryCollection extends ol.geom.Geometry {
+
+            /**
+             * constructor
+             * @param geometries Geometries.
+             */
+            constructor(geometries?: Array<ol.geom.Geometry>);
+
+            /**
+             * Apply a transform function to each coordinate of the geometry. The geometry is modified in place.
+             * If you do not want the geometry modified in place, first clone() it and then use this function on the clone.
+             * @param transformFn TransformFunction
+             */
+            applyTransform(transformFn: ol.TransformFunction): void;
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.GeometryCollection;
+
+            /**
+             * Return the geometries that make up this geometry collection.
+             * @returns Geometries.
+             */
+            getGeometries(): Array<Geometry>;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the geometries that make up this geometry collection.
+             * @param geometries Geometries.
+             */
+            setGeometries(geometries: Array<ol.geom.Geometry>): void;
+
         }
 
-        class LinearRing {
+        /**
+        * Linear ring geometry. Only used as part of polygon; cannot be rendered
+        * on its own.
+        */
+        class LinearRing extends SimpleGeometry {
+
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.LinearRing;
+
+            /**
+             * Return the area of the linear ring on projected plane.
+             * @returns Area (on projected plane).
+             */
+            getArea(): number;
+            
+            /**
+             * Return the coordinates of the linear ring.
+             * @returns Coordinates.
+             */
+            getCoordinates(): Array<ol.Coordinate>;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+            * @Set the coordinates of the linear ring
+            * @param coordinates Coordinates.
+            * @param layout Layout.
+            */
+            setCoordinates(coordinates: Array<ol.Coordinate>, layout?: any): void;
+
         }
 
-        class LineString {
-            new(): LineString;
+        /**
+        * Linestring geometry.
+        */
+        class LineString extends ol.geom.SimpleGeometry {
+
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * Append the passed coordinate to the coordinates of the linestring.
+             * @param coordinate Coordinate.
+             */
+            appendCoordinate(coordinate: ol.Coordinate): void;
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.LineString;
+
+            /**
+             * Returns the coordinate at `m` using linear interpolation, or `null` if no
+             * such coordinate exists.
+             *
+             * `extrapolate` controls extrapolation beyond the range of Ms in the
+             * MultiLineString. If `extrapolate` is `true` then Ms less than the first
+             * M will return the first coordinate and Ms greater than the last M will
+             * return the last coordinate.
+             *
+             * @param m M.
+             * @param extrapolate Extrapolate. Default is `false`.
+             * @returns Coordinate.
+             */
+            getCoordinateAtM(m: number, extrapolate?: boolean): ol.Coordinate;
+
+            /**
+             * Return the coordinates of the linestring.
+             * @returns Coordinates.
+             */
+            getCoordinates(): Array<ol.Coordinate>;
+
+            /**
+             * Return the length of the linestring on projected plane.
+             * @returns Length (on projected plane).
+             */
+            getLength(): number;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinates of the linestring.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout) : void;
         }
 
-        class MultiLineString {
+        /**
+        * Multi-linestring geometry.
+        */
+        class MultiLineString extends ol.geom.SimpleGeometry {
+
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<Array<ol.Coordinate>>, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * Append the passed linestring to the multilinestring.
+             * @param lineString LineString.
+             */
+            appendLineString(lineString: ol.geom.LineString): void;
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.MultiLineString;
+
+            /**
+             * Returns the coordinate at `m` using linear interpolation, or `null` if no
+             * such coordinate exists.
+             *
+             * `extrapolate` controls extrapolation beyond the range of Ms in the
+             * MultiLineString. If `extrapolate` is `true` then Ms less than the first
+             * M will return the first coordinate and Ms greater than the last M will
+             * return the last coordinate.
+             *
+             * `interpolate` controls interpolation between consecutive LineStrings
+             * within the MultiLineString. If `interpolate` is `true` the coordinates
+             * will be linearly interpolated between the last coordinate of one LineString
+             * and the first coordinate of the next LineString.  If `interpolate` is
+             * `false` then the function will return `null` for Ms falling between
+             * LineStrings.
+             *
+             * @param m M.
+             * @param extrapolate Extrapolate. Default is `false`.
+             * @param interpolate Interpolate. Default is `false`.
+             * @returns Coordinate.
+             */
+            getCoordinateAtM(m: number, extrapolate?: boolean, interpolate?: boolean): ol.Coordinate;
+
+            /**
+             * Return the coordinates of the multilinestring.
+             * @returns Coordinates.
+             */
+            getCoordinates(): Array<Array<ol.Coordinate>>;
+
+            /**
+             * Return the linestring at the specified index.
+             * @param index Index.
+             * @returns LineString.
+             */
+            getLineString(index: number): ol.geom.LineString;
+
+            /**
+             * Return the linestrings of this multilinestring.
+             * @returns LineStrings.
+             */
+            getLineStrings(): Array<ol.geom.LineString>;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinates of the multilinestring.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<Array<ol.Coordinate>>, layout?: ol.geom.GeometryLayout): void;
         }
 
-        class MultiPoint {
+        /**
+        * Multi-point geometry.
+        */
+        class MultiPoint extends ol.geom.SimpleGeometry {
+
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * Append the passed point to this multipoint.
+             * @param {ol.geom.Point} point Point.
+             */
+            appendPoint(point: ol.geom.Point): void;
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.MultiPoint;
+
+            /**
+             * Return the coordinates of the multipoint.
+             * @returns Coordinates.
+             */
+            getCoordinates(): Array<ol.Coordinate>;
+
+            /**
+             * Return the point at the specified index.
+             * @param index Index.
+             * @returns Point.
+             */
+            getPoint(index: number): ol.geom.Point;
+
+            /**
+             * Return the points of this multipoint.
+             * @returns Points.
+             */
+            getPoints(): Array<ol.geom.Point>;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinates of the multipoint.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout): void;
+        }
+        
+        /**
+         * Multi-polygon geometry.
+         */
+        class MultiPolygon extends ol.geom.SimpleGeometry {
+            
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<Array<Array<ol.Coordinate>>>, layout?: ol.geom.GeometryLayout);
+            
+            /**
+             * Append the passed polygon to this multipolygon.
+             * @param polygon Polygon.
+             */
+            appendPolygon(polygon: ol.geom.Polygon): void;
+            
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.MultiPolygon;
+            
+            /**
+             * Return the area of the multipolygon on projected plane.
+             * @returns Area (on projected plane).
+             */
+            getArea(): number;
+            
+            /**
+             * Get the coordinate array for this geometry.  This array has the structure
+             * of a GeoJSON coordinate array for multi-polygons.
+             *
+             * @param right Orient coordinates according to the right-hand
+             *     rule (counter-clockwise for exterior and clockwise for interior rings).
+             *     If `false`, coordinates will be oriented according to the left-hand rule
+             *     (clockwise for exterior and counter-clockwise for interior rings).
+             *     By default, coordinate orientation will depend on how the geometry was
+             *     constructed.
+             * @returns Coordinates.
+             */
+            getCoordinates(right?: boolean): Array<Array<Array<ol.Coordinate>>>;
+            
+            /**
+             * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
+             * @returns Interior points.
+             */
+            getInteriorPoints(): ol.geom.MultiPoint;
+            
+            /**
+             * Return the polygon at the specified index.
+             * @param index Index.
+             * @returns  Polygon.
+             */
+            getPolygon(index: number): ol.geom.Polygon;
+            
+            /**
+             * Return the polygons of this multipolygon.
+             * @returns Polygons.
+             */
+            getPolygons(): Array<ol.geom.Polygon>;
+            
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+            
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinates of the multipolygon.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<Array<Array<ol.Coordinate>>>, layout?: ol.geom.GeometryLayout): void;
         }
 
-        class MultiPolygon {
+        /**
+        * Point geometry.
+        */
+        class Point extends SimpleGeometry {
+
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: ol.Coordinate, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.Point;
+
+            /**
+             * Return the coordinate of the point.
+             * @returns Coordinates.
+             */
+            getCoordinates(): ol.Coordinate;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinate of the point.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: ol.Coordinate, layout?: ol.geom.GeometryLayout): void;
         }
 
-        class Point {
-        }
+        /**
+        * Polygon geometry.
+        */
+        class Polygon extends SimpleGeometry {
 
-        class Polygon {
-        }
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<Array<ol.Coordinate>>, layout?: ol.geom.GeometryLayout);
 
-        class SimpleGeometry {
+            /**
+             * Create an approximation of a circle on the surface of a sphere.
+             * @param sphere The sphere.
+             * @param center Center (`[lon, lat]` in degrees).
+             * @param radius The great-circle distance from the center to the polygon vertices.
+             * @param n Optional number of vertices for the resulting polygon. Default is `32`.
+             * @returns The "circular" polygon.
+             */
+            static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, n?: number): ol.geom.Polygon;
+
+            /**
+             * Append the passed linear ring to this polygon.
+             * @param linearRing Linear ring.
+             */
+            appendLinearRing(linearRing: ol.geom.LinearRing): void;
+
+            /**
+             * Make a complete copy of the geometry.
+             * @returns Clone.
+             */
+            clone(): ol.geom.Polygon;
+
+            /**
+             * Return the area of the polygon on projected plane.
+             * @returns Area (on projected plane).
+             */
+            getArea(): number;
+
+            /**
+             * Get the coordinate array for this geometry.  This array has the structure
+             * of a GeoJSON coordinate array for polygons.
+             *
+             * @param right Orient coordinates according to the right-hand
+             *     rule (counter-clockwise for exterior and clockwise for interior rings).
+             *     If `false`, coordinates will be oriented according to the left-hand rule
+             *     (clockwise for exterior and counter-clockwise for interior rings).
+             *     By default, coordinate orientation will depend on how the geometry was
+             *     constructed.
+             * @returns Coordinates.
+             */
+            getCoordinates(right?: boolean): Array<Array<ol.Coordinate>>;
+
+            /**
+             * Return an interior point of the polygon.
+             * @returns Interior point.
+             */
+            getInteriorPoint(): ol.geom.Point;
+
+            /**
+             * Return the Nth linear ring of the polygon geometry. Return `null` if the
+             * given index is out of range.
+             * The exterior linear ring is available at index `0` and the interior rings
+             * at index `1` and beyond.
+             *
+             * @param index Index.
+             * @returns Linear ring.
+             */
+            getLinearRing(index: number): ol.geom.LinearRing;
+
+            /**
+             * Return the linear rings of the polygon.
+             * @returns Linear rings.
+             */
+            getLinearRings(): Array<ol.geom.LinearRing>;
+
+            /**
+             * Get the type of this geometry.
+             * @returns Geometry type
+             */
+            getType(): ol.geom.GeometryType;
+
+            /**
+             * Test if the geometry and the passed extent intersect.
+             * @param extent Extent
+             * @returns true if the geometry and the extent intersect. 
+             */
+            intersectsExtent(extent: ol.Extent): boolean;
+
+            /**
+             * Set the coordinates of the polygon.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<Array<ol.Coordinate>>, layout?: ol.geom.GeometryLayout): void;
+        }
+        /**
+         * Abstract base class; only used for creating subclasses; do not instantiate
+         * in apps, as cannot be rendered.
+         */
+        class SimpleGeometry extends ol.geom.Geometry {
+
+            /**
+             * Apply a transform function to each coordinate of the geometry. The geometry is modified in place.
+             * If you do not want the geometry modified in place, first clone() it and then use this function on the clone.
+             * @param transformFn TransformFunction
+             */
+            applyTransform(transformFn: ol.TransformFunction): void;
+
+            /**
+             * Return the first coordinate of the geometry.
+             * @returns First coordinate.
+             */
+            getFirstCoordinate(): ol.Coordinate;
+
+            /**
+             * Return the last coordinate of the geometry.
+             * @returns Last point.
+             */
+            getLastCoordinate(): ol.Coordinate;
+
+            /**
+             * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
+             * @returns Layout.
+             */
+            getLayout(): ol.geom.GeometryLayout;
+
+            /** 
+            * Translate the geometry. This modifies the geometry coordinates in place. 
+            * If instead you want a new geometry, first clone() this geometry.
+            * @param deltaX Delta X
+            * @param deltaY Delta Y
+            */
+            translate(deltaX: number, deltaY: number): void;
         }
     }
 
@@ -2625,6 +3442,8 @@ declare module ol {
 
         class Snap {
         }
+
+        function defaults(opts: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
     }
 
     module layer {
@@ -2672,7 +3491,7 @@ declare module ol {
 
             /**
              * Return the minimum resolution of the layer.
-             * @returns The minimum resolution of the layer. 
+             * @returns The minimum resolution of the layer.
              */
             getMinResolution(): number;
 
@@ -2845,7 +3664,7 @@ declare module ol {
         class Layer extends ol.layer.Base {
 
             /**
-             * @constructor 
+             * @constructor
              * @param options Layer options
              */
             constructor(options?: olx.layer.LayerOptions);
@@ -2862,7 +3681,7 @@ declare module ol {
              */
             setSource(source: ol.source.Source): void;
         }
-        
+
         /**
          * For layer sources that provide pre-rendered, tiled images in grids that are organized by zoom levels for specific resolutions. Note that any property set in the options is set as a ol.Object property on the layer object; for example, setting title: 'My Title' in the options means that title is observable, and has get/set accessors.
          */
@@ -3067,7 +3886,8 @@ declare module ol {
          */
         function transformExtent(extent: Extent, source: ProjectionLike, destination: ProjectionLike): Extent;
 
-        interface Projection {
+        class Projection {
+            constructor(options: olx.Projection)
         }
     }
 
@@ -3112,6 +3932,7 @@ declare module ol {
         }
 
         class ImageWMS {
+            constructor(options: olx.ImageWMSOptions);
         }
 
         class MapQuest {
@@ -3152,9 +3973,18 @@ declare module ol {
         }
 
         class TileWMS {
+            constructor(options: olx.TileWMSOptions);
         }
 
         class Vector {
+          constructor(opts: olx.source.VectorOptions)
+
+          /**
+           * Get the extent of the features currently in the source.
+           */
+          getExtent(): ol.Extent;
+
+          getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
         }
 
         class VectorEvent {
@@ -3187,7 +4017,21 @@ declare module ol {
         class Circle {
         }
 
+        /**
+         * Set fill style for vector features.
+         */
         class Fill {
+
+          constructor(opt_options?: olx.style.FillOptions);
+
+          getColor(): ol.Color | string;
+
+          /**
+           * Set the color.
+           */
+          setColor(color: ol.Color | string): void;
+
+          getChecksum(): string;
         }
 
         class Icon {
@@ -3196,6 +4040,10 @@ declare module ol {
         class Image {
         }
 
+        interface GeometryFunction {
+          (feature: Feature): ol.geom.Geometry
+        }
+
         class RegularShape {
         }
 
@@ -3203,10 +4051,82 @@ declare module ol {
             constructor();
         }
 
+        /**
+         * Container for vector feature rendering styles. Any changes made to the style
+         * or its children through `set*()` methods will not take effect until the
+         * feature, layer or FeatureOverlay that uses the style is re-rendered.
+         */
         class Style {
+          constructor(opts: olx.style.StyleOptions);
         }
 
+        /**
+         * Set text style for vector features.
+         */
         class Text {
+          constructor(opt?: olx.style.TextOptions);
+
+          getFont(): string;
+          getOffsetX(): number;
+          getOffsetY(): number;
+          getFill(): Fill;
+          getRotation(): number;
+          getScale(): number;
+          getStroke(): Stroke;
+          getText(): string;
+          getTextAlign(): string;
+          getTextBaseline(): string;
+
+          /**
+           * Set the font.
+           */
+          setFont(font: string): void;
+
+          /**
+           * Set the x offset.
+           */
+          setOffsetX(offsetX: number): void;
+
+           /**
+            * Set the y offset.
+            */
+          setOffsetY(offsetY: number): void;
+
+          /**
+           * Set the fill.
+           */
+          setFill(fill: Fill): void;
+
+          /**
+           * Set the rotation.
+           */
+          setRotation(rotation: number): void;
+
+          /**
+           * Set the scale.
+           */
+          setScale(scale: number): void;
+
+          /**
+           * Set the stroke.
+           *
+           */
+          setStroke(stroke: Stroke): void;
+
+           /**
+            * Set the text.
+            */
+          setText(text: string): void;
+
+           /**
+            * Set the text alignment.
+            */
+          setTextAlign(textAlign: string): void;
+
+           /**
+            * Set the text baseline.
+            */
+          setTextBaseline(textBaseline: string): void;
         }
 
         /**
@@ -3290,7 +4210,7 @@ declare module ol {
              */
             getTileSize(z: number): number | ol.Size;
         }
-        
+
         /**
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
          */
@@ -3316,7 +4236,7 @@ declare module ol {
              */
             getMatrixIds(): Array<string>;
         }
-        
+
         /**
          * Set the grid pattern for sources accessing Zoomify tiled-image servers.
          */
@@ -3348,7 +4268,7 @@ declare module ol {
              */
             constructor(canvas: HTMLCanvasElement, gl: WebGLRenderingContext);
 
-            /** 
+            /**
             Get the WebGL rendering context
              @returns The rendering context.
             */
@@ -3371,55 +4291,55 @@ declare module ol {
 
     // Type definitions
 
-    /** 
-     * A function returning the canvas element ({HTMLCanvasElement}) used by the source as an image. The arguments passed to the function are: ol.Extent the image extent, {number} the image resolution, {number} the device pixel ratio, ol.Size the image size, and ol.proj.Projection the image projection. The canvas returned by this function is cached by the source. The this keyword inside the function references the ol.source.ImageCanvas. 
+    /**
+     * A function returning the canvas element ({HTMLCanvasElement}) used by the source as an image. The arguments passed to the function are: ol.Extent the image extent, {number} the image resolution, {number} the device pixel ratio, ol.Size the image size, and ol.proj.Projection the image projection. The canvas returned by this function is cached by the source. The this keyword inside the function references the ol.source.ImageCanvas.
      */
     function CanvasFunctionType(extent: Extent, resolution: number, pixelRatio: number, size: Size, projection: proj.Projection): HTMLCanvasElement;
 
-    /** 
-     * A color represented as a short array [red, green, blue, alpha]. red, green, and blue should be integers in the range 0..255 inclusive. alpha should be a float in the range 0..1 inclusive. 
+    /**
+     * A color represented as a short array [red, green, blue, alpha]. red, green, and blue should be integers in the range 0..255 inclusive. alpha should be a float in the range 0..1 inclusive.
      */
     interface Color extends Array<number> { }
-    
+
     /**
-     * An array of numbers representing an xy coordinate. Example: [16, 48]. 
+     * An array of numbers representing an xy coordinate. Example: [16, 48].
      */
     interface Coordinate extends Array<number> { }
 
-    /** 
-     * An array of numbers representing an extent: [minx, miny, maxx, maxy]. 
+    /**
+     * An array of numbers representing an extent: [minx, miny, maxx, maxy].
      */
     interface Extent extends Array<number> { }
 
-    /** 
-     * Overlay position: 'bottom-left', 'bottom-center', 'bottom-right', 'center-left', 'center-center', 'center-right', 'top-left', 'top-center', 'top-right' 
+    /**
+     * Overlay position: 'bottom-left', 'bottom-center', 'bottom-right', 'center-left', 'center-center', 'center-right', 'top-left', 'top-center', 'top-right'
      */
     interface OverlayPositioning extends String { }
 
     /**
-     * An array with two elements, representing a pixel. The first element is the x-coordinate, the second the y-coordinate of the pixel. 
+     * An array with two elements, representing a pixel. The first element is the x-coordinate, the second the y-coordinate of the pixel.
      */
     interface Pixel extends Array<number> { }
 
-    /** 
-     * Available renderers: 'canvas', 'dom' or 'webgl'. 
+    /**
+     * Available renderers: 'canvas', 'dom' or 'webgl'.
      */
     interface RendererType extends String { }
-    
-    /** 
-     * An array of numbers representing a size: [width, height]. 
+
+    /**
+     * An array of numbers representing a size: [width, height].
      */
     interface Size extends Array<number> { }
 
-    /** 
-     * An array of three numbers representing the location of a tile in a tile grid. The order is z, x, and y. z is the zoom level. 
+    /**
+     * An array of three numbers representing the location of a tile in a tile grid. The order is z, x, and y. z is the zoom level.
      */
     interface TileCoord extends Array<number> { }
 
-    // Functions 
+    // Functions
 
-    /** 
-     * A function that takes a ol.Coordinate and transforms it into a {string}. 
+    /**
+     * A function that takes a ol.Coordinate and transforms it into a {string}.
      */
     interface CoordinateFormatType { (coordinate?: Coordinate): string; }
 
@@ -3447,4 +4367,4 @@ declare module ol {
      * A transform function accepts an array of input coordinate values, an optional output array, and an optional dimension (default should be 2). The function transforms the input coordinate values, populates the output array, and returns the output array.
      */
     interface TransformFunction { (input: Array<number>, output?: Array<number>, dimension?: number): Array<number> }
-}
\ No newline at end of file
+}
diff --git a/openpgp/openpgp-tests.ts b/openpgp/openpgp-tests.ts
new file mode 100644
index 000000000..464bc77cd
--- /dev/null
+++ b/openpgp/openpgp-tests.ts
@@ -0,0 +1,128 @@
+/// <reference path="openpgp.d.ts" />
+
+// Open PGP Sample codes
+
+var options: openpgp.KeyOptions = {
+    numBits: 2048,
+    userId: 'Jon Smith <jon.smith@example.org>',
+    passphrase: 'super long and hard to guess secret'
+};
+
+openpgp.generateKeyPair(options).then(function (keypair) {
+    // success
+    var privkey = keypair.privateKeyArmored;
+    var pubkey = keypair.publicKeyArmored;
+}).catch(function (error) {
+    // failure
+});
+
+
+var spubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
+var publicKey = openpgp.key.readArmored(spubkey);
+
+openpgp.encryptMessage(publicKey.keys, 'Hello, World!').then(function (pgpMessage) {
+    // success
+}).catch(function (error) {
+    // failure
+});
+
+
+
+var sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
+var privateKey = openpgp.key.readArmored(sprivkey).keys[0];
+privateKey.decrypt('passphrase');
+
+var pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
+var pgpMessage = openpgp.message.readArmored(pgpMessageStr);
+
+openpgp.decryptMessage(privateKey, pgpMessage).then(function (plaintext) {
+    // success
+}).catch(function (error) {
+    // failure
+});
+
+
+// Open PGP Tests
+
+
+var keyoptions: openpgp.KeyOptions;
+var key= openpgp.key.generate(keyoptions);
+var keys: Array<openpgp.key.Key>;
+var message = openpgp.message.readArmored("");
+var cleartextmessage = openpgp.cleartext.readArmored("");
+var mpi: openpgp.crypto.Mpi;
+var mpis: Array<openpgp.crypto.Mpi>;
+
+
+openpgp.decryptAndVerifyMessage(key, key, "").then();
+openpgp.decryptAndVerifyMessage(key, keys, "").then();
+
+openpgp.decryptMessage(key, message).then();
+
+openpgp.encryptMessage(key, "").then();
+openpgp.encryptMessage(keys, "").then();
+
+openpgp.generateKeyPair(keyoptions).then(function (keypair) {
+    key = keypair.key;
+});
+
+openpgp.signAndEncryptMessage(key, key, "").then();
+openpgp.signAndEncryptMessage(keys, key, "").then();
+
+openpgp.signClearMessage(key, "").then();
+openpgp.signClearMessage(keys, "").then();
+
+openpgp.verifyClearSignedMessage(key, cleartextmessage);
+openpgp.verifyClearSignedMessage(keys, cleartextmessage);
+
+openpgp.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
+openpgp.armor.dearmor("");
+
+openpgp.cleartext.readArmored("");
+
+openpgp.crypto.generateSessionKey(openpgp.enums.symmetric.aes128);
+openpgp.crypto.getPrefixRandom(openpgp.enums.symmetric.aes128);
+openpgp.crypto.getPrivateMpiCount(openpgp.enums.symmetric.aes128);
+openpgp.crypto.publicKeyDecrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, mpi);
+openpgp.crypto.publicKeyEncrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpi);
+
+openpgp.crypto.cfb.decrypt("", "", "", true);
+openpgp.crypto.cfb.encrypt("", "", "", "", true);
+openpgp.crypto.cfb.mdc({}, "", "");
+
+openpgp.crypto.hash.digest(openpgp.enums.hash.md5, "");
+openpgp.crypto.hash.getHashByteLength(openpgp.enums.hash.md5);
+
+openpgp.crypto.random.getRandomBigInteger(0);
+openpgp.crypto.random.getRandomBytes(0);
+openpgp.crypto.random.getRandomValues(openpgp.util.str2Uint8Array(""));
+openpgp.crypto.random.getSecureRandom(0, 1);
+
+openpgp.crypto.signature.sign(openpgp.enums.hash.md5, openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
+openpgp.crypto.signature.verify(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, mpis, "");
+
+openpgp.key.generate(keyoptions);
+openpgp.key.readArmored("");
+
+openpgp.message.fromBinary("");
+openpgp.message.fromText("");
+openpgp.message.readArmored("");
+
+openpgp.packet.fromStructuredClone({});
+openpgp.packet.newPacketFromTag("");
+
+openpgp.util.bin2str([0, 1]);
+openpgp.util.calc_checksum("");
+openpgp.util.decode_utf8("");
+openpgp.util.encode_utf8("");
+openpgp.util.get_hashAlgorithmString();
+openpgp.util.getWebCrypto();
+openpgp.util.hex2bin("");
+openpgp.util.hexidump("");
+openpgp.util.hexstrdump("");
+openpgp.util.print_debug("");
+openpgp.util.print_debug_hexstr_dump("");
+openpgp.util.shiftRight("", 1);
+openpgp.util.str2bin("");
+openpgp.util.str2Uint8Array("");
+openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
\ No newline at end of file
diff --git a/openpgp/openpgp.d.ts b/openpgp/openpgp.d.ts
new file mode 100644
index 000000000..0ae8445a2
--- /dev/null
+++ b/openpgp/openpgp.d.ts
@@ -0,0 +1,552 @@
+// Type definitions for openpgpjs
+// Project: http://openpgpjs.org/
+// Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
+declare module openpgp {
+
+    interface KeyPair {
+        key: key.Key,
+        privateKeyArmored: string,
+        publicKeyArmored: string
+    }
+
+    interface KeyOptions {
+        keyType?: enums.publicKey,
+        numBits: number,
+        userId: string,
+        passphrase: string,
+        unlocked?: boolean
+    }
+
+    interface Keyid {
+        bytes: String,
+    }
+
+    interface Signature {
+        keyid: Keyid,
+        valid: boolean
+    }
+
+    interface VerifiedMessage {
+        text: String,
+        signatures: Array<Signature>
+    }
+
+    /** Decrypts message and verifies signatures
+
+        @param privateKey private key with decrypted secret key data
+        @param publicKeys array of keys to verify signatures
+        @param msg the message object with signed and encrypted data
+     */
+    function decryptAndVerifyMessage(privateKey: key.Key, publicKeys: Array<key.Key>, msg: String): Promise<VerifiedMessage>;
+    /** Decrypts message and verifies signatures
+
+        @param privateKey private key with decrypted secret key data
+        @param publicKey single key to verify signatures
+        @param msg the message object with signed and encrypted data
+     */
+    function decryptAndVerifyMessage(privateKey: key.Key, publicKey: key.Key, msg: String): Promise<VerifiedMessage>;
+
+    /** Decrypts message
+
+        @param privateKey private key with decrypted secret key data
+        @param msg the message object with the encrypted data
+     */
+    function decryptMessage(privateKey: key.Key, msg: message.Message): Promise<String>;
+
+    /** Encrypts message text with keys
+        @param keys array of keys used to encrypt the message
+        @param text message as native JavaScript string
+        @returns encrypted ASCII armored message
+     */
+    function encryptMessage(keys: Array<key.Key>, message: string): Promise<String>;
+    /** Encrypts message text with keys
+
+        @param single key used to encrypt the message
+        @param text message as native JavaScript string
+     */
+    function encryptMessage(key: key.Key, message: string): Promise<String>;
+
+    /** Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
+        @param options
+     */
+    function generateKeyPair(options: KeyOptions): Promise<KeyPair>;
+
+    /** Signs message text and encrypts it
+
+        @param publicKeys array of keys used to encrypt the message
+        @param privateKey private key with decrypted secret key data for signing
+        @param text private key with decrypted secret key data for signing
+     */
+    function signAndEncryptMessage(publicKeys: Array<key.Key>, privateKey: key.Key, text: String): Promise<String>;
+    /** Signs message text and encrypts it
+
+        @param publicKeys single key used to encrypt the message
+        @param privateKey private key with decrypted secret key data for signing
+        @param text private key with decrypted secret key data for signing
+     */
+    function signAndEncryptMessage(publicKey: key.Key, privateKey: key.Key, text: String): Promise<String>;
+
+    /** Signs a cleartext message
+    
+        @param privateKeys array of keys with decrypted secret key data to sign cleartext
+        @param text cleartext
+     */
+    function signClearMessage(privateKeys: Array<key.Key>, text: String): Promise<String>;
+    /** Signs a cleartext message
+    
+        @param privateKeys single key with decrypted secret key data to sign cleartext
+        @param text cleartext
+     */
+    function signClearMessage(privateKey: key.Key, text: String): Promise<String>;
+
+    /** Verifies signatures of cleartext signed message
+
+        @param publicKeys array of keys to verify signatures
+        @param msg cleartext message object with signatures
+     */
+    function verifyClearSignedMessage(publicKeys: Array<key.Key>, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+    /** Verifies signatures of cleartext signed message
+
+        @param publicKeys single key to verify signatures
+        @param msg cleartext message object with signatures
+     */
+    function verifyClearSignedMessage(publicKey: key.Key, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+}
+
+declare module openpgp.armor {
+
+    /** Armor an OpenPGP binary packet block
+
+        @param messagetype type of the message
+        @param body
+        @param partindex
+        @param parttotal
+     */
+    function armor(messagetype: enums.armor, body: Object, partindex: Number, parttotal: Number): String;
+
+    /** DeArmor an OpenPGP armored message; verify the checksum and return the encoded bytes
+
+        @param text OpenPGP armored message
+     */
+    function dearmor(text: String): Object;
+}
+
+declare module openpgp.cleartext {
+
+    /** Class that represents an OpenPGP cleartext signed message.
+     */
+    interface CleartextMessage {
+        /** Returns ASCII armored text of cleartext signed message
+         */
+        armor(): String;
+
+        /** Returns the key IDs of the keys that signed the cleartext message
+         */
+        getSigningKeyIds(): Array<Keyid>;
+
+        /** Get cleartext
+         */
+        getText(): String;
+
+        /** Sign the cleartext message
+            @param privateKeys private keys with decrypted secret key data for signing
+         */
+        sign(privateKeys: Array<key.Key>): void;
+
+        /** Verify signatures of cleartext signed message
+            @param keys array of keys to verify signatures
+         */
+        verify(keys: Array<key.Key>): Array<VerifiedMessage>;
+    }
+
+    function readArmored(armoredText: String): CleartextMessage;
+}
+
+declare module openpgp.config {
+    var prefer_hash_algorithm: enums.hash;
+    var encryption_cipher: enums.symmetric;
+    var compression: enums.compression;
+    var show_version: Boolean;
+    var show_comment: Boolean;
+    var integrity_protect: Boolean;
+    var keyserver: String;
+    var debug: Boolean;
+}
+
+declare module openpgp.crypto {
+    interface Mpi {
+        data: Number,
+        read(input: String): Number,
+        write(): String,
+    }
+
+    /** Generating a session key for the specified symmetric algorithm
+        @param algo Algorithm to use
+     */
+    function generateSessionKey(algo: enums.symmetric): String;
+
+    /** generate random byte prefix as string for the specified algorithm
+        @param algo Algorithm to use
+     */
+    function getPrefixRandom(algo: enums.symmetric): String;
+
+    /** Returns the number of integers comprising the private key of an algorithm
+        @param algo The public key algorithm
+     */
+    function getPrivateMpiCount(algo: enums.symmetric): Number;
+
+    /** Decrypts data using the specified public key multiprecision integers of the private key, the specified secretMPIs of the private key and the specified algorithm.
+        @param algo Algorithm to be used
+        @param publicMPIs Algorithm dependent multiprecision integers of the public key part of the private key
+        @param secretMPIs Algorithm dependent multiprecision integers of the private key used
+        @param data Data to be encrypted as MPI
+     */
+    function publicKeyDecrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: Mpi): Mpi;
+
+    /** Encrypts data using the specified public key multiprecision integers and the specified algorithm.
+        @param algo Algorithm to be used
+        @param publicMPIs Algorithm dependent multiprecision integers
+        @param data Data to be encrypted as MPI
+     */
+    function publicKeyEncrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, data: Mpi): Array<Mpi>;
+}
+
+declare module openpgp.crypto.cfb {
+    /** This function decrypts a given plaintext using the specified blockcipher to decrypt a message
+        @param cipherfn the algorithm cipher class to decrypt data in one block_size encryption
+        @param key binary string representation of key to be used to decrypt the ciphertext. This will be passed to the cipherfn
+        @param ciphertext to be decrypted provided as a string
+        @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Decryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
+     */
+    function decrypt(cipherfn: String, key: String, ciphertext: String, resync: Boolean): String;
+    
+    /** This function encrypts a given with the specified prefixrandom using the specified blockcipher to encrypt a message
+        @param prefixrandom random bytes of block_size length provided as a string to be used in prefixing the data
+        @param cipherfn the algorithm cipher class to encrypt data in one block_size encryption
+        @param plaintext data to be encrypted provided as a string
+        @param key binary string representation of key to be used to encrypt the plaintext. This will be passed to the cipherfn
+        @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Encryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
+     */
+    function encrypt(prefixrandom: String, cipherfn: String, plaintext: String, key: String, resync: Boolean): String;
+    
+    /** Decrypts the prefixed data for the Modification Detection Code (MDC) computation
+        @param cipherfn cipherfn.encrypt Cipher function to use
+        @param key binary string representation of key to be used to check the mdc This will be passed to the cipherfn
+        @param ciphertext The encrypted data
+     */
+    function mdc(cipherfn: Object, key: String, ciphertext: String): String;
+}
+
+declare module openpgp.crypto.hash {
+    /** Create a hash on the specified data using the specified algorithm
+        @param algo Hash algorithm type
+        @param data Data to be hashed
+     */
+    function digest(algo: enums.hash, data: String): String;
+
+    /** Returns the hash size in bytes of the specified hash algorithm type
+        @param algo Hash algorithm type
+     */
+    function getHashByteLength(algo: enums.hash): Number;
+}
+
+declare module openpgp.crypto.random {
+    /** Create a secure random big integer of bits length
+        @param bits Bit length of the MPI to create
+     */
+    function getRandomBigInteger(bits: Number): Number;
+    
+    /** Retrieve secure random byte string of the specified length
+        @param length Length in bytes to generate
+     */
+    function getRandomBytes(length: Number): String;
+    
+    /** Helper routine which calls platform specific crypto random generator
+        @param buf 
+     */
+    function getRandomValues(buf: Uint8Array): void;
+    
+    /** Return a secure random number in the specified range
+        @param from Min of the random number
+        @param to Max of the random number (max 32bit)
+     */
+    function getSecureRandom(from: Number, to: Number): Number;
+}
+
+declare module openpgp.crypto.signature {
+    /** Create a signature on data using the specified algorithm
+        @param hash_algo hash Algorithm to use
+        @param algo Asymmetric cipher algorithm to use
+        @param publicMPIs Public key multiprecision integers of the private key
+        @param secretMPIs Private key multiprecision integers which is used to sign the data
+        @param data Data to be signed
+     */
+    function sign(hash_algo: enums.hash, algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: String): Mpi;
+
+    /** 
+        @param algo public Key algorithm
+        @param hash_algo Hash algorithm
+        @param msg_MPIs Signature multiprecision integers
+        @param publickey_MPIs Public key multiprecision integers
+        @param data Data on where the signature was computed on
+     */
+    function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: Array<Mpi>, publickey_MPIs: Array<Mpi>, data: String): Boolean;
+}
+
+declare module openpgp.enums {
+
+    enum armor {
+        multipart_section,
+        multipart_last,
+        signed,
+        message,
+        public_key,
+        private_key
+    }
+
+    enum compression {
+        uncompressed,
+        zip,
+        zlib,
+        bzip2
+    }
+
+    enum hash {
+        md5,
+        sha1,
+        ripemd,
+        sha256,
+        sha384,
+        sha512,
+        sha224
+    }
+
+    enum packet {
+        publicKeyEncryptedSessionKey,
+        signature,
+        symEncryptedSessionKey,
+        onePassSignature,
+        secretKey,
+        publicKey,
+        secretSubkey,
+        compressed,
+        symmetricallyEncrypted,
+        marker,
+        literal,
+        trust,
+        userid,
+        publicSubkey,
+        userAttribute,
+        symEncryptedIntegrityProtected,
+        modificationDetectionCode,
+    }
+
+    enum publicKey {
+        rsa_encrypt_sign,
+        rsa_encrypt,
+        rsa_sign,
+        elgamal,
+        dsa
+    }
+
+    enum symmetric {
+        plaintext,
+        idea,
+        tripledes,
+        cast5,
+        blowfish,
+        aes128,
+        aes192,
+        aes256,
+        twofish
+    }
+}
+
+declare module openpgp.key {
+
+    interface KeyResult {
+        keys: Array<Key>,
+        err: Array<Error>
+    }
+
+    /** Class that represents an OpenPGP key. Must contain a primary key. Can contain additional subkeys, signatures, user ids, user attributes.
+     */
+    interface Key {
+        armor(): String,
+        decrypt(passphrase: String): Boolean,
+    }
+
+    /** Generates a new OpenPGP key. Currently only supports RSA keys. Primary and subkey will be of same type.
+
+        @param options
+     */
+    function generate(options: KeyOptions): Key;
+
+    /** Reads an OpenPGP armored text and returns one or multiple key objects
+
+        @param armoredText text to be parsed
+     */
+    function readArmored(armoredText: String): KeyResult;
+
+}
+
+declare module openpgp.message {
+    /** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message
+     */
+    interface Message {
+        /** Returns ASCII armored text of message
+         */
+        armor(): String,
+
+        /** Decrypt the message
+            @param privateKey private key with decrypted secret data
+         */
+        decrypt(privateKey: key.Key): Array<Message>,
+
+        /** Encrypt the message
+            @param keys array of keys, used to encrypt the message
+         */
+        encrypt(keys: Array<key.Key>): Array<Message>,
+
+        /** Returns the key IDs of the keys to which the session key is encrypted
+         */
+        getEncryptionKeyIds(): Array<Keyid>,
+
+        /** Get literal data that is the body of the message
+         */
+        getLiteralData(): String,
+
+        /** Returns the key IDs of the keys that signed the message
+         */
+        getSigningKeyIds(): Array<Keyid>,
+
+        /** Get literal data as text
+         */
+        getText(): String,
+
+        /** Sign the message (the literal data packet of the message)
+            @param privateKey private keys with decrypted secret key data for signing
+         */
+        sign(privateKey: Array<key.Key>): Message,
+
+        /** Unwrap compressed message
+         */
+        unwrapCompressed(): Message,
+
+        /** Verify message signatures
+            @param keys array of keys to verify signatures
+         */
+        verify(keys: Array<key.Key>): Array<Object>,
+    }
+
+    /** creates new message object from binary data
+        @param bytes
+     */
+    function fromBinary(bytes: String): Message;
+
+    /** creates new message object from text
+        @param text
+     */
+    function fromText(text: String): Message;
+
+    /** reads an OpenPGP armored message and returns a message object
+
+        @param armoredText text to be parsed
+     */
+    function readArmored(armoredText: String): Message;
+}
+
+declare module openpgp.packet {
+
+    /** Allocate a new packet from structured packet clone
+        @param packetClone packet clone
+     */
+    function fromStructuredClone(packetClone: Object): Object
+
+    /** Allocate a new packet
+        @param property name from enums.packet
+     */
+    function newPacketFromTag(tag: String): Object;
+}
+
+declare module openpgp.util {
+    /** Convert an array of integers(0.255) to a string
+        @param bin An array of (binary) integers to convert
+     */
+    function bin2str(bin: Array<Number>): String;
+
+    /** Calculates a 16bit sum of a string by adding each character codes modulus 65535
+        @param text String to create a sum of
+     */
+    function calc_checksum(text: String): Number;
+
+    /** Convert a string of utf8 bytes to a native javascript string
+        @param utf8 A valid squence of utf8 bytes
+     */
+    function decode_utf8(utf8: String): String
+
+    /** Convert a native javascript string to a string of utf8 bytes
+        param str The string to convert
+     */
+    function encode_utf8(str: String): String
+
+    /** Return the algorithm type as string
+     */
+    function get_hashAlgorithmString(): String
+
+    /** Get native Web Cryptography api. The default configuration is to use the api when available. But it can also be deactivated with config.useWebCrypto
+     */
+    function getWebCrypto(): Object
+
+    /** Create binary string from a hex encoded string
+        @param str Hex string to convert
+     */
+    function hex2bin(str: String): String;
+
+    /** Creating a hex string from an binary array of integers (0..255)
+        @param str Array of bytes to convert
+     */
+    function hexidump(str: String): String;
+
+    /** Create hexstring from a binary
+        @param str String to convert
+     */
+    function hexstrdump(str: String): String;
+    
+    /** Helper function to print a debug message. Debug messages are only printed if
+        @param str String of the debug message
+     */
+    function print_debug(str: String): void;
+    
+    /** Helper function to print a debug message. Debug messages are only printed if
+        @param str String of the debug message
+     */
+    function print_debug_hexstr_dump(str: String): void;
+    
+    /** Shifting a string to n bits right
+        @param value The string to shift
+        @param bitcount Amount of bits to shift (MUST be smaller than 9)
+     */
+    function shiftRight(value: String, bitcount: Number): String;
+    
+    /** Convert a string to an array of integers(0.255)
+        @param str String to convert
+     */
+    function str2bin(str: String): Array<Number>;
+    
+    /** Convert a string to a Uint8Array
+        @param str String to convert
+     */
+    function str2Uint8Array(str: String): Uint8Array;
+    
+    /** Convert a Uint8Array to a string. This currently functions the same as bin2str.
+        @param bin An array of (binary) integers to convert
+     */
+    function Uint8Array2str(bin: Uint8Array): String;
+
+
+}
\ No newline at end of file
diff --git a/orchestrator/orchestrator-tests.ts b/orchestrator/orchestrator-tests.ts
new file mode 100644
index 000000000..6f1a4a79b
--- /dev/null
+++ b/orchestrator/orchestrator-tests.ts
@@ -0,0 +1,107 @@
+/// <reference path="../requirejs/require.d.ts" />
+/// <reference path="orchestrator.d.ts" />
+
+'use strict';
+
+import Orchestrator = require('orchestrator');
+
+var orchestrator = new Orchestrator();
+
+
+// API:
+
+//
+// orchestrator.add(name[, deps][, function]);
+//
+
+orchestrator.add('thing1', function() {
+    // do stuff
+});
+orchestrator.add('thing2', function() {
+    // do stuff
+});
+orchestrator.add('mytask', ['array', 'of', 'task', 'names'], function() {
+    // Do stuff
+});
+orchestrator.add('thing2', function(callback: any){
+    var err: any = null;
+    // do stuff
+    callback(err);
+});
+
+
+var Q = require('q');
+
+orchestrator.add('thing3', function(){
+    var deferred = Q.defer();
+
+    // do async stuff
+    setTimeout(function () {
+        deferred.resolve();
+    }, 1);
+
+    return deferred.promise;
+});
+
+
+//TODO: map-stream currently not on DefinitelyTyped
+//var map = require('map-stream');
+//
+//orchestrator.add('thing4', function(){
+//    var stream = map(function (args, cb) {
+//        cb(null, args);
+//    });
+//    // do stream stuff
+//    return stream;
+//});
+
+//
+// orchestrator.hasTask(name);
+//
+
+orchestrator.hasTask('thing1');
+
+//
+// orchestrator.start(tasks...[, cb]);
+//
+
+orchestrator.start('thing1', 'thing2', 'thing3', 'thing4', function (err: any) {
+    // all done
+});
+orchestrator.start(['thing1','thing2'], ['thing3','thing4']);
+
+
+//
+// orchestrator.stop()
+//
+
+orchestrator.stop();
+
+//
+// orchestrator.on(event, cb);
+//
+
+orchestrator.on('task_start', function (e) {
+    var message: string = e.message;
+    var task: string = e.task;
+    var err: any = e.err;
+});
+orchestrator.on('task_stop', function (e) {
+    var message: string = e.message;
+    var task: string = e.task;
+    var duration: number = e.duration;
+});
+
+//
+// orchestrator.onAll(cb);
+//
+
+orchestrator.onAll(function (e) {
+    var message: string = e.message;
+    var task: string = e.task;
+    var err: any = e.err;
+    var src: string = e.src;
+});
+
+
+
diff --git a/orchestrator/orchestrator.d.ts b/orchestrator/orchestrator.d.ts
new file mode 100644
index 000000000..24ebec8cb
--- /dev/null
+++ b/orchestrator/orchestrator.d.ts
@@ -0,0 +1,127 @@
+// Type definitions for Orchestrator
+// Project: https://github.com/orchestrator/orchestrator
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../q/Q.d.ts" />
+
+declare type Strings = string|string[];
+
+declare module "orchestrator" {
+    class Orchestrator {
+        add: Orchestrator.AddMethod;
+        /**
+         * Have you defined a task with this name?
+         * @param name The task name to query
+         */
+        hasTask(name: string): boolean;
+        start: Orchestrator.StartMethod;
+        stop(): void;
+
+        /**
+         * Listen to orchestrator internals
+         * @param event Event name to listen to:
+         * <ul>
+         *   <li>start: from start() method, shows you the task sequence
+         *   <li>stop: from stop() method, the queue finished successfully
+         *   <li>err: from stop() method, the queue was aborted due to a task error
+         *   <li>task_start: from _runTask() method, task was started
+         *   <li>task_stop: from _runTask() method, task completed successfully
+         *   <li>task_err: from _runTask() method, task errored
+         *   <li>task_not_found: from start() method, you're trying to start a task that doesn't exist
+         *   <li>task_recursion: from start() method, there are recursive dependencies in your task list
+         * </ul>
+         * @param cb Passes single argument: e: event details
+         */
+        on(event: string, cb: (e: Orchestrator.OnCallbackEvent) => any): Orchestrator;
+
+        /**
+         * Listen to all orchestrator events from one callback
+         * @param cb Passes single argument: e: event details
+         */
+        onAll(cb: (e: Orchestrator.OnAllCallbackEvent) => any): void;
+    }
+
+    namespace Orchestrator {
+        interface AddMethodCallback {
+            /**
+             * Accept a callback
+             * @param callback
+             */
+            (callback?: Function): any;
+            /**
+             * Return a promise
+             */
+            (): Q.Promise<any>;
+            /**
+             * Return a stream: (task is marked complete when stream ends)
+             */
+            (): any; //TODO: stream type should be here e.g. map-stream
+        }
+
+        /**
+         * Define a task
+         */
+        interface AddMethod {
+            /**
+             * Define a task
+             * @param name The name of the task.
+             * @param deps An array of task names to be executed and completed before your task will run.
+             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+             * <ul>
+             *     <li>Take in a callback</li>
+             *     <li>Return a stream or a promise</li>
+             * </ul>
+             */
+            (name: string, deps?: string[], fn?: AddMethodCallback|Function): Orchestrator;
+            /**
+             * Define a task
+             * @param name The name of the task.
+             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+             * <ul>
+             *     <li>Take in a callback</li>
+             *     <li>Return a stream or a promise</li>
+             * </ul>
+             */
+            (name: string, fn?: AddMethodCallback|Function): Orchestrator;
+        }
+
+        /**
+         * Start running the tasks
+         */
+        interface StartMethod {
+            /**
+             * Start running the tasks
+             * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
+             * @param cb Callback to call after run completed.
+             */
+            (tasks: Strings, cb?: (error?: any) => any): Orchestrator;
+            /**
+             * Start running the tasks
+             * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
+             * @param cb Callback to call after run completed.
+             */
+            (...tasks: Strings[]/*, cb?: (error: any) => any */): Orchestrator;
+            //TODO: TypeScript 1.5.3 cannot express varargs followed by callback as a last argument...
+            (task1: Strings, task2: Strings, cb?: (error?: any) => any): Orchestrator;
+            (task1: Strings, task2: Strings, task3: Strings, cb?: (error?: any) => any): Orchestrator;
+            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, cb?: (error?: any) => any): Orchestrator;
+            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, cb?: (error?: any) => any): Orchestrator;
+            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, task6: Strings, cb?: (error?: any) => any): Orchestrator;
+        }
+
+        interface OnCallbackEvent {
+            message: string;
+            task: string;
+            err: any;
+            duration?: number;
+        }
+
+        interface OnAllCallbackEvent extends OnCallbackEvent {
+            src: string;
+        }
+
+    }
+
+    export = Orchestrator;
+}
diff --git a/os-locale/os-locale-tests.ts b/os-locale/os-locale-tests.ts
new file mode 100644
index 000000000..bcf5b0129
--- /dev/null
+++ b/os-locale/os-locale-tests.ts
@@ -0,0 +1,12 @@
+/// <reference path="./os-locale.d.ts" />
+
+import osLocale, { sync } from 'os-locale';
+
+osLocale((err: any, locale: string) => {
+});
+
+osLocale({spawn: false}, (err: any, locale: string) => {
+});
+
+var locale1: string = sync();
+var locale2: string = sync({spawn: false});
diff --git a/os-locale/os-locale.d.ts b/os-locale/os-locale.d.ts
new file mode 100644
index 000000000..74b2d6922
--- /dev/null
+++ b/os-locale/os-locale.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for os-locale 1.4.0
+// Project: https://github.com/sindresorhus/os-locale
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "os-locale" {
+	function osLocale(options: {spawn?: boolean}, cb: (err: any, locale: string) => void): void;
+	function osLocale(cb: (err: any, locale: string) => void): void;
+	function osLocaleSync(): string;
+	function osLocaleSync(options: {spawn?: boolean}): string;
+
+	export { osLocaleSync as sync };
+	export default osLocale;
+}
diff --git a/package.json b/package.json
index 2c5b834ed..2b9d019f8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "url": "https://github.com/borisyankov/DefinitelyTyped/issues"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 0.12.0"
   },
   "scripts": {
     "test": "./node_modules/.bin/dt --changes",
@@ -35,7 +35,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "definition-tester": "0.2.0",
-    "typescript": "1.5.3"
+    "definition-tester": "0.3.0",
+    "typescript": "1.6.2"
   }
 }
diff --git a/papaparse/papaparse-tests.ts b/papaparse/papaparse-tests.ts
index 14cc40bb3..8ae3f9167 100644
--- a/papaparse/papaparse-tests.ts
+++ b/papaparse/papaparse-tests.ts
@@ -12,14 +12,14 @@ res.errors[0].code;
 Papa.parse("3,3,3", {
 	delimiter: ';',
 	comments: false,
-	
+
 	step: function(results, p) {
 		p.abort();
 		results.data.length;
 	}
 });
 
-var file = new File();
+var file = new File(null, null, null);
 
 Papa.parse(file, {
 	complete: function(a, b) {
@@ -52,4 +52,4 @@ Papa.LocalChunkSize;
 var parser = new Papa.Parser({})
 parser.getCharIndex();
 parser.abort();
-parser.parse("", 0, false);
\ No newline at end of file
+parser.parse("", 0, false);
diff --git a/parse/parse-tests.ts b/parse/parse-tests.ts
index d373c064d..d3af6be5c 100644
--- a/parse/parse-tests.ts
+++ b/parse/parse-tests.ts
@@ -400,3 +400,16 @@ function test_view() {
     var model = Parse.User.current();
     var view = new Parse.View<Parse.User>();
 }
+
+function test_promise() {
+    let resolved = Parse.Promise.as(true);
+    let rejected = Parse.Promise.error("an error object");
+    Parse.Promise.when([resolved, rejected]).then(function() {
+        // success
+    }, function() {
+        // failed
+    });
+
+    // can check whether an object is a Parse.Promise object or not
+    Parse.Promise.is(resolved);
+}
diff --git a/parse/parse.d.ts b/parse/parse.d.ts
index cb4fa8b2b..d088014c7 100644
--- a/parse/parse.d.ts
+++ b/parse/parse.d.ts
@@ -7,7 +7,7 @@
 /// <reference path="../jquery/jquery.d.ts" />
 /// <reference path="../underscore/underscore.d.ts" />
 
-declare module Parse {
+declare namespace Parse {
 
     var applicationId: string;
     var javaScriptKey: string;
@@ -15,53 +15,37 @@ declare module Parse {
     var serverURL: string;
     var VERSION: string;
 
-    interface ParseDefaultOptions {
-        wait?: boolean;
-        silent?: boolean;
+    interface SuccessOption {
         success?: Function;
+    }
+
+    interface ErrorOption {
         error?: Function;
+    }
+
+    interface SuccessFailureOptions extends SuccessOption, ErrorOption {
+    }
+
+    interface WaitOption {
+        /**
+         * Set to true to wait for the server to confirm success
+         * before triggering an event.
+         */
+        wait?: boolean;
+    }
+
+    interface UseMasterKeyOption {
+        /**
+         * In Cloud Code and Node only, causes the Master Key to be used for this request.
+         */
         useMasterKey?: boolean;
     }
 
-    interface CollectionOptions {
-        model?: Object;
-        query?: Query;
-        comparator?: string;
-    }
-
-    interface CollectionAddOptions {
-        at?: number;
-    }
-
-    interface RouterOptions {
-        routes: any;
-    }
-
-    interface NavigateOptions {
-        trigger?: boolean;
-    }
-
-    interface ViewOptions {
-        model?: any;
-        collection?: any;
-        el?: any;
-        id?: string;
-        className?: string;
-        tagName?: string;
-        attributes?: any[];
-    }
-
-    interface PushData {
-        channels?: string[];
-        push_time?: Date;
-        expiration_time?: Date;
-        expiration_interval?: number;
-        where?: Query;
-        data?: any;
-        alert?: string;
-        badge?: string;
-        sound?: string;
-        title?: string;
+    interface SilentOption {
+        /**
+         * Set to true to avoid firing the event.
+         */
+        silent?: boolean;
     }
 
     /**
@@ -88,14 +72,16 @@ declare module Parse {
         then<U>(resolvedCallback: (value: T) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
     }
 
-    interface Promise<T> {
+    class Promise<T> {
+
+        static as<U>(resolvedValue: U): Promise<U>;
+        static error<U>(error: U): Promise<U>;
+        static is(possiblePromise: any): Boolean;
+        static when(promises: Promise<any>[]): Promise<any>;
 
         always(callback: Function): Promise<T>;
-        as(): Promise<T>;
         done(callback: Function): Promise<T>;
-        error(): Promise<T>;
         fail(callback: Function): Promise<T>;
-        is(): Promise<T>;
         reject(error: any): void;
         resolve(result: any): void;
         then<U>(resolvedCallback: (value: T) => Promise<U>,
@@ -104,8 +90,6 @@ declare module Parse {
             rejectedCallback?: (reason: any) => IPromise<U>): IPromise<T>;
         then<U>(resolvedCallback: (value: T) => U,
             rejectedCallback?: (reason: any) => U): IPromise<T>;
-
-        when(promises: Promise<T>[]): Promise<T>;
     }
 
     interface IBaseObject {
@@ -199,7 +183,7 @@ declare module Parse {
         constructor(name: string, data: any, type?: string);
         name(): string;
         url(): string;
-        save<T>(options?: ParseDefaultOptions): Promise<T>;
+        save<T>(options?: SuccessFailureOptions): Promise<T>;
 
     }
 
@@ -233,7 +217,7 @@ declare module Parse {
 
         constructor(arg1?: any, arg2?: any);
 
-        current(options?: ParseDefaultOptions): GeoPoint;
+        current(options?: SuccessFailureOptions): GeoPoint;
         radiansTo(point: GeoPoint): number;
         kilometersTo(point: GeoPoint): number;
         milesTo(point: GeoPoint): number;
@@ -332,10 +316,10 @@ declare module Parse {
         constructor(attributes?: string[], options?: any);
 
         static extend(className: string, protoProps?: any, classProps?: any): any;
-        static fetchAll<T>(list: Object[], options: ParseDefaultOptions): Promise<T>;
-        static fetchAllIfNeeded<T>(list: Object[], options: ParseDefaultOptions): Promise<T>;
-        static destroyAll<T>(list: Object[], options?: ParseDefaultOptions): Promise<T>;
-        static saveAll<T>(list: Object[], options?: ParseDefaultOptions): Promise<T>;
+        static fetchAll<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
+        static fetchAllIfNeeded<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
+        static destroyAll<T>(list: Object[], options?: Object.DestroyAllOptions): Promise<T>;
+        static saveAll<T>(list: Object[], options?: Object.SaveAllOptions): Promise<T>;
 
         initialize(): void;
         add(attr: string, item: any): Object;
@@ -344,12 +328,12 @@ declare module Parse {
         changedAttributes(diff: any): boolean;
         clear(options: any): any;
         clone(): Object;
-        destroy<T>(options?: ParseDefaultOptions): Promise<T>;
+        destroy<T>(options?: Object.DestroyOptions): Promise<T>;
         dirty(attr: String): boolean;
         dirtyKeys(): string[];
         escape(attr: string): string;
         existed(): boolean;
-        fetch<T>(options?: ParseDefaultOptions): Promise<T>;
+        fetch<T>(options?: Object.FetchOptions): Promise<T>;
         get(attr: string): any;
         getACL(): ACL;
         has(attr: string): boolean;
@@ -361,12 +345,27 @@ declare module Parse {
         previousAttributes(): any;
         relation(attr: string): Relation;
         remove(attr: string, item: any): any;
-        save<T>(options?: ParseDefaultOptions, arg2?: any, arg3?: any): Promise<T>;
-        set(key: string, value: any, options?: ParseDefaultOptions): boolean;
-        setACL(acl: ACL, options?: ParseDefaultOptions): boolean;
+        save<T>(options?: Object.SaveOptions, arg2?: any, arg3?: any): Promise<T>;
+        set(key: string, value: any, options?: Object.SetOptions): boolean;
+        setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
         unset(attr: string, options?: any): any;
-        validate(attrs: any, options?: ParseDefaultOptions): boolean;
+        validate(attrs: any, options?: SuccessFailureOptions): boolean;
+    }
 
+    namespace Object {
+        interface DestroyOptions extends SuccessFailureOptions, WaitOption, UseMasterKeyOption { }
+
+        interface DestroyAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface FetchOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface SaveOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption, WaitOption { }
+
+        interface SaveAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface SetOptions extends ErrorOption, SilentOption {
+            promise?: any;
+        }
     }
 
     /**
@@ -420,24 +419,49 @@ declare module Parse {
         query: Query;
         comparator: (object: Object) => any;
 
-        constructor(models?: Object[], options?: CollectionOptions);
+        constructor(models?: Object[], options?: Collection.Options);
         static extend(instanceProps: any, classProps: any): any;
 
         initialize(): void;
-        add(models: any[], options?: CollectionAddOptions): Collection<T>;
+        add(models: any[], options?: Collection.AddOptions): Collection<T>;
         at(index: number): Object;
         chain(): _Chain<Collection<T>>;
-        fetch(options?: ParseDefaultOptions): Promise<T>;
-        create(model: Object, options?: ParseDefaultOptions): Object;
+        fetch(options?: Collection.FetchOptions): Promise<T>;
+        create(model: Object, options?: Collection.CreateOptions): Object;
         get(id: string): Object;
         getByCid(cid: any): any;
         pluck(attr: string): any[];
-        remove(model: any, options?: ParseDefaultOptions): Collection<T>;
-        remove(models: any[], options?: ParseDefaultOptions): Collection<T>;
-        reset(models: any[], options?: ParseDefaultOptions): Collection<T>;
-        sort(options?: ParseDefaultOptions): Collection<T>;
+        remove(model: any, options?: Collection.RemoveOptions): Collection<T>;
+        remove(models: any[], options?: Collection.RemoveOptions): Collection<T>;
+        reset(models: any[], options?: Collection.ResetOptions): Collection<T>;
+        sort(options?: Collection.SortOptions): Collection<T>;
         toJSON(): any;
+    }
 
+    namespace Collection {
+        interface Options {
+            model?: Object;
+            query?: Query;
+            comparator?: string;
+        }
+
+        interface AddOptions extends SilentOption {
+            /**
+             * The index at which to add the models.
+             */
+            at?: number;
+        }
+
+        interface CreateOptions extends SuccessFailureOptions, WaitOption, SilentOption, UseMasterKeyOption {
+        }
+
+        interface FetchOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption { }
+
+        interface RemoveOptions extends SilentOption { }
+
+        interface ResetOptions extends SilentOption { }
+
+        interface SortOptions extends SilentOption { }
     }
 
     /**
@@ -549,23 +573,23 @@ declare module Parse {
         addDescending(key: string[]): Query;
         ascending(key: string): Query;
         ascending(key: string[]): Query;
-        collection(items?: Object[], options?: ParseDefaultOptions): Collection<Object>;
+        collection(items?: Object[], options?: Collection.Options): Collection<Object>;
         containedIn(key: string, values: any[]): Query;
         contains(key: string, substring: string): Query;
         containsAll(key: string, values: any[]): Query;
-        count<T>(options?: ParseDefaultOptions): Promise<T>;
+        count<T>(options?: Query.CountOptions): Promise<T>;
         descending(key: string): Query;
         descending(key: string[]): Query;
         doesNotExist(key: string): Query;
         doesNotMatchKeyInQuery(key: string, queryKey: string, query: Query): Query;
         doesNotMatchQuery(key: string, query: Query): Query;
-        each<T>(callback: Function, options?: ParseDefaultOptions): Promise<T>;
+        each<T>(callback: Function, options?: SuccessFailureOptions): Promise<T>;
         endsWith(key: string, suffix: string): Query;
         equalTo(key: string, value: any): Query;
         exists(key: string): Query;
-        find<T>(options?: ParseDefaultOptions): Promise<T>;
-        first<T>(options?: ParseDefaultOptions): Promise<T>;
-        get(objectId: string, options?: ParseDefaultOptions): Promise<any>;
+        find<T>(options?: Query.FindOptions): Promise<T>;
+        first<T>(options?: Query.FirstOptions): Promise<T>;
+        get(objectId: string, options?: Query.GetOptions): Promise<any>;
         greaterThan(key: string, value: any): Query;
         greaterThanOrEqualTo(key: string, value: any): Query;
         include(key: string): Query;
@@ -588,6 +612,13 @@ declare module Parse {
         withinRadians(key: string, point: GeoPoint, maxDistance: number): Query;
     }
 
+    namespace Query {
+        interface CountOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface FindOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface FirstOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface GetOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+    }
+
     /**
      * Represents a Role on the Parse server. Roles represent groupings of
      * Users for the purposes of granting permissions (e.g. specifying an ACL
@@ -608,7 +639,7 @@ declare module Parse {
         getRoles(): Relation;
         getUsers(): Relation;
         getName(): string;
-        setName(name: string, options?: ParseDefaultOptions): any;
+        setName(name: string, options?: SuccessFailureOptions): any;
     }
 
     /**
@@ -624,17 +655,31 @@ declare module Parse {
      */
     class Router extends Events {
 
-        routes: any[];
+        routes: Router.RouteMap;
 
-        constructor(options?: RouterOptions);
+        constructor(options?: Router.Options);
         static extend(instanceProps: any, classProps: any): any;
 
         initialize(): void;
-        navigate(fragment: string, options?: NavigateOptions): Router;
+        navigate(fragment: string, options?: Router.NavigateOptions): Router;
         navigate(fragment: string, trigger?: boolean): Router;
         route(route: string, name: string, callback: Function): Router;
     }
 
+    namespace Router {
+        interface Options {
+            routes: RouteMap;
+        }
+
+        interface RouteMap {
+            [url: string]: string;
+        }
+
+        interface NavigateOptions {
+            trigger?: boolean;
+        }
+    }
+
     /**
      * @class
      *
@@ -647,27 +692,27 @@ declare module Parse {
     class User extends Object {
 
         static current(): User;
-        static signUp<T>(username: string, password: string, attrs: any, options?: ParseDefaultOptions): Promise<T>;
-        static logIn<T>(username: string, password: string, options?: ParseDefaultOptions): Promise<T>;
+        static signUp<T>(username: string, password: string, attrs: any, options?: SuccessFailureOptions): Promise<T>;
+        static logIn<T>(username: string, password: string, options?: SuccessFailureOptions): Promise<T>;
         static logOut<T>(): Promise<T>;
         static allowCustomUserClass(isAllowed: boolean): void;
-        static become<T>(sessionToken: string, options?: ParseDefaultOptions): Promise<T>;
-        static requestPasswordReset<T>(email: string, options?: ParseDefaultOptions): Promise<T>;
+        static become<T>(sessionToken: string, options?: SuccessFailureOptions): Promise<T>;
+        static requestPasswordReset<T>(email: string, options?: SuccessFailureOptions): Promise<T>;
 
-        signUp<T>(attrs: any, options?: ParseDefaultOptions): Promise<T>;
-        logIn<T>(options?: ParseDefaultOptions): Promise<T>;
-        fetch<T>(options?: ParseDefaultOptions): Promise<T>;
+        signUp<T>(attrs: any, options?: SuccessFailureOptions): Promise<T>;
+        logIn<T>(options?: SuccessFailureOptions): Promise<T>;
+        fetch<T>(options?: SuccessFailureOptions): Promise<T>;
         save<T>(arg1: any, arg2: any, arg3: any): Promise<T>;
         authenticated(): boolean;
         isCurrent(): boolean;
 
         getEmail(): string;
-        setEmail(email: string, options: ParseDefaultOptions): boolean;
+        setEmail(email: string, options: SuccessFailureOptions): boolean;
 
         getUsername(): string;
-        setUsername(username: string, options?: ParseDefaultOptions): boolean;
+        setUsername(username: string, options?: SuccessFailureOptions): boolean;
 
-        setPassword(password: string, options?: ParseDefaultOptions): boolean;
+        setPassword(password: string, options?: SuccessFailureOptions): boolean;
         getSessionToken(): string;
     }
 
@@ -695,7 +740,7 @@ declare module Parse {
         $el: JQuery;
         attributes: any;
 
-        constructor(options?: ViewOptions);
+        constructor(options?: View.Options);
 
         static extend(properties: any, classProperties?: any): any;
 
@@ -704,13 +749,29 @@ declare module Parse {
         setElement(element: JQuery, delegate?: boolean): View<T>;
         render(): View<T>;
         remove(): View<T>;
-        make(tagName: any, attributes?: any, content?: any): any;
+        make(tagName: any, attributes?: View.Attribute[], content?: any): any;
         delegateEvents(events?: any): any;
         undelegateEvents(): any;
 
     }
 
-    module Analytics {
+    namespace View {
+        interface Options {
+            model?: any;
+            collection?: any;
+            el?: any;
+            id?: string;
+            className?: string;
+            tagName?: string;
+            attributes?: Attribute[];
+        }
+
+        interface Attribute {
+            [attributeName: string]: string | number | boolean;
+        }
+    }
+
+    namespace Analytics {
 
         function track<T>(name: string, dimensions: any):Promise<T>;
     }
@@ -720,13 +781,13 @@ declare module Parse {
      * @namespace
      * Provides a set of utilities for using Parse with Facebook.
      */
-    module FacebookUtils {
+    namespace FacebookUtils {
 
         function init(options?: any): void;
         function isLinked(user: User): boolean;
-        function link(user: User, permissions: any, options?: ParseDefaultOptions): void;
-        function logIn(permissions: any, options?: ParseDefaultOptions): void;
-        function unlink(user: User, options?: ParseDefaultOptions): void;
+        function link(user: User, permissions: any, options?: SuccessFailureOptions): void;
+        function logIn(permissions: any, options?: SuccessFailureOptions): void;
+        function unlink(user: User, options?: SuccessFailureOptions): void;
     }
 
     /**
@@ -736,7 +797,7 @@ declare module Parse {
      *   Some functions are only available from Cloud Code.
      * </em></strong></p>
      */
-    module Cloud {
+    namespace Cloud {
 
         interface CookieOptions {
             domain?: string;
@@ -796,10 +857,48 @@ declare module Parse {
         function beforeDelete(arg1: any, func?: (request: BeforeDeleteRequest, response: BeforeDeleteResponse) => void): void;
         function beforeSave(arg1: any, func?: (request: BeforeSaveRequest, response: BeforeSaveResponse) => void): void;
         function define(name: string, func?: (request: FunctionRequest, response: FunctionResponse) => void): void;
-        function httpRequest<T>(options: ParseDefaultOptions): Promise<HttpResponse>;
+        function httpRequest(options: HTTPOptions): Promise<HttpResponse>;
         function job(name: string, func?: (request: JobRequest, status: JobStatus) => void): HttpResponse;
-        function run<T>(name: string, data?: any, options?: ParseDefaultOptions): Promise<T>;
+        function run<T>(name: string, data?: any, options?: SuccessFailureOptions): Promise<T>;
         function useMasterKey(): void;
+
+        /**
+         * To use this Cloud Module in Cloud Code, you must require 'buffer' in your JavaScript file.
+         *
+         *     import Buffer = require("buffer").Buffer;
+         */
+        var HTTPOptions: new () => HTTPOptions;
+        interface HTTPOptions extends FunctionResponse {
+            /**
+             * The body of the request.
+             * If it is a JSON object, then the Content-Type set in the headers must be application/x-www-form-urlencoded or application/json.
+             * You can also set this to a Buffer object to send raw bytes.
+             * If you use a Buffer, you should also set the Content-Type header explicitly to describe what these bytes represent.
+             */
+            body?: string | Buffer | Object;
+            /**
+             * Defaults to 'false'.
+             */
+            followRedirects?: boolean;
+            /**
+             * The headers for the request.
+             */
+            headers?: {
+                [headerName: string]: string | number | boolean;
+            };
+            /**
+             *The method of the request (i.e GET, POST, etc).
+             */
+            method?: string;
+            /**
+             * The query portion of the url.
+             */
+            params?: any;
+            /**
+             * The url to send the request to.
+             */
+            url: string;
+        }
     }
 
 
@@ -883,7 +982,7 @@ declare module Parse {
      * You should not create subclasses of Parse.Op or instantiate Parse.Op
      * directly.
      */
-    module Op {
+    namespace Op {
 
         interface BaseOperation extends IBaseObject {
             objects(): any[];
@@ -918,9 +1017,26 @@ declare module Parse {
      * @name Parse.Push
      * @namespace
      */
-    module Push {
+    namespace Push {
+        function send<T>(data: PushData, options?: SendOptions): Promise<T>;
 
-        function send<T>(data: PushData, options?: ParseDefaultOptions):Promise<T>;
+        interface PushData {
+            channels?: string[];
+            push_time?: Date;
+            expiration_time?: Date;
+            expiration_interval?: number;
+            where?: Query;
+            data?: any;
+            alert?: string;
+            badge?: string;
+            sound?: string;
+            title?: string;
+        }
+
+        interface SendOptions {
+            success?: () => void;
+            error?: (error: Error) => void;
+        }
     }
 
     /**
@@ -934,11 +1050,11 @@ declare module Parse {
 
 }
 
+declare module "parse/node" {
+    export = { Parse };
+}
+
 declare module "parse" {
-    var type: typeof Parse;
-    var subType: {
-        Parse: typeof type;
-    }
-
-    export = subType;
+    import parse = require("parse/node");
+    export = parse
 }
diff --git a/passport-facebook/passport-facebook-tests.ts b/passport-facebook/passport-facebook-tests.ts
index b35770479..8accf57c0 100644
--- a/passport-facebook/passport-facebook-tests.ts
+++ b/passport-facebook/passport-facebook-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./passport-facebook.d.ts" />
+
 /**
  * Created by jcabresos on 4/19/2014.
  */
@@ -22,4 +24,4 @@ passport.use(new facebook.Strategy({
              done(null, user);
          });
     })
-);
\ No newline at end of file
+);
diff --git a/passport-google-oauth/passport-google-oauth-tests.ts b/passport-google-oauth/passport-google-oauth-tests.ts
index 60fad97b4..ef7a4e9ef 100644
--- a/passport-google-oauth/passport-google-oauth-tests.ts
+++ b/passport-google-oauth/passport-google-oauth-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./passport-google-oauth.d.ts" />
+
 /**
  * Created by jcabresos on 4/19/2014.
  */
diff --git a/passport-local/passport-local-tests.ts b/passport-local/passport-local-tests.ts
index 873dc609b..68056db49 100644
--- a/passport-local/passport-local-tests.ts
+++ b/passport-local/passport-local-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./passport-local.d.ts" />
+
 /**
  * Created by Maxime LUCE <https://github.com/SomaticIT>.
  */
diff --git a/passport-strategy/passport-strategy-tests.ts b/passport-strategy/passport-strategy-tests.ts
index e9c6fd604..ad5a9a38d 100644
--- a/passport-strategy/passport-strategy-tests.ts
+++ b/passport-strategy/passport-strategy-tests.ts
@@ -1,3 +1,4 @@
+/// <reference path="./passport-strategy.d.ts" />
 
 import express = require('express');
 import passport = require('passport-strategy');
diff --git a/passport-twitter/passport-twitter-tests.ts b/passport-twitter/passport-twitter-tests.ts
index ae644dfa2..f7d539f16 100644
--- a/passport-twitter/passport-twitter-tests.ts
+++ b/passport-twitter/passport-twitter-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./passport-twitter.d.ts" />
+
 /**
  * Created by jcabresos on 4/19/2014.
  */
diff --git a/peerjs/peerjs-tests.ts b/peerjs/peerjs-tests.ts
index 3b99471c7..dee76d9e2 100644
--- a/peerjs/peerjs-tests.ts
+++ b/peerjs/peerjs-tests.ts
@@ -4,8 +4,10 @@
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
     debug: 3,
-    logFunction: ()=>{
-    }
+});
+
+peerByOption.on("connection", dataConnection => {
+    var type: string = dataConnection.type;
 });
 
 peerByOption.listAllPeers(function(items){
@@ -21,9 +23,10 @@ var peerByIdAndOption: PeerJs.Peer = new Peer(
     {
         key: 'peerKey',
         debug: 3,
-        logFunction: ()=>{
-        }
     });
+peerByIdAndOption.on("call", mediaConnection => {
+    var isOpen: boolean = mediaConnection.open;
+});
 
 var id = peerByOption.id;
 var connections = peerByOption.connections;
diff --git a/peerjs/peerjs.d.ts b/peerjs/peerjs.d.ts
index b87d3bc87..7db935ffb 100644
--- a/peerjs/peerjs.d.ts
+++ b/peerjs/peerjs.d.ts
@@ -78,7 +78,7 @@ declare module PeerJs{
          * @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;
+        connect(id: string, options?: PeerJs.PeerConnectOption): 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).
diff --git a/phantom/phantom-tests.ts b/phantom/phantom-tests.ts
index bd12a5e6e..d18168827 100644
--- a/phantom/phantom-tests.ts
+++ b/phantom/phantom-tests.ts
@@ -117,7 +117,7 @@ phantom.create((ph) => {
       var finishedFunc = (result: any) => {
         ph.exit();
       };
-      page.evaluate(someFunc, finishedFunc, 'div', {wahtt: 111});
+      page.evaluate<string, {wahtt: number;}, void>(someFunc, finishedFunc, 'div', {wahtt: 111});
     });
   });
 
@@ -164,5 +164,3 @@ phantom.create((ph) => {
     });
   });
 });
-
-
diff --git a/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts b/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts
new file mode 100644
index 000000000..405325510
--- /dev/null
+++ b/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts
@@ -0,0 +1,114 @@
+/// <reference path="phonegap-facebook-plugin.d.ts" />
+
+facebookConnectPlugin.api("a", ["b", "c"]);
+facebookConnectPlugin.api("a", ["b", "c"], (result: any) => {});
+facebookConnectPlugin.api("a", ["b", "c"], (result: any) => {}, (error: string) => {});
+
+facebookConnectPlugin.getAccessToken((token: string) => {});
+facebookConnectPlugin.getAccessToken((token: string) => {}, (error: string) => {});
+
+facebookConnectPlugin.getLoginStatus();
+facebookConnectPlugin.getLoginStatus((status: PhonegapFacebookPlugin.LoginResult) => {
+    var accessToken: string = status.authResponse.accessToken;
+    var expiresIn: string = status.authResponse.expiresIn;
+    var secret: string = status.authResponse.secret;
+    var session_key: boolean = status.authResponse.session_key;
+    var sig: string = status.authResponse.sig;
+    var userID: string = status.authResponse.userID;
+    var status1: string = status.status;
+}, (error: string) => {});
+
+facebookConnectPlugin.logEvent("a");
+facebookConnectPlugin.logEvent("a", {});
+facebookConnectPlugin.logEvent("a", {}, 42);
+facebookConnectPlugin.logEvent("a", {}, 42, () => {});
+facebookConnectPlugin.logEvent("a", {}, 42, () => {}, (error: string) => {});
+
+facebookConnectPlugin.logPurchase(42, "a");
+facebookConnectPlugin.logPurchase(42, "a", () => {});
+facebookConnectPlugin.logPurchase(42, "a", () => {}, (error: string) => {});
+
+facebookConnectPlugin.login(["a", "b"], (result: PhonegapFacebookPlugin.LoginResult) => {
+    var accessToken: string = result.authResponse.accessToken;
+    var expiresIn: string = result.authResponse.expiresIn;
+    var secret: string = result.authResponse.secret;
+    var session_key: boolean = result.authResponse.session_key;
+    var sig: string = result.authResponse.sig;
+    var userID: string = result.authResponse.userID;
+    var status: string = result.status;
+}, (error: string) => {});
+
+facebookConnectPlugin.logout();
+facebookConnectPlugin.logout(() => {});
+facebookConnectPlugin.logout(() => {}, (error: string) => {});
+
+//#region BaseDialog
+
+var baseDialogOptions: PhonegapFacebookPlugin.BaseDialogOptions = {
+    method: "a"
+};
+
+facebookConnectPlugin.showDialog(baseDialogOptions, (status: PhonegapFacebookPlugin.BaseDialogResult) => {}, (error: string) => {});
+
+//#endregion
+
+//#region Feed Dialog
+
+var feedDialogOptions: PhonegapFacebookPlugin.FeedDialogOptions = {
+    method: "feed",
+    from: "a",
+    to: "b",
+    link: "c",
+    picture: "d",
+    source: "e",
+    name: "f",
+    caption: "g",
+    description: "h",
+    ref: "i"
+};
+
+facebookConnectPlugin.showDialog(feedDialogOptions, (status: PhonegapFacebookPlugin.FeedDialogResult) => {
+    var post_id: string = status.post_id;
+}, (error: string) => {});
+
+//#endregion
+
+//#region Send Dialog
+
+var sendDialogOptions: PhonegapFacebookPlugin.SendDialogOptions = {
+    method: "send",
+    to: "a",
+    link: "b"
+};
+
+facebookConnectPlugin.showDialog(sendDialogOptions, (status: PhonegapFacebookPlugin.SendDialogResult) => {
+}, (error: string) => {});
+
+//#endregion
+
+//#region Share Dialog
+
+var shareDialogOptions: PhonegapFacebookPlugin.ShareDialogOptions = {
+    method: "share",
+    href: "a"
+};
+
+facebookConnectPlugin.showDialog(shareDialogOptions, (status: PhonegapFacebookPlugin.ShareDialogResult) => {
+    var post_id: string = status.post_id;
+}, (error: string) => {});
+
+//#endregion
+
+//#region Share Open Graph Dialog
+
+var shareOpenGraphDialogOptions: PhonegapFacebookPlugin.ShareOpenGraphDialogOptions = {
+    method: "share_open_graph",
+    action_type: "a",
+    action_properties: "b"
+};
+
+facebookConnectPlugin.showDialog(shareOpenGraphDialogOptions, (status: PhonegapFacebookPlugin.ShareDialogResult) => {
+    var post_id: string = status.post_id;
+}, (error: string) => {});
+
+//#endregion
\ No newline at end of file
diff --git a/phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts b/phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts
new file mode 100644
index 000000000..02544b3b8
--- /dev/null
+++ b/phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts
@@ -0,0 +1,292 @@
+// Type definitions for phonegap-facebook-plugin 0.11.0
+// Project: https://github.com/Wizcorp/phonegap-facebook-plugin
+// Definitions by: Justin Unterreiner <https://github.com/Justin-Credible>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module PhonegapFacebookPlugin {
+
+    //#region API Methods
+
+    interface FacebookConnectPluginStatic {
+
+        /**
+         * Allows access to the Facebook Graph API. This API allows for additional permission because, unlike login, the Graph API can
+         * accept multiple permissions. In order to make calls to the Graph API on behalf of a user, the user has to be logged into your
+         * app using Facebook login.
+         * 
+         * @param graphPath The graph API path to use for the query.
+         * @param permissions The permissions to request.
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        api: (graphPath: string, permissions: string[], successCallback?: (result: any) => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to retreive the access token for the current user.
+         * 
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        getAccessToken: (successCallback?: (token: string) => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to get the login status for the current user.
+         * 
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        getLoginStatus: (successCallback?: (status: LoginResult) => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to log an event.
+         * 
+         * @param name Name of the event.
+         * @param params Extra data to log with the event (optional).
+         * @param valueToSum a property which is an arbitrary number that can represent any value (e.g., a price or a quantity).
+         *          When reported, all of the valueToSum properties will be summed together. For example, if 10 people each purchased
+         *          one item that cost $10 (and passed in valueToSum) then they would be summed to report a number of $100. (optional)
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        logEvent: (name: string, params?: any, valueToSum?: number, successCallback?: () => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to log a purchase.
+         * 
+         * @param value The value of the purchase.
+         * @param currency An ISO-4217 currency code.
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        logPurchase: (value: number, currency: string, successCallback?: () => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to log the user in via Facebook. Calling this will result in a Facebook login dialog (or external
+         * webpage) launching. Once the user completes the flow, one of the two callbacks will be executed.
+         * 
+         * @param permissions The permissions to request during login.
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        login: (permissions: string[], successCallback?: (result: LoginResult) => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to log the user out of Facebook. This will invalidate their access token.
+         * 
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        logout: (successCallback?: () => void, failureCallback?: (error: string) => void) => void;
+
+        /**
+         * Used to open a Facebook dialog.
+         * 
+         * @param options The options that control the dialog and it's behavior.
+         * @param successCallback The callback to be executed when the call completes successfully.
+         * @param failureCallback The callback to be executed when the call fails.
+         */
+        showDialog: (options: BaseDialogOptions, successCallback?: (status: BaseDialogResult) => void, failureCallback?: (error: string) => void) => void;
+    }
+
+    //#endregion
+
+    //#region Method Parameters
+
+    interface BaseDialogOptions {
+
+        /**
+         * The type of dialog to show, can be one of the following.
+         * 
+         * Depeneding on the type, a different options object will be used:
+         * 
+         * Method               Options Type
+         * feed                 FeedDialogOptions
+         * send                 SendDialogOptions
+         * share                ShareDialogOptions
+         * share_open_graph     ShareOpenGraphDialogOptions
+         */
+        method: string;
+    }
+
+    /**
+     * You can add the Feed Dialog to your app so people can publish individual stories to their timeline. This
+     * includes captions that your app manages and a personal comment from the person sharing the content.
+     * 
+     * For use with showDialog() of method type 'feed'.
+     */
+    interface FeedDialogOptions extends BaseDialogOptions {
+
+        /**
+         * The ID of the person posting the message. If this is unspecified, it defaults to the current person.
+         * If specified, it must be the ID of the person or of a page that the person administers.
+         */
+        from?: string;
+
+        /**
+         * The ID of the profile that this story will be published to. If this is unspecified, it defaults to
+         * the value of from. The ID must be a friend who also uses your app.
+         */
+        to?: string;
+
+        /**
+         * The link attached to this post.
+         */
+        link?: string;
+
+        /**
+         * The URL of a picture attached to this post. The picture must be at least 200px by 200px.
+         */
+        picture?: string;
+
+        /**
+         * The URL of a media file (either SWF or MP3) attached to this post. If SWF, you must also specify
+         * 'picture' to provide a thumbnail for the video.
+         */
+        source?: string;
+
+        /**
+         * The name of the link attachment.
+         */
+        name?: string;
+
+        /**
+         * The caption of the link (appears beneath the link name). If not specified, this field is automatically
+         * populated with the URL of the link.
+         */
+        caption?: string;
+
+        /**
+         * The description of the link (appears beneath the link caption). If not specified, this field is
+         * automatically populated by information scraped from the link, typically the title of the page.
+         */
+        description?: string;
+
+        /**
+         * This argument is a comma-separated list, consisting of at most 5 distinct items, each of length at
+         * least 1 and at most 15 characters drawn from the set
+         * '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_'.
+         * Each category is used in Facebook Insights to help you measure the performance of different types
+         * of post.
+         */
+        ref?: string;
+    }
+
+    /**
+     * The Send Dialog lets people privately send content to specific friends. They'll have the option to privately
+     * share a link as a Facebook message or group post. The Send Dialog does not require any extended permissions.
+     * 
+     * For use with showDialog() of method type 'send'.
+     */
+    interface SendDialogOptions extends BaseDialogOptions {
+
+        /**
+         * A user ID of a recipient. Once the dialog comes up, the sender can specify additional people, and groups
+         * addresses as recipients. Sending content to a Facebook group will post it to the group's wall.
+         */
+        to: string;
+
+        /**
+         * Required parameter. The URL that is being sent in the message.
+         */
+        link: string;
+    }
+
+    /**
+     * The Share dialog prompts a person to publish an individual story or an Open Graph story to their timeline.
+     * This does not require Facebook Login or any extended permissions, so it is the easiest way to enable
+     * sharing on web.
+     * 
+     * For use with showDialog() of method type 'share'.
+     */
+    interface ShareDialogOptions extends BaseDialogOptions {
+
+        /**
+         * The link attached to this post. Required when using method share. Include open graph meta tags in the
+         * page at this URL to customize the story that is shared.
+         */
+        href: string;
+    }
+
+    /**
+     * The Share dialog prompts a person to publish an individual story or an Open Graph story to their timeline.
+     * This does not require Facebook Login or any extended permissions, so it is the easiest way to enable
+     * sharing on web.
+     * 
+     * For use with showDialog() of method type 'share_open_graph'.
+     */
+    interface ShareOpenGraphDialogOptions extends BaseDialogOptions {
+
+        /**
+         * A string specifying which Open Graph action type to publish, e.g., og.likes for the built in like type.
+         * The dialog also supports approved custom types.
+         */
+        action_type: string;
+
+        /**
+         * A JSON object of key/value pairs specifying parameters which correspond to the action_type being used.
+         * Valid key/value pairs are the same parameters that can be used when publishing Open Graph Actions using
+         * the API.
+         */
+        action_properties: string;
+    }
+
+    //#endregion
+
+    //#region Callback Results
+
+    /**
+     * Result for the login() and getLoginStatus() success callbacks.
+     */
+    interface LoginResult {
+        authResponse: {
+            accessToken: string;
+            expiresIn: string;
+            secret: string;
+            session_key: boolean;
+            sig: string;
+            userID: string;
+        },
+        status: string;
+    }
+
+    /**
+     * The base result type for all showDialog() success callbacks.
+     */
+    interface BaseDialogResult {
+        error_code: string;
+        error_message: string;
+    }
+
+    /**
+     * The response object returned from a success callback for showDialog() of type 'feed'.
+     */
+    interface FeedDialogResult extends BaseDialogResult {
+
+        /**
+         * The ID of the posted story, if the person chose to publish.
+         */
+        post_id: string;
+    }
+
+    /**
+     * The response object returned from a success callback for showDialog() of type 'send'.
+     */
+    interface SendDialogResult extends BaseDialogResult {
+    }
+
+    /**
+     * The response object returned from a success callback for showDialog() of type 'share' or 'share_open_graph'.
+     */
+    interface ShareDialogResult extends BaseDialogResult {
+
+        /**
+         * Only available if the user is logged into your app using Facebook and has granted publish_actions.
+         * If present, this is the ID of the published Open Graph story.
+         */
+        post_id: string;
+    }
+
+    //#endregion
+}
+
+declare var facebookConnectPlugin: PhonegapFacebookPlugin.FacebookConnectPluginStatic;
\ No newline at end of file
diff --git a/phonegap-plugin-push/phonegap-plugin-push-tests.ts b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
new file mode 100644
index 000000000..916a6cf82
--- /dev/null
+++ b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
@@ -0,0 +1,59 @@
+/// <reference path="phonegap-plugin-push.d.ts" />
+
+function test() {
+	var options:PhonegapPluginPush.InitOptions = {
+		android: {
+			senderID: '123456789',
+			icon: 'phonegap',
+			iconColor: 'blue',
+			sound: true,
+			vibrate: true,
+			clearNotifications: false
+		},
+		ios: {
+			badge: true,
+			sound: true,
+			alert: true
+		},
+		windows: {}
+	};
+	var push:PhonegapPluginPush.PushNotification;
+
+	/*from constructor*/
+	push = new PushNotification(options);
+
+	push.unregister(() => {
+		console.log('did unregister');
+	}, () => {
+		console.log('did not unregister');
+	});
+
+	/*from init*/
+	push = PushNotification.init(options);
+
+	push.on('registration', (data:PhonegapPluginPush.RegistrationEventResponse) => {
+		console.log(data.registrationId);
+	});
+
+	push.on('notification', (data:PhonegapPluginPush.NotificationEventResponse) => {
+		console.log(data.message);
+		console.log(data.title);
+		console.log(data.count);
+		console.log(data.sound);
+		console.log(data.image);
+
+		/*the rest of the additional fields are not 'canon'*/
+		console.log(data.additionalData);
+		console.log(data.additionalData.foreground);
+	});
+
+	push.on('error', (e:Error) => {
+		console.log(e.message);
+	});
+
+	push.setApplicationIconBadgeNumber(() => {
+		console.log('did setApplicationIconBadgeNumber');
+	}, () => {
+		console.log('did not setApplicationIconBadgeNumber');
+	}, 1);
+}
diff --git a/phonegap-plugin-push/phonegap-plugin-push.d.ts b/phonegap-plugin-push/phonegap-plugin-push.d.ts
new file mode 100644
index 000000000..e9168a642
--- /dev/null
+++ b/phonegap-plugin-push/phonegap-plugin-push.d.ts
@@ -0,0 +1,178 @@
+// Type definitions for phonegap-plugin-push
+// Project: https://github.com/phonegap/phonegap-plugin-push
+// Definitions by: Frederico Galvão <https://github.com/fredgalvao>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module PhonegapPluginPush {
+	type EventResponse = RegistrationEventResponse | NotificationEventResponse | Error
+
+	interface PushNotification {
+		/**
+		 * The event registration will be triggered on each successful registration with the 3rd party push service.
+		 * @param event
+		 * @param callback
+		 */
+		on(event:"registration", callback:(response:RegistrationEventResponse)=>any):void
+		/**
+		 * The event notification will be triggered each time a push notification is received by a 3rd party push service on the device.
+		 * @param event
+		 * @param callback
+		 */
+		on(event:"notification", callback:(response:NotificationEventResponse)=>any):void
+		/**
+		 * The event error will trigger when an internal error occurs and the cache is aborted.
+		 * @param event
+		 * @param callback
+		 */
+		on(event:"error", callback:(response:Error)=>any):void
+		/*Generic one, needed for the overloads*/
+		/**
+		 *
+		 * @param event Name of the event to listen to. See below(above) for all the event names.
+		 * @param callback is called when the event is triggered.
+		 */
+		on(event:string, callback:(response:EventResponse)=>any):void
+
+		/**
+		 * The unregister method is used when the application no longer wants to receive push notifications.
+		 * @param successHandler
+		 * @param errorHandler
+		 */
+		unregister(successHandler:()=>any, errorHandler?:()=>any):void
+		/*TODO according to js source code, "errorHandler" is optional, but is "count" also optional? I can't read objetive-C code (can anyone at all? I wonder...)*/
+		/**
+		 * Set the badge count visible when the app is not running
+		 *
+		 * The count is an integer indicating what number should show up in the badge. Passing 0 will clear the badge. Each notification event contains a data.count value which can be used to set the badge to correct number.
+		 * @param successHandler
+		 * @param errorHandler
+		 * @param count
+		 */
+		setApplicationIconBadgeNumber(successHandler:()=>any, errorHandler:()=>any, count:number):void
+	}
+
+	/**
+	 * platform specific initialization options.
+	 */
+	interface InitOptions {
+		/**
+		 * Android specific initialization options.
+		 */
+		android?: {
+			/**
+			 * Maps to the project number in the Google Developer Console.
+			 */
+			senderID:string
+			/**
+			 * The name of a drawable resource to use as the small-icon.
+			 */
+			icon?:string
+			/**
+			 * Sets the background color of the small icon.
+			 * Supported Formats - http://developer.android.com/reference/android/graphics/Color.html#parseColor(java.lang.String)
+			 */
+			iconColor?:string
+			/**
+			 * If true it plays the sound specified in the push data or the default system sound. Default is true.
+			 */
+			sound?:boolean
+			/**
+			 * If true the device vibrates on receipt of notification. Default is true.
+			 */
+			vibrate?:boolean
+			/**
+			 * If true the app clears all pending notifications when it is closed. Default is true.
+			 */
+			clearNotifications?:boolean
+		}
+
+		/**
+		 * iOS specific initialization options.
+		 */
+		ios?: {
+			/**
+			 * If true the device shows an alert on receipt of notification. Default is false.
+			 */
+			badge?: boolean
+			/**
+			 * If true the device sets the badge number on receipt of notification. Default is false.
+			 */
+			sound?: boolean
+			/**
+			 * If true the device plays a sound on receipt of notification. Default is false.
+			 */
+			alert?: boolean
+		}
+
+		/**
+		 * Windows specific initialization options.
+		 */
+		windows?: {
+
+		}
+	}
+
+	interface RegistrationEventResponse {
+		/**
+		 * The registration ID provided by the 3rd party remote push service.
+		 */
+		registrationId:string
+	}
+
+	interface NotificationEventResponse {
+		/**
+		 * The text of the push message sent from the 3rd party service.
+		 */
+		message:string
+		/**
+		 * The optional title of the push message sent from the 3rd party service.
+		 */
+		title?:string
+		/**
+		 * The number of messages to be displayed in the badge iOS or message count in the notification shade in Android.
+		 * For windows, it represents the value in the badge notification which could be a number or a status glyph.
+		 */
+		count:string
+		/**
+		 * The name of the sound file to be played upon receipt of the notification.
+		 */
+		sound:string
+		/**
+		 * The path of the image file to be displayed in the notification.
+		 */
+		image:string
+		/**
+		 * An optional collection of data sent by the 3rd party push service that does not fit in the above properties.
+		 */
+		additionalData: NotificationEventAdditionalData
+	}
+
+	interface NotificationEventAdditionalData {
+		/**
+		 * TODO: document all possible properties (I only got the android ones)
+		 *
+		 * Loosened up with a dictionary notation, but all non-defined properties need to use (map['prop']) notation
+		 *
+		 * Ideally the developer would overload (merged declaration) this or create a new interface that would extend this one
+		 * so that he could specify any custom code without having to use array notation (map['prop']) for all of them.
+		 */
+		[name: string]: any
+		/**
+		 * Whether the notification was received while the app was in the foreground
+		 */
+		foreground?:boolean
+		collapse_key?:string
+		from?:string
+		notId?:string
+	}
+
+	interface PushNotificationStatic {
+		init(options:InitOptions):PushNotification
+		new(options:InitOptions):PushNotification
+	}
+}
+
+interface Window {
+	PushNotification:PhonegapPluginPush.PushNotificationStatic
+}
+declare var PushNotification:PhonegapPluginPush.PushNotificationStatic;
diff --git a/photoswipe/photoswipe-tests.ts b/photoswipe/photoswipe-tests.ts
index 79125bd05..e4006d5c1 100644
--- a/photoswipe/photoswipe-tests.ts
+++ b/photoswipe/photoswipe-tests.ts
@@ -6,13 +6,11 @@ function test_defaultUI() {
             src: "path/to/image.jpg",
             w: 100,
             h: 200,
-            specialProperty: true
         },
         {
             src: "path/to/image2.jpg",
             w: 1000,
             h: 2000,
-            specialProperty: false
         }
     ];
 
@@ -53,7 +51,8 @@ function test_defaultUI() {
             return el.tagName === 'A';
         },
         mainScrollEndFriction: 0.35,
-        panEndFriction: 0.35
+        panEndFriction: 0.35,
+        modal: true
     };
 
     var photoSwipe: PhotoSwipe<PhotoSwipeUI_Default.Options>;
diff --git a/photoswipe/photoswipe.d.ts b/photoswipe/photoswipe.d.ts
index b09fe75dd..bf1cf701b 100644
--- a/photoswipe/photoswipe.d.ts
+++ b/photoswipe/photoswipe.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for PhotoSwipe 4.0.7
+// Type definitions for PhotoSwipe 4.0.8
 // Project: http://photoswipe.com/
 // Definitions by: Xiaohan Zhang <https://github.com/hellochar>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -268,6 +268,20 @@ declare module PhotoSwipe {
          */
         mainClass?: string;
 
+        /**
+         * NOTE: this property will be ignored in future versions of PhotoSwipe.
+         *
+         * @deprecated
+         */
+        mainScrollEndFriction?: number;
+
+        /**
+         * NOTE: this property will be ignored in future versions of PhotoSwipe.
+         *
+         * @deprecated
+         */
+        panEndFriction?: number;
+
         /**
          * Function that should return total number of items in gallery. Don't put very complex code here, function is executed very often.
          *
@@ -294,6 +308,13 @@ declare module PhotoSwipe {
          * }
          */
         isClickableElement?: (el: HTMLElement) => boolean;
+
+        /**
+         * Controls whether PhotoSwipe should expand to take up the entire viewport.
+         * If false, the PhotoSwipe element will take the size of the positioned parent of the template. Take a look at the FAQ for more
+         * information.
+         */
+        modal?: boolean;
     }
 
     interface UIFramework {
diff --git a/physijs/tests/jenga.ts b/physijs/tests/jenga.ts
index e2eeecc94..77b9c6cd6 100644
--- a/physijs/tests/jenga.ts
+++ b/physijs/tests/jenga.ts
@@ -85,7 +85,7 @@ initScene = function() {
 
     // Materials
     table_material = Physijs.createMaterial(
-        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/wood.jpg' ), ambient: 0xFFFFFF }),
+        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/wood.jpg' ) }),
         .9, // high friction
         .2 // low restitution
     );
@@ -93,7 +93,7 @@ initScene = function() {
     table_material.map.repeat.set( 5, 5 );
 
     block_material = Physijs.createMaterial(
-        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ), ambient: 0xFFFFFF }),
+        new THREE.MeshLambertMaterial({ map: THREE.ImageUtils.loadTexture( 'images/plywood.jpg' ) }),
         .4, // medium friction
         .4 // medium restitution
     );
diff --git a/pixi.js/pixi.js.d.ts b/pixi.js/pixi.js.d.ts
index 8e83cbf1e..d3f268d2f 100644
--- a/pixi.js/pixi.js.d.ts
+++ b/pixi.js/pixi.js.d.ts
@@ -492,16 +492,18 @@ declare module PIXI {
     //renderers
 
     export interface RendererOptions {
-
         view?: HTMLCanvasElement;
         transparent?: boolean
         antialias?: boolean;
         resolution?: number;
-        clearBeforeRendering?: boolean;
         preserveDrawingBuffer?: boolean;
         forceFXAA?: boolean;
         roundPixels?: boolean;
 
+        autoResize?: boolean;
+        backgroundColor?: number;
+        blendModes?: { [s: string]: any; };
+        clearBeforeRender?: boolean;
     }
     export class SystemRenderer extends EventEmitter {
 
@@ -762,7 +764,7 @@ declare module PIXI {
         fragmentSrc: string;
 
         init(): void;
-        cachUniformLocations(keys: string): void;
+        cacheUniformLocations(keys: string): void;
         cacheAttributeLocations(keys: string): void;
         compile(): WebGLProgram;
         syncUniform(uniform: any): void;
diff --git a/podcast/podcast.d.ts b/podcast/podcast.d.ts
index cfe4766ad..c4e280d2d 100644
--- a/podcast/podcast.d.ts
+++ b/podcast/podcast.d.ts
@@ -64,6 +64,12 @@ interface IItemOptions
     date: Date;
     lat?: number;
     long?: number;
+    enclosure?: {
+        url: string;
+        file?: string;
+        size?: number;
+        mime?: string;
+    }
     itunesAuthor?: string;
     itunesExplicit?: boolean;
     itunesSubtitle?: string;
diff --git a/polyline/polyline.d.ts b/polyline/polyline.d.ts
index 0f220e1d3..a7f803efc 100644
--- a/polyline/polyline.d.ts
+++ b/polyline/polyline.d.ts
@@ -8,7 +8,7 @@
 interface Polyline {
   decode(string: string, precision?: number): number[][];
   encode(coordinate: number[][], precision?: number): string;
-  fromGeoJSON(geojson: GeoJSON.GeoJsonObject, precision?: number): string;
+  fromGeoJSON(geojson: GeoJSON.LineString | GeoJSON.Feature, precision?: number): string;
 }
 
 declare var polyline: Polyline;
diff --git a/polymer/polymer-tests.ts b/polymer/polymer-tests.ts
index ac7f180b4..311fda967 100644
--- a/polymer/polymer-tests.ts
+++ b/polymer/polymer-tests.ts
@@ -56,3 +56,27 @@ document.registerElement('my-element', MyElement);
 // Equivalent:
 var el1 = new MyElement();
 var el2 = document.createElement('my-element');
+
+// ES6 class syntax
+
+// implicit implementation
+class MyElement2 {
+  is: string;
+
+  registered() {
+    this.is = "my-element2";
+  }
+}
+
+Polymer(MyElement2);
+
+// explicit implementation
+class MyElement3 implements polymer.Base {
+  is: string;
+
+  registered() {
+    this.is = "my-element3";
+  }
+}
+
+Polymer(MyElement3);
diff --git a/polymer/polymer.d.ts b/polymer/polymer.d.ts
index 5515fa3dc..b764aeb2a 100644
--- a/polymer/polymer.d.ts
+++ b/polymer/polymer.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for polymer v1.0
+// Type definitions for polymer v1.1.2
 // Project: https://github.com/Polymer/polymer
 // Definitions by: Louis Grignon <https://github.com/lgrignon>, Suguru Inatomi <https://github.com/laco0416>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -11,15 +11,17 @@ declare module polymer {
 
   interface PropObjectType {
     type: PropConstructorType;
-    value?:boolean|number|string|Function;
-    reflectToAttributes?:boolean;
-    notify?:boolean;
-    readOnly?:boolean;
-    observer?:string;
-    computed?:string;
+    value?: boolean | number | string | Function;
+    reflectToAttribute?: boolean;
+    readOnly?: boolean;
+    notify?: boolean;
+    computed?: string;
+    observer?: string;
   }
 
   interface Base {
+    /** Need to allow all properties for callback methods. */
+    [prop: string]: any;
 
     /* polymer-micro */
 
@@ -199,6 +201,8 @@ declare module polymer {
 
     observers?: string[];
 
+    registered?(): void;
+
     created?(): void;
 
     attached?(): void;
@@ -297,9 +301,9 @@ declare module polymer {
 
     dom:DomApiStatic;
 
-    (prototype: Base):webcomponents.CustomElementConstructor;
+    (prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
 
-    Class(prototype: Base):webcomponents.CustomElementConstructor;
+    Class(prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
   }
 }
 
diff --git a/postal/postal.d.ts b/postal/postal.d.ts
index e1bad48cc..a23e14d87 100644
--- a/postal/postal.d.ts
+++ b/postal/postal.d.ts
@@ -15,36 +15,36 @@ interface IResolver {
 	purge(options?: {topic?: string, binding?: string, compact?: boolean}): void;
 }
 
-interface ICallback {
-	(data: any, envelope: IEnvelope): void
+interface ICallback<T> {
+	(data: T, envelope: IEnvelope<T>): void
 }
 
-interface ISubscriptionDefinition {
+interface ISubscriptionDefinition<T> {
 	channel: string;
 	topic: string;
-	callback: ICallback;
+	callback: ICallback<T>;
 
 	// after and before lack documentation
 
-	constraint(predicateFn: (data: any, envelope: IEnvelope) => boolean): ISubscriptionDefinition;
-	constraints(predicateFns: ((data: any, envelope: IEnvelope) => boolean)[]): ISubscriptionDefinition;
-	context(theContext: any): ISubscriptionDefinition;
-	debounce(interval: number): ISubscriptionDefinition;
-	defer(): ISubscriptionDefinition;
-	delay(waitTime: number): ISubscriptionDefinition;
-	disposeAfter(maxCalls: number): ISubscriptionDefinition;
-	distinct(): ISubscriptionDefinition;
-	distinctUntilChanged(): ISubscriptionDefinition;
-	logError(): ISubscriptionDefinition;
-	once(): ISubscriptionDefinition;
-	throttle(interval: number): ISubscriptionDefinition;
-	subscribe(callback: ICallback): ISubscriptionDefinition;
+	constraint(predicateFn: (data: T, envelope: IEnvelope<T>) => boolean): ISubscriptionDefinition<T>;
+	constraints(predicateFns: ((data: T, envelope: IEnvelope<T>) => boolean)[]): ISubscriptionDefinition<T>;
+	context(theContext: any): ISubscriptionDefinition<T>;
+	debounce(interval: number): ISubscriptionDefinition<T>;
+	defer(): ISubscriptionDefinition<T>;
+	delay(waitTime: number): ISubscriptionDefinition<T>;
+	disposeAfter(maxCalls: number): ISubscriptionDefinition<T>;
+	distinct(): ISubscriptionDefinition<T>;
+	distinctUntilChanged(): ISubscriptionDefinition<T>;
+	logError(): ISubscriptionDefinition<T>;
+	once(): ISubscriptionDefinition<T>;
+	throttle(interval: number): ISubscriptionDefinition<T>;
+	subscribe(callback: ICallback<T>): ISubscriptionDefinition<T>;
 	unsubscribe(): void;
 }
 
-interface IEnvelope {
+interface IEnvelope<T> {
 	topic: string;
-	data?: any;
+	data?: T;
 
 	/*Uses DEFAULT_CHANNEL if no channel is provided*/
 	channel?: string;
@@ -53,10 +53,10 @@ interface IEnvelope {
 }
 
 
-interface IChannelDefinition {
-	subscribe(topic: string, callback: ICallback): ISubscriptionDefinition;
+interface IChannelDefinition<T> {
+	subscribe(topic: string, callback: ICallback<T>): ISubscriptionDefinition<T>;
 
-	publish(topic: string, data?: any): void;
+	publish(topic: string, data?: T): void;
 
 	channel: string;
 }
@@ -73,24 +73,24 @@ interface IDestinationArg {
 
 interface IPostal {
 	subscriptions: {};
-	wiretaps: ICallback[];
+	wiretaps: ICallback<any>[];
 
-	addWireTap(callback: ICallback): () => void;
+	addWireTap(callback: ICallback<any>): () => void;
 
-	channel(name?: string): IChannelDefinition;
+	channel<T>(name?: string): IChannelDefinition<T>;
 
-	getSubscribersFor(): ISubscriptionDefinition[];
-	getSubscribersFor(options: {channel?: string, topic?: string, context?: any}): ISubscriptionDefinition[];
-	getSubscribersFor(predicateFn: (sub: ISubscriptionDefinition) => boolean): ISubscriptionDefinition[];
+	getSubscribersFor(): ISubscriptionDefinition<any>[];
+	getSubscribersFor(options: {channel?: string, topic?: string, context?: any}): ISubscriptionDefinition<any>[];
+	getSubscribersFor(predicateFn: (sub: ISubscriptionDefinition<any>) => boolean): ISubscriptionDefinition<any>[];
 
 	linkChannels(source: ISourceArg | ISourceArg[], destination: IDestinationArg | IDestinationArg[]): void;
 
-	publish(envelope: IEnvelope): void;
+	publish(envelope: IEnvelope<any>): void;
 
 	reset(): void;
 
-	subscribe(options: {channel?: string, topic: string, callback: ICallback}): ISubscriptionDefinition;
-	unsubscribe(sub: ISubscriptionDefinition): void;
+	subscribe(options: {channel?: string, topic: string, callback: ICallback<any>}): ISubscriptionDefinition<any>;
+	unsubscribe(sub: ISubscriptionDefinition<any>): void;
 	unsubscribeFor(): void;
 	unsubscribeFor(options: {channel?: string, topic?: string, context?: any}): void;
 
diff --git a/power-assert/power-assert-tests.ts b/power-assert/power-assert-tests.ts
index d21076b97..0bd483f87 100644
--- a/power-assert/power-assert-tests.ts
+++ b/power-assert/power-assert-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="./power-assert.d.ts" />
 
-import assert = require("power-assert");
+import assert from "power-assert";
 
 assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
 
diff --git a/power-assert/power-assert.d.ts b/power-assert/power-assert.d.ts
index 203edc052..6fae2033e 100644
--- a/power-assert/power-assert.d.ts
+++ b/power-assert/power-assert.d.ts
@@ -9,7 +9,7 @@
 /// <reference path="../power-assert-formatter/power-assert-formatter.d.ts" />
 
 declare function assert(value:any, message?:string):void;
-declare module assert {
+declare namespace assert {
     export class AssertionError implements Error {
         name:string;
         message:string;
@@ -62,5 +62,5 @@ declare module assert {
 }
 
 declare module "power-assert" {
-    export = assert;
+    export default assert;
 }
diff --git a/precond/precond-tests.ts b/precond/precond-tests.ts
new file mode 100644
index 000000000..dc843e99f
--- /dev/null
+++ b/precond/precond-tests.ts
@@ -0,0 +1,43 @@
+/// <reference path="./precond.d.ts" />
+
+import precond = require('precond');
+
+precond.checkArgument(true);
+precond.checkArgument(true, "msg");
+precond.checkArgument(true, "%s %s %s", 1, "two");
+
+precond.checkState(true);
+precond.checkState(true, "msg");
+precond.checkState(true, "%s %s %s", 1, "two");
+
+precond.checkIsDef(true);
+precond.checkIsDef(true, "msg");
+precond.checkIsDef(true, "%s %s %s", 1, "two");
+
+precond.checkIsDefAndNotNull(true);
+precond.checkIsDefAndNotNull(true, "msg");
+precond.checkIsDefAndNotNull(true, "%s %s %s", 1, "two");
+
+precond.checkIsString(true);
+precond.checkIsString(true, "msg");
+precond.checkIsString(true, "%s %s %s", 1, "two");
+
+precond.checkIsArray(true);
+precond.checkIsArray(true, "msg");
+precond.checkIsArray(true, "%s %s %s", 1, "two");
+
+precond.checkIsNumber(true);
+precond.checkIsNumber(true, "msg");
+precond.checkIsNumber(true, "%s %s %s", 1, "two");
+
+precond.checkIsBoolean(true);
+precond.checkIsBoolean(true, "msg");
+precond.checkIsBoolean(true, "%s %s %s", 1, "two");
+
+precond.checkIsFunction(true);
+precond.checkIsFunction(true, "msg");
+precond.checkIsFunction(true, "%s %s %s", 1, "two");
+
+precond.checkIsObject(true);
+precond.checkIsObject(true, "msg");
+precond.checkIsObject(true, "%s %s %s", 1, "two");
\ No newline at end of file
diff --git a/precond/precond-tests.ts.tscparams b/precond/precond-tests.ts.tscparams
new file mode 100644
index 000000000..2988d8fd6
--- /dev/null
+++ b/precond/precond-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs
\ No newline at end of file
diff --git a/precond/precond.d.ts b/precond/precond.d.ts
new file mode 100644
index 000000000..ef5362468
--- /dev/null
+++ b/precond/precond.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for precond 0.2.3
+// Project: https://github.com/MathieuTurcotte/node-precond
+// Definitions by: Oliver Schneider <https://github.com/olsio>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "precond" {
+    export function checkArgument(value: any, message?: string, ...formatArgs: any[]): void;
+    export function checkState(value: any, message?: string, ...formatArgs: any[]): void;
+    export function checkIsDef(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsDefAndNotNull(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsString(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsArray(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsNumber(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsBoolean(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsFunction(value: any, message?: string, ...formatArgs: any[]): any;
+    export function checkIsObject(value: any, message?: string, ...formatArgs: any[]): any;
+}
\ No newline at end of file
diff --git a/progress/progress-test.ts b/progress/progress-test.ts
new file mode 100644
index 000000000..699c20b05
--- /dev/null
+++ b/progress/progress-test.ts
@@ -0,0 +1,32 @@
+/// <reference path="progress.d.ts"/>
+
+var ProgressBar = require('progress');
+
+
+/**
+ * Usage example from https://github.com/tj/node-progress
+ */
+var bar = new ProgressBar(':bar', { total: 10 });
+var timer = setInterval(function () {
+  bar.tick();
+  if (bar.complete) {
+    console.log('\ncomplete\n');
+    clearInterval(timer);
+  }
+}, 100);
+
+
+/**
+ * Custom token example from https://github.com/tj/node-progress
+ */
+var bar = new ProgressBar(':current: :token1 :token2', { total: 3 });
+
+bar.tick({
+  'token1': "Hello",
+  'token2': "World!\n"
+});
+
+bar.tick(2, {
+  'token1': "Goodbye",
+  'token2': "World!"
+});
diff --git a/progress/progress.d.ts b/progress/progress.d.ts
new file mode 100644
index 000000000..2c7e683ec
--- /dev/null
+++ b/progress/progress.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for node-progress v1.1.8
+// Project: https://github.com/tj/node-progress
+// Definitions by: Sebastian Lenz <https://github.com/sebastian-lenz>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+
+
+declare module "progress"
+{
+    /**
+     * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
+     */
+    interface ProgressBarOptions
+    {
+        /**
+         * Total number of ticks to complete.
+         */
+        total:number;
+
+        /**
+         * The displayed width of the progress bar defaulting to total.
+         */
+        width?:number;
+
+        /**
+         * The output stream defaulting to stderr.
+         */
+        stream?:NodeJS.WritableStream;
+
+        /**
+         * Completion character defaulting to "=".
+         */
+        complete?:string;
+
+        /**
+         * Incomplete character defaulting to "-".
+         */
+        incomplete?:string;
+
+        /**
+         * Option to clear the bar on completion defaulting to false.
+         */
+        clear?:boolean;
+
+        /**
+         * Optional function to call when the progress bar completes.
+         */
+        callback?:Function;
+    }
+
+
+    /**
+     * Flexible ascii progress bar.
+     */
+    class ProgressBar
+    {
+        /**
+         * Initialize a `ProgressBar` with the given `fmt` string and `options` or
+         * `total`.
+         *
+         * Options:
+         *   - `total` total number of ticks to complete
+         *   - `width` the displayed width of the progress bar defaulting to total
+         *   - `stream` the output stream defaulting to stderr
+         *   - `complete` completion character defaulting to "="
+         *   - `incomplete` incomplete character defaulting to "-"
+         *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
+         *   - `callback` optional function to call when the progress bar completes
+         *   - `clear` will clear the progress bar upon termination
+         *
+         * Tokens:
+         *   - `:bar` the progress bar itself
+         *   - `:current` current tick number
+         *   - `:total` total ticks
+         *   - `:elapsed` time elapsed in seconds
+         *   - `:percent` completion percentage
+         *   - `:eta` eta in seconds
+         */
+        constructor(format:string, total:number);
+        constructor(format:string, options:ProgressBarOptions);
+
+
+        /**
+         * "tick" the progress bar with optional `len` and optional `tokens`.
+         */
+        tick(tokens?:any):void;
+        tick(count?:number, tokens?:any):void;
+
+
+        /**
+         * Method to render the progress bar with optional `tokens` to place in the
+         * progress bar's `fmt` field.
+         */
+        render(tokens?:any):void;
+
+
+        /**
+         * "update" the progress bar to represent an exact percentage.
+         * The ratio (between 0 and 1) specified will be multiplied by `total` and
+         * floored, representing the closest available "tick." For example, if a
+         * progress bar has a length of 3 and `update(0.5)` is called, the progress
+         * will be set to 1.
+         *
+         * A ratio of 0.5 will attempt to set the progress to halfway.
+         *
+         * @param ratio The ratio (between 0 and 1 inclusive) to set the
+         *   overall completion to.
+         */
+        update(ratio:number, tokens?:any):void;
+
+
+        /**
+         * Terminates a progress bar.
+         */
+        terminate():void;
+    }
+
+
+    export = ProgressBar;
+}
diff --git a/project-oxford/project-oxford-tests.ts b/project-oxford/project-oxford-tests.ts
new file mode 100644
index 000000000..896d407b8
--- /dev/null
+++ b/project-oxford/project-oxford-tests.ts
@@ -0,0 +1,480 @@
+///<reference path='project-oxford.d.ts' />
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../mocha/mocha.d.ts" />
+
+import oxford = require("project-oxford");
+
+import assert = require('assert');
+import _Promise = require('bluebird');
+import fs = require('fs');
+
+var client = new oxford.Client(process.env.OXFORD_KEY);
+
+// Store variables, no point in calling the api too often
+var billFaces = <string[]>[];
+var personGroupId = "uuid.v4()";
+var personGroupId2 = "uuid.v4()";
+var billPersonId: string;
+
+describe('Project Oxford Face API Test', function () {
+    afterEach(function() {
+        // delay after each test to prevent throttling
+        var now = +new Date() + 250;
+        while(now > +new Date());
+    });
+
+    describe('#detect()', function () {
+        it('detects a face in a stream', function (done) {
+            client.face.detect({
+                stream: fs.createReadStream('./test/images/face1.jpg'),
+                analyzesFaceLandmarks: true,
+                analyzesAge: true,
+                analyzesGender: true,
+                analyzesHeadPose: true
+            }).then(function (response) {
+                assert.ok(response[0].faceId);
+                assert.ok(response[0].faceRectangle);
+                assert.ok(response[0].faceLandmarks);
+                assert.ok(response[0].attributes.gender);
+                assert.ok(response[0].attributes.headPose);
+
+                assert.equal(response[0].attributes.gender, 'male');
+                done();
+            });
+        });
+
+        it('detects a face in a local file', function (done) {
+            client.face.detect({
+                path: './test/images/face1.jpg',
+                analyzesFaceLandmarks: true,
+                analyzesAge: true,
+                analyzesGender: true,
+                analyzesHeadPose: true
+            }).then(function (response) {
+                assert.ok(response[0].faceId);
+                assert.ok(response[0].faceRectangle);
+                assert.ok(response[0].faceLandmarks);
+                assert.ok(response[0].attributes.gender);
+                assert.ok(response[0].attributes.headPose);
+
+                assert.equal(response[0].attributes.gender, 'male');
+                done();
+            });
+        });
+
+        it('detects a face in a remote file', function (done) {
+            client.face.detect({
+                url: 'https://upload.wikimedia.org/wikipedia/commons/1/19/Bill_Gates_June_2015.jpg',
+                analyzesFaceLandmarks: true,
+                analyzesAge: true,
+                analyzesGender: true,
+                analyzesHeadPose: true
+            }).then(function (response) {
+                assert.ok(response[0].faceId);
+                assert.ok(response[0].faceRectangle);
+                assert.ok(response[0].faceLandmarks);
+                assert.ok(response[0].attributes.gender);
+                assert.ok(response[0].attributes.headPose);
+
+                assert.equal(response[0].attributes.gender, 'male');
+                done();
+            });
+        });
+    });
+
+    describe('#similar()', function () {
+        it('detects similar faces', function (done) {
+            var detects = <any>[];
+
+            this.timeout(10000);
+
+            detects.push(client.face.detect({
+                path: './test/images/face1.jpg',
+            }).then(function(response) {
+                assert.ok(response[0].faceId)
+                billFaces.push(response[0].faceId);
+            }));
+
+            detects.push(client.face.detect({
+                path: './test/images/face2.jpg',
+            }).then(function(response) {
+                assert.ok(response[0].faceId)
+                billFaces.push(response[0].faceId);
+            }));
+
+            _Promise.all(detects).then(function() {
+                client.face.similar(billFaces[0], [billFaces[1]]).then(function(response) {
+                    done();
+                });
+            });
+        });
+    });
+
+    describe('#grouping()', function () {
+        it('detects groups faces', function (done) {
+            var faceIds = <string[]>[];
+
+            this.timeout(10000);
+
+            client.face.detect({
+                path: './test/images/face-group.jpg',
+            }).then(function(response) {
+                response.forEach(function (face) {
+                    faceIds.push(face.faceId);
+                });
+
+                assert.equal(faceIds.length, 6);
+            }).then(function() {
+                client.face.grouping(faceIds).then(function (response) {
+                    assert.ok(response.messyGroup);
+                    done();
+                });
+            });
+        });
+    });
+
+    describe('#verify()', function () {
+        it('verifies a face against another face', function (done) {
+            this.timeout(10000);
+
+            assert.equal(billFaces.length, 2);
+
+            client.face.verify(billFaces).then(function (response) {
+                assert.ok(response);
+                assert.ok((response.isIdentical === true || response.isIdentical === false));
+                assert.ok(response.confidence);
+                done();
+            });
+        });
+    });
+
+    describe('#PersonGroup', function () {
+        before(function(done) {
+            this.timeout(5000);
+            // In order to test the
+            // training feature, we have to start trainign - sadly, we can't
+            // delete the group then. So we clean up before we run tests - and to wait
+            // for cleanup to finish, we're just using done().
+            client.face.personGroup.list().then(function (response) {
+                var promises = <any>[];
+
+                response.forEach(function (personGroup) {
+                    if (personGroup.name.indexOf('po-node-test-group') > -1) {
+                        promises.push(client.face.personGroup.delete(personGroup.personGroupId));
+                    }
+                });
+
+                _Promise.all(promises).then(function () {
+                    done();
+                });
+            });
+        });
+
+        it('creates a PersonGroup', function (done) {
+            client.face.personGroup.create(personGroupId, 'po-node-test-group', 'test-data').then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('lists PersonGroups', function (done) {
+            client.face.personGroup.list().then(function (response) {
+                assert.ok(response);
+                assert.ok((response.length > 0));
+                assert.ok(response[0].personGroupId);
+                done();
+            });
+        });
+
+        it('gets a PersonGroup', function (done) {
+            client.face.personGroup.get(personGroupId).then(function (response) {
+                assert.equal(response.personGroupId, personGroupId);
+                assert.equal(response.name, 'po-node-test-group');
+                assert.equal(response.userData, 'test-data');
+                done();
+            });
+        });
+
+        it('updates a PersonGroup', function (done) {
+            client.face.personGroup.update(personGroupId, 'po-node-test-group2', 'test-data2').then(function (response) {
+                assert.ok(true, "void response expected");;
+                done();
+            }).catch(function (response) {
+                assert.equal(response, 'PersonGroupTrainingNotFinished')
+            });
+        });
+
+        it('gets a PersonGroup\'s training status', function (done) {
+            client.face.personGroup.trainingStatus(personGroupId).then(function (response) {
+                done();
+            }).catch(function (response) {
+                assert.equal(response.code, 'PersonGroupNotTrained');
+                done();
+            });
+        });
+
+        it('starts a PersonGroup\'s training', function (done) {
+            client.face.personGroup.trainingStart(personGroupId).then(function (response) {
+                assert.equal(response.status, 'running');
+                done();
+            }).catch(function (response) {
+                assert.equal(response.status, 'running');
+                done();
+            });
+        });
+
+        it('deletes a PersonGroup', function (done) {
+            client.face.personGroup.delete(personGroupId).then(function (response) {
+                assert.ok(true, "void response");
+                done();
+            }).catch(function (response) {
+                assert.equal(response.code, 'PersonGroupTrainingNotFinished');
+                done();
+            });
+        });
+    });
+
+    describe('#Person', function () {
+
+        it('creates a PersonGroup for the Person', function (done) {
+            client.face.personGroup.create(personGroupId2, 'po-node-test-group', 'test-data')
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('creates a Person', function (done) {
+            client.face.person.create(personGroupId2, [billFaces[0]], 'test-bill', 'test-data')
+            .then(function (response) {
+                assert.ok(response.personId);
+                billPersonId = response.personId;
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('gets a Person', function (done) {
+            client.face.person.get(personGroupId2, billPersonId).then(function (response) {
+                assert.ok(response.personId);
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('updates a Person', function (done) {
+            client.face.person.update(personGroupId2, billPersonId, [billFaces[0]], 'test-bill', 'test-data')
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+        });
+
+        it('adds a face to a Person', function (done) {
+            client.face.person.addFace(personGroupId2, billPersonId, billFaces[1], 'test-data')
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('gets a face from a Person', function (done) {
+            client.face.person.getFace(personGroupId2, billPersonId, billFaces[1])
+            .then(function (response) {
+                assert.ok(response.userData);
+                assert.equal(response.userData, 'test-data');
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('updates a face on a Person', function (done) {
+            client.face.person.updateFace(personGroupId2, billPersonId, billFaces[1], 'test-data')
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('deletes a face on a Person', function (done) {
+            client.face.person.deleteFace(personGroupId2, billPersonId, billFaces[1])
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('lists Persons', function (done) {
+            client.face.person.list(personGroupId2)
+            .then(function (response) {
+                assert.ok(response[0].personId);
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+
+        it('deletes a Person', function (done) {
+            client.face.person.delete(personGroupId2, billPersonId)
+            .then(function (response) {
+                assert.ok(true, "void response expected");
+                done();
+            })
+            .catch(function (error) {
+                assert.ok(false, JSON.stringify(error));
+                done();
+            });
+        });
+    });
+});
+
+describe('Project Oxford Vision API Test', function () {
+    before(function() {
+        // ensure the output directory exists
+        if(!fs.existsSync('./test/output')){
+            fs.mkdirSync('./test/output', parseInt("0766", 8));
+        }
+    });
+
+    afterEach(function() {
+        // delay after each test to prevent throttling
+        var now = +new Date() + 250;
+        while(now > +new Date());
+    });
+
+    it('analyzes a local image', function (done) {
+        this.timeout(10000);
+        client.vision.analyzeImage({
+            path: './test/images/vision.jpg',
+            ImageType: true,
+            Color: true,
+            Faces: true,
+            Adult: true,
+            Categories: true
+        })
+        .then(function (response) {
+            assert.ok(response);
+            assert.ok(response.categories);
+            assert.ok(response.adult);
+            assert.ok(response.metadata);
+            assert.ok(response.faces);
+            assert.ok(response.color);
+            assert.ok(response.imageType);
+            done();
+        })
+    });
+
+    it('analyzes an online image', function (done) {
+        this.timeout(10000);
+        client.vision.analyzeImage({
+            url: 'https://upload.wikimedia.org/wikipedia/commons/1/19/Bill_Gates_June_2015.jpg',
+            ImageType: true,
+            Color: true,
+            Faces: true,
+            Adult: true,
+            Categories: true
+        })
+        .then(function (response) {
+            assert.ok(response);
+            assert.ok(response.categories);
+            assert.ok(response.adult);
+            assert.ok(response.metadata);
+            assert.ok(response.faces);
+            assert.ok(response.color);
+            assert.ok(response.imageType);
+            done();
+        });
+    });
+
+    it('creates a thumbnail for a local image', function (done) {
+        this.timeout(10000);
+        client.vision.thumbnail({
+            path: './test/images/vision.jpg',
+            pipe: fs.createWriteStream('./test/output/thumb2.jpg'),
+            width: 100,
+            height: 100,
+            smartCropping: true
+        })
+        .then(function (response) {
+            var stats = fs.statSync('./test/output/thumb2.jpg');
+            assert.ok((stats.size > 0));
+            done();
+        });
+    });
+
+    it('creates a thumbnail for an online image', function (done) {
+        this.timeout(10000);
+        client.vision.thumbnail({
+            url: 'https://upload.wikimedia.org/wikipedia/commons/1/19/Bill_Gates_June_2015.jpg',
+            pipe: fs.createWriteStream('./test/output/thumb1.jpg'),
+            width: 100,
+            height: 100,
+            smartCropping: true
+        })
+        .then(function (response) {
+            var stats = fs.statSync('./test/output/thumb1.jpg');
+            assert.ok((stats.size > 0));
+            done();
+        });
+    });
+
+    it('runs OCR on a local image', function (done) {
+        this.timeout(10000);
+        client.vision.ocr({
+            path: './test/images/vision.jpg',
+            language: 'en',
+            detectOrientation: true
+        })
+        .then(function (response) {
+            assert.ok(response.language);
+            assert.ok(response.regions);
+            done();
+        });
+    });
+
+    it('runs OCR on an online image', function (done) {
+        this.timeout(10000);
+        client.vision.ocr({
+            url: 'https://upload.wikimedia.org/wikipedia/commons/1/19/Bill_Gates_June_2015.jpg',
+            language: 'en',
+            detectOrientation: true
+        })
+        .then(function (response) {
+            assert.ok(response.language);
+            assert.ok(response.orientation);
+            done();
+        });
+    });
+});
diff --git a/project-oxford/project-oxford.d.ts b/project-oxford/project-oxford.d.ts
new file mode 100644
index 000000000..dffecc361
--- /dev/null
+++ b/project-oxford/project-oxford.d.ts
@@ -0,0 +1,522 @@
+// Type definitions for project-oxford v0.1.3
+// Project: https://github.com/felixrieseberg/project-oxford
+// Definitions by: Scott Southwood <https://github.com/scsouthw/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="..\bluebird\bluebird.d.ts" />
+/// <reference path="..\node\node.d.ts" />
+
+declare module "project-oxford" {
+    import Promise = require("bluebird");
+    import stream = require("stream");
+    
+    export class Client {
+        constructor(apiKey: string);
+        private _key: string;
+        public face: FaceAPI;
+        public vision: VisionAPI;
+    }
+    
+    export class FaceAPI {
+
+        /**
+         * Call the Face Detected API
+         * Detects human faces in an image and returns face locations, face landmarks, and
+         * optional attributes including head-pose, gender, and age. Detection is an essential
+         * API that provides faceId to other APIs like Identification, Verification,
+         * and Find Similar.
+         *
+         * @param  {object}  options                        - Options object
+         * @param  {string}  options.url                    - URL to image to be used
+         * @param  {string}  options.path                   - Path to image to be used
+         * @param  {stream}  options.stream                 - Stream for image to be used
+         * @param  {boolean} options.analyzesFaceLandmarks  - Analyze face landmarks?
+         * @param  {boolean} options.analyzesAge            - Analyze age?
+         * @param  {boolean} options.analyzesGender         - Analyze gender?
+         * @param  {boolean} options.analyzesHeadPose       - Analyze headpose?
+         * @return {Promise}                                - Promise resolving with the resulting JSON
+         */
+        public detect(options: Options.Detect): Promise<[FaceResponses.Detect]>;
+
+        /**
+         * Detect similar faces using faceIds (as returned from the detect API)
+         * @param  {string} sourceFace          - String of faceId for the source face
+         * @param  {string[]} candidateFaces    - Array of faceIds to use as candidates
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public similar(sourceFaceId: string, candidateFacesIds: string[]): Promise<FaceResponses.Similar>;
+
+        /**
+         * Divides candidate faces into groups based on face similarity using faceIds.
+         * The output is one or more disjointed face groups and a MessyGroup.
+         * A face group contains the faces that have similar looking, often of the same person.
+         * There will be one or more face groups ranked by group size, i.e. number of face.
+         * Faces belonging to the same person might be split into several groups in the result.
+         * The MessyGroup is a special face group that each face is not similar to any other
+         * faces in original candidate faces. The messyGroup will not appear in the result if
+         * all faces found their similar counterparts. The candidate face list has a
+         * limit of 100 faces.
+         *
+         * @param  {string[]} faces     - Array of faceIds to use
+         * @return {Promise}            - Promise resolving with the resulting JSON
+         */
+        public grouping(faces: string[]): Promise<FaceResponses.Grouping>;
+
+        /**
+         * Identifies persons from a person group by one or more input faces.
+         * To recognize which person a face belongs to, Face Identification needs a person group
+         * that contains number of persons. Each person contains one or more faces. After a person
+         * group prepared, it should be trained to make it ready for identification. Then the
+         * identification API compares the input face to those persons' faces in person group and
+         * returns the best-matched candidate persons, ranked by confidence.
+         *
+         * @param  {string[]} faces     - Array of faceIds to use
+         * @return {Promise}            - Promise resolving with the resulting JSON
+         */
+        public identify(faceIDs: string[], options: Options.Identify): Promise<FaceResponses.Identify[]>;
+
+        /**
+         * Analyzes two faces and determine whether they are from the same person.
+         * Verification works well for frontal and near-frontal faces.
+         * For the scenarios that are sensitive to accuracy please use with own judgment.
+         * @param  {string[]} faces     - Array containing two faceIds to use
+         * @return {Promise}            - Promise resolving with the resulting JSON
+         */
+        public verify(faces: string[]): Promise<FaceResponses.Verify>;
+        
+        /**
+         * @namespace
+         * @memberof face
+         */
+        public personGroup: PersonGroup;
+        public person: Person;
+    }
+
+    export class VisionAPI {
+        /**
+         * This operation does a deep analysis on the given image and then extracts a
+         * set of rich visual features based on the image content.
+         *
+         * @param  {Object}  options                - Options object describing features to extract
+         * @param  {string}  options.url            - Url to image to be analyzed
+         * @param  {string}  options.path           - Path to image to be analyzed
+         * @param  {boolean} options.ImageType      - Detects if image is clipart or a line drawing.
+         * @param  {boolean} options.Color          - Determines the accent color, dominant color, if image is black&white.
+         * @param  {boolean} options.Faces          - Detects if faces are present. If present, generate coordinates, gender and age.
+         * @param  {boolean} options.Adult          - Detects if image is pornographic in nature (nudity or sex act). Sexually suggestive content is also detected.
+         * @param  {boolean} options.Categories     - Image categorization; taxonomy defined in documentation.
+         * @return {Promise}                        - Promise resolving with the resulting JSON
+         */
+        public analyzeImage(options: Options.Analyze): Promise<VisionResponses.Analyze>;
+        
+        /**
+         * Generate a thumbnail image to the user-specified width and height. By default, the
+         * service analyzes the image, identifies the region of interest (ROI), and generates
+         * smart crop coordinates based on the ROI. Smart cropping is designed to help when you
+         * specify an aspect ratio that differs from the input image.
+         *
+         * @param  {Object}  options                - Options object describing features to extract
+         * @param  {string}  options.url            - Url to image to be thumbnailed
+         * @param  {string}  options.path           - Path to image to be thumbnailed
+         * @param  {number}  options.width          - Width of the thumb in pixels
+         * @param  {number}  options.height         - Height of the thumb in pixels
+         * @param  {boolean} options.smartCropping  - Should SmartCropping be enabled?
+         * @param  {Object}  options.pipe           - We'll pipe the returned image to this object
+         * @return {Promise}                        - Promise resolving with the resulting JSON
+         */
+        public thumbnail(options: Options.Thumbnail): Promise<stream.Stream>;
+        
+        /**
+         * Optical Character Recognition (OCR) detects text in an image and extracts the recognized
+         * characters into a machine-usable character stream.
+         *
+         * @param  {Object}  options                    - Options object describing features to extract
+         * @param  {string}  options.url                - Url to image to be analyzed
+         * @param  {string}  options.path               - Path to image to be analyzed
+         * @param  {string}  options.language           - BCP-47 language code of the text to be detected in the image. Default value is "unk", then the service will auto detect the language of the text in the image.
+         * @param  {string}  options.detectOrientation  - Detect orientation of text in the image
+         * @return {Promise}                            - Promise resolving with the resulting JSON
+         */
+        public ocr(options: Options.Ocr): Promise<VisionResponses.Ocr>;
+    }
+
+    export class PersonGroup {
+        /**
+         * Creates a new person group with a user-specified ID.
+         * A person group is one of the most important parameters for the Identification API.
+         * The Identification searches person faces in a specified person group.
+         *
+         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+         * @param  {string} name                - Person group display name. The maximum length is 128.
+         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public create(personGroupId: string, name: string, userData: string): Promise<void>;
+
+        /**
+         * Deletes an existing person group.
+         *
+         * @param  {string} personGroupId       - Name of person group to delete
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public delete(personGroupId: string): Promise<void>;
+
+        /**
+         * Gets an existing person group.
+         *
+         * @param  {string} personGroupId       - Name of person group to get
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public get(personGroupId: string): Promise<PersonGroupResponses.PersonGroup>;
+
+        /**
+         * Retrieves the training status of a person group. Training is triggered by the Train PersonGroup API.
+         * The training will process for a while on the server side. This API can query whether the training
+         * is completed or ongoing.
+         *
+         * @param  {string} personGroupId       - Name of person group to get
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public trainingStatus(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+        /**
+         * Starts a person group training.
+             * Training is a necessary preparation process of a person group before identification.
+         * Each person group needs to be trained in order to call Identification. The training
+         * will process for a while on the server side even after this API has responded.
+         *
+         * @param  {string} personGroupId       - Name of person group to get
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public trainingStart(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+        /**
+         * Updates an existing person group's display name and userData.
+         *
+         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+         * @param  {string} name                - Person group display name. The maximum length is 128.
+         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public update(personGroupId: string, name: string, userData: string): Promise<void>;
+
+        /**
+         * Lists all person groups in the current subscription.
+         * @return {Promise}                    - Promise resolving with the resulting JSON
+         */
+        public list(): Promise<PersonGroupResponses.PersonGroup[]>;
+    }
+
+    export class Person {
+        /**
+         * Adds a face to a person for identification. The maximum face count for each person is 32.
+         * The face ID must be added to a person before its expiration. Typically a face ID expires
+         * 24 hours after detection.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person that the face is added to.
+         * @param {string} faceId            - The ID of the face to be added. The maximum face amount for each person is 32.
+         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public addFace(personGroupId: string, personId: string, faceId: string, userData?: string): Promise<void>;
+
+        /**
+         * Deletes a face from a person.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person that the face is removed from.
+         * @param {string} faceId            - The ID of the face to be deleted.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public deleteFace(personGroupId: string, personId: string, faceId: string): Promise<void>;
+
+        /**
+         * Updates a face for a person.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person that the face is updated on.
+         * @param {string} faceId            - The ID of the face to be updated.
+         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public updateFace(personGroupId: string, personId: string, faceId: string, userData: string): Promise<void>;
+
+        /**
+         * Get a face for a person.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person that the face is to get from.
+         * @param {string} faceId            - The ID of the face to get.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public getFace(personGroupId: string, personId: string, faceId: string): Promise<PersonResponses.Face>;
+
+        /**
+         * Creates a new person in a specified person group for identification.
+         * The number of persons has a subscription limit. Free subscription amount is 1000 persons.
+         * The maximum face count for each person is 32.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string[]} faces           - Array of face id's for the target person
+         * @param {string} name              - Target person's display name. The maximum length is 128.
+         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public create(personGroupId: string, faces: string[], name: string, userData: string): Promise<{ personId: string }>;
+
+        /**
+         * Deletes an existing person from a person group.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person to delete.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public delete(personGroupId: string, personId: string): Promise<void>;
+
+        /**
+         * Gets an existing person from a person group.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string} personId          - The target person to get.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public get(personGroupId: string, personId: string): Promise<PersonResponses.Person>;
+
+        /**
+         * Updates a person's information.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @param {string[]} faces           - Array of face id's for the target person
+         * @param {string} name              - Target person's display name. The maximum length is 128.
+         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public update(personGroupId: string, personId: string, faces: string[], name: string, userData: string): Promise<void>;
+
+        /**
+         * Lists all persons in a person group, with the person information.
+         *
+         * @param {string} personGroupId     - The target person's person group.
+         * @return {Promise}                 - Promise resolving with the resulting JSON
+         */
+        public list(personGroupId: string): Promise<PersonResponses.Person[]>;
+    }
+    
+    module Options {
+        interface Detect {
+            url?: string; // URL to image to be used
+            path?: string; // Path to image to be used
+            stream?: stream.Stream; // Stream of an image to be used
+            analyzesFaceLandmarks?: boolean; // Analyze face landmarks?
+            analyzesAge?: boolean; // Analyze age?
+            analyzesGender?: boolean; // Analyze gender?
+            analyzesHeadPose?: boolean; //Analyze headpose?
+        }
+
+        interface Identify {
+            personGroupId: string;
+            maxNumOfCandidatesReturned: number; // range is 1-10 
+        }
+
+        interface Analyze {
+            url?: string; // Url to image to be analyzed
+            path?: string; // Path to image to be analyzed
+            ImageType?: boolean; // Detects if image is clipart or a line drawing.
+            Color?: boolean; // Determines the accent color, dominant color, if image is black& white.
+            Faces?: boolean; // Detects if faces are present.If present, generate coordinates, gender and age.
+            Adult?: boolean; // Detects if image is pornographic in nature(nudity or sex act).Sexually suggestive content is also detected.
+            Categories?: boolean; // Image categorization; taxonomy defined in documentation.
+        }
+
+        interface Thumbnail {
+            url?: string; // Url to image to be thumbnailed
+            path?: string; // Path to image to be thumbnailed
+            width?: number; // Width of the thumb in pixels
+            height?: number; // Height of the thumb in pixels
+            smartCropping?: boolean; // Should SmartCropping be enabled?
+            pipe?: stream.Writable; // We'll pipe the returned image to this object
+        }
+
+        interface Ocr {
+            url?: string; // URL to image to be analyzed
+            path?: string; // Path to image to be analyzed
+            language?: string; //BCP - 47 language code of the text to be detected in the image.Default value is "unk", then the service will auto detect the language of the text in the image.
+            detectOrientation?: boolean; // Detect orientation of text in the image
+        }
+    }
+
+    module FaceResponses {
+        interface FaceRectangle {
+            top: number;
+            left: number;
+            width: number;
+            height: number;
+        }
+
+        interface point {
+            x: number;
+            y: number;
+        }
+
+        interface FaceLandmarks {
+            "pupilLeft": point;
+            "pupilRight": point;
+            "noseTip": point;
+            "mouthLeft": point;
+            "mouthRight": point;
+            "eyebrowLeftOuter": point;
+            "eyebrowLeftInner": point;
+            "eyeLeftOuter": point;
+            "eyeLeftTop": point;
+            "eyeLeftBottom": point;
+            "eyeLeftInner": point;
+            "eyebrowRightInner": point;
+            "eyebrowRightOuter": point;
+            "eyeRightInner": point;
+            "eyeRightTop": point;
+            "eyeRightBottom": point;
+            "eyeRightOuter": point;
+            "noseRootLeft": point;
+            "noseRootRight": point;
+            "noseLeftAlarTop": point;
+            "noseRightAlarTop": point;
+            "noseLeftAlarOutTip": point;
+            "noseRightAlarOutTip": point;
+            "upperLipTop": point;
+            "upperLipBottom": point;
+            "underLipTop": point;
+            "underLipBottom": point;
+        }
+
+        interface Attributes {
+            "headPose": { "pitch": number, "roll": number, "yaw": number };
+            "gender": string;
+            "age": number;
+        }
+
+        export interface Detect {
+            "faceId": string;
+            "faceRectangle": FaceRectangle;
+            "faceLandmarks": FaceLandmarks;
+            "attributes": Attributes;
+        }
+
+        export interface Similar {
+            "faceIds": string[];
+        }
+
+        export interface Grouping {
+            "groups": string[];
+            "messyGroup": string[];
+        }
+
+        export interface Identify {
+            "faceId": string;
+            "candidates": [{
+                personId: string;
+                confidence: number;
+            }];
+        }
+
+        export interface Verify {
+            "isIdentical": boolean;
+            "confidence": number;
+        }
+    }
+
+    module PersonGroupResponses {
+
+        export interface PersonGroup {
+            "personGroupId": string;
+            "name": string;
+            "userData": string;
+        }
+
+        export interface TrainingStatus {
+            "personGroupId": string;
+            "status": string;
+            "startTime": string;
+            "endTime": string;
+        }
+    }
+
+    module PersonResponses {
+        export interface Create {
+            "personId": string;
+        }
+
+        export interface Person {
+            "personId": string;
+            "faceIds": string[];
+            "name": string;
+            "userData": string;
+        }
+
+        export interface Face {
+            "faceId": string;
+            "userData": string;
+        }
+    }
+
+    module VisionResponses {
+        export interface Analyze {
+            "categories": [{
+                "name": string;
+                "score": number;
+            }],
+            "adult": {
+                "isAdultContent": boolean;
+                "isRacyContent": boolean;
+                "adultScore": number;
+                "racyScore": number;
+            },
+            "requestId": string;
+            "metadata": {
+                "width": number;
+                "height": number;
+                "format": string;
+            },
+            "faces": [
+                {
+                    "age": number;
+                    "gender": string;
+                    "faceRectangle": {
+                        "left": number;
+                        "top": number;
+                        "width": number;
+                        "height": number;
+                    }
+                }
+            ],
+            "color": {
+                "dominantColorForeground": string;
+                "dominantColorBackground": string;
+                "dominantColors": string[];
+                "accentColor": string;
+                "isBWImg": boolean;
+            },
+            "imageType": {
+                "clipArtType": number;
+                "lineDrawingType": number;
+            }
+        }
+        
+
+        export interface Ocr {
+            "language": string;
+            "textAngle": number;
+            "orientation": string;
+            "regions": [{
+                "boundingBox": string;
+                "lines": [{
+                    "boundingBox": string;
+                    "words": [{
+                        "boundingBox": string;
+                        "text": string;
+                    }]
+                }]
+            }]
+        }
+    }
+}
\ No newline at end of file
diff --git a/promise-pool/promise-pool-tests.ts b/promise-pool/promise-pool-tests.ts
index 4f3bd40de..a9cc160be 100644
--- a/promise-pool/promise-pool-tests.ts
+++ b/promise-pool/promise-pool-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./promise-pool.d.ts" />
+
 import Q = require('q');
 import promisePool = require('promise-pool');
 
@@ -44,4 +46,4 @@ function onProgress(progress: promisePool.IProgress) {
     progress.fulfilled == 0;
     progress.total == 0;
     progress.index == 0;
-}
\ No newline at end of file
+}
diff --git a/protobufjs/protobufjs-tests.ts b/protobufjs/protobufjs-tests.ts
index 8cf52b274..f20efec3c 100644
--- a/protobufjs/protobufjs-tests.ts
+++ b/protobufjs/protobufjs-tests.ts
@@ -15,51 +15,51 @@ function testProtoBufJs() {
     assert.ok("loadProto" in ProtoBuf, "ProtoBuf should contain property loadProto");
     assert.ok("loadProtoFile" in ProtoBuf, "ProtoBuf should contain property loadProtoFile");
     assert.ok("newBuilder" in ProtoBuf, "ProtoBuf should contain property newBuilder");
-    
+
     var jsonProto: ProtoBuf.ProtoBuilder = ProtoBuf.loadJson(readFileSync("test.json",
         {"encoding": "utf8"}));
     assertIsProtoBuilder(jsonProto, "loadJson");
-    
+
     var jsonFileProto: ProtoBuf.ProtoBuilder = ProtoBuf.loadJsonFile("test.json");
     assertIsProtoBuilder(jsonFileProto, "loadJsonFile");
-    
+
     ProtoBuf.loadJsonFile("test.json", (error: any, builder: ProtoBuf.ProtoBuilder) => {
         assertIsProtoBuilder(builder, "loadJsonFile callback");
       });
-      
+
     var proto: ProtoBuf.ProtoBuilder = ProtoBuf.loadProto(readFileSync("test.proto",
         {"encoding": "utf8"}));
     assertIsProtoBuilder(proto, "loadProto");
-    
+
     var protoFile: ProtoBuf.ProtoBuilder = ProtoBuf.loadProtoFile("test.proto");
     assertIsProtoBuilder(protoFile, "loadProtoFile");
-    
+
     ProtoBuf.loadProtoFile("test.proto", (error: any, builder: ProtoBuf.ProtoBuilder) => {
         assertIsProtoBuilder(builder, "loadProtoFile callback");
       });
-      
+
      var newBuilder: ProtoBuf.ProtoBuilder = ProtoBuf.newBuilder();
      assertIsProtoBuilder(newBuilder, "newBuilder");
-     
+
      assertIsNamespace(protoFile.ns, "protoFile.ns");
      assertIsNamespace(protoFile.ptr, "protoFile.ptr");
-     
+
      assertIsProtoBuf(protoFile.build(), "protoFile.build()");
      assertIsProtoBuf(protoFile.result, "protoFile.result");
-     
+
      assertIsProtoBuilder(protoFile.create(), "protoFile.create()");
      assertIsProtoBuilder(protoFile.define("js"), "protoFile.define()");
-     
+
      assertIsT(protoFile.lookup(), "protoFile.lookup()");
 }
 
 function testBuilderJs() {
     var Builder: ProtoBuf.Builder = ProtoBuf.Builder;
     assertIsBuilder(Builder, "Builder");
-    
+
     var newBuilder: ProtoBuf.ProtoBuilder = new ProtoBuf.Builder();
     assertIsProtoBuilder(newBuilder, "new Builder()");
-    
+
     var Message: ProtoBuf.Message = Builder.Message;
     var Service: ProtoBuf.Service = Builder.Service;
 }
@@ -104,13 +104,13 @@ function assertIsBuilder(b: ProtoBuf.Builder, name: string) {
 }
 
 function assertIsProtoBuf(pb: ProtoBuf.ProtoBuf, name: string) {
-    for (var package in pb) {
-        if (pb.hasOwnProperty(package)) {
-            for (var property in pb[package]) {
-                if (typeof pb[package][property] == typeof Object
-                      && pb[package].hasOwnProperty(property)) {
-                    assertIsMetaMessage(pb[package][property],
-                        name + "." + package + "." + property);
+    for (var pkg in pb) {
+        if (pb.hasOwnProperty(pkg)) {
+            for (var property in pb[pkg]) {
+                if (typeof pb[pkg][property] == typeof Object
+                      && pb[pkg].hasOwnProperty(property)) {
+                    assertIsMetaMessage(pb[pkg][property],
+                        name + "." + pkg + "." + property);
                 }
             }
         }
@@ -127,7 +127,7 @@ function assertIsMetaMessage(mm: ProtoBuf.MetaMessage, name: string) {
 function assertIsDotProto(dp: ProtoBuf.DotProto, name: string) {
     assert.ok("Parser" in dp, name + " should contain property Parser");
     assert.ok("Tokenizer" in dp, name + " should contain property Tokenizer");
-    
+
     assertIsParser(new dp.Parser(readFileSync("test.proto", {"encoding": "utf8"})),
         name + ".Parser");
     assertIsTokenizer(new dp.Tokenizer(readFileSync("test.proto", {"encoding": "utf8"})),
@@ -138,7 +138,7 @@ function assertIsParser(p: ProtoBuf.Parser, name: string) {
     assert.ok("tn" in p, name + " should contain property tn");
     assert.ok("parse" in p, name + " should contain property parse");
     assert.ok("toString" in p, name + " should contain property toString");
-    
+
     assertIsTokenizer(p.tn, name + ".tn");
     assertIsMetaProto(p.parse(), name + ".parse()");
 }
@@ -162,7 +162,7 @@ function assertIsMetaProto(mp: ProtoBuf.MetaProto, name: string) {
     assert.ok("imports" in mp, name + " should contain proeprty imports");
     assert.ok("options" in mp, name + " should contain proeprty options");
     assert.ok("services" in mp, name + " should contain proeprty services");
-    
+
     for (var message in mp.messages) {
         assertIsProtoMessage(mp.messages[message], name + ".messages." + message);
     }
@@ -178,7 +178,7 @@ function assertIsProtoEnum(pe: ProtoBuf.ProtoEnum, name: string) {
     assert.ok("name" in pe, name + " should contain property name");
     assert.ok("values" in pe, name + " should contain property values");
     assert.ok("options" in pe, name + " should contain property options");
-    
+
     assertIsProtoEnumValue(pe.values, name + ".values");
 }
 
@@ -202,7 +202,7 @@ function assertIsProtoMessage(pm: ProtoBuf.ProtoMessage, name: string) {
     assert.ok("messages" in pm, name + " should contain property messages");
     assert.ok("options" in pm, name + " should contain property options");
     assert.ok("oneofs" in pm, name + " should contain property oneofs");
-    
+
     for (var f in pm.fields) {
         assertIsProtoField(pm.fields[f], name + ".fields." + f);
     }
@@ -224,7 +224,7 @@ function assertIsProtoService(ps: ProtoBuf.ProtoService, name: string) {
     assert.ok("name" in ps, name + " should contain property name");
     assert.ok("rpc" in ps, name + " should contain property rpc");
     assert.ok("options" in ps, name + " should contain property options");
-    
+
     for (var rpc in ps.rpc) {
       assertIsProtoRpcService(ps.rpc[rpc], name + ".rpc." + rpc);
     }
@@ -237,14 +237,14 @@ function assertIsReflect(r: ProtoBuf.Reflect, name: string) {
     assert.ok("Enum" in r, name + " should contain property Enum");
     assert.ok("Extension" in r, name + " should contain property Extension");
     assert.ok("Service" in r, name + " should contain property Service");
-    
+
     assertIsT(new ProtoBuf.Reflect.T(), "new ProtoBuf.Reflect.T()");
     assertIsNamespace(new ProtoBuf.Reflect.Namespace(), "new ProtoBuf.Reflect.Namespace()");
     assertIsMessage(new ProtoBuf.Reflect.Message(), "new ProtoBuf.Reflect.Message()");
     assertIsEnum(new ProtoBuf.Reflect.Enum(), "new ProtoBuf.Reflect.Enum()");
     assertIsExtension(new ProtoBuf.Reflect.Extension(), "new ProtoBuf.Reflect.Extension()");
     assertIsService(new ProtoBuf.Reflect.Service(), "new ProtoBuf.Reflect.Service()");
-    
+
     assertIsValue(new ProtoBuf.Reflect.Enum.Value(), "new ProtoBuf.Reflect.Enum.Value()");
     assertIsOneOf(new ProtoBuf.Reflect.Message.OneOf(), "new ProtoBuf.Reflect.Message.OneOf()");
     assertIsMethod(new ProtoBuf.Reflect.Service.Method(), "new ProtoBuf.Reflect.Service.Method()");
@@ -255,7 +255,7 @@ function assertIsReflect(r: ProtoBuf.Reflect, name: string) {
 function assertIsT(t: ProtoBuf.ReflectT, name: string) {
     if (t != null && t != undefined) {
         assertIsTNoRecursion(t, name);
-    
+
         assertIsProtoBuilder(t.builder, name + ".builder");
         assertIsTNoRecursion(t.parent, name + ".parent");
     }
@@ -273,9 +273,9 @@ function assertIsTNoRecursion(t: ProtoBuf.ReflectT, name: string) {
 
 function assertIsNamespace(ns: ProtoBuf.ReflectNamespace, name: string) {
     assertIsNamespaceNoRecursion(ns, name);
-    
+
     assertIsT(ns, name);
-    
+
     for (var child in ns.children) {
         assertIsT(ns.children[child], name + ".children." + child);
     }
@@ -308,7 +308,7 @@ function assertIsMessage(m: ProtoBuf.ReflectMessage, name: string) {
         assert.ok("encode" in m, name + " should contain property encode");
         assert.ok("calculate" in m, name + " should contain property calculate");
         assert.ok("decode" in m, name + " should contain property decode");
-        
+
         assertIsNamespace(m, name);
     }
 }
@@ -316,22 +316,22 @@ function assertIsMessage(m: ProtoBuf.ReflectMessage, name: string) {
 function assertIsEnum(e: ProtoBuf.ReflectEnum, name: string) {
     assert.ok("object" in e, name + " should contain property object");
     assert.ok("build" in e, name + " should contain property build");
-    
+
     assertIsNamespace(e, name);
 }
 
 function assertIsExtension(e: ProtoBuf.ReflectExtension, name: string) {
     assert.ok("field" in e, name + " should contain property field");
-    
+
     assertIsT(e, name);
-    
+
     assertIsField(e.field, name + ".field");
 }
 
 function assertIsService(s: ProtoBuf.ReflectService, name: string) {
     assert.ok("clazz" in s, name + " should contain property clazz");
     assert.ok("build" in s, name + " should contain property build");
-    
+
     assertIsNamespace(s, name);
 }
 
@@ -355,9 +355,9 @@ function assertIsField(f: ProtoBuf.ReflectField, name: string) {
         assert.ok("calculate" in f, name + " should contain property calculate");
         assert.ok("calculateValue" in f, name + " should contain property calculateValue");
         assert.ok("decode" in f, name + " should contain property decode");
-        
+
         assertIsT(f, name);
-        
+
         assertIsT(f.resolvedType, name + ".resolvedType");
         assertIsOneOf(f.oneof, name + ".oneof");
     }
@@ -370,15 +370,15 @@ function assertIsWireTuple(wt: ProtoBuf.WireTuple, name: string) {
 
 function assertIsExtensionField(ef: ProtoBuf.ReflectExtensionField, name: string) {
     assert.ok("extension" in ef, name + " should contain property extension");
-    
+
     assertIsField(ef, name);
-    
+
     assertIsExtension(ef.extension, name + ".extension");
 }
 
 function assertIsOneOf(oo: ProtoBuf.ReflectOneOf, name: string) {
     assert.ok("fields" in oo, name + " should contain property fields");
-    
+
     for (var f in oo.fields) {
         assertIsField(oo.fields[f], name + ".fields." + f);
     }
@@ -387,7 +387,7 @@ function assertIsOneOf(oo: ProtoBuf.ReflectOneOf, name: string) {
 function assertIsValue(v: ProtoBuf.ReflectValue, name: string) {
     assert.ok("className" in v, name + " should contain property className");
     assert.ok("id" in v, name + " should contain property id");
-    
+
     assertIsT(v, name);
 }
 
@@ -395,7 +395,7 @@ function assertIsMethod(m: ProtoBuf.ReflectMethod, name: string) {
     assert.ok("className" in m, name + " should contain property className");
     assert.ok("options" in m, name + " should contain property options");
     assert.ok("buildOpt" in m, name + " should contain property buildOpt");
-    
+
     assertIsT(m, name);
 }
 
@@ -405,9 +405,9 @@ function assertIsRPCMethod(rpc: ProtoBuf.ReflectRPCMethod, name: string) {
     assert.ok("resolvedRequestType" in rpc, name + " should contain property resolvedRequestType");
     assert.ok("resolvedResponseType" in rpc,
         name + " should contain property resolvedResponseType");
-        
+
     assertIsMethod(rpc, name);
-        
+
     assertIsMessage(rpc.resolvedRequestType, name + ".resolvedRequestType");
     assertIsMessage(rpc.resolveResponseType, name + ".resolvedResponsetype");
 }
@@ -415,4 +415,4 @@ function assertIsRPCMethod(rpc: ProtoBuf.ReflectRPCMethod, name: string) {
 testProtoBufJs();
 testBuilderJs();
 testDotProtoJs();
-testReflectJs();
\ No newline at end of file
+testReflectJs();
diff --git a/pubsubjs/PubSub-tests.ts b/pubsubjs/PubSub-tests.ts
index 6f0163e97..0a452d08e 100644
--- a/pubsubjs/PubSub-tests.ts
+++ b/pubsubjs/PubSub-tests.ts
@@ -68,4 +68,16 @@ function test_Hierarchical_addressing() {
     // topics, three times in total
     // But, mySpecificSubscriber will only be called once, as it only
     // subscribes to the 'car.drive' topic
+}
+
+function ClearAllSubscriptions() {
+    // create a function to receive messages
+    var mySubscriber = (msg: string, data: any) => { console.log(msg, data); }
+
+    // create two subscriptions
+    PubSub.subscribe('topic1', mySubscriber);
+    PubSub.subscribe('topic2', mySubscriber);
+
+    // unsubscribe from all subscrpitions
+    PubSub.clearAllSubscriptions();
 }
\ No newline at end of file
diff --git a/pubsubjs/pubsub.d.ts b/pubsubjs/pubsub.d.ts
index e24c901a4..d8e6e077d 100644
--- a/pubsubjs/pubsub.d.ts
+++ b/pubsubjs/pubsub.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for PubSubJS 1.3.5
+// Type definitions for PubSubJS 1.5.2
 // Project: https://github.com/mroderick/PubSubJS
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module PubSubJS {
-    interface Base extends Publish, Subscribe, Unsubscribe {
+    interface Base extends Publish, Subscribe, Unsubscribe, ClearAllSubscriptions {
         version: string;
         name: string;
     }
@@ -25,6 +25,15 @@ declare module PubSubJS {
     interface Unsubscribe{
         unsubscribe(tokenOrFunction: any): any;
     }
+
+
+    interface ClearAllSubscriptions{
+        clearAllSubscriptions(): any;
+    }
 }
 
 declare var PubSub: PubSubJS.Base;
+
+declare module "pubsub-js" {
+  export = PubSub;
+}
diff --git a/pusher-js/pusher-js-tests.ts b/pusher-js/pusher-js-tests.ts
new file mode 100644
index 000000000..c672ff58e
--- /dev/null
+++ b/pusher-js/pusher-js-tests.ts
@@ -0,0 +1,353 @@
+/// <reference path="pusher-js.d.ts" />
+
+import Pusher = require('pusher-js');
+import { PresenceChannel } from "pusher-js";
+
+var API_KEY: string;
+var pusher: Pusher.Pusher;
+
+//
+// Configuration
+//
+
+pusher = new Pusher(API_KEY, {
+    authEndpoint: "http://example.com/pusher/auth"
+});
+
+pusher = new Pusher(API_KEY, {
+    auth: {
+        params: { foo: "bar" },
+        headers: { baz: "boo" }
+    }
+});
+
+pusher = new Pusher(API_KEY, {
+    auth: {
+        params: { foo: "bar" },
+        headers: { "X-CSRF-Token": "SOME_CSRF_TOKEN" }
+    }
+});
+
+pusher = new Pusher(API_KEY, { cluster: "eu" });
+
+pusher = new Pusher(API_KEY, { enabledTransports: ["ws"] });
+
+pusher = new Pusher(API_KEY, { disabledTransports: ["sockjs"] });
+
+// will only use WebSockets
+pusher = new Pusher(API_KEY, {
+    enabledTransports: ["ws", "xhr_streaming"],
+    disabledTransports: ["xhr_streaming"]
+});
+
+//
+// Connection
+//
+
+var socket: Pusher.Pusher;
+var my_channel: Pusher.Channel;
+var channels: Pusher.Channel[];
+
+socket = new Pusher(API_KEY);
+
+//
+// Subscribing to channels
+//
+
+my_channel = socket.subscribe('my-channel');
+
+my_channel = socket.subscribe('private-my-channel');
+
+channels = socket.allChannels();
+console.group('Pusher - subscribed to:');
+for (var i = 0; i < channels.length; i++) {
+    var channel = channels[i];
+    console.log(channel.name);
+}
+console.groupEnd();
+
+my_channel = socket.subscribe('my-channel');
+socket.bind('new-comment',
+    function(data: any) {
+        // add comment into page
+    }
+);
+
+var channel: Pusher.Channel;
+
+var context = { title: 'Pusher' };
+var handler = function(){
+    console.log('My name is ' + this.title);
+};
+channel.bind('new-comment', handler, context);
+
+channel.unbind('new-comment', handler); // removes just `handler` for the `new-comment` event
+channel.unbind('new-comment'); // removes all handlers for the `new-comment` event
+channel.unbind(null, handler); // removes `handler` for all events
+channel.unbind(null, null, context); // removes all handlers for `context`
+channel.unbind(); // removes all handlers on `channel`
+
+
+//
+//
+// Samples from Pusher Documentation
+//
+//
+
+//
+// JavaScript Quick Start Guide
+//
+
+channel.bind('my-event', function(data: any) {
+    alert('An event was triggered with message: ' + data.message);
+});
+
+//
+// Client API Overview
+//
+
+var options: Pusher.Config;
+
+var channelName: string;
+var privateChannelName: string;
+var presenceChannelName: string;
+var add_member: Function;
+var remove_member: Function;
+var update_member_count: Function;
+var eventName: string;
+var callback: Function;
+var applicationKey: string;
+var log: Function;
+var $: any;
+var data: any;
+
+// Connecting to Pusher
+
+pusher = new Pusher(applicationKey, options);
+
+options = {
+    encrypted: true, // true/false
+    auth: {
+        params: { // {key: value} pairs
+            param1: 'value1',
+            param2: 'value2'
+        },
+        headers: { // {key: value} pairs
+            header1: 'value1',
+            header2: 'value2'
+        }
+    }
+};
+
+pusher = new Pusher('app_key', {
+    auth: {
+        params: {
+            CSRFToken: 'some_csrf_token'
+        }
+    }
+});
+
+pusher = new Pusher('app_key', {
+    auth: {
+        headers: {
+            'X-CSRF-Token': 'some_csrf_token'
+        }
+    }
+});
+
+pusher = new Pusher('app_key', { cluster: 'eu' });
+
+pusher = new Pusher('app_key', { encrypted: true } );
+
+pusher = new Pusher('app_key');
+pusher.connection.bind( 'error', function( err: any ) {
+    if( err.data.code === 4004 ) {
+        log('>>> detected limit error');
+    }
+});
+
+// Disconnecting from Pusher
+
+pusher.disconnect();
+
+// Connection States
+
+pusher = new Pusher('YOUR_APP_KEY');
+
+pusher.connection.bind('connected', function() {
+    $('div#status').text('Real time is go!');
+});
+
+pusher.connection.bind('connecting_in', function(delay: any) {
+    alert("I haven't been able to establish a connection for this feature.  " +
+        "I will try again in " + delay + " seconds.")
+});
+
+pusher.connection.bind('state_change', function(states: any) {
+    // states = {previous: 'oldState', current: 'newState'}
+    $('div#status').text("Pusher's current state is " + states.current);
+});
+
+var connectionState: string = pusher.connection.state;
+
+// Accessing channels
+
+channel = pusher.channel(channelName);
+
+// Public channels
+
+channel = pusher.subscribe(channelName);
+
+pusher.unsubscribe(channelName);
+
+// Private channels
+
+var privateChannel = pusher.subscribe(privateChannelName);
+
+// Presence channels
+
+var presenceChannel: PresenceChannel<any> = <any>pusher.subscribe(presenceChannelName);
+
+var count: number = presenceChannel.members.count;
+
+presenceChannel.members.each(function(member: Pusher.UserInfo<any>) {
+    var userId = member.id;
+    var userInfo = member.info;
+});
+
+var some_user_id: number;
+var user = presenceChannel.members.get(some_user_id);
+
+var me = presenceChannel.members.me;
+
+pusher = new Pusher('app_key');
+presenceChannel = <any>pusher.subscribe('presence-example');
+presenceChannel.bind('pusher:subscription_succeeded', function() {
+    var me = presenceChannel.members.me;
+    var userId = me.id;
+    var userInfo = me.info;
+});
+
+channel = pusher.subscribe('presence-meeting-11');
+
+channel.bind('pusher:subscription_succeeded', function(members: Pusher.Members<any>) {
+    // for example
+    update_member_count(members.count);
+
+    members.each(function(member) {
+        // for example:
+        add_member(member.id, member.info);
+    });
+});
+
+channel.bind('pusher:member_added', function(member: Pusher.UserInfo<any>) {
+    // for example:
+    add_member(member.id, member.info);
+});
+
+channel.bind('pusher:member_removed', function(member: Pusher.UserInfo<any>) {
+    // for example:
+    remove_member(member.id, member.info);
+});
+
+// Pusher Events
+
+channel.bind(eventName, callback);
+
+pusher = new Pusher('APP_KEY');
+channel = pusher.subscribe('APPL');
+channel.bind('new-price',
+    function(data: any) {
+        // add new price into the APPL widget
+    }
+);
+
+var context = { title: 'Pusher' };
+var handler = function(){
+    console.log('My name is ' + this.title);
+};
+channel.bind('new-comment', handler, context);
+
+pusher.bind(eventName, callback);
+
+pusher = new Pusher('APP_KEY');
+var channel1 = pusher.subscribe('test_channel_1');
+var channel2 = pusher.subscribe('test_channel_2');
+var channel3 = pusher.subscribe('test_channel_3');
+
+var eventName = 'new-comment';
+callback = function(data: any) {
+    // add comment into page
+};
+
+// listen for 'new-comment' event on channel 1, 2 and 3
+pusher.bind(eventName, callback);
+
+// Unbinding from Events
+
+channel.unbind(eventName, callback);
+
+pusher = new Pusher('APP_KEY');
+channel = pusher.subscribe('APPL');
+callback = function(data: any) {};
+channel.bind('new-price', callback);
+
+channel.unbind('new-price', callback);
+
+// Pusher channel events
+
+channel.bind('pusher:subscription_succeeded', function() {
+});
+
+pusher = new Pusher('APP_KEY');
+channel = pusher.subscribe('private-channel');
+channel.bind('pusher:subscription_error', function(status: number) {
+    if(status == 408 || status == 503){
+        // retry?
+    }
+});
+
+// Triggering Client Events
+
+var triggered = channel.trigger(eventName, data);
+pusher = new Pusher('YOUR_APP_KEY');
+channel = pusher.subscribe('private-channel');
+channel.bind('pusher:subscription_succeeded', function() {
+    var triggered = channel.trigger('client-someeventname', { your: data });
+});
+
+// Best practice when sending client events
+
+var outputEl = document.getElementById('client_event_example_log');
+var state: any = {
+    currentX: 0,
+    currentY: 0,
+    lastX: undefined,
+    lastY: undefined
+};
+
+pusher = new Pusher("YOUR_APP_KEY");
+channel = pusher.subscribe("private-mousemoves");
+
+// this method should be bound as a 'mousemove' event listener
+document.body.addEventListener('mousemove', onMouseMove, false);
+function onMouseMove(ev: any){
+    ev = ev || window.event;
+    state.currentX = ev.pageX || ev.clientX;
+    state.currentY = ev.pageY || ev.clientY;
+}
+
+setInterval(function(){
+    if(state.currentX !== state.lastX || state.currentY !== state.lastY){
+        state.lastX = state.currentX;
+        state.lastY = state.currentY;
+
+        var text = document.createTextNode(
+            'Triggering event due to state change: x: ' + state.currentX + ', y: ' + state.currentY
+        );
+        outputEl.replaceChild( text, outputEl.firstChild );
+
+        channel.trigger("client-mouse-moved", {x:state.currentX, y: state.currentY});
+    }
+}, 300); // send every 300 milliseconds if position has changed
+
diff --git a/pusher-js/pusher-js.d.ts b/pusher-js/pusher-js.d.ts
new file mode 100644
index 000000000..9306faa8f
--- /dev/null
+++ b/pusher-js/pusher-js.d.ts
@@ -0,0 +1,231 @@
+// Type definitions for pusher-js 3.0.0
+// Project: https://github.com/pusher/pusher-js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "pusher-js" {
+
+    namespace pusher {
+        interface PusherStatic {
+            new(apiKey: string, config?: Config): Pusher;
+        }
+
+        interface Pusher {
+            subscribe(name: string): Channel;
+            subscribeAll(): void;
+            unsubscribe(name: string): void;
+            channel(name: string): Channel;
+            allChannels(): Channel[];
+            bind(eventName: string, callback: Function): Pusher;
+            bind_all(callback: Function): Pusher;
+            disconnect(): void;
+            key: string;
+            config: Config; //TODO: add GlobalConfig typings
+            channels: any; //TODO: Type this
+            global_emitter: EventsDispatcher;
+            sessionId: number;
+            timeline: any; //TODO: Type this
+            connection: ConnectionManager;
+        }
+
+        interface Config {
+            /**
+             * Forces the connection to use encrypted transports.
+             */
+            encrypted?: boolean;
+
+            /**
+             * Endpoint on your server that will return the authentication signature needed for private channels.
+             */
+            authEndpoint?: string;
+
+            /**
+             * Defines how the authentication endpoint, defined using authEndpoint, will be called.
+             * There are two options available: ajax and jsonp.
+             */
+            authTransport?: string;
+
+            /**
+             * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
+             * For example, following will pass foo=bar via the query string and baz: boo via headers:
+             */
+            auth?: AuthConfig;
+
+
+            /**
+             * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
+             */
+            cluster?: string;
+
+
+            /**
+             * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
+             */
+            disableStats?: boolean;
+
+            /**
+             * Specifies which transports should be used by Pusher to establish a connection.
+             * Useful for applications running in controlled, well-behaving environments.
+             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+             * Additional transports may be added in the future and without adding them to this list, they will be disabled.
+             */
+            enabledTransports?: string[];
+
+
+            /**
+             * Specified which transports must not be used by Pusher to establish a connection.
+             * This settings overwrites transports whitelisted via the enabledTransports options.
+             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+             * Additional transports may be added in the future and without adding them to this list, they will be enabled.
+             */
+            disabledTransports?: string[];
+
+            /**
+             * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
+             */
+            ignoreNullOrigin?: boolean;
+
+            /**
+             * After this time (in miliseconds) without any messages received from the server,
+             * a ping message will be sent to check if the connection is still working.
+             * Default value is is supplied by the server, low values will result in unnecessary traffic.
+             */
+            activityTimeout?: number;
+
+            /**
+             * Time before the connection is terminated after sending a ping message.
+             * Default is 30000 (30s). Low values will cause false disconnections, if latency is high.
+             */
+            pongTimeout?: number;
+
+            wsHost?: string;
+            wsPort?: number;
+            wssPort?: number;
+            httpHost?: string;
+            httpPort?: number;
+            httpsPort?: number;
+        }
+
+        interface AuthConfig {
+            params?: { [key: string]: any };
+            headers?: { [key: string]: any };
+        }
+
+        interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
+            bind(eventName: string, callback: Function, context?: any): Self;
+            bind_all(callback: Function): Self;
+            unbind(eventName?: string, callback?: Function, context?: any): Self;
+            unbind_all(eventName?: string, callback?: Function): Self;
+            emit(eventName: string, data?: any): Self;
+        }
+
+        interface Channel extends GenericEventsDispatcher<Channel> {
+            /** Triggers an event */
+            trigger(eventName: string, data?: any): boolean;
+            pusher: Pusher;
+            name: string;
+            subscribed: boolean;
+            /**
+             * Authenticates the connection as a member of the channel.
+             * @param  {String} socketId
+             * @param  {Function} callback
+             */
+            authorize(socketId: string, callback: (data: any) => void): void;
+        }
+
+        interface EventsDispatcher {
+            bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
+            bind_all(callback: Function): EventsDispatcher;
+            unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
+            unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
+            emit(eventName: string, data?: any): EventsDispatcher;
+        }
+
+        interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
+            key: string;
+            options: any; //TODO: Timeline.js
+            state: string;
+            connection: any; //TODO: Type this
+            encrypted: boolean;
+            timeline: any; //TODO: Type this
+            connectionCallbacks: {
+                message: (message: string) => void;
+                ping: () => void;
+                activity: () => void;
+                error: (error: any) => void;
+                closed: () => void;
+            };
+            errorCallbacks: {
+                ssl_only: () => void;
+                refused: () => void;
+                backoff: () => void;
+                retry: () => void;
+            };
+            handshakeCallbacks: {
+                ssl_only: () => void;
+                refused: () => void;
+                backoff: () => void;
+                retry: () => void;
+                connected: (handshake: any) => void; //TODO: Type this
+            };
+            /**
+             * Establishes a connection to Pusher.
+             *
+             * Does nothing when connection is already established. See top-level doc
+             * to find events emitted on connection attempts.
+             */
+            connect(): void;
+            /**
+             * Sends raw data.
+             * @param {String} data
+             */
+            send(data: string): boolean;
+            /** Sends an event.
+             *
+             * @param {String} name
+             * @param {String} data
+             * @param {String} [channel]
+             * @returns {Boolean} whether message was sent or not
+             */
+            send_event(name: string, data: string, channel: string): boolean;
+            /** Closes the connection. */
+            disconnect(): void;
+            isEncrypted(): boolean;
+        }
+
+        interface PresenceChannel<T> extends Channel {
+            members: Members<T>;
+        }
+
+        interface Members<T> {
+            /**
+             * Returns member's info for given id.
+             *
+             * Resulting object containts two fields - id and info.
+             *
+             * @param {Number} id
+             * @return {Object} member's info or null
+             */
+            get(id: number): T;
+            /**
+             * Calls back for each member in unspecified order.
+             *
+             * @param  {Function} callback
+             */
+            each(callback: (member: any) => void): void;
+            members: { [id: number]: UserInfo<T> };
+            count: number;
+            myID: number;
+            me: UserInfo<T>;
+        }
+
+        interface UserInfo<T> {
+            id: number;
+            info: T;
+        }
+    }
+
+    var pusher: pusher.PusherStatic;
+
+    export = pusher;
+}
diff --git a/q-retry/q-retry-tests.ts b/q-retry/q-retry-tests.ts
index e5d5dd8ca..fc33d7ba9 100644
--- a/q-retry/q-retry-tests.ts
+++ b/q-retry/q-retry-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./q-retry.d.ts" />
+
 import Q = require('q-retry');
 
 Q
@@ -9,7 +11,7 @@ Q
         return 0;
     })
     .retry(num => {
-        num.toFixed;    
+        num.toFixed;
     })
     .retry(() => {
 
@@ -32,8 +34,8 @@ Q
         limit: 10,
         interval: 1000,
         maxInterval: 20000,
-        intervalMultiplier: 1.5    
+        intervalMultiplier: 1.5
     })
     .then(str => {
         str.charAt;
-    });
\ No newline at end of file
+    });
diff --git a/qs/qs-tests.ts b/qs/qs-tests.ts
new file mode 100644
index 000000000..04be4f266
--- /dev/null
+++ b/qs/qs-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="./qs.d.ts" />
+
+import qs = require('qs');
+
+qs.stringify({ a: 'b' });
+qs.stringify({ a: 'b', c: 'd' }, { delimiter: '&' });
+
+qs.parse('a=b');
+qs.parse('a=b&c=d', { delimiter: '&' });
diff --git a/qs/qs.d.ts b/qs/qs.d.ts
new file mode 100644
index 000000000..5889fae49
--- /dev/null
+++ b/qs/qs.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for qs
+// Project: https://github.com/hapijs/qs
+// Definitions by: Roman Korneev <https://github.com/RWander>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module QueryString {
+    interface IStringifyOptions {
+        delimiter?: string;
+        strictNullHandling?: boolean;
+        skipNulls?: boolean;
+        encode?: boolean;
+        filter?: any;
+        arrayFormat?: any;
+        indices?: string;
+    }
+
+    interface IParseOptions {
+        delimiter?: string;
+        depth?: number;
+        arrayLimit?: number;
+        parseArrays?: boolean;
+        allowDots?: boolean;
+        plainObjects?: boolean;
+        allowPrototypes?: boolean;
+        parameterLimit?: number;
+        strictNullHandling?: boolean;
+    }
+
+    function stringify(obj: any, options?: IStringifyOptions): string;
+    function parse(str: string, options?: IParseOptions): any;
+}
+
+declare module "qs" {
+	export = QueryString;
+}
diff --git a/qunit/qunit.d.ts b/qunit/qunit.d.ts
index ddbf014e4..fde535a68 100644
--- a/qunit/qunit.d.ts
+++ b/qunit/qunit.d.ts
@@ -5,163 +5,178 @@
 
 
 interface DoneCallbackObject {
-	/**
-	* The number of failed assertions
-	*/
-	failed: number;
+    /**
+    * The number of failed assertions
+    */
+    failed: number;
 
-	/**
-	* The number of passed assertions
-	*/
-	passed: number;
+    /**
+    * The number of passed assertions
+    */
+    passed: number;
 
-	/**
-	* The total number of assertions
-	*/
-	total: number;
+    /**
+    * The total number of assertions
+    */
+    total: number;
 
-	/**
-	* The time in milliseconds it took tests to run from start to finish.
-	*/
-	runtime: number;
+    /**
+    * The time in milliseconds it took tests to run from start to finish.
+    */
+    runtime: number;
 }
 
 interface LogCallbackObject {
-	/**
-	* The boolean result of an assertion, true means passed, false means failed.
-	*/
-	result: boolean;
+    /**
+    * The boolean result of an assertion, true means passed, false means failed.
+    */
+    result: boolean;
 
-	/**
-	* One side of a comparision assertion. Can be undefined when ok() is used.
-	*/
-	actual: Object;
+    /**
+    * One side of a comparision assertion. Can be undefined when ok() is used.
+    */
+    actual: Object;
 
-	/**
-	* One side of a comparision assertion. Can be undefined when ok() is used.
-	*/
-	expected: Object;
+    /**
+    * One side of a comparision assertion. Can be undefined when ok() is used.
+    */
+    expected: Object;
 
-	/**
-	* A string description provided by the assertion.
-	*/
-	message: string;
+    /**
+    * A string description provided by the assertion.
+    */
+    message: string;
 
-	/**
-	* The associated stacktrace, either from an exception or pointing to the source 
-	* of the assertion. Depends on browser support for providing stacktraces, so can be 
-	* undefined.
-	*/
-	source: string;
+    /**
+    * The associated stacktrace, either from an exception or pointing to the source 
+    * of the assertion. Depends on browser support for providing stacktraces, so can be 
+    * undefined.
+    */
+    source: string;
 }
 
 interface ModuleStartCallbackObject {
-	/**
-	* Name of the next module to run
-	*/
-	name: string;
+    /**
+    * Name of the next module to run
+    */
+    name: string;
 }
 
 interface ModuleDoneCallbackObject {
-	/**
-	* Name of this module
-	*/
-	name: string;
+    /**
+    * Name of this module
+    */
+    name: string;
 
-	/**
-	* The number of failed assertions
-	*/
-	failed: number;
+    /**
+    * The number of failed assertions
+    */
+    failed: number;
 
-	/**
-	* The number of passed assertions
-	*/
-	passed: number;
+    /**
+    * The number of passed assertions
+    */
+    passed: number;
 
-	/**
-	* The total number of assertions
-	*/
-	total: number;
+    /**
+    * The total number of assertions
+    */
+    total: number;
 }
 
 interface TestDoneCallbackObject {
-	/**
-	* TName of the next test to run
-	*/
-	name: string;
+    /**
+    * TName of the next test to run
+    */
+    name: string;
 
-	/**
-	* Name of the current module
-	*/
-	module: string;
+    /**
+    * Name of the current module
+    */
+    module: string;
 
-	/**
-	* The number of failed assertions
-	*/
-	failed: number;
+    /**
+    * The number of failed assertions
+    */
+    failed: number;
 
-	/**
-	* The number of passed assertions
-	*/
-	passed: number;
+    /**
+    * The number of passed assertions
+    */
+    passed: number;
 
-	/**
-	* The total number of assertions
-	*/
-	total: number;
+    /**
+    * The total number of assertions
+    */
+    total: number;
 
-	/**
-	* The total runtime, including setup and teardown
-	*/
-	duration: number;
+    /**
+    * The total runtime, including setup and teardown
+    */
+    duration: number;
 }
 
 interface TestStartCallbackObject {
-	/**
-	* Name of the next test to run
-	*/
-	name: string;
+    /**
+    * Name of the next test to run
+    */
+    name: string;
 
-	/**
-	* Name of the current module
-	*/
-	module: string;
+    /**
+    * Name of the current module
+    */
+    module: string;
 }
 
 interface Config {
-	altertitle: boolean;
-	autostart: boolean;
-	current: Object;
-	reorder: boolean;
-	requireExpects: boolean;
-	testTimeout: number;
-	urlConfig: Array<URLConfigItem>;
-	done: any;
+    altertitle: boolean;
+    autostart: boolean;
+    current: Object;
+    reorder: boolean;
+    requireExpects: boolean;
+    testTimeout: number;
+    urlConfig: Array<URLConfigItem>;
+    done: any;
 }
 
 interface URLConfigItem {
-	id: string;
-	label: string;
-	tooltip: string;
+    id: string;
+    label: string;
+    tooltip: string;
 }
 
 interface LifecycleObject {
-	/**
-	* Runs before each test
-	*/
-	setup?: () => any;
+    /**
+     * Runs before each test
+     * @deprecated
+     */
+    setup?: () => void;
 
-	/**
-	* Runs after each test
-	*/
-	teardown?: () => any;
+    /**
+     * Runs after each test
+     * @deprecated
+     */
+    teardown?: () => void;
+    /**
+     * Runs before each test
+     */
+    beforeEach?: () => void;
+    /**
+     * Runs after each test
+     */
+    afterEach?: () => void;
+
+    /**
+     * Any additional properties on the hooks object will be added to that context.
+     */
+    [property: string]: any;
 }
 
 interface QUnitAssert {
-	/* ASSERT */
-	assert: any;
-	current_testEnvironment: any;
-	jsDump: any;
+    /* ASSERT */
+    assert: any;
+    current_testEnvironment: any;
+    jsDump: any;
 
     /**
     * Instruct QUnit to wait for an asynchronous operation.
@@ -172,32 +187,32 @@ interface QUnitAssert {
     */
     async(): () => void;
 
-	/**
-	* A deep recursive comparison assertion, working on primitive types, arrays, objects, 
-	* regular expressions, dates and functions.
-	*
-	* The deepEqual() assertion can be used just like equal() when comparing the value of 
-	* objects, such that { key: value } is equal to { key: value }. For non-scalar values, 
-	* identity will be disregarded by deepEqual.
-	*
-	* @param actual Object or Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
-	deepEqual(actual: any, expected: any, message?: string): any;
+    /**
+    * A deep recursive comparison assertion, working on primitive types, arrays, objects, 
+    * regular expressions, dates and functions.
+    *
+    * The deepEqual() assertion can be used just like equal() when comparing the value of 
+    * objects, such that { key: value } is equal to { key: value }. For non-scalar values, 
+    * identity will be disregarded by deepEqual.
+    *
+    * @param actual Object or Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
+    deepEqual(actual: any, expected: any, message?: string): any;
 
-	/** 
-	* A non-strict comparison assertion, roughly equivalent to JUnit assertEquals.
-	*
-	* The equal assertion uses the simple comparison operator (==) to compare the actual 
-	* and expected arguments. When they are equal, the assertion passes: any; otherwise, it fails. 
-	* When it fails, both actual and expected values are displayed in the test result, 
-	* in addition to a given message.
-	* 
-	* @param actual Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
+    /** 
+    * A non-strict comparison assertion, roughly equivalent to JUnit assertEquals.
+    *
+    * The equal assertion uses the simple comparison operator (==) to compare the actual 
+    * and expected arguments. When they are equal, the assertion passes: any; otherwise, it fails. 
+    * When it fails, both actual and expected values are displayed in the test result, 
+    * in addition to a given message.
+    * 
+    * @param actual Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
     equal(actual: any, expected: any, message?: string): any;
 
     /**
@@ -211,94 +226,94 @@ interface QUnitAssert {
     */
     expect(amount: number): any;
 
-	/**
-	* An inverted deep recursive comparison assertion, working on primitive types, 
-	* arrays, objects, regular expressions, dates and functions.
-	*
-	* The notDeepEqual() assertion can be used just like equal() when comparing the 
-	* value of objects, such that { key: value } is equal to { key: value }. For non-scalar 
-	* values, identity will be disregarded by notDeepEqual.
-	* 
-	* @param actual Object or Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
-	notDeepEqual(actual: any, expected: any, message?: string): any;
+    /**
+    * An inverted deep recursive comparison assertion, working on primitive types, 
+    * arrays, objects, regular expressions, dates and functions.
+    *
+    * The notDeepEqual() assertion can be used just like equal() when comparing the 
+    * value of objects, such that { key: value } is equal to { key: value }. For non-scalar 
+    * values, identity will be disregarded by notDeepEqual.
+    * 
+    * @param actual Object or Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
+    notDeepEqual(actual: any, expected: any, message?: string): any;
 
-	/**
-	* A non-strict comparison assertion, checking for inequality.
-	*
-	* The notEqual assertion uses the simple inverted comparison operator (!=) to compare 
-	* the actual and expected arguments. When they aren't equal, the assertion passes: any; 
-	* otherwise, it fails. When it fails, both actual and expected values are displayed 
-	* in the test result, in addition to a given message.
-	* 
-	* @param actual Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
-	notEqual(actual: any, expected: any, message?: string): any;
+    /**
+    * A non-strict comparison assertion, checking for inequality.
+    *
+    * The notEqual assertion uses the simple inverted comparison operator (!=) to compare 
+    * the actual and expected arguments. When they aren't equal, the assertion passes: any; 
+    * otherwise, it fails. When it fails, both actual and expected values are displayed 
+    * in the test result, in addition to a given message.
+    * 
+    * @param actual Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
+    notEqual(actual: any, expected: any, message?: string): any;
 
-	notPropEqual(actual: any, expected: any, message?: string): any;
+    notPropEqual(actual: any, expected: any, message?: string): any;
 
-	propEqual(actual: any, expected: any, message?: string): any;
+    propEqual(actual: any, expected: any, message?: string): any;
 
-	/**
-	* A non-strict comparison assertion, checking for inequality.
-	*
-	* The notStrictEqual assertion uses the strict inverted comparison operator (!==) 
-	* to compare the actual and expected arguments. When they aren't equal, the assertion 
-	* passes: any; otherwise, it fails. When it fails, both actual and expected values are 
-	* displayed in the test result, in addition to a given message.
-	* 
-	* @param actual Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
-	notStrictEqual(actual: any, expected: any, message?: string): any;
+    /**
+    * A non-strict comparison assertion, checking for inequality.
+    *
+    * The notStrictEqual assertion uses the strict inverted comparison operator (!==) 
+    * to compare the actual and expected arguments. When they aren't equal, the assertion 
+    * passes: any; otherwise, it fails. When it fails, both actual and expected values are 
+    * displayed in the test result, in addition to a given message.
+    * 
+    * @param actual Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
+    notStrictEqual(actual: any, expected: any, message?: string): any;
 
-	/**
-	* A boolean assertion, equivalent to CommonJS’s assert.ok() and JUnit’s assertTrue(). 
-	* Passes if the first argument is truthy.
-	*
-	* The most basic assertion in QUnit, ok() requires just one argument. If the argument 
-	* evaluates to true, the assertion passes; otherwise, it fails. If a second message 
-	* argument is provided, it will be displayed in place of the result.
-	* 
-	* @param state Expression being tested
-	* @param message A short description of the assertion
-	*/
-	ok(state: any, message?: string): any;
+    /**
+    * A boolean assertion, equivalent to CommonJS’s assert.ok() and JUnit’s assertTrue(). 
+    * Passes if the first argument is truthy.
+    *
+    * The most basic assertion in QUnit, ok() requires just one argument. If the argument 
+    * evaluates to true, the assertion passes; otherwise, it fails. If a second message 
+    * argument is provided, it will be displayed in place of the result.
+    * 
+    * @param state Expression being tested
+    * @param message A short description of the assertion
+    */
+    ok(state: any, message?: string): any;
 
-	/**
-	* A strict type and value comparison assertion.
-	*
-	* The strictEqual() assertion provides the most rigid comparison of type and value with 
-	* the strict equality operator (===)
-	* 
-	* @param actual Expression being tested
-	* @param expected Known comparison value
-	* @param message A short description of the assertion
-	*/
-	strictEqual(actual: any, expected: any, message?: string): any;
+    /**
+    * A strict type and value comparison assertion.
+    *
+    * The strictEqual() assertion provides the most rigid comparison of type and value with 
+    * the strict equality operator (===)
+    * 
+    * @param actual Expression being tested
+    * @param expected Known comparison value
+    * @param message A short description of the assertion
+    */
+    strictEqual(actual: any, expected: any, message?: string): any;
 
-	/**
-	* Assertion to test if a callback throws an exception when run.
-	* 
-	* When testing code that is expected to throw an exception based on a specific set of 
-	* circumstances, use throws() to catch the error object for testing and comparison.
-	* 
-	* @param block Function to execute
-	* @param expected Error Object to compare
-	* @param message A short description of the assertion
-	*/
-	throws(block: () => any, expected: any, message?: string): any;
+    /**
+    * Assertion to test if a callback throws an exception when run.
+    * 
+    * When testing code that is expected to throw an exception based on a specific set of 
+    * circumstances, use throws() to catch the error object for testing and comparison.
+    * 
+    * @param block Function to execute
+    * @param expected Error Object to compare
+    * @param message A short description of the assertion
+    */
+    throws(block: () => any, expected: any, message?: string): any;
 
-	/**
-	* @param block Function to execute
-	* @param message A short description of the assertion
-	*/
-	throws(block: () => any, message?: string): any;
+    /**
+    * @param block Function to execute
+    * @param message A short description of the assertion
+    */
+    throws(block: () => any, message?: string): any;
 
     /**
     * Alias of throws.
@@ -326,177 +341,177 @@ interface QUnitAssert {
     raises(block: () => any, message?: string): any;
 }
 
-interface QUnitStatic extends QUnitAssert {	
-	/* ASYNC CONTROL */
+interface QUnitStatic extends QUnitAssert {    
+    /* ASYNC CONTROL */
 
-	/**
-	* Start running tests again after the testrunner was stopped. See stop().
-	*
-	* When your async test has multiple exit points, call start() for the corresponding number of stop() increments.
-	* 
-	* @param decrement Optional argument to merge multiple start() calls into one. Use with multiple corrsponding stop() calls.
-	*/
-	start(decrement?: number): any;
+    /**
+    * Start running tests again after the testrunner was stopped. See stop().
+    *
+    * When your async test has multiple exit points, call start() for the corresponding number of stop() increments.
+    * 
+    * @param decrement Optional argument to merge multiple start() calls into one. Use with multiple corrsponding stop() calls.
+    */
+    start(decrement?: number): any;
 
-	/**
-	* Stop the testrunner to wait for async tests to run. Call start() to continue.
-	*
-	* When your async test has multiple exit points, call stop() with the increment argument, corresponding to the number of start() calls you need.
-	*
-	* On Blackberry 5.0, window.stop is a native read-only function. If you deal with that browser, use QUnit.stop() instead, which will work anywhere.
-	*
-	* @param decrement Optional argument to merge multiple stop() calls into one. Use with multiple corrsponding start() calls.
-	*/
-	stop(increment? : number): any;
-	
-	/* CALLBACKS */
+    /**
+    * Stop the testrunner to wait for async tests to run. Call start() to continue.
+    *
+    * When your async test has multiple exit points, call stop() with the increment argument, corresponding to the number of start() calls you need.
+    *
+    * On Blackberry 5.0, window.stop is a native read-only function. If you deal with that browser, use QUnit.stop() instead, which will work anywhere.
+    *
+    * @param decrement Optional argument to merge multiple stop() calls into one. Use with multiple corrsponding start() calls.
+    */
+    stop(increment? : number): any;
+    
+    /* CALLBACKS */
 
-	/**
-	* Register a callback to fire whenever the test suite begins.
-	*
-	* QUnit.begin() is called once before running any tests. (a better would've been QUnit.start, 
-	* but thats already in use elsewhere and can't be changed.)
-	*
-	* @param callback Callback to execute
-	*/
-	begin(callback: () => any): any;
+    /**
+    * Register a callback to fire whenever the test suite begins.
+    *
+    * QUnit.begin() is called once before running any tests. (a better would've been QUnit.start, 
+    * but thats already in use elsewhere and can't be changed.)
+    *
+    * @param callback Callback to execute
+    */
+    begin(callback: () => any): any;
 
-	/**
-	* Register a callback to fire whenever the test suite ends.
-	*
-	* @param callback Callback to execute.
-	*/
-	done(callback: (details: DoneCallbackObject) => any): any;
+    /**
+    * Register a callback to fire whenever the test suite ends.
+    *
+    * @param callback Callback to execute.
+    */
+    done(callback: (details: DoneCallbackObject) => any): any;
 
-	/**
-	* Register a callback to fire whenever an assertion completes.
-	*
-	* This is one of several callbacks QUnit provides. Its intended for integration scenarios like 
-	* PhantomJS or Jenkins. The properties of the details argument are listed below as options.
-	*
-	* @param callback Callback to execute.
-	*/
-	log(callback: (details: LogCallbackObject) => any): any;
+    /**
+    * Register a callback to fire whenever an assertion completes.
+    *
+    * This is one of several callbacks QUnit provides. Its intended for integration scenarios like 
+    * PhantomJS or Jenkins. The properties of the details argument are listed below as options.
+    *
+    * @param callback Callback to execute.
+    */
+    log(callback: (details: LogCallbackObject) => any): any;
 
-	/**
-	* Register a callback to fire whenever a module ends.
-	*
-	* @param callback Callback to execute.
-	*/
-	moduleDone(callback: (details: ModuleDoneCallbackObject) => any): any;
+    /**
+    * Register a callback to fire whenever a module ends.
+    *
+    * @param callback Callback to execute.
+    */
+    moduleDone(callback: (details: ModuleDoneCallbackObject) => any): any;
 
-	/**
-	* Register a callback to fire whenever a module begins.
-	*
-	* @param callback Callback to execute.
-	*/
-	moduleStart(callback: (details: ModuleStartCallbackObject) => any): any;
+    /**
+    * Register a callback to fire whenever a module begins.
+    *
+    * @param callback Callback to execute.
+    */
+    moduleStart(callback: (details: ModuleStartCallbackObject) => any): any;
 
-	/**
-	* Register a callback to fire whenever a test ends.
-	*
-	* @param callback Callback to execute.
-	*/
-	testDone(callback: (details: TestDoneCallbackObject) => any): any;
+    /**
+    * Register a callback to fire whenever a test ends.
+    *
+    * @param callback Callback to execute.
+    */
+    testDone(callback: (details: TestDoneCallbackObject) => any): any;
 
-	/**
-	* Register a callback to fire whenever a test begins.
-	*
-	* @param callback Callback to execute.
-	*/
-	testStart(callback: (details: TestStartCallbackObject) => any): any;
-	
-	/* CONFIGURATION */
+    /**
+    * Register a callback to fire whenever a test begins.
+    *
+    * @param callback Callback to execute.
+    */
+    testStart(callback: (details: TestStartCallbackObject) => any): any;
+    
+    /* CONFIGURATION */
 
-	/**
-	* QUnit has a bunch of internal configuration defaults, some of which are 
-	* useful to override. Check the description for each option for details.
-	*/
-	config: Config;
-	
-	/* TEST */
+    /**
+    * QUnit has a bunch of internal configuration defaults, some of which are 
+    * useful to override. Check the description for each option for details.
+    */
+    config: Config;
+    
+    /* TEST */
 
-	/**
-	* Add an asynchronous test to run. The test must include a call to start().
-	*
-	* For testing asynchronous code, asyncTest will automatically stop the test runner 
-	* and wait for your code to call start() to continue.
-	*
-	* @param name Title of unit being tested
-	* @param expected Number of assertions in this test
-	* @param test Function to close over assertions
-	*/
-	asyncTest(name: string, expected: number, test: (assert: QUnitAssert) => any): any;
+    /**
+    * Add an asynchronous test to run. The test must include a call to start().
+    *
+    * For testing asynchronous code, asyncTest will automatically stop the test runner 
+    * and wait for your code to call start() to continue.
+    *
+    * @param name Title of unit being tested
+    * @param expected Number of assertions in this test
+    * @param test Function to close over assertions
+    */
+    asyncTest(name: string, expected: number, test: (assert: QUnitAssert) => any): any;
 
-	/**
-	* Add an asynchronous test to run. The test must include a call to start().
-	*
-	* For testing asynchronous code, asyncTest will automatically stop the test runner 
-	* and wait for your code to call start() to continue.
-	*
-	* @param name Title of unit being tested
-	* @param test Function to close over assertions
-	*/
-	asyncTest(name: string, test: (assert: QUnitAssert) => any): any;
+    /**
+    * Add an asynchronous test to run. The test must include a call to start().
+    *
+    * For testing asynchronous code, asyncTest will automatically stop the test runner 
+    * and wait for your code to call start() to continue.
+    *
+    * @param name Title of unit being tested
+    * @param test Function to close over assertions
+    */
+    asyncTest(name: string, test: (assert: QUnitAssert) => any): any;
 
-	/**
-	* Specify how many assertions are expected to run within a test.
-	*
-	* To ensure that an explicit number of assertions are run within any test, use 
-	* expect( number ) to register an expected count. If the number of assertions 
-	* run does not match the expected count, the test will fail.
-	*
-	* @param amount Number of assertions in this test.
-	* @depricated since version 1.16
-	*/
-	expect(amount: number): any;
+    /**
+    * Specify how many assertions are expected to run within a test.
+    *
+    * To ensure that an explicit number of assertions are run within any test, use 
+    * expect( number ) to register an expected count. If the number of assertions 
+    * run does not match the expected count, the test will fail.
+    *
+    * @param amount Number of assertions in this test.
+    * @depricated since version 1.16
+    */
+    expect(amount: number): any;
 
-	/**
-	* Group related tests under a single label.
-	*
-	* All tests that occur after a call to module() will be grouped into that module. 
-	* The test names will all be preceded by the module name in the test results. 
-	* You can then use that module name to select tests to run.
-	*
-	* @param name Label for this group of tests
-	* @param lifecycle Callbacks to run before and after each test
-	*/
-	module(name: string, lifecycle?: LifecycleObject): any;
+    /**
+    * Group related tests under a single label.
+    *
+    * All tests that occur after a call to module() will be grouped into that module. 
+    * The test names will all be preceded by the module name in the test results. 
+    * You can then use that module name to select tests to run.
+    *
+    * @param name Label for this group of tests
+    * @param lifecycle Callbacks to run before and after each test
+    */
+    module(name: string, lifecycle?: LifecycleObject): any;
 
-	/**
-	* Add a test to run.
-	*
-	* When testing the most common, synchronous code, use test().
-	* The assert argument to the callback contains all of QUnit's assertion methods. 
-	* If you are avoiding using any of QUnit's globals, you can use the assert 
-	* argument instead.
-	* 
-	* @param title Title of unit being tested
-	* @param expected Number of assertions in this test
-	* @param test Function to close over assertions
-	*/
-	test(title: string, expected: number, test: (assert: QUnitAssert) => any): any;
+    /**
+    * Add a test to run.
+    *
+    * When testing the most common, synchronous code, use test().
+    * The assert argument to the callback contains all of QUnit's assertion methods. 
+    * If you are avoiding using any of QUnit's globals, you can use the assert 
+    * argument instead.
+    * 
+    * @param title Title of unit being tested
+    * @param expected Number of assertions in this test
+    * @param test Function to close over assertions
+    */
+    test(title: string, expected: number, test: (assert: QUnitAssert) => any): any;
 
-	/**
-	* @param title Title of unit being tested
-	* @param test Function to close over assertions
-	*/
-	test(title: string, test: (assert: QUnitAssert) => any): any;
+    /**
+    * @param title Title of unit being tested
+    * @param test Function to close over assertions
+    */
+    test(title: string, test: (assert: QUnitAssert) => any): any;
 
-	/**
-	* https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L1568
-	*/
-	equiv(a: any, b: any): any;
+    /**
+    * https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L1568
+    */
+    equiv(a: any, b: any): any;
 
-	/**
-	* https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L897
-	*/
-	push(result: any, actual: any, expected: any, message: string): any;
+    /**
+    * https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L897
+    */
+    push(result: any, actual: any, expected: any, message: string): any;
 
-	/**
-	* https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L839
-	*/
-	reset(): any;
+    /**
+    * https://github.com/jquery/qunit/blob/master/qunit/qunit.js#L839
+    */
+    reset(): any;
 }
 
 /* ASSERT */
@@ -635,7 +650,7 @@ declare function start(decrement?: number): any;
 * @param decrement Optional argument to merge multiple stop() calls into one. Use with multiple corrsponding start() calls.
 */
 declare function stop(increment? : number): any;
-	
+    
 /* CALLBACKS */
 
 /**
@@ -692,7 +707,7 @@ declare function testDone(callback: (details: TestDoneCallbackObject) => any): a
 * @param callback Callback to execute.
 */
 declare function testStart(callback: (details: TestStartCallbackObject) => any): any;
-	
+    
 /* TEST */
 
 /**
diff --git a/rangy/rangy-tests.ts b/rangy/rangy-tests.ts
new file mode 100644
index 000000000..b0c6c1cc2
--- /dev/null
+++ b/rangy/rangy-tests.ts
@@ -0,0 +1,95 @@
+/// <reference path="rangy.d.ts" />
+
+declare function assertAny(a:any):any;
+declare function assertBoolean(b:boolean):any;
+declare function assertString(s:string):any;
+declare function assertRangyRange(r:RangyRange):any;
+declare function getRangyRange():RangyRange;
+
+function testRangyStatic() {
+    rangy.addInitListener((rangy:RangyStatic) => {
+    });
+
+    rangy.createMissingNativeApi();
+    rangy.shim();
+
+    let nativeRange:Range|TextRange = rangy.createNativeRange(document);
+    nativeRange = rangy.createNativeRange(window);
+    nativeRange = rangy.createNativeRange(new HTMLIFrameElement);
+    nativeRange = rangy.createNativeRange();
+
+    let rangyRange:RangyRange = rangy.createRange(document);
+    rangyRange = rangy.createRange(window);
+    rangyRange = rangy.createRange(new HTMLIFrameElement);
+    rangyRange = rangy.createRange();
+
+    rangyRange = rangy.createRangyRange(document);
+    rangyRange = rangy.createRangyRange(window);
+    rangyRange = rangy.createRangyRange(new HTMLIFrameElement);
+    rangyRange = rangy.createRangyRange();
+
+    let nativeSelection:Selection = rangy.getNativeSelection(window);
+    nativeSelection = rangy.getNativeSelection();
+
+    let rangySelection:RangySelection = rangy.getSelection();
+
+    let initialized:boolean = rangy.initialized;
+    let supported:boolean = rangy.supported;
+}
+
+function testRangyRange() {
+    let rangyRange:RangyRange = rangy.createRange();
+
+    assertBoolean(rangyRange.canSurroundContents());
+    rangyRange.collapseAfter(new Node);
+    rangyRange.collapseBefore(new Node);
+    rangyRange.collapseToPoint(new Node, 23);
+    assertAny(rangyRange.compareNode(new Node));
+    assertBoolean(rangyRange.containsNode(new Node, true));
+    assertBoolean(rangyRange.containsNodeContents(new Node));
+    assertBoolean(rangyRange.containsNodeText(new Node));
+    assertBoolean(rangyRange.containsNodeText(new Node));
+    assertBoolean(rangyRange.containsRange(rangyRange));
+    assertBoolean(rangyRange.equals(rangyRange));
+    let bookmark:{start:number, end:number} = rangyRange.getBookmark();
+    bookmark = rangyRange.getBookmark(new Node);
+    let doc:Document = rangyRange.getDocument();
+    let nodes:Node[] = rangyRange.getNodes();
+    nodes = rangyRange.getNodes([new Node]);
+    nodes = rangyRange.getNodes([new Node], (node:Node) => true);
+    assertString(rangyRange.inspect());
+    assertRangyRange(rangyRange.intersection(rangyRange));
+    assertBoolean(rangyRange.intersectsOrTouchesRange(rangyRange));
+    assertBoolean(rangyRange.intersectsRange(rangyRange));
+    assertBoolean(rangyRange.isValid());
+    rangyRange.moveToBookmark({});
+    rangyRange.normalizeBoundaries();
+    rangyRange.refresh();
+    rangyRange.select();
+    rangyRange.setStartAndEnd(new Node, 23);
+    rangyRange.setStartAndEnd(new Node, 23, 42);
+    rangyRange.setStartAndEnd(new Node, 23, new Node, 42);
+    rangyRange.splitBoundaries();
+    assertString(rangyRange.toHtml());
+    assertRangyRange(rangyRange.union(rangyRange));
+}
+
+function testSelection() {
+    let selection:RangySelection = rangy.getSelection();
+
+    selection.detach();
+    let ranges:RangyRange[] = selection.getAllRanges();
+    selection.getBookmark(new Node);
+    let nativeTextRange:TextRange = selection.getNativeTextRange();
+    assertString(selection.inspect());
+    assertBoolean(selection.isBackwards());
+    selection.moveToBookmark({});
+    var nativeSelection:Selection = selection.nativeSelection;
+    selection.refresh();
+    selection.refresh(true);
+    selection.restoreRanges({});
+    var object:Object = selection.saveRanges();
+    selection.setRanges(ranges);
+    selection.setSingleRange(getRangyRange());
+    assertString(selection.toHtml());
+}
diff --git a/rangy/rangy.d.ts b/rangy/rangy.d.ts
new file mode 100644
index 000000000..16ce2a5a3
--- /dev/null
+++ b/rangy/rangy.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for Rangy
+// Project: https://github.com/timdown/rangy
+// Definitions by: Rudolph Gottesheim <http://www.midnight-design.at/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface RangyRange extends Range {
+    setStartAndEnd(startNode:Node, startOffset:number, endNode?:Node, endOffset?:number):any;
+    setStartAndEnd(startNode:Node, startOffset:number, endOffset:number):any;
+    canSurroundContents():boolean;
+    isValid():boolean;
+    toHtml():string;
+    compareNode(node:Node):any;
+    intersectsOrTouchesRange(range:RangyRange):boolean;
+    intersectsRange(range:RangyRange):boolean;
+    intersection(range:RangyRange):RangyRange;
+    union(range:RangyRange):RangyRange;
+    containsNode(node:Node, partial:boolean):boolean;
+    containsNodeContents(node:Node):boolean;
+    containsNodeText(node:Node):boolean;
+    containsRange(range:RangyRange):boolean;
+    splitBoundaries():any;
+    normalizeBoundaries():any;
+    collapseToPoint(node:Node, offset:number):any;
+    collapseBefore(node:Node):any;
+    collapseAfter(node:Node):any;
+    getNodes(nodeTypes?:any[], filter?:(node:Node) => boolean):Node[];
+    getBookmark(containerNode?:Node):{start:number, end:number};
+    moveToBookmark(bookmark:Object):any;
+    getDocument():Document;
+    inspect():string;
+    equals(range:RangyRange):boolean;
+    refresh():any;
+    select():any;
+}
+
+interface RangySelection extends Selection {
+    nativeSelection:Selection;
+    isBackwards():boolean;
+    refresh(checkForChanges?:boolean):any;
+    toHtml():string;
+    getAllRanges():RangyRange[];
+    getNativeTextRange():TextRange;
+    setSingleRange(range:RangyRange):any;
+    setRanges(ranges:RangyRange[]):any;
+    getBookmark(containerNode:Node):any;
+    moveToBookmark(bookmark:Object):any;
+    saveRanges():Object;
+    restoreRanges(saved:Object):any;
+    detach():any;
+    inspect():string;
+}
+
+interface RangyStatic {
+    createNativeRange(doc?:Document|Window|HTMLIFrameElement):TextRange|Range;
+    createRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
+    createRangyRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
+    getNativeSelection(win?:Window):Selection;
+    getSelection():RangySelection;
+    addInitListener(listener:(rangy:RangyStatic) => void):any;
+    shim():any;
+    createMissingNativeApi():any;
+    initialized:boolean;
+    supported:boolean;
+}
+
+declare var rangy:RangyStatic;
diff --git a/react-bootstrap/react-bootstrap-test.tsx b/react-bootstrap/react-bootstrap-test.tsx
new file mode 100644
index 000000000..cdb1c7bae
--- /dev/null
+++ b/react-bootstrap/react-bootstrap-test.tsx
@@ -0,0 +1,898 @@
+// React-Bootstrap Test 
+// ================================================================================
+///<reference path="react-bootstrap.d.ts"/>
+///<reference path="../react/react.d.ts"/>
+
+// Imports 
+// --------------------------------------------------------------------------------
+import * as React from 'react';
+import { Component, CSSProperties } from 'react';
+import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput } from 'react-bootstrap';
+
+
+export class ReactBootstrapTest extends Component<any, any> {
+    callback() { 
+        alert('Callback: ' + JSON.stringify(arguments));
+    }
+
+    public render() {
+        let style: CSSProperties = { padding: '50px' };
+        let tooltip = (<Tooltip><strong>Holy guacamole!</strong> Check this info.</Tooltip>);
+
+        const innerGlyphicon = <Glyphicon glyph='music' />;
+        const innerButton = <Button>Before</Button>;
+        const innerDropdown = (
+          <DropdownButton title='Action' id='input-dropdown-addon'>
+            <MenuItem key='1'>Item</MenuItem>
+          </DropdownButton>
+        );
+        const innerRadio = <input type='radio' aria-label='...' />;
+        const innerCheckbox = <input type='checkbox' aria-label='...' />;
+
+        return (
+            <div style={style}> 
+                <div style={style}>
+                    <ButtonToolbar>
+                        <Button>Default</Button>
+                        <Button bsStyle='primary'>Primary</Button>
+                        <Button bsStyle='success'>Success</Button>
+                        <Button bsStyle='info'>Info</Button>
+                        <Button bsStyle='warning'>Warning</Button>
+                        <Button bsStyle='danger'>Danger</Button>
+                        <Button bsStyle='link'>Link</Button>
+                    </ButtonToolbar>                    
+                </div>
+
+                <div style={style}>
+                    <ButtonToolbar>
+                        <Button bsStyle='primary' bsSize='large'>Large button</Button>
+                        <Button bsSize='large'>Large button</Button>
+                    </ButtonToolbar>
+                    <ButtonToolbar>
+                        <Button bsStyle='primary'>Default button</Button>
+                        <Button>Default button</Button>
+                    </ButtonToolbar>
+                    <ButtonToolbar>
+                        <Button bsStyle='primary' bsSize='small'>Small button</Button>
+                        <Button bsSize='small'>Small button</Button>
+                    </ButtonToolbar>
+                    <ButtonToolbar>
+                        <Button bsStyle='primary' bsSize='xsmall'>Extra small button</Button>
+                        <Button bsSize='xsmall'>Extra small button</Button>
+                    </ButtonToolbar>
+                </div>
+
+                <div style={style}>
+                    <Well>
+                        <Button bsStyle='primary' bsSize='large' block>Block level button</Button>
+                        <Button bsSize='large' block>Block level button</Button>
+                    </Well>
+                </div>
+
+                <div style={style}>
+                    <ButtonToolbar>
+                        <Button bsStyle='primary' bsSize='large' active>Primary button</Button>
+                        <Button bsSize='large' active>Button</Button>
+                    </ButtonToolbar>
+                </div>
+
+
+                <div style={style}>
+                    <ButtonToolbar>
+                        <Button href='#'>Link</Button>
+                        <Button>Button</Button>
+                    </ButtonToolbar>    
+                </div>
+
+
+                <div style={style}>
+                    <ButtonGroup>
+                        <Button>Left</Button>
+                        <Button>Middle</Button>
+                        <Button>Right</Button>
+                    </ButtonGroup>
+                </div>
+
+
+                <div style={style as CSSProperties}>
+                    <ButtonToolbar>
+                        <ButtonGroup>
+                            <Button>1</Button>
+                            <Button>2</Button>
+                            <Button>3</Button>
+                            <Button>4</Button>
+                        </ButtonGroup>
+                        <ButtonGroup>
+                            <Button>5</Button>
+                            <Button>6</Button>
+                            <Button>7</Button>
+                        </ButtonGroup>
+                        <ButtonGroup>
+                            <Button>8</Button>
+                        </ButtonGroup>
+                    </ButtonToolbar>
+                </div>
+
+                // TODO: Start here
+
+                <div style={style}>
+                  <ButtonToolbar>
+                      <ButtonGroup bsSize='large'>
+                        <Button>Left</Button>
+                        <Button>Middle</Button>
+                        <Button>Right</Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+
+                    <ButtonToolbar>
+                      <ButtonGroup>
+                        <Button>Left</Button>
+                        <Button>Middle</Button>
+                        <Button>Right</Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+
+                    <ButtonToolbar>
+                      <ButtonGroup bsSize='small'>
+                        <Button>Left</Button>
+                        <Button>Middle</Button>
+                        <Button>Right</Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+
+                    <ButtonToolbar>
+                      <ButtonGroup bsSize='xsmall'>
+                        <Button>Left</Button>
+                        <Button>Middle</Button>
+                        <Button>Right</Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+                </div>
+
+                <div style={style}>
+                  <ButtonGroup vertical>
+                    <Button>Button</Button>
+                    <Button>Button</Button>
+                    <DropdownButton title='Dropdown' id='bg-vertical-dropdown-1'>
+                      <MenuItem eventKey='1'>Dropdown link</MenuItem>
+                      <MenuItem eventKey='2'>Dropdown link</MenuItem>
+                    </DropdownButton>
+                    <Button>Button</Button>
+                    <Button>Button</Button>
+                    <DropdownButton title='Dropdown' id='bg-vertical-dropdown-2'>
+                      <MenuItem eventKey='1'>Dropdown link</MenuItem>
+                      <MenuItem eventKey='2'>Dropdown link</MenuItem>
+                    </DropdownButton>
+                    <DropdownButton title='Dropdown' id='bg-vertical-dropdown-3'>
+                      <MenuItem eventKey='1'>Dropdown link</MenuItem>
+                      <MenuItem eventKey='2'>Dropdown link</MenuItem>
+                    </DropdownButton>
+                  </ButtonGroup>
+                </div>
+
+                <div style={style}>
+                  <DropdownButton bsStyle={'default'} title={'hello'} key={0} id={0}>
+                    <MenuItem eventKey='1'>Action</MenuItem>
+                    <MenuItem eventKey='2'>Another action</MenuItem>
+                    <MenuItem eventKey='3' active>Active Item</MenuItem>
+                    <MenuItem divider />
+                    <MenuItem eventKey='4'>Separated link</MenuItem>
+                  </DropdownButton>                
+                </div>
+
+                <div style={style}>
+                  <div className="clearfix">
+                    <ul className="dropdown-menu open">
+                      <MenuItem header>Header</MenuItem>
+                      <MenuItem>link</MenuItem>
+                      <MenuItem divider/>
+                      <MenuItem header>Header</MenuItem>
+                      <MenuItem>link</MenuItem>
+                      <MenuItem disabled>disabled</MenuItem>
+                      <MenuItem title="See? I have a title.">
+                        link with title
+                      </MenuItem>
+                      <MenuItem eventKey={1} href="#someHref" onSelect={this.callback}>
+                        link that alerts
+                      </MenuItem>
+                    </ul>
+                  </div>
+                </div>
+
+                <div style={style}>
+                    <Panel onClick={this.callback}>
+                        Basic panel example
+                    </Panel>                
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Panel header='Panel heading without title'>
+                      Panel content
+                    </Panel>
+                    <Panel header='Header'>
+                      Panel content
+                    </Panel>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <Panel footer='Panel footer'>
+                    Panel content
+                  </Panel>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Panel header='Header'>
+                      Panel content
+                    </Panel>
+
+                    <Panel header='Header' bsStyle='primary'>
+                      Panel content
+                    </Panel>
+
+                    <Panel header='Header' bsStyle='success'>
+                      Panel content
+                    </Panel>
+
+                    <Panel header='Header' bsStyle='info'>
+                      Panel content
+                    </Panel>
+
+                    <Panel header='Header' bsStyle='warning'>
+                      Panel content
+                    </Panel>
+
+                    <Panel header='Header' bsStyle='danger'>
+                      Panel content
+                    </Panel>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <Panel collapsible defaultExpanded header='Panel heading'>
+                    Some default panel content here.
+                    <ListGroup fill>
+                      <ListGroupItem>Item 1</ListGroupItem>
+                      <ListGroupItem>Item 2</ListGroupItem>
+                      <ListGroupItem>&hellip;</ListGroupItem>
+                    </ListGroup>
+                    Some more panel content here.
+                  </Panel>
+                </div>
+
+                <div style={style}>
+                  <Accordion>
+                    <Panel header='Collapsible Group Item #1' eventKey='1'>
+                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
+                farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                    </Panel>
+                    <Panel header='Collapsible Group Item #2' eventKey='2'>
+                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
+                farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                    </Panel>
+                    <Panel header='Collapsible Group Item #3' eventKey='3'>
+                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
+                farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                    </Panel>
+                  </Accordion>
+                </div>
+
+                <div style={style}>
+                  <div className='static-modal'>
+                    <Modal.Dialog>
+                      <Modal.Header>
+                        <Modal.Title>Modal title</Modal.Title>
+                      </Modal.Header>
+
+                      <Modal.Body>
+                        One fine body...
+                      </Modal.Body>
+
+                      <Modal.Footer>
+                        <Button>Close</Button>
+                        <Button bsStyle='primary'>Save changes</Button>
+                      </Modal.Footer>
+
+                    </Modal.Dialog>
+                  </div>
+                </div>
+
+                <div style={style} className="static-tooltip">
+                  <div>
+                    <Tooltip placement="right" className="in">
+                      Tooltip right
+                    </Tooltip>
+
+                    <Tooltip placement="top" className="in">
+                      Tooltip top
+                    </Tooltip>
+
+                    <Tooltip placement="left" className="in">
+                      Tooltip left
+                    </Tooltip>
+
+                    <Tooltip placement="bottom" className="in">
+                      Tooltip bottom
+                    </Tooltip>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <ButtonToolbar>
+                    <OverlayTrigger placement='left' overlay={tooltip}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+
+                    <OverlayTrigger placement='top' overlay={tooltip}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+
+                    <OverlayTrigger placement='bottom' overlay={tooltip}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+
+                    <OverlayTrigger placement='right' overlay={tooltip}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+                  </ButtonToolbar>
+                </div>
+
+                <div style={style}>
+                  <div style={{ height: 120, position: 'relative' } as CSSProperties}>
+                    <Popover placement='right' positionLeft={200} positionTop={50} title='Popover right'>
+                      And here's some <strong>amazing</strong> content. It's very engaging. right?
+                    </Popover>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <ButtonToolbar>
+                    <OverlayTrigger trigger='click' placement='left' overlay={<Popover title='Popover left'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='click' placement='top' overlay={<Popover title='Popover top'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='click' placement='bottom' overlay={<Popover title='Popover bottom'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='click' placement='right' overlay={<Popover title='Popover right'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Holy guacamole!</Button>
+                    </OverlayTrigger>
+                  </ButtonToolbar>
+                </div>
+
+                <div style={style}>
+                  <ButtonToolbar>
+                    <OverlayTrigger trigger='click' placement='bottom' overlay={<Popover title='Popover bottom'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Click</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='hover' placement='bottom' overlay={<Popover title='Popover bottom'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Hover</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='focus' placement='bottom' overlay={<Popover title='Popover bottom'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Focus</Button>
+                    </OverlayTrigger>
+                    <OverlayTrigger trigger='click' rootClose placement='bottom' overlay={<Popover title='Popover bottom'><strong>Holy guacamole!</strong> Check this info.</Popover>}>
+                      <Button bsStyle='default'>Click + rootClose</Button>
+                    </OverlayTrigger>
+                  </ButtonToolbar>
+                </div>
+
+                <div style={style}>
+                  <ProgressBar now={60} />
+                </div>
+
+                <div style={style}>
+                  <ProgressBar now={60} label='%(percent)s%' />
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <ProgressBar bsStyle='success' now={40} />
+                    <ProgressBar bsStyle='info' now={20} />
+                    <ProgressBar bsStyle='warning' now={60} />
+                    <ProgressBar bsStyle='danger' now={80} />
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <ProgressBar striped bsStyle='success' now={40} />
+                    <ProgressBar striped bsStyle='info' now={20} />
+                    <ProgressBar striped bsStyle='warning' now={60} />
+                    <ProgressBar striped bsStyle='danger' now={80} />
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <ProgressBar active now={45} />
+                </div>
+
+                <div style={style}>
+                  <ProgressBar>
+                    <ProgressBar striped bsStyle='success' now={35} key={1} />
+                    <ProgressBar bsStyle='warning' now={20} key={2} />
+                    <ProgressBar active bsStyle='danger' now={10} key={3} />
+                  </ProgressBar>
+                </div>
+
+                <div style={style}>
+                  <Nav bsStyle='pills' activeKey={1} onSelect={this.callback}>
+                    <NavItem eventKey={1} href='/home'>NavItem 1 content</NavItem>
+                    <NavItem eventKey={2} title='Item'>NavItem 2 content</NavItem>
+                    <NavItem eventKey={3} disabled>NavItem 3 content</NavItem>
+                  </Nav>
+                </div>
+
+                <div style={style}>
+                  <Nav bsStyle='pills' stacked activeKey={1} onSelect={this.callback}>
+                    <NavItem eventKey={1} href='/home'>NavItem 1 content</NavItem>
+                    <NavItem eventKey={2} title='Item'>NavItem 2 content</NavItem>
+                    <NavItem eventKey={3} disabled>NavItem 3 content</NavItem>
+                  </Nav>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Nav bsStyle='tabs' justified activeKey={1} onSelect={this.callback}>
+                      <NavItem eventKey={1} href='/home'>NavItem 1 content</NavItem>
+                      <NavItem eventKey={2} title='Item'>NavItem 2 content</NavItem>
+                      <NavItem eventKey={3} disabled>NavItem 3 content</NavItem>
+                    </Nav>
+                    <br />
+                    <Nav bsStyle='pills' justified activeKey={1} onSelect={this.callback}>
+                      <NavItem eventKey={1} href='/home'>NavItem 1 content</NavItem>
+                      <NavItem eventKey={2} title='Item'>NavItem 2 content</NavItem>
+                      <NavItem eventKey={3} disabled>NavItem 3 content</NavItem>
+                    </Nav>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <Navbar brand='React-Bootstrap'>
+                    <Nav>
+                      <NavItem eventKey={1} href='#'>Link</NavItem>
+                      <NavItem eventKey={2} href='#'>Link</NavItem>
+                      <NavDropdown eventKey={3} title='Dropdown' id='basic-nav-dropdown'>
+                        <MenuItem eventKey='1'>Action</MenuItem>
+                        <MenuItem eventKey='2'>Another action</MenuItem>
+                        <MenuItem eventKey='3'>Something else here</MenuItem>
+                        <MenuItem divider />
+                        <MenuItem eventKey='4'>Separated link</MenuItem>
+                      </NavDropdown>
+                    </Nav>
+                  </Navbar>                
+                </div>
+
+                <div style={style}>
+                  <Navbar brand='React-Bootstrap' inverse toggleNavKey={0}>
+                    <Nav right eventKey={0}> {/* This is the eventKey referenced */}
+                      <NavItem eventKey={1} href='#'>Link</NavItem>
+                      <NavItem eventKey={2} href='#'>Link</NavItem>
+                    </Nav>
+                  </Navbar>                
+                </div>
+
+                <div style={style}>
+                  <Pager>
+                    <PageItem href='#'>Previous</PageItem>
+                    <PageItem href='#'>Next</PageItem>
+                  </Pager>
+                </div>
+
+                <div style={style}>
+                  <Tabs defaultActiveKey={1} animation={false}>
+                    <Tab eventKey={1} title='Tab 1'>Tab 1 content</Tab>
+                    <Tab eventKey={2} title='Tab 2'>Tab 2 content</Tab>
+                    <Tab eventKey={3} title='Tab 3' disabled>Tab 3 content</Tab>
+                  </Tabs>
+                </div>
+
+                <div style={style}>
+                  <Pager>
+                    <PageItem href='#'>Previous</PageItem>
+                    <PageItem href='#'>Next</PageItem>
+                  </Pager>
+                </div>
+
+                <div style={style}>
+                  <Pager>
+                    <PageItem previous href='#'>&larr; Previous Page</PageItem>
+                    <PageItem next href='#'>Next Page &rarr;</PageItem>
+                  </Pager>
+                </div>
+
+                <div style={style}>
+                  <Pager>
+                    <PageItem previous href='#'>&larr; Previous</PageItem>
+                    <PageItem disabled next href='#'>Next &rarr;</PageItem>
+                  </Pager>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Pagination
+                      bsSize='large'
+                      items={10}
+                      activePage={1}
+                      onSelect={this.callback} />
+                    <br />
+                    <Pagination
+                      bsSize='medium'
+                      items={10}
+                      activePage={1}
+                      onSelect={this.callback} />
+                    <br />
+            
+                    <Pagination
+                      bsSize='small'
+                      items={10}
+                      activePage={1}
+                      onSelect={this.callback} />
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <Alert bsStyle='warning'>
+                    <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
+                  </Alert>
+                </div>
+
+                <div style={style}>
+                  <Carousel>
+                    <CarouselItem>
+                      <img width={900} height={500} alt='900x500' src='carousel.png'/>
+                      <div className='carousel-caption'>
+                        <h3>First slide label</h3>
+                        <p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
+                      </div>
+                    </CarouselItem>
+                    <CarouselItem>
+                      <img width={900} height={500} alt='900x500' src='carousel.png'/>
+                      <div className='carousel-caption'>
+                        <h3>Second slide label</h3>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+                      </div>
+                    </CarouselItem>
+                    <CarouselItem>
+                      <img width={900} height={500} alt='900x500' src='carousel.png'/>
+                      <div className='carousel-caption'>
+                        <h3>Third slide label</h3>
+                        <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
+                      </div>
+                    </CarouselItem>
+                  </Carousel>   
+                </div>
+
+                <div style={style}>
+                  <Grid>
+                    <Row className='show-grid'>
+                      <Col xs={12} md={8}><code>&lt;{'Col xs={12} md={8}'} /&gt;</code></Col>
+                      <Col xs={6} md={4}><code>&lt;{'Col xs={6} md={4}'} /&gt;</code></Col>
+                    </Row>
+
+                    <Row className='show-grid'>
+                      <Col xs={6} md={4}><code>&lt;{'Col xs={6} md={4}'} /&gt;</code></Col>
+                      <Col xs={6} md={4}><code>&lt;{'Col xs={6} md={4}'} /&gt;</code></Col>
+                      <Col xs={6} md={4}><code>&lt;{'Col xs={6} md={4}'} /&gt;</code></Col>
+                    </Row>
+
+                    <Row className='show-grid'>
+                      <Col xs={6} xsOffset={6}><code>&lt;{'Col xs={6} xsOffset={6}'} /&gt;</code></Col>
+                    </Row>
+
+                    <Row className='show-grid'>
+                      <Col md={6} mdPush={6}><code>&lt;{'Col md={6} mdPush={6}'} /&gt;</code></Col>
+                      <Col md={6} mdPull={6}><code>&lt;{'Col md={6} mdPull={6}'} /&gt;</code></Col>
+                    </Row>
+                  </Grid>
+                </div>
+
+                <div style={style}>
+                  <Grid>
+                    <Row>
+                    <Col xs={6} md={3}>
+                      <Thumbnail href='#' alt='171x180' src='thumbnail.png' />
+                    </Col>
+                    <Col xs={6} md={3}>
+                      <Thumbnail href='#' alt='171x180' src='thumbnail.png' />
+                    </Col>
+                    <Col xs={6} md={3}>
+                      <Thumbnail href='#' alt='171x180' src='thumbnail.png' />
+                    </Col>
+                    </Row>
+                  </Grid>
+                </div>
+
+                <div style={style}>
+                  <ListGroup>
+                    <ListGroupItem>Item 1</ListGroupItem>
+                    <ListGroupItem>Item 2</ListGroupItem>
+                    <ListGroupItem>...</ListGroupItem>
+                  </ListGroup>
+                </div>
+
+                <div style={style}>
+                  <ListGroup>
+                    <ListGroupItem href='#link1'>Link 1</ListGroupItem>
+                    <ListGroupItem href='#link2'>Link 2</ListGroupItem>
+                    <ListGroupItem onClick={this.callback}>
+                      Trigger an alert
+                    </ListGroupItem>
+                  </ListGroup>
+                </div>
+
+                <div style={style}>
+                  <ListGroup>
+                    <ListGroupItem href='#' active>Link 1</ListGroupItem>
+                    <ListGroupItem href='#'>Link 2</ListGroupItem>
+                    <ListGroupItem href='#' disabled>Link 3</ListGroupItem>
+                  </ListGroup>
+                </div>
+
+                <div style={style}>
+                  <ListGroup>
+                    <ListGroupItem bsStyle='success'>Success</ListGroupItem>
+                    <ListGroupItem bsStyle='info'>Info</ListGroupItem>
+                    <ListGroupItem bsStyle='warning'>Warning</ListGroupItem>
+                    <ListGroupItem bsStyle='danger'>Danger</ListGroupItem>
+                  </ListGroup>
+                </div>
+
+                <div style={style}>
+                  <ListGroup>
+                    <ListGroupItem header='Heading 1'>Some body text</ListGroupItem>
+                    <ListGroupItem header='Heading 2' href='#'>Linked item</ListGroupItem>
+                    <ListGroupItem header='Heading 3' bsStyle='danger'>Danger styling</ListGroupItem>
+                  </ListGroup>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <h1>Label <Label>New</Label></h1>
+                    <h2>Label <Label>New</Label></h2>
+                    <h3>Label <Label>New</Label></h3>
+                    <h4>Label <Label>New</Label></h4>
+                    <h5>Label <Label>New</Label></h5>
+                    <p>Label <Label>New</Label></p>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Label bsStyle='default'>Default</Label>&nbsp;
+                    <Label bsStyle='primary'>Primary</Label>&nbsp;
+                    <Label bsStyle='success'>Success</Label>&nbsp;
+                    <Label bsStyle='info'>Info</Label>&nbsp;
+                    <Label bsStyle='warning'>Warning</Label>&nbsp;
+                    <Label bsStyle='danger'>Danger</Label>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <p>Badges <Badge>42</Badge></p>
+                </div>
+
+                <div style={style}>
+                  <Jumbotron>
+                    <h1>Hello, world!</h1>
+                    <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
+                    <p><Button bsStyle='primary'>Learn more</Button></p>
+                  </Jumbotron>
+                </div>
+
+                <div style={style}>
+                  <PageHeader>Example page header <small>Subtext for header</small></PageHeader>
+                </div>
+
+                <div style={style}>
+                    <Well>Look I'm in a well!</Well>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <Well bsSize='large'>Look I'm in a large well!</Well>
+                    <Well bsSize='small'>Look I'm in a small well!</Well>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <div>
+                    <ButtonToolbar>
+                      <ButtonGroup>
+                        <Button><Glyphicon glyph='align-left' /></Button>
+                        <Button><Glyphicon glyph='align-center' /></Button>
+                        <Button><Glyphicon glyph='align-right' /></Button>
+                        <Button><Glyphicon glyph='align-justify' /></Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+                    <ButtonToolbar>
+                      <ButtonGroup>
+                        <Button bsSize='large'><Glyphicon glyph='star' /> Star</Button>
+                        <Button><Glyphicon glyph='star' /> Star</Button>
+                        <Button bsSize='small'><Glyphicon glyph='star' /> Star</Button>
+                        <Button bsSize='xsmall'><Glyphicon glyph='star' /> Star</Button>
+                      </ButtonGroup>
+                    </ButtonToolbar>
+                  </div>
+                </div>
+
+                <div style={style}>
+                  <Table striped bordered condensed hover>
+                    <thead>
+                      <tr>
+                        <th>Number</th>
+                        <th>First Name</th>
+                        <th>Last Name</th>
+                        <th>Username</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td>1</td>
+                        <td>Mark</td>
+                        <td>Otto</td>
+                        <td>@mdo</td>
+                      </tr>
+                      <tr>
+                        <td>2</td>
+                        <td>Jacob</td>
+                        <td>Thornton</td>
+                        <td>@fat</td>
+                      </tr>
+                      <tr>
+                        <td>3</td>
+                        <td colSpan={2}>Larry the Bird</td>
+                        <td>@twitter</td>
+                      </tr>
+                    </tbody>
+                  </Table>
+                </div>
+
+                <div style={style}>
+                <Table responsive>
+                    <thead>
+                      <tr>
+                        <th>Number</th>
+                        <th>Table heading</th>
+                        <th>Table heading</th>
+                        <th>Table heading</th>
+                        <th>Table heading</th>
+                        <th>Table heading</th>
+                        <th>Table heading</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td>1</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                      </tr>
+                      <tr>
+                        <td>2</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                      </tr>
+                      <tr>
+                        <td>3</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                        <td>Table cell</td>
+                      </tr>
+                    </tbody>
+                  </Table>
+                </div>
+
+                <div style={style}>
+                  <Input type='text'
+                         value="hello"
+                         placeholder='Enter text'
+                         label='Working example with validation'
+                         help='Validation is based on string length.'
+                         bsStyle="success"
+                         hasFeedback
+                         ref='input'
+                         groupClassName='group-class'
+                         labelClassName='label-class'
+                         onChange={this.callback} />
+                </div>
+
+                <div style={style}>
+                  <form>
+                    <Input type='text' label='Text' placeholder='Enter text' />
+                    <Input type='email' label='Email Address' placeholder='Enter email' />
+                    <Input type='password' label='Password' />
+                    <Input type='file' label='File' help='[Optional] Block level help text' />
+                    <Input type='checkbox' label='Checkbox' checked readOnly />
+                    <Input type='radio' label='Radio' checked readOnly />
+                    <Input type='select' label='Select' placeholder='select'>
+                      <option value='select'>select</option>
+                      <option value='other'>...</option>
+                    </Input>
+                    <Input type='select' label='Multiple Select' multiple>
+                      <option value='select'>select (multiple)</option>
+                      <option value='other'>...</option>
+                    </Input>
+                    <Input type='textarea' label='Text Area' placeholder='textarea' />
+                    <ButtonInput value='Button Input' />
+                    <ButtonInput type='reset' value='Reset Button' />
+                    <ButtonInput type='submit' value='Submit Button' />
+                  </form>
+                </div>
+
+                <div style={style}>
+                  <form>
+                    <Input type="text" ref="input" onChange={this.callback} />
+                      <ButtonInput bsSize="small">Child Text</ButtonInput>
+                      <ButtonInput type="reset" bsStyle="primary" onClick={this.callback} />
+                      <ButtonInput type="submit" value="Submit Your Input" bsStyle="success" bsSize="large" disabled={false} />
+                    </form>
+                </div>
+
+                <div style={style}>
+                  <form>
+                    <Input type='text' addonBefore='@' />
+                    <Input type='text' addonAfter='.00' />
+                    <Input type='text' addonBefore='$' addonAfter='.00' />
+                    <Input type='text' addonAfter={innerGlyphicon} />
+                    <Input type='text' buttonBefore={innerButton} />
+                    <Input type='text' buttonAfter={innerDropdown} />
+                    <Input type='text' addonBefore={innerRadio} />
+                    <Input type='text' addonBefore={innerCheckbox} />
+                  </form>
+                </div>
+
+                <div style={style}>
+                  <form>
+                    <Input type='text' bsSize="large" placeholder='Large text' />
+                    <Input type='text' bsSize="medium" placeholder='Normal text' />
+                    <Input type='text' bsSize="small" placeholder='Small text' />
+                  </form>
+                </div>
+
+                <div style={style}>
+                  <form>
+                    <Input type='text' bsStyle='success' label='Success' hasFeedback />
+                    <Input type='text' bsStyle='warning' label='Warning' hasFeedback />
+                    <Input type='text' bsStyle='error' label='Error' hasFeedback />
+                  </form>
+                </div>
+
+                <div style={style}>
+                  <form className='form-horizontal'>
+                    <Input type='text' label='Text' labelClassName='col-xs-2' wrapperClassName='col-xs-10' />
+                    <Input type='textarea' label='Textarea' labelClassName='col-xs-2' wrapperClassName='col-xs-10' />
+                    <Input type='checkbox' label='Checkbox' wrapperClassName='col-xs-offset-2 col-xs-10' help='Offset is applied to wrapper.' />
+                  </form>
+                </div>
+
+                <div style={style}>
+                  <Input label='Input wrapper' help='Use this when you need something other than the available input types.' wrapperClassName='wrapper'>
+                    <Row>
+                      <Col xs={6}>
+                        <input type='text' className='form-control' />
+                      </Col>
+                      <Col xs={6}>
+                        <input type='text' className='form-control' />
+                      </Col>
+                    </Row>
+                  </Input>
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
new file mode 100644
index 000000000..0c0584474
--- /dev/null
+++ b/react-bootstrap/react-bootstrap.d.ts
@@ -0,0 +1,908 @@
+// Type definitions for react-bootstrap 
+// Project: https://github.com/react-bootstrap/react-bootstrap
+// Definitions by: Walker Burgin <https://github.com/walkerburgin>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../react/react.d.ts"/>
+///<reference path="../es6-promise/es6-promise.d.ts" />
+    
+declare module "react-bootstrap" {
+    // Import React 
+    import React = require("react");
+
+
+    // <Button />
+    // ----------------------------------------
+    interface ButtonProps { 
+
+        // Optional
+        active?: boolean;
+        disabled?: boolean;
+        block?: boolean;
+        bsStyle?: string;
+        bsSize?: string;
+        navItem?: boolean;
+        navDropdown?: boolean;
+        componentClass?: string;
+        href?: string;
+        onClick?: Function; // Add more specific type 
+        target?: string;
+        type?: string;
+    }
+    interface Button extends  React.ReactElement<ButtonProps> { }
+    interface ButtonClass extends  React.ComponentClass<ButtonProps> { }
+    var Button: ButtonClass;
+
+
+    // <ButtonToolbar />
+    // ----------------------------------------
+    interface ButtonToolbarProps { 
+
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    interface ButtonToolbar extends React.ReactElement<ButtonToolbarProps> { }
+    interface ButtonToolbarClass extends  React.ComponentClass<ButtonToolbarProps> { }
+    var ButtonToolbar: ButtonToolbarClass;
+
+    // <ButtonGroup />
+    // ----------------------------------------
+    interface ButtonGroupProps { 
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    interface ButtonGroup extends React.ReactElement<ButtonGroupProps> { }
+    interface ButtonGroupClass extends  React.ComponentClass<ButtonGroupProps> { }
+    var ButtonGroup: ButtonGroupClass;
+    
+
+    // <DropdownButton />
+    // ----------------------------------------
+    interface DropdownButtonProps { 
+        bsStyle?: string;
+        bsSize?: string;
+        buttonClassName?: string; 
+        children?: any; // TODO: Add more specific type 
+        className?: string;
+        dropup?: boolean;
+        href?: string;
+        id?: string | number; 
+        key?: any; // TODO: Add more specific type
+        navItem?: boolean;
+        noCaret?: boolean;
+        onClick?: Function;  // TODO: Add more specifc type 
+        onSelect?: Function; // TODO: Add more specific type 
+        pullRight?: boolean;
+        title?: any; // TODO: Add more specific type
+    }
+    interface DropdownButton extends React.ReactElement<DropdownButtonProps> { }
+    interface DropdownButtonClass extends React.ComponentClass<DropdownButtonProps> { }
+    var DropdownButton: DropdownButtonClass;
+
+
+    // <SplitButton />
+    // ----------------------------------------
+    interface SplitButtonProps { 
+        bsStyle?: string;
+        bsSize?: string;
+        children?: any; // TODO: Add more specific type 
+        className?: string;
+        disabled?: boolean;
+        dropdownTitle?: any; // TODO: Add more specific type
+        dropup?: boolean;
+        href?: string;
+        id?: string; 
+        onClick?: Function;  // TODO: Add more specific type 
+        onSelect?: Function; // TODO: Add more specific type 
+        pullRight?: boolean;
+        target?: string;
+        title?: any; // TODO: Add more specific type
+    }
+    interface SplitButton extends React.ReactElement<SplitButtonProps> { }
+    interface SplitButtonClass extends React.ComponentClass<SplitButtonProps> { }
+    var SplitButton: SplitButtonClass;
+
+
+    // <MenuItem />
+    // ----------------------------------------
+    interface MenuItemProps { 
+        active?: boolean;
+        disabled?: boolean;
+        divider?: boolean;
+        eventKey?: any;
+        header?: boolean;
+        href?: string;
+        key?: any; 
+        onSelect?: Function;
+        target?: string;
+        title?: string;
+    }
+    interface MenuItem extends React.ReactElement<MenuItemProps> { }
+    interface MenuItemClass extends React.ComponentClass<MenuItemProps> { }
+    var MenuItem: MenuItemClass;
+
+
+    // <Panel />
+    // ----------------------------------------
+    interface PanelProps { 
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+        id?: string;
+        onSelect?: Function; // TODO: Add more specific type 
+        onClick?: Function; // TODO: Add more specific type 
+    }
+    interface Panel extends React.ReactElement<PanelProps> { }
+    interface PanelClass extends React.ComponentClass<PanelProps> { }
+    var Panel: PanelClass;
+
+
+    // <Accordion />
+    // ----------------------------------------
+    interface AccordionProps { 
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+        id?: string;
+        onSelect?: Function; // TODO: Add more specific type 
+    }
+    interface Accordion extends React.ReactElement<AccordionProps> { }
+    interface AccordionClass extends  React.ComponentClass<AccordionProps> { }
+    var Accordion: AccordionClass;
+
+
+    // <PanelGroup />
+    // ----------------------------------------
+    interface PanelGroupProps { 
+        accordion?: boolean;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        children?: any;
+        className?: string;
+        defaultActiveKey?: any;
+        onSelect?: Function;
+    }
+    interface PanelGroup extends React.ReactElement<PanelGroupProps> { }
+    interface PanelGroupClass extends  React.ComponentClass<PanelGroupProps> { }
+    var PanelGroup: PanelGroupClass;
+
+
+    // <Modal.Dialog />
+    // ----------------------------------------
+    interface ModalDialogProps {
+        // TODO: Add more specific type 
+    }
+    interface ModalDialog extends React.ReactElement<ModalDialogProps> { }
+    interface ModalDialogClass extends React.ComponentClass<ModalHeaderProps> { }
+
+
+    // <Modal.Header />
+    // ----------------------------------------
+    interface ModalHeaderProps {
+        closeButton?: boolean;
+        modalClassName?: string;
+        onHide?: Function;
+        // undefined?: string;
+    }
+    interface ModalHeader extends React.ReactElement<ModalHeaderProps> { }
+    interface ModalHeaderClass extends React.ComponentClass<ModalHeaderProps> { }
+
+
+    // <Modal.Title/>
+    // ----------------------------------------
+    interface ModalTitleProps {
+        modalClassName?: string;
+    }
+    interface ModalTitle extends React.ReactElement<ModalTitleProps> { }
+    interface ModalTitleClass extends React.ComponentClass<ModalTitleProps> { }
+
+
+    // <Modal.Body />
+    // ----------------------------------------
+    interface ModalBodyProps {
+        modalClassName?: string;
+    }
+    interface ModalBody extends React.ReactElement<ModalBodyProps> { }
+    interface ModalBodyClass extends React.ComponentClass<ModalBodyProps> { }
+
+
+    // <Modal.Footer />
+    // ----------------------------------------
+    interface ModalFooterProps {
+        modalClassName?: string;
+    }
+    interface ModalFooter extends React.ReactElement<ModalFooterProps> { }
+    interface ModalFooterClass extends React.ComponentClass<ModalFooterProps> { }
+
+
+    // <Modal />
+    // ----------------------------------------
+    interface ModalProps { 
+        // Required
+        onHide: Function;
+
+        // Optional
+        animation?: boolean;
+        autoFocus?: boolean;
+        backdrop?: boolean|string;
+        bsSize?: string;
+        container?: any; // TODO: Add more specific type
+        dialogClassName?: string;
+        dialogComponent?: any; // TODO: Add more specific type
+        enforceFocus?: boolean;
+        keyboard?: boolean;
+    }
+    interface Modal extends React.ReactElement<ModalProps> { }
+    interface ModalClass extends React.ComponentClass<ModalProps> { 
+        Header: ModalHeaderClass;
+        Title: ModalTitleClass;
+        Body: ModalBodyClass;
+        Footer: ModalFooterClass;
+        Dialog: ModalDialogClass;
+    }
+    var Modal: ModalClass;
+
+
+    // <OverlayTrigger />
+    // ----------------------------------------
+    interface OverlayTriggerProps { 
+        // Required
+        overlay: any; // TODO: Add more specific type
+
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number;
+        defaultOverlayShown?: boolean;
+        delay?: number;
+        delayHide?: number;
+        delayShow?: number;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        trigger?: string;
+    }
+    interface OverlayTrigger extends React.ReactElement<OverlayTriggerProps> { }
+    interface OverlayTriggerClass extends  React.ComponentClass<OverlayTriggerProps> { }
+    var OverlayTrigger: OverlayTriggerClass;
+
+
+    // <Tooltip />
+    // ----------------------------------------
+    interface TooltipProps {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        id?: string; 
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+        title?: any; // TODO: Add more specific type
+    }
+    interface Tooltip extends React.ReactElement<TooltipProps> { }
+    interface TooltipClass extends React.ComponentClass<TooltipProps> { }
+    var Tooltip: TooltipClass;
+
+
+    // <Popover/>
+    // ----------------------------------------
+    interface PopoverProps {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        id?: string; 
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+        title: any; // TODO: Add more specific type
+    }
+    interface Popover extends React.ReactElement<PopoverProps> { }
+    interface PopoverClass extends React.ComponentClass<PopoverProps> { }
+    var Popover: PopoverClass;
+
+
+    // <Overlay />
+    // ----------------------------------------
+    interface OverlayProps {
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number; // TODO: Add more specific type
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        onHide?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        show?: boolean;
+        target?: Function;
+    }
+    interface Overlay extends React.ReactElement<OverlayProps> { }
+    interface OverlayClass extends  React.ComponentClass<OverlayProps> { }
+    var Overlay: OverlayClass;
+
+
+    // <ProgressBar />
+    // ----------------------------------------
+    interface ProgressBarProps {
+        // Optional
+        active?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        children?: any; // TODO: Add more specific type
+        className?: string;
+        interpolatedClass?: any; // TODO: Add more specific type
+        label?: any; // TODO: Add more specific type
+        key?: number; // TODO: Add more specific type
+        max?: number;
+        min?: number;
+        now?: number;
+        srOnly?: boolean;
+        striped?: boolean;
+    }
+    interface ProgressBar extends React.ReactElement<ProgressBarProps> { }
+    interface ProgressBarClass extends  React.ComponentClass<ProgressBarProps> { }
+    var ProgressBar: ProgressBarClass;
+
+
+    // <Nav />
+    // ----------------------------------------
+    // TODO: This one turned into a union of two different types 
+    interface NavProps {
+        // Optional
+        activeHref?: string;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        collapsible?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        id?: string;
+        justified?: boolean;
+        navbar?: boolean;
+        onSelect?: Function;
+        pullRight?: boolean;
+        right?: boolean;
+        stacked?: boolean;
+        ulClassName?: string;
+        ulId?: string;
+    }
+    interface Nav extends React.ReactElement<NavProps> { }
+    interface NavClass extends  React.ComponentClass<NavProps> { }
+    var Nav: NavClass;
+
+
+    // <NavItem />
+    // ----------------------------------------
+    interface NavItemProps {
+        active?: boolean;
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        disabled?: boolean;
+        eventKey?: any;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        href?: string;
+        inverse?: boolean;
+        linkId?: string;
+        navExpanded?: boolean;
+        onSelect?: Function;
+        onToggle?: Function;
+        role?: string;
+        staticTop?: boolean;
+        target?: string;
+        title?: string;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    interface NavItem extends React.ReactElement<NavItemProps> { }
+    interface NavItemClass extends React.ComponentClass<NavItemProps> { }
+    var NavItem: NavItemClass;
+
+
+    // <Navbar />
+    // ----------------------------------------
+    interface NavbarProps {
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        inverse?: boolean;
+        navExpanded?: boolean;
+        onToggle?: Function;
+        role?: string;
+        staticTop?: boolean;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    interface Navbar extends React.ReactElement<NavbarProps> { }
+    interface NavbarClass extends  React.ComponentClass<NavbarProps> { }
+    var Navbar: NavbarClass;
+
+
+    // <NavDropdown />
+    // ----------------------------------------
+    interface NavDropdownProps {
+        eventKey?: any;
+        title?: string;
+        id?: string;
+    }
+    interface NavDropdown extends React.ReactElement<NavDropdownProps> { }
+    interface NavDropdownClass extends  React.ComponentClass<NavDropdownProps> { }
+    var NavDropdown: NavDropdownClass;
+
+
+    // <Tabs />
+    // ----------------------------------------
+    interface TabsProps {
+        activeKey?: any; 
+        animation?: boolean;
+        bsStyle?: string;
+        defaultActiveKey?: any;
+        id?: string | number;
+        onSelect?: Function;
+        paneWidth?: any; // TODO: Add more specific type 
+        position?: string;
+        tabWidth?: any; // TODO: Add more specific type
+    }
+    interface Tabs extends React.ReactElement<TabsProps> { }
+    interface TabsClass extends React.ComponentClass<TabsProps> { }
+    var Tabs: TabsClass;
+
+
+    // <Tab />
+    // ----------------------------------------
+    interface TabProps {
+        animation?: boolean;
+        disabled?: boolean;
+        eventKey?: any; // TODO: Add more specific type
+        title?: any; // TODO: Add more specific type
+    }
+    interface Tab extends React.ReactElement<TabProps> { }
+    interface TabClass extends React.ComponentClass<TabProps> { }
+    var Tab: TabClass;
+
+
+    // <Pager />
+    // ----------------------------------------
+    interface PagerProps {
+        onSelect?: Function;
+    }
+    interface Pager extends React.ReactElement<PagerProps> { }
+    interface PagerClass extends  React.ComponentClass<PagerProps> { }
+    var Pager: PagerClass;
+
+
+    // <PageItem />
+    // ----------------------------------------
+    interface PageItemProps {
+        disabled?: boolean;
+        eventKey?: any; 
+        href?: string;
+        next?: boolean;
+        onSelect?: Function;
+        previous?: boolean;
+        target?: string;
+        title?: string;
+    }
+    interface PageItem extends React.ReactElement<PageItemProps> { }
+    interface PageItemClass extends React.ComponentClass<PageItemProps> { }
+    var PageItem: PageItemClass;
+
+
+    // <Pagination />
+    // ----------------------------------------
+    interface PaginationProps {
+        activePage?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        buttonComponentClass?: any; // TODO: Add more specific type
+        ellipsis?: boolean;
+        first?: boolean;
+        items?: number;
+        last?: boolean;
+        maxButtons?: number;
+        next?: boolean;
+        onSelect?: Function;
+        prev?: boolean;
+    }
+    interface Pagination extends React.ReactElement<PaginationProps> { }
+    interface PaginationClass extends React.ComponentClass<PaginationProps> { }
+    var Pagination: PaginationClass;
+
+
+    // <Alert />
+    // ----------------------------------------
+    interface AlertProps {
+        bsSize?: string;
+        bsStyle?: string;
+        closeLabel?: string;
+        dismissAfter?: number;
+        onDismiss?: Function;
+    }
+    interface Alert extends React.ReactElement<AlertProps> { }
+    interface AlertClass extends React.ComponentClass<AlertProps> { }
+    var Alert: AlertClass;
+
+
+    // <Carousel />
+    // ----------------------------------------
+    interface CarouselProps {
+        activeIndex?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        controls?: boolean;
+        defaultActiveIndex?: number;
+        direction?: string;
+        indicators?: boolean;
+        interval?: number;
+        nextIcon?: any; // TODO: Add more specific type
+        onSelect?: Function;
+        onSlideEnd?: Function;
+        pauseOnHover?: boolean;
+        prevIcon?: any; // TODO: Add more specific type
+        slide?: boolean;
+        wrap?: boolean;   
+    }
+    interface Carousel extends React.ReactElement<CarouselProps> { }
+    interface CarouselClass extends React.ComponentClass<CarouselProps> { }
+    var Carousel: CarouselClass;
+
+
+    // <CarouselItem />
+    // ----------------------------------------
+    interface CarouselItemProps {
+        active?: boolean;
+        animtateIn?: boolean;
+        animateOut?: boolean;
+        caption?: any; // TODO: Add more specific type
+        direction?: string;
+        index?: number;
+        onAnimateOutEnd?: Function;
+    }
+    interface CarouselItem extends React.ReactElement<CarouselItemProps> { }
+    interface CarouselItemClass extends React.ComponentClass<CarouselItemProps> { }
+    var CarouselItem: CarouselItemClass;
+
+
+    // <Grid />
+    // ----------------------------------------
+    interface GridProps {
+        componentClass?: any; // TODO: Add more specific type
+        fluid?: boolean; 
+    }
+    interface Grid extends React.ReactElement<GridProps> { }
+    interface GridClass extends React.ComponentClass<GridProps> { }
+    var Grid: GridClass;
+
+
+    // <Row />
+    // ----------------------------------------
+    interface RowProps {
+        className?: string;
+        componentClass?: any; // TODO: Add more specific type
+    }
+    interface Row extends React.ReactElement<RowProps> { }
+    interface RowClass extends React.ComponentClass<RowProps> { }
+    var Row: RowClass;
+
+
+    // <Col />
+    // ----------------------------------------
+    interface ColProps {
+        componentClass?: any; // TODO: Add more specific type
+        lg?: number;
+        lgOffset?: number;
+        lgPull?: number;
+        lgPush?: number;
+        md?: number;
+        mdOffset?: number;
+        mdPull?: number;
+        mdPush?: number;
+        sm?: number;
+        smOffset?: number;
+        smPull?: number;
+        smPush?: number;
+        xs?: number;
+        xsOffset?: number;
+        xsPull?: number;
+        xsPush?: number;
+    }
+    interface Col extends React.ReactElement<ColProps> { } 
+    interface ColClass extends React.ComponentClass<ColProps> { }
+    var Col: ColClass;
+
+
+    // <Thumbnail />
+    // ----------------------------------------
+    interface ThumbnailProps {
+        alt?: string;
+        bsSize?: string;
+        bsStyle?: string;
+        href?: string;
+        src?: string;
+    }
+    interface Thumbnail extends React.ReactElement<ThumbnailProps> { }
+    interface ThumbnailClass extends React.ComponentClass<ThumbnailProps> { }
+    var Thumbnail: ThumbnailClass;    
+
+
+    // <ListGroup />
+    // ----------------------------------------
+    interface ListGroupProps {
+        className?: string;
+        id?: string | number;
+        fill?: boolean; // TODO: Add more specific type
+    }
+    interface ListGroup extends React.ReactElement<ListGroupProps> { }
+    interface ListGroupClass extends React.ComponentClass<ListGroupProps> { }
+    var ListGroup: ListGroupClass;
+
+
+    // <ListGroupItem />
+    // ----------------------------------------
+    interface ListGroupItemProps {
+        active?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        className?: string;
+        disabled?: any;
+        eventKey?: any;
+        header?: any; // TODO: Add more specific type
+        href?: string;
+        key?: any; // TODO: Add more specific type 
+        listItem?: boolean;
+        onClick?: Function; // TODO: Add more specific type 
+        target?: string;
+    }
+    interface ListGroupItem extends React.ReactElement<ListGroupItemProps> { }
+    interface ListGroupItemClass extends React.ComponentClass<ListGroupItemProps> { }
+    var ListGroupItem: ListGroupItemClass;
+
+
+    // <Label />
+    // ----------------------------------------
+    interface LabelProps {
+        bsSize?: string;
+        bsStyle?: string;
+    }
+    interface Label extends React.ReactElement<LabelProps> { }
+    interface LabelClass extends React.ComponentClass<LabelProps> { }
+    var Label: LabelClass;
+
+
+    // <Badge />
+    // ----------------------------------------
+    interface BadgeProps {
+        pullRight?: boolean;
+    }
+    interface Badge extends React.ReactElement<BadgeProps> { }
+    interface BadgeClass extends React.ComponentClass<BadgeProps> { }
+    var Badge: BadgeClass;
+
+
+    // <Jumbotron />
+    // ----------------------------------------
+    interface JumbotronProps {
+        componentClass?: any; // TODO: Add more specific type
+    }
+    interface Jumbotron extends React.ReactElement<JumbotronProps> { }
+    interface JumbotronClass extends React.ComponentClass<JumbotronProps> { }
+    var Jumbotron: JumbotronClass;
+
+
+    // <PageHeader />
+    // ----------------------------------------
+    interface PageHeaderProps {
+        // No props 
+    }
+    interface PageHeader extends React.ReactElement<PageHeaderProps> { }
+    interface PageHeaderClass extends React.ComponentClass<PageHeaderProps> { }
+    var PageHeader: PageHeaderClass;
+
+
+    // <Well />
+    // ----------------------------------------
+    interface WellProps {
+        bsSize?: string;
+        bsStyle?: string;
+    }
+    interface Well extends React.ReactElement<WellProps> { }
+    interface WellClass extends React.ComponentClass<WellProps> { }
+    var Well: WellClass;
+
+
+    // <Glyphicon />
+    // ----------------------------------------
+    interface GlyphiconProps {
+        // Required 
+        glyph: string;
+    }
+    interface Glyphicon extends React.ReactElement<GlyphiconProps> { }
+    interface GlyphiconClass extends React.ComponentClass<GlyphiconProps> { }
+    var Glyphicon: GlyphiconClass;
+
+
+    // <Table />
+    // ----------------------------------------
+    interface TableProps {
+        bordered?: boolean;
+        condensed?: boolean;
+        hover?: boolean;
+        responsive?: boolean;
+        striped?: boolean;
+    }
+    interface Table extends React.ReactElement<TableProps> { }
+    interface TableClass extends React.ComponentClass<TableProps> { }
+    var Table: TableClass;
+
+
+    // <Input />
+    // ----------------------------------------
+    interface InputProps {
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type 
+        checked?: boolean;
+        disabled?: boolean;
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        id?: string | number;
+        label?: any; // TODO: Add more specific type 
+        labelClassName?: string;
+        multiple?: boolean;
+        placeholder?: string;
+        ref?: string;
+        readOnly?: boolean;
+        type?: string;
+        onChange?: Function; // TODO: Add more specific type 
+        onKeyDown?: Function; // TODO: Add more specific type 
+        onKeyUp?: Function; // TODO: Add more specific type 
+        onKeyPress?: Function; // TODO: Add more specific type 
+        value?: any; // TODO: Add more specific type
+        wrapperClassName?: string; 
+    }
+    interface Input extends React.ReactElement<InputProps> { }
+    interface InputClass extends React.ComponentClass<InputProps> { }
+    var Input: InputClass;
+
+
+    // <ButtonInput />
+    // ----------------------------------------
+    interface ButtonInputProps { 
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type 
+        disabled?: boolean;
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        id?: string | number;
+        label?: any; // TODO: Add more specific type 
+        labelClassName?: string;
+        multiple?: boolean;
+        onClick?: Function; // TODO: Add more specific type 
+        type?: string;
+        value?: any; // TODO: Add more specific type
+        wrapperClassName?: string; 
+    }
+    interface ButtonInput extends React.ReactElement<ButtonInputProps> { }
+    interface ButtonInputClass extends React.ComponentClass<ButtonInputProps> { }
+    var ButtonInput: ButtonInputClass;
+
+
+    // TODO: FormControls.Static
+  
+  
+    // <Portal />
+    // ----------------------------------------
+    interface PortalProps { 
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Portal extends React.ReactElement<PortalProps> { }
+    interface PortalClass extends React.ComponentClass<PortalProps> { }
+    var Portal: PortalClass;
+
+   
+    // <Position />
+    // ----------------------------------------
+    interface PositionProps { 
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Position extends React.ReactElement<PositionProps> { }
+    interface PositionClass extends  React.ComponentClass<PositionProps> { }
+    var Position: PositionClass;
+
+
+    // <Fade />
+    // ----------------------------------------
+    interface FadeProps { 
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    interface Fade extends React.ReactElement<FadeProps> { }
+    interface FadeClass extends React.ComponentClass<FadeProps> { }
+    var Fade: FadeClass;
+}
diff --git a/react-dnd/react-dnd-tests.ts b/react-dnd/react-dnd-tests.ts
index d270a041d..9846c6c83 100644
--- a/react-dnd/react-dnd-tests.ts
+++ b/react-dnd/react-dnd-tests.ts
@@ -11,6 +11,7 @@ var r = React.DOM;
 
 import DragSource = ReactDnd.DragSource;
 import DropTarget = ReactDnd.DropTarget;
+import DragLayer = ReactDnd.DragLayer;
 import DragDropContext = ReactDnd.DragDropContext;
 import HTML5Backend = require('react-dnd/modules/backends/HTML5');
 import TestBackend = require('react-dnd/modules/backends/Test');
@@ -80,6 +81,8 @@ module Knight {
     }
 
     export class Knight extends React.Component<KnightP, {}> {
+        static defaultProps: KnightP;
+        
         static create = React.createFactory(Knight);
 
         componentDidMount() {
@@ -153,6 +156,8 @@ module BoardSquare {
     }
 
     export class BoardSquare extends React.Component<BoardSquareP, {}> {
+        static defaultProps: BoardSquareP;
+        
         private _renderOverlay = (color: string) => {
             return r.div({
                 style: {
@@ -197,6 +202,32 @@ module BoardSquare {
     export var create = React.createFactory(DndBoardSquare);
 }
 
+// Custom Drag Layer Component
+// ----------------------------------------------------------------------
+module CustomDragLayer {
+    interface CustomDragLayerP extends React.Props<CustomDragLayer> {
+        isDragging?: boolean;
+        item?: Object;
+    }
+
+    function dragLayerCollect(monitor: ReactDnd.DragLayerMonitor) {
+        return {
+            isDragging: monitor.isDragging(),
+            item: monitor.getItem(),
+        };
+    }
+
+    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+        render() {
+            return r.div(null, this.props.isDragging ? this.props.item : null);
+        }
+    }
+
+    export var dragLayer = DragLayer(dragLayerCollect)(CustomDragLayer);
+
+    export var create = React.createFactory(dragLayer);
+}
+
 // Board Component
 // ----------------------------------------------------------------------
 
@@ -237,13 +268,18 @@ module Board {
             }
 
             return r.div({
-                style: {
-                    width: '100%',
-                    height: '100%',
-                    display: 'flex',
-                    flexWrap: 'wrap'
-                },
-                children: squares
+                children: [
+                    CustomDragLayer.create(),
+                    r.div({
+                        style: {
+                            width: '100%',
+                            height: '100%',
+                            display: 'flex',
+                            flexWrap: 'wrap'
+                        },
+                        children: squares
+                    })
+                ]
             });
         }
     }
diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts
index d86af3b8b..151f0a404 100644
--- a/react-dnd/react-dnd.d.ts
+++ b/react-dnd/react-dnd.d.ts
@@ -53,10 +53,10 @@ declare module __ReactDnd {
         backend: Backend
     ): (componentClass: React.ComponentClass<P>) => ContextComponentClass<P>;
 
-    // TODO: Add exported function for DragLayer.
-    // The React DnD docs say that this is an advanced feature that is only
-    // necessary when performing custom rendering or when using a custom
-    // backend.
+    export function DragLayer<P>(
+        collect: (monitor: DragLayerMonitor) => Object,
+        options?: DndOptions<P>
+    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
 
     // Shared
     // ----------------------------------------------------------------------
@@ -148,6 +148,20 @@ declare module __ReactDnd {
 
     type ConnectDropTarget = <P>(elementOrNode: React.ReactElement<P>) => React.ReactElement<P>;
 
+    /// DragLayerMonitor
+    // ----------------------------------------------------------------------
+
+    class DragLayerMonitor {
+        isDragging(): boolean;
+        getItemType(): Identifier;
+        getItem(): Object;
+        getInitialClientOffset(): ClientOffset;
+        getInitialSourceClientOffset(): ClientOffset;
+        getClientOffset(): ClientOffset;
+        getDifferenceFromInitialOffset(): ClientOffset;
+        getSourceClientOffset(): ClientOffset;
+    }
+
     /// Backend
     /// ---------------------------------------------------------------------
 
diff --git a/react-dom/react-dom.d.ts b/react-dom/react-dom.d.ts
new file mode 100644
index 000000000..16ded77d8
--- /dev/null
+++ b/react-dom/react-dom.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for React-DOM v0.14.0-rc
+// Project: https://www.npmjs.com/package/react-dom
+// Definitions by: Stefan-Bieliauskas <http://www.conts.de>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./../react/react.d.ts" />
+
+declare class __ReactDom {
+    public  render<P>(
+        element: __React.DOMElement<P>,
+        container: Element,
+        callback?: () => any): __React.DOMComponent<P>;
+    public render<P, S>(
+        element: __React.ClassicElement<P>,
+        container: Element,
+        callback?: () => any): __React.ClassicComponent<P, S>;
+    public render<P, S>(
+        element: __React.ReactElement<P>,
+        container: Element,
+        callback?: () => any): __React.Component<P, S>;
+
+    public findDOMNode<TElement extends Element>(
+        componentOrElement: __React.Component<any, any> | Element): TElement;
+    public findDOMNode(
+        componentOrElement: __React.Component<any, any> | Element): Element;
+
+    public unmountComponentAtNode(container: Element): boolean;
+}
+
+declare class __ReactDomServer {
+    public  renderToString(element: __React.ReactElement<any>): string;
+    public  renderToStaticMarkup(element: __React.ReactElement<any>): string;
+}
+declare module "react-dom" {
+    export  = __ReactDom
+}
+
+declare module "react-dom/server" {
+    export  = __ReactDomServer
+}
\ No newline at end of file
diff --git a/react-mixin/react-mixin-tests.tsx b/react-mixin/react-mixin-tests.tsx
new file mode 100644
index 000000000..32532b133
--- /dev/null
+++ b/react-mixin/react-mixin-tests.tsx
@@ -0,0 +1,55 @@
+/// <reference path="react-mixin.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+import reactMixin = require('react-mixin');
+import * as React from 'react';
+
+var someMixin: React.Mixin<any, any>;
+var someOtherMixin: React.Mixin<any, any>;
+
+class Foo extends React.Component<any, any> {
+    render(): JSX.Element { return <div />; }
+}
+
+reactMixin(Foo.prototype, someMixin);
+reactMixin(Foo.prototype, someOtherMixin);
+
+
+var mixin: React.Mixin<any, any> = {
+    getDefaultProps: function(): any {
+        return {b: 2};
+    }
+};
+
+class Foo2 extends React.Component<any, any> {
+    static defaultProps = {
+        a: 1
+    };
+    render(): JSX.Element {
+        console.log(this.props); // {a: 1, b: 2}
+        return null;
+    }
+}
+
+reactMixin.onClass(Foo2, mixin);
+
+@reactMixin.decorate(mixin)
+class Foo3 extends React.Component<any, any> {
+}
+
+function autobind(methodNames: string[]): React.Mixin<any, any> {
+    return {
+        componentWillMount: function(): void {
+            methodNames.forEach((name) => {
+                this[name] = this[name].bind(this);
+            });
+        }
+    };
+}
+
+@reactMixin.decorate(mixin)
+@reactMixin.decorate(autobind(Object.keys(mixin)))
+class Foo4 extends React.Component<any, any> {
+}
+
+
diff --git a/react-mixin/react-mixin-tests.tsx.tscparams b/react-mixin/react-mixin-tests.tsx.tscparams
new file mode 100644
index 000000000..c90abf04f
--- /dev/null
+++ b/react-mixin/react-mixin-tests.tsx.tscparams
@@ -0,0 +1 @@
+--target es5 --noImplicitAny --experimentalDecorators --jsx react
diff --git a/react-mixin/react-mixin.d.ts b/react-mixin/react-mixin.d.ts
new file mode 100644
index 000000000..e7d25a6ab
--- /dev/null
+++ b/react-mixin/react-mixin.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for react-mixin 2.0.2
+// Project: https://github.com/brigand/react-mixin
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+
+declare module "react-mixin" {
+    import * as React from 'react';
+
+    namespace reactMixin {
+        export interface ClassDecorator {
+            <TFunction extends Function>(target: TFunction): TFunction|void;
+        }
+
+        interface ReactMixin {
+            decorate(mixin: React.Mixin<any, any>): ClassDecorator;
+            onClass<S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+            <S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+        }
+    }
+
+    var reactMixin: reactMixin.ReactMixin;
+
+    export = reactMixin;
+}
+
diff --git a/react-props-decorators/react-props-decorators-tests.ts b/react-props-decorators/react-props-decorators-tests.ts
new file mode 100644
index 000000000..33691834c
--- /dev/null
+++ b/react-props-decorators/react-props-decorators-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="react-props-decorators.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+import * as React from 'react';
+import { propTypes, defaultProps } from 'react-props-decorators';
+
+@propTypes({
+    foo: React.PropTypes.string,
+    bar: React.PropTypes.number
+})
+@defaultProps({
+    foo: "defaultString",
+    bar: 100
+})
+class Baz extends React.Component<any, any> {
+    /* ... */
+}
diff --git a/react-props-decorators/react-props-decorators-tests.ts.tscparams b/react-props-decorators/react-props-decorators-tests.ts.tscparams
new file mode 100644
index 000000000..3f0863ac6
--- /dev/null
+++ b/react-props-decorators/react-props-decorators-tests.ts.tscparams
@@ -0,0 +1 @@
+--experimentalDecorators --noImplicitAny --target ES5
diff --git a/react-props-decorators/react-props-decorators.d.ts b/react-props-decorators/react-props-decorators.d.ts
new file mode 100644
index 000000000..9b62d84f9
--- /dev/null
+++ b/react-props-decorators/react-props-decorators.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for react-props-decorators 0.1.0
+// Project: https://github.com/popkirby/react-props-decorators
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+
+declare module "react-props-decorators" {
+    import * as React from 'react';
+
+    export interface ClassDecorator {
+        <TFunction extends Function>(target:TFunction): TFunction|void;
+    }
+
+    var propTypes: (map: React.ValidationMap<any>) => ClassDecorator;
+    var defaultProps: (defaultProps: any) => ClassDecorator;
+
+    export {
+        propTypes,
+        defaultProps
+    }
+}
+
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
new file mode 100644
index 000000000..9bd662295
--- /dev/null
+++ b/react-redux/react-redux-tests.tsx
@@ -0,0 +1,244 @@
+/// <reference path="react-redux.d.ts" />
+/// <reference path="../react/react.d.ts"/>
+/// <reference path="../redux/redux.d.ts" />
+/// <reference path="../react-router/react-router.d.ts" />
+/// <reference path="../object-assign/object-assign.d.ts" />
+
+import { Component } from 'react';
+import * as React from 'react';
+import * as Router from 'react-router';
+import { Route, RouterState } from 'react-router';
+import { Store, Dispatch, bindActionCreators } from 'redux';
+import { connect, Provider } from 'react-redux';
+import objectAssign = require('object-assign');
+
+//
+// Quick Start
+// https://github.com/rackt/react-redux/blob/master/docs/quick-start.md#quick-start
+//
+
+interface CounterState {
+    counter: number;
+}
+declare var increment: Function;
+
+class Counter extends Component<any, any> {
+  render() {
+    return (
+      <button onClick={this.props.onIncrement}>
+        {this.props.value}
+      </button>
+    );
+  }
+}
+
+function mapStateToProps(state: CounterState) {
+    return {
+        value: state.counter
+    };
+}
+
+// Which action creators does it want to receive by props?
+function mapDispatchToProps(dispatch: Dispatch) {
+    return {
+        onIncrement: () => dispatch(increment())
+    };
+}
+
+connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(Counter);
+
+
+@connect(mapStateToProps)
+class CounterContainer extends Component<any, any> {
+
+}
+
+class App extends Component<any, any> {
+    render(): JSX.Element {
+        // ...
+        return null;
+    }
+}
+
+const targetEl = document.getElementById('root');
+
+React.render((
+    <Provider store={store}>
+        {() => <App />}
+    </Provider>
+), targetEl);
+
+//
+// API
+// https://github.com/rackt/react-redux/blob/master/docs/api.md
+//
+declare var routes: Route;
+declare var store: Store;
+declare var routerState: RouterState;
+class MyRootComponent extends Component<any, any> {
+
+}
+class TodoApp extends Component<any, any> {
+
+}
+interface TodoState {
+    todos: string[]|string;
+}
+interface TodoProps {
+    userId: number;
+}
+interface DispatchProps {
+    addTodo(userId: number, text: string): void;
+}
+declare var actionCreators: () => {
+    action: Function;
+}
+declare var addTodo: () => { type: string; };
+declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
+declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
+
+React.render(
+  <Provider store={store}>
+    {() => <MyRootComponent />}
+  </Provider>,
+  document.body
+);
+
+Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
+    React.render(
+        <Provider store={store}>
+            {/*
+             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
+             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
+            */}
+        </Provider>,
+        document.getElementById('root')
+    );
+});
+
+//TODO: for React Router 1.0
+//TODO: error TS2604: JSX element type 'Router' does not have any construct or call signatures.
+//React.render(
+//    <Provider store={store}>
+//        {() => <Router history={history}>...</Router>}
+//    </Provider>,
+//    targetEl
+//);
+
+// Inject just dispatch and don't listen to store
+
+connect()(TodoApp);
+
+// Inject dispatch and every field in the global state
+
+connect((state: TodoState) => state)(TodoApp);
+
+// Inject dispatch and todos
+
+function mapStateToProps2(state: TodoState) {
+    return { todos: state.todos };
+}
+
+export default connect(mapStateToProps2)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+connect(mapStateToProps2, actionCreators)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...) as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps2(dispatch: Dispatch) {
+    return { actions: bindActionCreators(actionCreators, dispatch) };
+}
+
+connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
+
+// Inject todos and a specific action creator (addTodo)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps3(dispatch: Dispatch) {
+    return bindActionCreators({ addTodo }, dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
+
+// Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps4(dispatch: Dispatch) {
+    return {
+        todoActions: bindActionCreators(todoActionCreators, dispatch),
+        counterActions: bindActionCreators(counterActionCreators, dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
+
+// Inject todos, and todoActionCreators and counterActionCreators together as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps5(dispatch: Dispatch) {
+    return {
+        actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
+
+// Inject todos, and all todoActionCreators and counterActionCreators directly as props
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps6(dispatch: Dispatch) {
+    return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps6)(TodoApp);
+
+// Inject todos of a specific user depending on props
+
+function mapStateToProps3(state: TodoState, ownProps: TodoProps): TodoState {
+    return { todos: state.todos[ownProps.userId] };
+}
+
+connect(mapStateToProps3)(TodoApp);
+
+// Inject todos of a specific user depending on props, and inject props.userId into the action
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState {
+    return objectAssign({}, ownProps, {
+        todos: stateProps.todos[ownProps.userId],
+        addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
+    });
+}
+
+connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
+
+
+
diff --git a/react-redux/react-redux-tests.tsx.tscparams b/react-redux/react-redux-tests.tsx.tscparams
new file mode 100644
index 000000000..c90abf04f
--- /dev/null
+++ b/react-redux/react-redux-tests.tsx.tscparams
@@ -0,0 +1 @@
+--target es5 --noImplicitAny --experimentalDecorators --jsx react
diff --git a/react-redux/react-redux.d.ts b/react-redux/react-redux.d.ts
new file mode 100644
index 000000000..f1ef5458e
--- /dev/null
+++ b/react-redux/react-redux.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for react-redux 2.1.2
+// Project: https://github.com/rackt/react-redux
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+/// <reference path="../redux/redux.d.ts" />
+
+declare module "react-redux" {
+  import { Component } from 'react';
+  import { Store, Dispatch, ActionCreator } from 'redux';
+
+  export interface ClassDecorator {
+    <TFunction extends Function>(target: TFunction): TFunction|void;
+  }
+
+  /**
+   * Connects a React component to a Redux store.
+   * @param mapStateToProps
+   * @param mapDispatchToProps
+   * @param mergeProps
+   * @param options
+     */
+  export function connect(mapStateToProps?: MapStateToProps,
+                          mapDispatchToProps?: MapDispatchToPropsFunction|MapDispatchToPropsObject,
+                          mergeProps?: MergeProps,
+                          options?: Options): ClassDecorator;
+
+  interface MapStateToProps {
+    (state: any, ownProps?: any): any;
+  }
+
+  interface MapDispatchToPropsFunction {
+    (dispatch: Dispatch, ownProps?: any): any;
+  }
+
+  interface MapDispatchToPropsObject {
+    [name: string]: ActionCreator;
+  }
+
+  interface MergeProps {
+    (stateProps: any, dispatchProps: any, ownProps: any): any;
+  }
+
+  interface Options {
+    /**
+     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+     * preventing unnecessary updates, assuming that the component is a “pure” component
+     * and does not rely on any input or state other than its props and the selected Redux store’s state.
+     * Defaults to true.
+     * @default true
+     */
+    pure: boolean;
+  }
+
+  export interface Property {
+    /**
+     * The single Redux store in your application.
+     */
+    store?: Store;
+    children?: Function;
+  }
+
+  /**
+   * Makes the Redux store available to the connect() calls in the component hierarchy below.
+   */
+  export class Provider extends Component<Property, {}> { }
+}
diff --git a/react-router/react-router-test.ts b/react-router/react-router-test.ts
index 62180a258..115c8b77f 100644
--- a/react-router/react-router-test.ts
+++ b/react-router/react-router-test.ts
@@ -312,12 +312,18 @@ 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) => {
+        var v3: Router.Router = Router.run(React.createElement(Router.Route, null), '/foo/bar', (Handler, state) => {
             React.render(React.createElement(Handler, null), document.body);
         });
-        var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
+
+        // React.createFactory() version
+        var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        var v5: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        var v6: Router.Router = Router.run(React.createFactory(Router.Route)(), '/foo/bar', (Handler, state) => {
             React.render(React.createElement(Handler, null), document.body);
         });
     }
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index d8dd12c97..4cebcfab3 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path='../react/react.d.ts' />
-///<reference path='../react/react-addons.d.ts' />
 
 declare module ReactRouter {
     import React = __React;
@@ -114,13 +113,12 @@ declare module ReactRouter {
     // Components
     // ----------------------------------------------------------------------
     // Link
-    interface LinkProp {
+    interface LinkProp extends React.HTMLAttributes {
         activeClassName?: string;
         activeStyle?: {};
         to: string;
         params?: {};
         query?: {};
-        onClick?: Function;
     }
     interface Link extends React.ReactElement<LinkProp>, Navigation, State {
         handleClick(event: any): void;
@@ -174,7 +172,7 @@ declare module ReactRouter {
 
     function create(options: RouterCreateOption): Router;
     function run(routes: Route, callback: RouterRunCallback): Router;
-    function run(routes: Route, location: LocationBase, callback: RouterRunCallback): Router;
+    function run(routes: Route, location: LocationBase | string, callback: RouterRunCallback): Router;
 
 
     //
diff --git a/react-spinkit/react-spinkit-tests.tsx b/react-spinkit/react-spinkit-tests.tsx
new file mode 100644
index 000000000..eb84781e4
--- /dev/null
+++ b/react-spinkit/react-spinkit-tests.tsx
@@ -0,0 +1,7 @@
+/// <reference path="react-spinkit.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+import Spinner from 'react-spinkit';
+import * as React from 'react';
+
+let spinner = <Spinner spinnerName='double-bounce' />;
diff --git a/react-spinkit/react-spinkit.d.ts b/react-spinkit/react-spinkit.d.ts
new file mode 100644
index 000000000..666def38e
--- /dev/null
+++ b/react-spinkit/react-spinkit.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for react-spinkit 1.1.4
+// Project: https://github.com/KyleAMathews/react-spinkit
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+
+declare module "react-spinkit" {
+    import { Component } from 'react';
+
+    interface Props {
+        spinnerName?: string;
+    }
+
+    class Spinner extends Component<Props, {}> { }
+
+    export default Spinner;
+}
+
diff --git a/react/README.md b/react/README.md
index 1f4cb7f03..b7ff4b55e 100644
--- a/react/README.md
+++ b/react/README.md
@@ -1,11 +1,5 @@
 # React v0.13.3 Type Definitions
 
 This folder contains the following `.d.ts` files:
-* `react.d.ts` declares the external module `"react"`
-* `react-addons.d.ts` declares the external module `"react/addons"`
-* `react-global.d.ts` declares the internal module `React` in the global namespace
-* `react-addons-global.d.ts` extends the global `React` module with `addons`
-
-Interfaces are duplicated between these files; please take care to keep them in sync when making changes.
-See [#3615](https://github.com/borisyankov/DefinitelyTyped/pull/3615) for relevant discussion.
-
+* `react.d.ts` declares the module `"react"` and `"react/addons"`
+* `react-global.d.ts` declares the global namespace `React` (only include this if you are actually using the global `React`)
diff --git a/react/react-addons-global.d.ts b/react/react-addons-global.d.ts
deleted file mode 100644
index 508ae0522..000000000
--- a/react/react-addons-global.d.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-// Type definitions for ReactWithAddons v0.13.1 (internal module)
-// 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-global.d.ts" />
-
-declare module React {
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpec {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-        // [key: string]: UpdateSpec;
-    }
-
-    interface UpdateArraySpec extends UpdateSpec {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    module ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    module ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    module ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-}
-
diff --git a/react/react-addons-tests.ts b/react/react-addons-tests.ts
index 6976d9959..4d8ed3212 100644
--- a/react/react-addons-tests.ts
+++ b/react/react-addons-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="react-addons.d.ts" />
+/// <reference path="react.d.ts" />
 import React = require("react/addons");
 
 import TestUtils = React.addons.TestUtils;
@@ -57,9 +57,10 @@ var ClassicComponent: React.ClassicComponentClass<Props> =
                 seconds: this.props.foo
             };
         },
-        reset: () => {
-            this.replaceState(this.getInitialState());
-        },
+        // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+        // reset: () => {
+        //     this.replaceState(this.getInitialState());
+        // },
         render: () => {
             return React.DOM.div(null,
                 React.DOM.input({
@@ -71,32 +72,34 @@ var ClassicComponent: React.ClassicComponentClass<Props> =
 
 class ModernComponent extends React.Component<Props, State>
     implements React.ChildContextProvider<ChildContext> {
-    
+
     static propTypes: React.ValidationMap<Props> = {
         foo: React.PropTypes.number
     }
-    
+
     static contextTypes: React.ValidationMap<Context> = {
         someValue: React.PropTypes.string
     }
-    
+
     static childContextTypes: React.ValidationMap<ChildContext> = {
         someOtherValue: React.PropTypes.string
     }
     
+    static defaultProps: Props;
+
     context: Context;
-    
+
     getChildContext() {
         return {
             someOtherValue: 'foo'
         }
     }
-    
+
     state = {
         inputValue: this.context.someValue,
         seconds: this.props.foo
     }
-    
+
     reset() {
         this.setState({
             inputValue: this.context.someValue,
@@ -105,7 +108,7 @@ class ModernComponent extends React.Component<Props, State>
     }
 
     private _input: React.HTMLComponent;
-    
+
     render() {
         return React.DOM.div(null,
             React.DOM.input({
@@ -206,7 +209,7 @@ myComponent.reset();
 // --------------------------------------------------------------------------
 
 var children: any[] = ["Hello world", [null], React.DOM.span(null)];
-var divStyle = { // CSSProperties
+var divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
 };
diff --git a/react/react-addons.d.ts b/react/react-addons.d.ts
deleted file mode 100644
index d9915e502..000000000
--- a/react/react-addons.d.ts
+++ /dev/null
@@ -1,1054 +0,0 @@
-// Type definitions for ReactWithAddons v0.13.1 (external module)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "react/addons" {
-    //
-    // 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>;
-
-    //
-    // 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: {};
-        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;
-        defaultChecked?: boolean;
-        defaultValue?: 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 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;
-        height?: number | 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;
-        width?: number | 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
-        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;
-        svg: 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;
-    }
-
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpec {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-        // [key: string]: UpdateSpec;
-    }
-
-    interface UpdateArraySpec extends UpdateSpec {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    module ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    module ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    module ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-
-    //
-    // 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;
-    }
-}
diff --git a/react/react-global-tests.ts b/react/react-global-tests.ts
new file mode 100644
index 000000000..0b20e4650
--- /dev/null
+++ b/react/react-global-tests.ts
@@ -0,0 +1,369 @@
+/// <reference path="react-global.d.ts" />
+
+interface Props extends React.Props<MyComponent> {
+    hello: string;
+    world?: string;
+    foo: number;
+    bar: boolean;
+}
+
+interface State {
+    inputValue?: string;
+    seconds?: number;
+}
+
+interface Context {
+    someValue?: string;
+}
+
+interface ChildContext {
+    someOtherValue: string;
+}
+
+interface MyComponent extends React.Component<Props, State> {
+    reset(): void;
+}
+
+var props: Props = {
+    key: 42,
+    ref: "myComponent42",
+    hello: "world",
+    foo: 42,
+    bar: true
+};
+
+var container: Element;
+
+//
+// Top-Level API
+// --------------------------------------------------------------------------
+
+var ClassicComponent: React.ClassicComponentClass<Props> =
+    React.createClass<Props, State>({
+        getDefaultProps() {
+            return <Props>{
+                hello: undefined,
+                world: "peace",
+                foo: undefined,
+                bar: undefined,
+            };
+        },
+        getInitialState() {
+            return {
+                inputValue: this.context.someValue,
+                seconds: this.props.foo
+            };
+        },
+        reset() {
+            this.replaceState(this.getInitialState());
+        },
+        render() {
+            return React.DOM.div(null,
+                React.DOM.input({
+                    ref: input => this._input = input,
+                    value: this.state.inputValue
+                }));
+        }
+    });
+
+class ModernComponent extends React.Component<Props, State>
+    implements React.ChildContextProvider<ChildContext> {
+    
+    static propTypes: React.ValidationMap<Props> = {
+        foo: React.PropTypes.number
+    }
+    
+    static contextTypes: React.ValidationMap<Context> = {
+        someValue: React.PropTypes.string
+    }
+    
+    static childContextTypes: React.ValidationMap<ChildContext> = {
+        someOtherValue: React.PropTypes.string
+    }
+    
+    static defaultProps: Props;
+    
+    context: Context;
+    
+    getChildContext() {
+        return {
+            someOtherValue: 'foo'
+        }
+    }
+    
+    state = {
+        inputValue: this.context.someValue,
+        seconds: this.props.foo
+    }
+    
+    reset() {
+        this.setState({
+            inputValue: this.context.someValue,
+            seconds: this.props.foo
+        });
+    }
+
+    private _input: React.HTMLComponent;
+    
+    render() {
+        return React.DOM.div(null,
+            React.DOM.input({
+                ref: input => this._input = input,
+                value: this.state.inputValue
+            }));
+    }
+}
+
+// React.createFactory
+var factory: React.Factory<Props> =
+    React.createFactory(ModernComponent);
+var factoryElement: React.ReactElement<Props> =
+    factory(props);
+
+var classicFactory: React.ClassicFactory<Props> =
+    React.createFactory(ClassicComponent);
+var classicFactoryElement: React.ClassicElement<Props> =
+    classicFactory(props);
+
+var domFactory: React.DOMFactory<any> =
+    React.createFactory("foo");
+var domFactoryElement: React.DOMElement<any> =
+    domFactory();
+
+// React.createElement
+var element: React.ReactElement<Props> =
+    React.createElement(ModernComponent, props);
+var classicElement: React.ClassicElement<Props> =
+    React.createElement(ClassicComponent, props);
+var domElement: React.HTMLElement =
+    React.createElement("div");
+
+// React.cloneElement
+var clonedElement: React.ReactElement<Props> =
+    React.cloneElement(element, props);
+var clonedClassicElement: React.ClassicElement<Props> =
+    React.cloneElement(classicElement, props);
+var clonedDOMElement: React.HTMLElement =
+    React.cloneElement(domElement);
+
+// React.render
+var component: React.Component<Props, any> =
+    React.render(element, container);
+var classicComponent: React.ClassicComponent<Props, any> =
+    React.render(classicElement, container);
+var domComponent: React.DOMComponent<any> =
+    React.render(domElement, container);
+
+// Other Top-Level API
+var unmounted: boolean = React.unmountComponentAtNode(container);
+var str: string = React.renderToString(element);
+var markup: string = React.renderToStaticMarkup(element);
+var notValid: boolean = React.isValidElement(props); // false
+var isValid = React.isValidElement(element); // true
+React.initializeTouchEvents(true);
+var domNode: Element = React.findDOMNode(component);
+domNode = React.findDOMNode(domNode);
+
+//
+// React Elements
+// --------------------------------------------------------------------------
+
+var type = element.type;
+var elementProps: Props = element.props;
+var key = element.key;
+
+//
+// React Components
+// --------------------------------------------------------------------------
+
+var displayName: string = ClassicComponent.displayName;
+var defaultProps: Props = ClassicComponent.getDefaultProps();
+var propTypes: React.ValidationMap<Props> = ClassicComponent.propTypes;
+
+//
+// Component API
+// --------------------------------------------------------------------------
+
+// modern
+var componentState: State = component.state;
+component.setState({ inputValue: "!!!" });
+component.forceUpdate();
+
+// classic
+var htmlElement: Element = classicComponent.getDOMNode();
+var divElement: HTMLDivElement = classicComponent.getDOMNode<HTMLDivElement>();
+var isMounted: boolean = classicComponent.isMounted();
+classicComponent.setProps(elementProps);
+classicComponent.replaceProps(props);
+classicComponent.replaceState({ inputValue: "???", seconds: 60 });
+
+var myComponent = <MyComponent>component;
+myComponent.reset();
+
+//
+// Attributes
+// --------------------------------------------------------------------------
+
+var children: any[] = ["Hello world", [null], React.DOM.span(null)];
+var divStyle: React.CSSProperties = { // CSSProperties
+    flex: "1 1 main-size",
+    backgroundImage: "url('hello.png')"
+};
+var htmlAttr: React.HTMLAttributes = {
+    key: 36,
+    ref: "htmlComponent",
+    children: children,
+    className: "test-attr",
+    style: divStyle,
+    onClick: (event: React.MouseEvent) => {
+        event.preventDefault();
+        event.stopPropagation();
+    },
+    dangerouslySetInnerHTML: {
+        __html: "<strong>STRONG</strong>"
+    }
+};
+React.DOM.div(htmlAttr);
+React.DOM.span(htmlAttr);
+React.DOM.input(htmlAttr);
+
+React.DOM.svg({ viewBox: "0 0 48 48" },
+    React.DOM.rect({
+      x: 22,
+      y: 10,
+      width: 4,
+      height: 28
+    }),
+    React.DOM.rect({
+      x: 10,
+      y: 22,
+      width: 28,
+      height: 4
+    }));
+
+
+//
+// React.PropTypes
+// --------------------------------------------------------------------------
+
+var PropTypesSpecification: React.ComponentSpec<any, any> = {
+    propTypes: {
+        optionalArray: React.PropTypes.array,
+        optionalBool: React.PropTypes.bool,
+        optionalFunc: React.PropTypes.func,
+        optionalNumber: React.PropTypes.number,
+        optionalObject: React.PropTypes.object,
+        optionalString: React.PropTypes.string,
+        optionalNode: React.PropTypes.node,
+        optionalElement: React.PropTypes.element,
+        optionalMessage: React.PropTypes.instanceOf(Date),
+        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
+        optionalUnion: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.number,
+            React.PropTypes.instanceOf(Date)
+        ]),
+        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+        optionalObjectWithShape: React.PropTypes.shape({
+            color: React.PropTypes.string,
+            fontSize: React.PropTypes.number
+        }),
+        requiredFunc: React.PropTypes.func.isRequired,
+        requiredAny: React.PropTypes.any.isRequired,
+        customProp: function(props: any, propName: string, componentName: string) {
+            if (!/matchme/.test(props[propName])) {
+                return new Error("Validation failed!");
+            }
+            return null;
+        }
+    },
+    render: (): React.ReactElement<any> => {
+        return null;
+    }
+};
+
+//
+// ContextTypes
+// --------------------------------------------------------------------------
+
+var ContextTypesSpecification: React.ComponentSpec<any, any> = {
+    contextTypes: {
+        optionalArray: React.PropTypes.array,
+        optionalBool: React.PropTypes.bool,
+        optionalFunc: React.PropTypes.func,
+        optionalNumber: React.PropTypes.number,
+        optionalObject: React.PropTypes.object,
+        optionalString: React.PropTypes.string,
+        optionalNode: React.PropTypes.node,
+        optionalElement: React.PropTypes.element,
+        optionalMessage: React.PropTypes.instanceOf(Date),
+        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
+        optionalUnion: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.number,
+            React.PropTypes.instanceOf(Date)
+        ]),
+        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+        optionalObjectWithShape: React.PropTypes.shape({
+            color: React.PropTypes.string,
+            fontSize: React.PropTypes.number
+        }),
+        requiredFunc: React.PropTypes.func.isRequired,
+        requiredAny: React.PropTypes.any.isRequired,
+        customProp: function(props: any, propName: string, componentName: string) {
+            if (!/matchme/.test(props[propName])) {
+                return new Error("Validation failed!");
+            }
+            return null;
+        }
+    },
+    render: (): React.ReactElement<any> => {
+        return null;
+    }
+};
+
+//
+// React.Children
+// --------------------------------------------------------------------------
+
+var childMap: { [key: string]: number } =
+    React.Children.map<number>(children, (child) => { return 42; });
+React.Children.forEach(children, (child) => {});
+var nChildren: number = React.Children.count(children);
+var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
+
+//
+// Example from http://facebook.github.io/react/
+// --------------------------------------------------------------------------
+
+interface TimerState {
+    secondsElapsed: number;
+}
+class Timer extends React.Component<{}, TimerState> {
+    state = {
+        secondsElapsed: 0
+    }
+    private _interval: number;
+    tick() {
+        this.setState((prevState, props) => ({
+            secondsElapsed: prevState.secondsElapsed + 1
+        }));
+    }
+    componentDidMount() {
+        this._interval = setInterval(() => this.tick(), 1000);
+    }
+    componentWillUnmount() {
+        clearInterval(this._interval);
+    }
+    render() {
+        return React.DOM.div(
+            null,
+            "Seconds Elapsed: ",
+            this.state.secondsElapsed
+        );
+    }
+}
+React.render(React.createElement(Timer), container);
+
diff --git a/react/react-global.d.ts b/react/react-global.d.ts
index f8b376355..1728ba2fc 100644
--- a/react/react-global.d.ts
+++ b/react/react-global.d.ts
@@ -1,935 +1,285 @@
-// Type definitions for React v0.13.1 (internal module)
+// Type definitions for React v0.13.3 (namespace)
 // 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 {
+/// <reference path="react.d.ts" />
+
+import React = __React;
+
+declare namespace __React {
     //
-    // React Elements
+    // React.addons
     // ----------------------------------------------------------------------
 
-    type ReactType = ComponentClass<any> | string;
+    export module addons {
+        export var CSSTransitionGroup: CSSTransitionGroup;
+        export var TransitionGroup: TransitionGroup;
 
-    interface ReactElement<P> {
-        type: string | ComponentClass<P>;
-        props: P;
-        key: string | number;
-        ref: string | ((component: Component<P, any>) => any);
+        export var LinkedStateMixin: LinkedStateMixin;
+        export var PureRenderMixin: PureRenderMixin;
+
+        export function batchedUpdates<A, B>(
+            callback: (a: A, b: B) => any, a: A, b: B): void;
+        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        export function batchedUpdates(callback: () => any): void;
+
+        // deprecated: use petehunt/react-classset or JedWatson/classnames
+        export function classSet(cx: { [key: string]: boolean }): string;
+        export function classSet(...classList: string[]): string;
+
+        export function cloneWithProps<P>(
+            element: DOMElement<P>, props: P): DOMElement<P>;
+        export function cloneWithProps<P>(
+            element: ClassicElement<P>, props: P): ClassicElement<P>;
+        export function cloneWithProps<P>(
+            element: ReactElement<P>, props: P): ReactElement<P>;
+
+        export function createFragment(
+            object: { [key: string]: ReactNode }): ReactFragment;
+
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+
+        // Development tools
+        export import Perf = ReactPerf;
+        export import TestUtils = ReactTestUtils;
     }
 
-    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
+    // React.addons (Transitions)
     // ----------------------------------------------------------------------
 
-    interface Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactElement<P>;
+    interface TransitionGroupProps {
+        component?: ReactType;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
     }
 
-    interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string;
+        transitionAppear?: boolean;
+        transitionEnter?: boolean;
+        transitionLeave?: boolean;
     }
 
-    interface DOMFactory<P> extends ClassicFactory<P> {
-        (props?: P, ...children: ReactNode[]): DOMElement<P>;
+    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+    type TransitionGroup = ComponentClass<TransitionGroupProps>;
+
+    //
+    // React.addons (Mixins)
+    // ----------------------------------------------------------------------
+
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
     }
 
-    type HTMLFactory = DOMFactory<HTMLAttributes>;
-    type SVGFactory = DOMFactory<SVGAttributes>;
-    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
+    interface LinkedStateMixin extends Mixin<any, any> {
+        linkState<T>(key: string): ReactLink<T>;
+    }
+
+    interface PureRenderMixin extends Mixin<any, any> {
+    }
 
     //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
+    // Reat.addons.update
     // ----------------------------------------------------------------------
 
-    type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
 
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean;
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
 
     //
-    // Top Level API
+    // React.addons.Perf
     // ----------------------------------------------------------------------
 
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+    interface ComponentPerfContext {
+        current: string;
+        owner: string;
+    }
 
-    function createFactory<P>(type: string): DOMFactory<P>;
-    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
-    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
+    interface NumericPerfContext {
+        [key: string]: number;
+    }
 
-    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;
-        render(): JSX.Element;
-        props: P;
-        state: S;
-        context: {};
-        refs: {
-            [key: string]: Component<any, any>
+    interface Measurements {
+        exclusive: NumericPerfContext;
+        inclusive: NumericPerfContext;
+        render: NumericPerfContext;
+        counts: NumericPerfContext;
+        writes: NumericPerfContext;
+        displayNames: {
+            [key: string]: ComponentPerfContext;
         };
+        totalTime: number;
     }
 
-    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;
+    module ReactPerf {
+        export function start(): void;
+        export function stop(): void;
+        export function printInclusive(measurements: Measurements[]): void;
+        export function printExclusive(measurements: Measurements[]): void;
+        export function printWasted(measurements: Measurements[]): void;
+        export function printDOM(measurements: Measurements[]): void;
+        export function getLastMeasurements(): Measurements[];
     }
 
     //
-    // Class Interfaces
+    // React.addons.TestUtils
     // ----------------------------------------------------------------------
 
-    interface ComponentClass<P> {
-        new(props?: P, context?: any): Component<P, any>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-        defaultProps?: P;
+    interface MockedComponentClass {
+        new(): any;
     }
 
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
-        new(props?: P, context?: any): ClassicComponent<P, any>;
-        getDefaultProps?(): P;
-        displayName?: string;
+    module ReactTestUtils {
+        export import Simulate = ReactSimulate;
+
+        export function renderIntoDocument<P>(
+            element: ReactElement<P>): Component<P, any>;
+        export function renderIntoDocument<C extends Component<any, any>>(
+            element: ReactElement<any>): C;
+
+        export function mockComponent(
+            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
+
+        export function isElementOfType(
+            element: ReactElement<any>, type: ReactType): boolean;
+        export function isTextComponent(instance: Component<any, any>): boolean;
+        export function isDOMComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponentWithType(
+            instance: Component<any, any>,
+            type: ComponentClass<any>): boolean;
+
+        export function findAllInRenderedTree(
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
+
+        export function scryRenderedDOMComponentsWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>;
+
+        export function scryRenderedDOMComponentsWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>;
+
+        export function scryRenderedComponentsWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>[];
+        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C[];
+
+        export function findRenderedComponentWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>;
+        export function findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C;
+
+        export function createRenderer(): ShallowRenderer;
     }
 
-    //
-    // 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 SyntheticEventData {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
     }
 
-    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 EventSimulator {
+        (element: Element, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
     }
 
-    interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any>;
+    module ReactSimulate {
+        export var blur: EventSimulator;
+        export var change: EventSimulator;
+        export var click: EventSimulator;
+        export var cut: EventSimulator;
+        export var doubleClick: EventSimulator;
+        export var drag: EventSimulator;
+        export var dragEnd: EventSimulator;
+        export var dragEnter: EventSimulator;
+        export var dragExit: EventSimulator;
+        export var dragLeave: EventSimulator;
+        export var dragOver: EventSimulator;
+        export var dragStart: EventSimulator;
+        export var drop: EventSimulator;
+        export var focus: EventSimulator;
+        export var input: EventSimulator;
+        export var keyDown: EventSimulator;
+        export var keyPress: EventSimulator;
+        export var keyUp: EventSimulator;
+        export var mouseDown: EventSimulator;
+        export var mouseEnter: EventSimulator;
+        export var mouseLeave: EventSimulator;
+        export var mouseMove: EventSimulator;
+        export var mouseOut: EventSimulator;
+        export var mouseOver: EventSimulator;
+        export var mouseUp: EventSimulator;
+        export var paste: EventSimulator;
+        export var scroll: EventSimulator;
+        export var submit: EventSimulator;
+        export var touchCancel: EventSimulator;
+        export var touchEnd: EventSimulator;
+        export var touchMove: EventSimulator;
+        export var touchStart: EventSimulator;
+        export var wheel: EventSimulator;
     }
 
-    //
-    // 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;
-        defaultChecked?: boolean;
-        defaultValue?: 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;
-        height?: number | 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;
-        width?: number | 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;
+    class ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
     }
 }
diff --git a/react/react-tests.ts b/react/react-tests.ts
index a4d2c4f7a..053a17eb9 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -41,24 +41,24 @@ var container: Element;
 
 var ClassicComponent: React.ClassicComponentClass<Props> =
     React.createClass<Props, State>({
-        getDefaultProps: () => {
+        getDefaultProps() {
             return <Props>{
                 hello: undefined,
                 world: "peace",
                 foo: undefined,
-                bar: undefined
+                bar: undefined,
             };
         },
-        getInitialState: () => {
+        getInitialState() {
             return {
                 inputValue: this.context.someValue,
                 seconds: this.props.foo
             };
         },
-        reset: () => {
+        reset() {
             this.replaceState(this.getInitialState());
         },
-        render: () => {
+        render() {
             return React.DOM.div(null,
                 React.DOM.input({
                     ref: input => this._input = input,
@@ -82,6 +82,8 @@ class ModernComponent extends React.Component<Props, State>
         someOtherValue: React.PropTypes.string
     }
     
+    static defaultProps: Props;
+    
     context: Context;
     
     getChildContext() {
@@ -204,7 +206,7 @@ myComponent.reset();
 // --------------------------------------------------------------------------
 
 var children: any[] = ["Hello world", [null], React.DOM.span(null)];
-var divStyle = { // CSSProperties
+var divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
 };
diff --git a/react/react.d.ts b/react/react.d.ts
index 218c6c94a..4fd7d5e77 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for React v0.13.1 (external module)
+// Type definitions for React v0.13.3
 // 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 {
+declare namespace __React {
     //
     // React Elements
     // ----------------------------------------------------------------------
@@ -132,10 +132,15 @@ declare module __React {
 
     // Base component for plain JS classes
     class Component<P, S> implements ComponentLifecycle<P, S> {
+        static propTypes: ValidationMap<any>;
+        static contextTypes: ValidationMap<any>;
+        static childContextTypes: ValidationMap<any>;
+        static defaultProps: Props<any>;
+
         constructor(props?: P, context?: any);
         setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
         setState(state: S, callback?: () => any): void;
-        forceUpdate(): void;
+        forceUpdate(callBack?: () => any): void;
         render(): JSX.Element;
         props: P;
         state: S;
@@ -215,6 +220,8 @@ declare module __React {
 
     interface ComponentSpec<P, S> extends Mixin<P, S> {
         render(): ReactElement<any>;
+
+        [propertyName: string]: any;
     }
 
     //
@@ -334,7 +341,7 @@ declare module __React {
         ref?: string | ((component: T) => any);
     }
 
-    interface DOMAttributes extends Props<DOMComponent<any>> {
+    interface DOMAttributesBase<T> extends Props<T> {
         onCopy?: ClipboardEventHandler;
         onCut?: ClipboardEventHandler;
         onPaste?: ClipboardEventHandler;
@@ -370,11 +377,17 @@ declare module __React {
         onScroll?: UIEventHandler;
         onWheel?: WheelEventHandler;
 
+        className?: string;
+        id?: string;
+
         dangerouslySetInnerHTML?: {
             __html: string;
         };
     }
 
+    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
+    }
+
     // This interface is not complete. Only properties accepting
     // unitless numbers are listed here (see CSSProperty.js in React)
     interface CSSProperties {
@@ -394,15 +407,17 @@ declare module __React {
         zIndex?: number;
         zoom?: number;
 
+        fontSize?: number | string;
+
         // SVG-related properties
         fillOpacity?: number;
         strokeOpacity?: number;
         strokeWidth?: number;
+
+        [propertyName: string]: any;
     }
 
-    interface HTMLAttributes extends DOMAttributes {
-        ref?: string | ((component: HTMLComponent) => void);
-
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
         accept?: string;
         acceptCharset?: string;
         accessKey?: string;
@@ -419,7 +434,6 @@ declare module __React {
         charSet?: string;
         checked?: boolean;
         classID?: string;
-        className?: string;
         cols?: number;
         colSpan?: number;
         content?: string;
@@ -454,7 +468,6 @@ declare module __React {
         htmlFor?: string;
         httpEquiv?: string;
         icon?: string;
-        id?: string;
         label?: string;
         lang?: string;
         list?: string;
@@ -522,6 +535,9 @@ declare module __React {
         unselectable?: boolean;
     }
 
+    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
     interface SVGElementAttributes extends HTMLAttributes {
         viewBox?: string;
         preserveAspectRatio?: string;
@@ -562,6 +578,7 @@ declare module __React {
         stroke?: string;
         strokeDasharray?: string;
         strokeLinecap?: string;
+        strokeMiterlimit?: string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         textAnchor?: string;
@@ -755,8 +772,8 @@ declare module __React {
     // ----------------------------------------------------------------------
 
     interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild) => T): { [key:string]: T };
-        forEach(children: ReactNode, fn: (child: ReactChild) => any): void;
+        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
         count(children: ReactNode): number;
         only(children: ReactNode): ReactChild;
     }
@@ -794,7 +811,1086 @@ declare module "react" {
     export = __React;
 }
 
-declare module JSX {
+declare module "react/addons" {
+    //
+    // 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> {
+        static propTypes: ValidationMap<any>;
+        static contextTypes: ValidationMap<any>;
+        static childContextTypes: ValidationMap<any>;
+        static defaultProps: Props<any>;
+
+        constructor(props?: P, context?: any);
+        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+        setState(state: S, callback?: () => any): void;
+        forceUpdate(callBack?: () => any): void;
+        render(): JSX.Element;
+        props: P;
+        state: S;
+        context: {};
+        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>;
+
+        [propertyName: string]: 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 DOMAttributesBase<T> extends Props<T> {
+        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;
+
+        className?: string;
+        id?: string;
+
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+    }
+
+    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
+    }
+
+    // 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;
+
+        fontSize?: number | string;
+
+        // SVG-related properties
+        fillOpacity?: number;
+        strokeOpacity?: number;
+        strokeWidth?: number;
+
+        [propertyName: string]: any;
+    }
+
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
+        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;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: any;
+        coords?: string;
+        crossOrigin?: string;
+        data?: string;
+        dateTime?: string;
+        defaultChecked?: boolean;
+        defaultValue?: 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;
+        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 HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
+    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;
+        height?: number | 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;
+        strokeMiterlimit?: string;
+        strokeOpacity?: number | string;
+        strokeWidth?: number | string;
+        textAnchor?: string;
+        transform?: string;
+        version?: string;
+        viewBox?: string;
+        width?: number | 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, index: number) => T): { [key:string]: T };
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => 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;
+    }
+
+    //
+    // React.addons
+    // ----------------------------------------------------------------------
+
+    export module addons {
+        export var CSSTransitionGroup: CSSTransitionGroup;
+        export var TransitionGroup: TransitionGroup;
+
+        export var LinkedStateMixin: LinkedStateMixin;
+        export var PureRenderMixin: PureRenderMixin;
+
+        export function batchedUpdates<A, B>(
+            callback: (a: A, b: B) => any, a: A, b: B): void;
+        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+        export function batchedUpdates(callback: () => any): void;
+
+        // deprecated: use petehunt/react-classset or JedWatson/classnames
+        export function classSet(cx: { [key: string]: boolean }): string;
+        export function classSet(...classList: string[]): string;
+
+        export function cloneWithProps<P>(
+            element: DOMElement<P>, props: P): DOMElement<P>;
+        export function cloneWithProps<P>(
+            element: ClassicElement<P>, props: P): ClassicElement<P>;
+        export function cloneWithProps<P>(
+            element: ReactElement<P>, props: P): ReactElement<P>;
+
+        export function createFragment(
+            object: { [key: string]: ReactNode }): ReactFragment;
+
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+
+        // Development tools
+        export import Perf = ReactPerf;
+        export import TestUtils = ReactTestUtils;
+    }
+
+    //
+    // React.addons (Transitions)
+    // ----------------------------------------------------------------------
+
+    interface TransitionGroupProps {
+        component?: ReactType;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+    }
+
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string;
+        transitionAppear?: boolean;
+        transitionEnter?: boolean;
+        transitionLeave?: boolean;
+    }
+
+    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+    type TransitionGroup = ComponentClass<TransitionGroupProps>;
+
+    //
+    // React.addons (Mixins)
+    // ----------------------------------------------------------------------
+
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    interface LinkedStateMixin extends Mixin<any, any> {
+        linkState<T>(key: string): ReactLink<T>;
+    }
+
+    interface PureRenderMixin extends Mixin<any, any> {
+    }
+
+    //
+    // Reat.addons.update
+    // ----------------------------------------------------------------------
+
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
+
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
+
+    //
+    // React.addons.Perf
+    // ----------------------------------------------------------------------
+
+    interface ComponentPerfContext {
+        current: string;
+        owner: string;
+    }
+
+    interface NumericPerfContext {
+        [key: string]: number;
+    }
+
+    interface Measurements {
+        exclusive: NumericPerfContext;
+        inclusive: NumericPerfContext;
+        render: NumericPerfContext;
+        counts: NumericPerfContext;
+        writes: NumericPerfContext;
+        displayNames: {
+            [key: string]: ComponentPerfContext;
+        };
+        totalTime: number;
+    }
+
+    module ReactPerf {
+        export function start(): void;
+        export function stop(): void;
+        export function printInclusive(measurements: Measurements[]): void;
+        export function printExclusive(measurements: Measurements[]): void;
+        export function printWasted(measurements: Measurements[]): void;
+        export function printDOM(measurements: Measurements[]): void;
+        export function getLastMeasurements(): Measurements[];
+    }
+
+    //
+    // React.addons.TestUtils
+    // ----------------------------------------------------------------------
+
+    interface MockedComponentClass {
+        new(): any;
+    }
+
+    module ReactTestUtils {
+        export import Simulate = ReactSimulate;
+
+        export function renderIntoDocument<P>(
+            element: ReactElement<P>): Component<P, any>;
+        export function renderIntoDocument<C extends Component<any, any>>(
+            element: ReactElement<any>): C;
+
+        export function mockComponent(
+            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
+
+        export function isElementOfType(
+            element: ReactElement<any>, type: ReactType): boolean;
+        export function isTextComponent(instance: Component<any, any>): boolean;
+        export function isDOMComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponent(instance: Component<any, any>): boolean;
+        export function isCompositeComponentWithType(
+            instance: Component<any, any>,
+            type: ComponentClass<any>): boolean;
+
+        export function findAllInRenderedTree(
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
+
+        export function scryRenderedDOMComponentsWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithClass(
+            tree: Component<any, any>,
+            className: string): DOMComponent<any>;
+
+        export function scryRenderedDOMComponentsWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>[];
+        export function findRenderedDOMComponentWithTag(
+            tree: Component<any, any>,
+            tagName: string): DOMComponent<any>;
+
+        export function scryRenderedComponentsWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>[];
+        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C[];
+
+        export function findRenderedComponentWithType<P>(
+            tree: Component<any, any>,
+            type: ComponentClass<P>): Component<P, {}>;
+        export function findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any>): C;
+
+        export function createRenderer(): ShallowRenderer;
+    }
+
+    interface SyntheticEventData {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
+    }
+
+    interface EventSimulator {
+        (element: Element, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
+    }
+
+    module ReactSimulate {
+        export var blur: EventSimulator;
+        export var change: EventSimulator;
+        export var click: EventSimulator;
+        export var cut: EventSimulator;
+        export var doubleClick: EventSimulator;
+        export var drag: EventSimulator;
+        export var dragEnd: EventSimulator;
+        export var dragEnter: EventSimulator;
+        export var dragExit: EventSimulator;
+        export var dragLeave: EventSimulator;
+        export var dragOver: EventSimulator;
+        export var dragStart: EventSimulator;
+        export var drop: EventSimulator;
+        export var focus: EventSimulator;
+        export var input: EventSimulator;
+        export var keyDown: EventSimulator;
+        export var keyPress: EventSimulator;
+        export var keyUp: EventSimulator;
+        export var mouseDown: EventSimulator;
+        export var mouseEnter: EventSimulator;
+        export var mouseLeave: EventSimulator;
+        export var mouseMove: EventSimulator;
+        export var mouseOut: EventSimulator;
+        export var mouseOver: EventSimulator;
+        export var mouseUp: EventSimulator;
+        export var paste: EventSimulator;
+        export var scroll: EventSimulator;
+        export var submit: EventSimulator;
+        export var touchCancel: EventSimulator;
+        export var touchEnd: EventSimulator;
+        export var touchMove: EventSimulator;
+        export var touchStart: EventSimulator;
+        export var wheel: EventSimulator;
+    }
+
+    class ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
+    }
+}
+
+declare namespace JSX {
     import React = __React;
 
     interface Element extends React.ReactElement<any> { }
diff --git a/redis/redis-tests.ts b/redis/redis-tests.ts
index 9c7003541..5acb02465 100644
--- a/redis/redis-tests.ts
+++ b/redis/redis-tests.ts
@@ -4,6 +4,7 @@ import redis = require('redis');
 
 var value: any;
 var valueArr: any[];
+var commandArr: any[][];
 var num: number;
 var str: string;
 var bool: boolean;
@@ -40,6 +41,7 @@ client.end();
 // Connection (http://redis.io/commands#connection)
 client.auth(str, resCallback);
 client.ping(numCallback);
+client.unref();
 
 // Strings (http://redis.io/commands#strings)
 client.append(str, str, numCallback);
@@ -49,9 +51,7 @@ client.set(str, str, strCallback);
 client.get(str, strCallback);
 client.exists(str, numCallback);
 
-client.publish(str, value);
-client.subscribe(str);
-
+// Event handlers
 client.on(str, messageHandler);
 client.once(str, messageHandler);
 
@@ -62,5 +62,31 @@ client.get(args);
 client.get(args, resCallback);
 client.set(args);
 client.set(args, resCallback);
+client.mset(args, resCallback);
 
 client.incr(str, resCallback);
+
+// Friendlier hash commands
+client.hgetall(str, resCallback);
+client.hmset(str, value, resCallback);
+client.hmset(str, str, str, str, str, resCallback);
+
+// Publish / Subscribe
+client.publish(str, value);
+client.subscribe(str);
+
+// Multi
+client.multi()
+    .scard(str)
+    .smembers(str)
+    .keys('*', resCallback)
+    .dbsize()
+    .exec(resCallback);
+
+client.multi(commandArr).exec();
+
+// Monitor mode
+client.monitor(resCallback);
+
+// Send command
+client.send_command(str, args, resCallback);
\ No newline at end of file
diff --git a/redis/redis.d.ts b/redis/redis.d.ts
index 8e9c97856..79caa6aa3 100644
--- a/redis/redis.d.ts
+++ b/redis/redis.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for redis
+// Type definitions for redis 0.12.1
 // Project: https://github.com/mranney/node_redis
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>, TANAKA Koichi <https://github.com/MugeSo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/redis.d.ts
@@ -8,347 +8,619 @@
 /// <reference path="../node/node.d.ts" />
 
 declare module "redis" {
-  export function createClient(port_arg: number, host_arg?: string, options?: ClientOpts): RedisClient;
-  export function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
-  export function createClient(options?: ClientOpts): RedisClient;
-	export function print(err: Error, reply: any): void;
-	export var debug_mode: boolean;
+    export function createClient(port_arg:number, host_arg?:string, options?:ClientOpts):RedisClient;
+    export function createClient(unix_socket:string, options?:ClientOpts):RedisClient;
+    export function createClient(options?:ClientOpts):RedisClient;
 
-	interface MessageHandler {
-		(channel: string, message: any): void;
-	}
+    export function print(err:Error, reply:any):void;
 
-  interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
-    (args: any[], callback?: ResCallbackT<R>): void;
-    (...args: any[]): void;
-  }
+    export var debug_mode:boolean;
 
-  interface ResCallbackT<R> {
-    (err: Error, res: R): void;
-  }
+    export interface MessageHandler<M> {
+        (channel:string, message:M): void;
+    }
 
-	interface ServerInfo {
-		redis_version: string;
-		versions: number[];
-	}
+    export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
+        (args:any[], callback?:ResCallbackT<R>): void;
+        (...args:any[]): void;
+    }
 
-	interface ClientOpts {
-		parser?: string;
-		return_buffers?: boolean;
-		detect_buffers?: boolean;
-		socket_nodelay?: boolean;
-		no_ready_check?: boolean;
-		enable_offline_queue?: boolean;
-		retry_max_delay?: number;
-		connect_timeout?: number;
-		max_attempts?: number;
-		auth_pass?: string;
-	}
+    export interface ResCallbackT<R> {
+        (err:Error, res:R): void;
+    }
 
-	interface RedisClient extends NodeJS.EventEmitter {
-    // event: connect
-    // event: error
-    // event: message
-    // event: pmessage
-    // event: subscribe
-    // event: psubscribe
-    // event: unsubscribe
-    // event: punsubscribe
+    export interface ServerInfo {
+        redis_version: string;
+        versions: number[];
+    }
 
-    connected: boolean;
-    retry_delay: number;
-    retry_backoff: number;
-    command_queue: any[];
-    offline_queue: any[];
-    server_info: ServerInfo;
+    export interface ClientOpts {
+        parser?: string;
+        return_buffers?: boolean;
+        detect_buffers?: boolean;
+        socket_nodelay?: boolean;
+        socket_keepalive?: boolean;
+        no_ready_check?: boolean;
+        enable_offline_queue?: boolean;
+        retry_max_delay?: number;
+        connect_timeout?: number;
+        max_attempts?: number;
+        auth_pass?: string;
+        family?: string;
+        command_queue_high_water?: number;
+        command_queue_low_water?: number;
+    }
 
-    end(): void;
+    export interface RedisClient extends NodeJS.EventEmitter {
+        // event: connect
+        // event: error
+        // event: message
+        // event: pmessage
+        // event: subscribe
+        // event: psubscribe
+        // event: unsubscribe
+        // event: punsubscribe
 
-    // Connection (http://redis.io/commands#connection)
-    auth(password: string, callback?: ResCallbackT<any>): void;
-    ping(callback?: ResCallbackT<number>): void;
+        connected: boolean;
+        retry_delay: number;
+        retry_backoff: number;
+        command_queue: any[];
+        offline_queue: any[];
+        server_info: ServerInfo;
 
-    // Strings (http://redis.io/commands#strings)
-    append(key: string, value: string, callback?: ResCallbackT<number>): void;
-    bitcount(key: string, callback?: ResCallbackT<number>): void;
-    bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): void;
-    set(key: string, value: string, callback?: ResCallbackT<string>): void;
-    get(key: string, callback?: ResCallbackT<string>): void;
-    exists(key: string, value: string, callback?: ResCallbackT<number>): void;
+        end(): void;
+        unref(): void;
 
-    publish(channel: string, value: any): void;
-    subscribe(channel: string): void;
+        // Low level command execution
+        send_command(command:string, ...args:any[]): boolean;
 
-    /*
-    commands = set_union([
-      "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
-      "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
-      "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
-      "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
-      "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
-      "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
-      "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
-      "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
-      "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
-      "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
-    */
+        // Connection (http://redis.io/commands#connection)
+        auth(password:string, callback?:ResCallbackT<any>): boolean;
+        ping(callback?:ResCallbackT<number>): boolean;
 
-    get(args: any[], callback?: ResCallbackT<string>): void;
-    get(...args: any[]): void;
-    set(args: any[], callback?: ResCallbackT<string>): void;
-    set(...args: any[]): void;
-    setnx(args: any[], callback?: ResCallbackT<any>): void;
-    setnx(...args: any[]): void;
-    setex(args: any[], callback?: ResCallbackT<any>): void;
-    setex(...args: any[]): void;
-    append(args: any[], callback?: ResCallbackT<any>): void;
-    append(...args: any[]): void;
-    strlen(args: any[], callback?: ResCallbackT<any>): void;
-    strlen(...args: any[]): void;
-    del(args: any[], callback?: ResCallbackT<any>): void;
-    del(...args: any[]): void;
-    exists(args: any[], callback?: ResCallbackT<any>): void;
-    exists(...args: any[]): void;
-    setbit(args: any[], callback?: ResCallbackT<any>): void;
-    setbit(...args: any[]): void;
-    getbit(args: any[], callback?: ResCallbackT<any>): void;
-    getbit(...args: any[]): void;
-    setrange(args: any[], callback?: ResCallbackT<any>): void;
-    setrange(...args: any[]): void;
-    getrange(args: any[], callback?: ResCallbackT<any>): void;
-    getrange(...args: any[]): void;
-    substr(args: any[], callback?: ResCallbackT<any>): void;
-    substr(...args: any[]): void;
-    incr(args: any[], callback?: ResCallbackT<any>): void;
-    incr(...args: any[]): void;
-    decr(args: any[], callback?: ResCallbackT<any>): void;
-    decr(...args: any[]): void;
-    mget(args: any[], callback?: ResCallbackT<any>): void;
-    mget(...args: any[]): void;
-    rpush(...args: any[]): void;
-    lpush(args: any[], callback?: ResCallbackT<any>): void;
-    lpush(...args: any[]): void;
-    rpushx(args: any[], callback?: ResCallbackT<any>): void;
-    rpushx(...args: any[]): void;
-    lpushx(args: any[], callback?: ResCallbackT<any>): void;
-    lpushx(...args: any[]): void;
-    linsert(args: any[], callback?: ResCallbackT<any>): void;
-    linsert(...args: any[]): void;
-    rpop(args: any[], callback?: ResCallbackT<any>): void;
-    rpop(...args: any[]): void;
-    lpop(args: any[], callback?: ResCallbackT<any>): void;
-    lpop(...args: any[]): void;
-    brpop(args: any[], callback?: ResCallbackT<any>): void;
-    brpop(...args: any[]): void;
-    brpoplpush(args: any[], callback?: ResCallbackT<any>): void;
-    brpoplpush(...args: any[]): void;
-    blpop(args: any[], callback?: ResCallbackT<any>): void;
-    blpop(...args: any[]): void;
-    llen(args: any[], callback?: ResCallbackT<any>): void;
-    llen(...args: any[]): void;
-    lindex(args: any[], callback?: ResCallbackT<any>): void;
-    lindex(...args: any[]): void;
-    lset(args: any[], callback?: ResCallbackT<any>): void;
-    lset(...args: any[]): void;
-    lrange(args: any[], callback?: ResCallbackT<any>): void;
-    lrange(...args: any[]): void;
-    ltrim(args: any[], callback?: ResCallbackT<any>): void;
-    ltrim(...args: any[]): void;
-    lrem(args: any[], callback?: ResCallbackT<any>): void;
-    lrem(...args: any[]): void;
-    rpoplpush(args: any[], callback?: ResCallbackT<any>): void;
-    rpoplpush(...args: any[]): void;
-    sadd(args: any[], callback?: ResCallbackT<any>): void;
-    sadd(...args: any[]): void;
-    srem(args: any[], callback?: ResCallbackT<any>): void;
-    srem(...args: any[]): void;
-    smove(args: any[], callback?: ResCallbackT<any>): void;
-    smove(...args: any[]): void;
-    sismember(args: any[], callback?: ResCallbackT<any>): void;
-    sismember(...args: any[]): void;
-    scard(args: any[], callback?: ResCallbackT<any>): void;
-    scard(...args: any[]): void;
-    spop(args: any[], callback?: ResCallbackT<any>): void;
-    spop(...args: any[]): void;
-    srandmember(args: any[], callback?: ResCallbackT<any>): void;
-    srandmember(...args: any[]): void;
-    sinter(args: any[], callback?: ResCallbackT<any>): void;
-    sinter(...args: any[]): void;
-    sinterstore(args: any[], callback?: ResCallbackT<any>): void;
-    sinterstore(...args: any[]): void;
-    sunion(args: any[], callback?: ResCallbackT<any>): void;
-    sunion(...args: any[]): void;
-    sunionstore(args: any[], callback?: ResCallbackT<any>): void;
-    sunionstore(...args: any[]): void;
-    sdiff(args: any[], callback?: ResCallbackT<any>): void;
-    sdiff(...args: any[]): void;
-    sdiffstore(args: any[], callback?: ResCallbackT<any>): void;
-    sdiffstore(...args: any[]): void;
-    smembers(args: any[], callback?: ResCallbackT<any>): void;
-    smembers(...args: any[]): void;
-    zadd(args: any[], callback?: ResCallbackT<any>): void;
-    zadd(...args: any[]): void;
-    zincrby(args: any[], callback?: ResCallbackT<any>): void;
-    zincrby(...args: any[]): void;
-    zrem(args: any[], callback?: ResCallbackT<any>): void;
-    zrem(...args: any[]): void;
-    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): void;
-    zremrangebyscore(...args: any[]): void;
-    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): void;
-    zremrangebyrank(...args: any[]): void;
-    zunionstore(args: any[], callback?: ResCallbackT<any>): void;
-    zunionstore(...args: any[]): void;
-    zinterstore(args: any[], callback?: ResCallbackT<any>): void;
-    zinterstore(...args: any[]): void;
-    zrange(args: any[], callback?: ResCallbackT<any>): void;
-    zrange(...args: any[]): void;
-    zrangebyscore(args: any[], callback?: ResCallbackT<any>): void;
-    zrangebyscore(...args: any[]): void;
-    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): void;
-    zrevrangebyscore(...args: any[]): void;
-    zcount(args: any[], callback?: ResCallbackT<any>): void;
-    zcount(...args: any[]): void;
-    zrevrange(args: any[], callback?: ResCallbackT<any>): void;
-    zrevrange(...args: any[]): void;
-    zcard(args: any[], callback?: ResCallbackT<any>): void;
-    zcard(...args: any[]): void;
-    zscore(args: any[], callback?: ResCallbackT<any>): void;
-    zscore(...args: any[]): void;
-    zrank(args: any[], callback?: ResCallbackT<any>): void;
-    zrank(...args: any[]): void;
-    zrevrank(args: any[], callback?: ResCallbackT<any>): void;
-    zrevrank(...args: any[]): void;
-    hset(args: any[], callback?: ResCallbackT<any>): void;
-    hset(...args: any[]): void;
-    hsetnx(args: any[], callback?: ResCallbackT<any>): void;
-    hsetnx(...args: any[]): void;
-    hget(args: any[], callback?: ResCallbackT<any>): void;
-    hget(...args: any[]): void;
-    hmset(args: any[], callback?: ResCallbackT<any>): void;
-    hmset(key: string, hash: any, callback?: ResCallbackT<any>): void;
-    hmset(...args: any[]): void;
-    hmget(args: any[], callback?: ResCallbackT<any>): void;
-    hmget(...args: any[]): void;
-    hincrby(args: any[], callback?: ResCallbackT<any>): void;
-    hincrby(...args: any[]): void;
-    hdel(args: any[], callback?: ResCallbackT<any>): void;
-    hdel(...args: any[]): void;
-    hlen(args: any[], callback?: ResCallbackT<any>): void;
-    hlen(...args: any[]): void;
-    hkeys(args: any[], callback?: ResCallbackT<any>): void;
-    hkeys(...args: any[]): void;
-    hvals(args: any[], callback?: ResCallbackT<any>): void;
-    hvals(...args: any[]): void;
-    hgetall(args: any[], callback?: ResCallbackT<any>): void;
-    hgetall(...args: any[]): void;
-    hgetall(key: string, callback?: ResCallbackT<any>): void;
-    hexists(args: any[], callback?: ResCallbackT<any>): void;
-    hexists(...args: any[]): void;
-    incrby(args: any[], callback?: ResCallbackT<any>): void;
-    incrby(...args: any[]): void;
-    decrby(args: any[], callback?: ResCallbackT<any>): void;
-    decrby(...args: any[]): void;
-    getset(args: any[], callback?: ResCallbackT<any>): void;
-    getset(...args: any[]): void;
-    mset(args: any[], callback?: ResCallbackT<any>): void;
-    mset(...args: any[]): void;
-    msetnx(args: any[], callback?: ResCallbackT<any>): void;
-    msetnx(...args: any[]): void;
-    randomkey(args: any[], callback?: ResCallbackT<any>): void;
-    randomkey(...args: any[]): void;
-    select(args: any[], callback?: ResCallbackT<any>): void;
-    select(...args: any[]): void;
-    move(args: any[], callback?: ResCallbackT<any>): void;
-    move(...args: any[]): void;
-    rename(args: any[], callback?: ResCallbackT<any>): void;
-    rename(...args: any[]): void;
-    renamenx(args: any[], callback?: ResCallbackT<any>): void;
-    renamenx(...args: any[]): void;
-    expire(args: any[], callback?: ResCallbackT<any>): void;
-    expire(...args: any[]): void;
-    expireat(args: any[], callback?: ResCallbackT<any>): void;
-    expireat(...args: any[]): void;
-    keys(args: any[], callback?: ResCallbackT<any>): void;
-    keys(...args: any[]): void;
-    dbsize(args: any[], callback?: ResCallbackT<any>): void;
-    dbsize(...args: any[]): void;
-    auth(args: any[], callback?: ResCallbackT<any>): void;
-    auth(...args: any[]): void;
-    ping(args: any[], callback?: ResCallbackT<any>): void;
-    ping(...args: any[]): void;
-    echo(args: any[], callback?: ResCallbackT<any>): void;
-    echo(...args: any[]): void;
-    save(args: any[], callback?: ResCallbackT<any>): void;
-    save(...args: any[]): void;
-    bgsave(args: any[], callback?: ResCallbackT<any>): void;
-    bgsave(...args: any[]): void;
-    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): void;
-    bgrewriteaof(...args: any[]): void;
-    shutdown(args: any[], callback?: ResCallbackT<any>): void;
-    shutdown(...args: any[]): void;
-    lastsave(args: any[], callback?: ResCallbackT<any>): void;
-    lastsave(...args: any[]): void;
-    type(args: any[], callback?: ResCallbackT<any>): void;
-    type(...args: any[]): void;
-    multi(args: any[], callback?: ResCallbackT<any>): void;
-    multi(...args: any[]): void;
-    exec(args: any[], callback?: ResCallbackT<any>): void;
-    exec(...args: any[]): void;
-    discard(args: any[], callback?: ResCallbackT<any>): void;
-    discard(...args: any[]): void;
-    sync(args: any[], callback?: ResCallbackT<any>): void;
-    sync(...args: any[]): void;
-    flushdb(args: any[], callback?: ResCallbackT<any>): void;
-    flushdb(...args: any[]): void;
-    flushall(args: any[], callback?: ResCallbackT<any>): void;
-    flushall(...args: any[]): void;
-    sort(args: any[], callback?: ResCallbackT<any>): void;
-    sort(...args: any[]): void;
-    info(args: any[], callback?: ResCallbackT<any>): void;
-    info(...args: any[]): void;
-    monitor(args: any[], callback?: ResCallbackT<any>): void;
-    monitor(...args: any[]): void;
-    ttl(args: any[], callback?: ResCallbackT<any>): void;
-    ttl(...args: any[]): void;
-    persist(args: any[], callback?: ResCallbackT<any>): void;
-    persist(...args: any[]): void;
-    slaveof(args: any[], callback?: ResCallbackT<any>): void;
-    slaveof(...args: any[]): void;
-    debug(args: any[], callback?: ResCallbackT<any>): void;
-    debug(...args: any[]): void;
-    config(args: any[], callback?: ResCallbackT<any>): void;
-    config(...args: any[]): void;
-    subscribe(args: any[], callback?: ResCallbackT<any>): void;
-    subscribe(...args: any[]): void;
-    unsubscribe(args: any[], callback?: ResCallbackT<any>): void;
-    unsubscribe(...args: any[]): void;
-    psubscribe(args: any[], callback?: ResCallbackT<any>): void;
-    psubscribe(...args: any[]): void;
-    punsubscribe(args: any[], callback?: ResCallbackT<any>): void;
-    punsubscribe(...args: any[]): void;
-    publish(args: any[], callback?: ResCallbackT<any>): void;
-    publish(...args: any[]): void;
-    watch(args: any[], callback?: ResCallbackT<any>): void;
-    watch(...args: any[]): void;
-    unwatch(args: any[], callback?: ResCallbackT<any>): void;
-    unwatch(...args: any[]): void;
-    cluster(args: any[], callback?: ResCallbackT<any>): void;
-    cluster(...args: any[]): void;
-    restore(args: any[], callback?: ResCallbackT<any>): void;
-    restore(...args: any[]): void;
-    migrate(args: any[], callback?: ResCallbackT<any>): void;
-    migrate(...args: any[]): void;
-    dump(args: any[], callback?: ResCallbackT<any>): void;
-    dump(...args: any[]): void;
-    object(args: any[], callback?: ResCallbackT<any>): void;
-    object(...args: any[]): void;
-    client(args: any[], callback?: ResCallbackT<any>): void;
-    client(...args: any[]): void;
-    eval(args: any[], callback?: ResCallbackT<any>): void;
-    eval(...args: any[]): void;
-    evalsha(args: any[], callback?: ResCallbackT<any>): void;
-    evalsha(...args: any[]): void;
-    quit(args: any[], callback?: ResCallbackT<any>): void;
-    quit(...args: any[]): void;
-	}
+        // Strings (http://redis.io/commands#strings)
+        append(key:string, value:string, callback?:ResCallbackT<number>): boolean;
+        bitcount(key:string, callback?:ResCallbackT<number>): boolean;
+        bitcount(key:string, start:number, end:number, callback?:ResCallbackT<number>): boolean;
+        set(key:string, value:string, callback?:ResCallbackT<string>): boolean;
+        get(key:string, callback?:ResCallbackT<string>): boolean;
+        exists(key:string, value:string, callback?:ResCallbackT<number>): boolean;
+
+        publish(channel:string, value:any): boolean;
+        subscribe(channel:string): boolean;
+
+        /*
+         commands = set_union([
+         "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
+         "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
+         "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
+         "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
+         "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
+         "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
+         "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
+         "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
+         "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
+         "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
+         */
+
+        get(args:any[], callback?:ResCallbackT<string>): boolean;
+        get(...args:any[]): boolean;
+        set(args:any[], callback?:ResCallbackT<string>): boolean;
+        set(...args:any[]): boolean;
+        setnx(args:any[], callback?:ResCallbackT<any>): boolean;
+        setnx(...args:any[]): boolean;
+        setex(args:any[], callback?:ResCallbackT<any>): boolean;
+        setex(...args:any[]): boolean;
+        append(args:any[], callback?:ResCallbackT<any>): boolean;
+        append(...args:any[]): boolean;
+        strlen(args:any[], callback?:ResCallbackT<any>): boolean;
+        strlen(...args:any[]): boolean;
+        del(args:any[], callback?:ResCallbackT<any>): boolean;
+        del(...args:any[]): boolean;
+        exists(args:any[], callback?:ResCallbackT<any>): boolean;
+        exists(...args:any[]): boolean;
+        setbit(args:any[], callback?:ResCallbackT<any>): boolean;
+        setbit(...args:any[]): boolean;
+        getbit(args:any[], callback?:ResCallbackT<any>): boolean;
+        getbit(...args:any[]): boolean;
+        setrange(args:any[], callback?:ResCallbackT<any>): boolean;
+        setrange(...args:any[]): boolean;
+        getrange(args:any[], callback?:ResCallbackT<any>): boolean;
+        getrange(...args:any[]): boolean;
+        substr(args:any[], callback?:ResCallbackT<any>): boolean;
+        substr(...args:any[]): boolean;
+        incr(args:any[], callback?:ResCallbackT<any>): boolean;
+        incr(...args:any[]): boolean;
+        decr(args:any[], callback?:ResCallbackT<any>): boolean;
+        decr(...args:any[]): boolean;
+        mget(args:any[], callback?:ResCallbackT<any>): boolean;
+        mget(...args:any[]): boolean;
+        rpush(...args:any[]): boolean;
+        lpush(args:any[], callback?:ResCallbackT<any>): boolean;
+        lpush(...args:any[]): boolean;
+        rpushx(args:any[], callback?:ResCallbackT<any>): boolean;
+        rpushx(...args:any[]): boolean;
+        lpushx(args:any[], callback?:ResCallbackT<any>): boolean;
+        lpushx(...args:any[]): boolean;
+        linsert(args:any[], callback?:ResCallbackT<any>): boolean;
+        linsert(...args:any[]): boolean;
+        rpop(args:any[], callback?:ResCallbackT<any>): boolean;
+        rpop(...args:any[]): boolean;
+        lpop(args:any[], callback?:ResCallbackT<any>): boolean;
+        lpop(...args:any[]): boolean;
+        brpop(args:any[], callback?:ResCallbackT<any>): boolean;
+        brpop(...args:any[]): boolean;
+        brpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
+        brpoplpush(...args:any[]): boolean;
+        blpop(args:any[], callback?:ResCallbackT<any>): boolean;
+        blpop(...args:any[]): boolean;
+        llen(args:any[], callback?:ResCallbackT<any>): boolean;
+        llen(...args:any[]): boolean;
+        lindex(args:any[], callback?:ResCallbackT<any>): boolean;
+        lindex(...args:any[]): boolean;
+        lset(args:any[], callback?:ResCallbackT<any>): boolean;
+        lset(...args:any[]): boolean;
+        lrange(args:any[], callback?:ResCallbackT<any>): boolean;
+        lrange(...args:any[]): boolean;
+        ltrim(args:any[], callback?:ResCallbackT<any>): boolean;
+        ltrim(...args:any[]): boolean;
+        lrem(args:any[], callback?:ResCallbackT<any>): boolean;
+        lrem(...args:any[]): boolean;
+        rpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
+        rpoplpush(...args:any[]): boolean;
+        sadd(args:any[], callback?:ResCallbackT<any>): boolean;
+        sadd(...args:any[]): boolean;
+        srem(args:any[], callback?:ResCallbackT<any>): boolean;
+        srem(...args:any[]): boolean;
+        smove(args:any[], callback?:ResCallbackT<any>): boolean;
+        smove(...args:any[]): boolean;
+        sismember(args:any[], callback?:ResCallbackT<any>): boolean;
+        sismember(...args:any[]): boolean;
+        scard(args:any[], callback?:ResCallbackT<any>): boolean;
+        scard(...args:any[]): boolean;
+        spop(args:any[], callback?:ResCallbackT<any>): boolean;
+        spop(...args:any[]): boolean;
+        srandmember(args:any[], callback?:ResCallbackT<any>): boolean;
+        srandmember(...args:any[]): boolean;
+        sinter(args:any[], callback?:ResCallbackT<any>): boolean;
+        sinter(...args:any[]): boolean;
+        sinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
+        sinterstore(...args:any[]): boolean;
+        sunion(args:any[], callback?:ResCallbackT<any>): boolean;
+        sunion(...args:any[]): boolean;
+        sunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
+        sunionstore(...args:any[]): boolean;
+        sdiff(args:any[], callback?:ResCallbackT<any>): boolean;
+        sdiff(...args:any[]): boolean;
+        sdiffstore(args:any[], callback?:ResCallbackT<any>): boolean;
+        sdiffstore(...args:any[]): boolean;
+        smembers(args:any[], callback?:ResCallbackT<any>): boolean;
+        smembers(...args:any[]): boolean;
+        zadd(args:any[], callback?:ResCallbackT<any>): boolean;
+        zadd(...args:any[]): boolean;
+        zincrby(args:any[], callback?:ResCallbackT<any>): boolean;
+        zincrby(...args:any[]): boolean;
+        zrem(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrem(...args:any[]): boolean;
+        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zremrangebyscore(...args:any[]): boolean;
+        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): boolean;
+        zremrangebyrank(...args:any[]): boolean;
+        zunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zunionstore(...args:any[]): boolean;
+        zinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zinterstore(...args:any[]): boolean;
+        zrange(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrange(...args:any[]): boolean;
+        zrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrangebyscore(...args:any[]): boolean;
+        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrevrangebyscore(...args:any[]): boolean;
+        zcount(args:any[], callback?:ResCallbackT<any>): boolean;
+        zcount(...args:any[]): boolean;
+        zrevrange(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrevrange(...args:any[]): boolean;
+        zcard(args:any[], callback?:ResCallbackT<any>): boolean;
+        zcard(...args:any[]): boolean;
+        zscore(args:any[], callback?:ResCallbackT<any>): boolean;
+        zscore(...args:any[]): boolean;
+        zrank(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrank(...args:any[]): boolean;
+        zrevrank(args:any[], callback?:ResCallbackT<any>): boolean;
+        zrevrank(...args:any[]): boolean;
+        hset(args:any[], callback?:ResCallbackT<any>): boolean;
+        hset(...args:any[]): boolean;
+        hsetnx(args:any[], callback?:ResCallbackT<any>): boolean;
+        hsetnx(...args:any[]): boolean;
+        hget(args:any[], callback?:ResCallbackT<any>): boolean;
+        hget(...args:any[]): boolean;
+        hmset(args:any[], callback?:ResCallbackT<any>): boolean;
+        hmset(key:string, hash:any, callback?:ResCallbackT<any>): boolean;
+        hmset(...args:any[]): boolean;
+        hmget(args:any[], callback?:ResCallbackT<any>): boolean;
+        hmget(...args:any[]): boolean;
+        hincrby(args:any[], callback?:ResCallbackT<any>): boolean;
+        hincrby(...args:any[]): boolean;
+        hdel(args:any[], callback?:ResCallbackT<any>): boolean;
+        hdel(...args:any[]): boolean;
+        hlen(args:any[], callback?:ResCallbackT<any>): boolean;
+        hlen(...args:any[]): boolean;
+        hkeys(args:any[], callback?:ResCallbackT<any>): boolean;
+        hkeys(...args:any[]): boolean;
+        hvals(args:any[], callback?:ResCallbackT<any>): boolean;
+        hvals(...args:any[]): boolean;
+        hgetall(args:any[], callback?:ResCallbackT<any>): boolean;
+        hgetall(...args:any[]): boolean;
+        hgetall(key:string, callback?:ResCallbackT<any>): boolean;
+        hexists(args:any[], callback?:ResCallbackT<any>): boolean;
+        hexists(...args:any[]): boolean;
+        incrby(args:any[], callback?:ResCallbackT<any>): boolean;
+        incrby(...args:any[]): boolean;
+        decrby(args:any[], callback?:ResCallbackT<any>): boolean;
+        decrby(...args:any[]): boolean;
+        getset(args:any[], callback?:ResCallbackT<any>): boolean;
+        getset(...args:any[]): boolean;
+        mset(args:any[], callback?:ResCallbackT<any>): boolean;
+        mset(...args:any[]): boolean;
+        msetnx(args:any[], callback?:ResCallbackT<any>): boolean;
+        msetnx(...args:any[]): boolean;
+        randomkey(args:any[], callback?:ResCallbackT<any>): boolean;
+        randomkey(...args:any[]): boolean;
+        select(args:any[], callback?:ResCallbackT<any>): void;
+        select(...args:any[]): void;
+        move(args:any[], callback?:ResCallbackT<any>): boolean;
+        move(...args:any[]): boolean;
+        rename(args:any[], callback?:ResCallbackT<any>): boolean;
+        rename(...args:any[]): boolean;
+        renamenx(args:any[], callback?:ResCallbackT<any>): boolean;
+        renamenx(...args:any[]): boolean;
+        expire(args:any[], callback?:ResCallbackT<any>): boolean;
+        expire(...args:any[]): boolean;
+        expireat(args:any[], callback?:ResCallbackT<any>): boolean;
+        expireat(...args:any[]): boolean;
+        keys(args:any[], callback?:ResCallbackT<any>): boolean;
+        keys(...args:any[]): boolean;
+        dbsize(args:any[], callback?:ResCallbackT<any>): boolean;
+        dbsize(...args:any[]): boolean;
+        auth(args:any[], callback?:ResCallbackT<any>): void;
+        auth(...args:any[]): void;
+        ping(args:any[], callback?:ResCallbackT<any>): boolean;
+        ping(...args:any[]): boolean;
+        echo(args:any[], callback?:ResCallbackT<any>): boolean;
+        echo(...args:any[]): boolean;
+        save(args:any[], callback?:ResCallbackT<any>): boolean;
+        save(...args:any[]): boolean;
+        bgsave(args:any[], callback?:ResCallbackT<any>): boolean;
+        bgsave(...args:any[]): boolean;
+        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): boolean;
+        bgrewriteaof(...args:any[]): boolean;
+        shutdown(args:any[], callback?:ResCallbackT<any>): boolean;
+        shutdown(...args:any[]): boolean;
+        lastsave(args:any[], callback?:ResCallbackT<any>): boolean;
+        lastsave(...args:any[]): boolean;
+        type(args:any[], callback?:ResCallbackT<any>): boolean;
+        type(...args:any[]): boolean;
+        multi(args:any[], callback?:ResCallbackT<any>): Multi;
+        multi(...args:any[]): Multi;
+        exec(args:any[], callback?:ResCallbackT<any>): boolean;
+        exec(...args:any[]): boolean;
+        discard(args:any[], callback?:ResCallbackT<any>): boolean;
+        discard(...args:any[]): boolean;
+        sync(args:any[], callback?:ResCallbackT<any>): boolean;
+        sync(...args:any[]): boolean;
+        flushdb(args:any[], callback?:ResCallbackT<any>): boolean;
+        flushdb(...args:any[]): boolean;
+        flushall(args:any[], callback?:ResCallbackT<any>): boolean;
+        flushall(...args:any[]): boolean;
+        sort(args:any[], callback?:ResCallbackT<any>): boolean;
+        sort(...args:any[]): boolean;
+        info(args:any[], callback?:ResCallbackT<any>): boolean;
+        info(...args:any[]): boolean;
+        monitor(args:any[], callback?:ResCallbackT<any>): boolean;
+        monitor(...args:any[]): boolean;
+        ttl(args:any[], callback?:ResCallbackT<any>): boolean;
+        ttl(...args:any[]): boolean;
+        persist(args:any[], callback?:ResCallbackT<any>): boolean;
+        persist(...args:any[]): boolean;
+        slaveof(args:any[], callback?:ResCallbackT<any>): boolean;
+        slaveof(...args:any[]): boolean;
+        debug(args:any[], callback?:ResCallbackT<any>): boolean;
+        debug(...args:any[]): boolean;
+        config(args:any[], callback?:ResCallbackT<any>): boolean;
+        config(...args:any[]): boolean;
+        subscribe(args:any[], callback?:ResCallbackT<any>): boolean;
+        subscribe(...args:any[]): boolean;
+        unsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
+        unsubscribe(...args:any[]): boolean;
+        psubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
+        psubscribe(...args:any[]): boolean;
+        punsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
+        punsubscribe(...args:any[]): boolean;
+        publish(args:any[], callback?:ResCallbackT<any>): boolean;
+        publish(...args:any[]): boolean;
+        watch(args:any[], callback?:ResCallbackT<any>): boolean;
+        watch(...args:any[]): boolean;
+        unwatch(args:any[], callback?:ResCallbackT<any>): boolean;
+        unwatch(...args:any[]): boolean;
+        cluster(args:any[], callback?:ResCallbackT<any>): boolean;
+        cluster(...args:any[]): boolean;
+        restore(args:any[], callback?:ResCallbackT<any>): boolean;
+        restore(...args:any[]): boolean;
+        migrate(args:any[], callback?:ResCallbackT<any>): boolean;
+        migrate(...args:any[]): boolean;
+        dump(args:any[], callback?:ResCallbackT<any>): boolean;
+        dump(...args:any[]): boolean;
+        object(args:any[], callback?:ResCallbackT<any>): boolean;
+        object(...args:any[]): boolean;
+        client(args:any[], callback?:ResCallbackT<any>): boolean;
+        client(...args:any[]): boolean;
+        eval(args:any[], callback?:ResCallbackT<any>): boolean;
+        eval(...args:any[]): boolean;
+        evalsha(args:any[], callback?:ResCallbackT<any>): boolean;
+        evalsha(...args:any[]): boolean;
+        quit(args:any[], callback?:ResCallbackT<any>): boolean;
+        quit(...args:any[]): boolean;
+    }
+
+    export interface Multi {
+        exec(callback?:ResCallbackT<any[]>): boolean;
+
+        get(args:any[], callback?:ResCallbackT<string>): Multi;
+        get(...args:any[]): Multi;
+        set(args:any[], callback?:ResCallbackT<string>): Multi;
+        set(...args:any[]): Multi;
+        setnx(args:any[], callback?:ResCallbackT<any>): Multi;
+        setnx(...args:any[]): Multi;
+        setex(args:any[], callback?:ResCallbackT<any>): Multi;
+        setex(...args:any[]): Multi;
+        append(args:any[], callback?:ResCallbackT<any>): Multi;
+        append(...args:any[]): Multi;
+        strlen(args:any[], callback?:ResCallbackT<any>): Multi;
+        strlen(...args:any[]): Multi;
+        del(args:any[], callback?:ResCallbackT<any>): Multi;
+        del(...args:any[]): Multi;
+        exists(args:any[], callback?:ResCallbackT<any>): Multi;
+        exists(...args:any[]): Multi;
+        setbit(args:any[], callback?:ResCallbackT<any>): Multi;
+        setbit(...args:any[]): Multi;
+        getbit(args:any[], callback?:ResCallbackT<any>): Multi;
+        getbit(...args:any[]): Multi;
+        setrange(args:any[], callback?:ResCallbackT<any>): Multi;
+        setrange(...args:any[]): Multi;
+        getrange(args:any[], callback?:ResCallbackT<any>): Multi;
+        getrange(...args:any[]): Multi;
+        substr(args:any[], callback?:ResCallbackT<any>): Multi;
+        substr(...args:any[]): Multi;
+        incr(args:any[], callback?:ResCallbackT<any>): Multi;
+        incr(...args:any[]): Multi;
+        decr(args:any[], callback?:ResCallbackT<any>): Multi;
+        decr(...args:any[]): Multi;
+        mget(args:any[], callback?:ResCallbackT<any>): Multi;
+        mget(...args:any[]): Multi;
+        rpush(...args:any[]): Multi;
+        lpush(args:any[], callback?:ResCallbackT<any>): Multi;
+        lpush(...args:any[]): Multi;
+        rpushx(args:any[], callback?:ResCallbackT<any>): Multi;
+        rpushx(...args:any[]): Multi;
+        lpushx(args:any[], callback?:ResCallbackT<any>): Multi;
+        lpushx(...args:any[]): Multi;
+        linsert(args:any[], callback?:ResCallbackT<any>): Multi;
+        linsert(...args:any[]): Multi;
+        rpop(args:any[], callback?:ResCallbackT<any>): Multi;
+        rpop(...args:any[]): Multi;
+        lpop(args:any[], callback?:ResCallbackT<any>): Multi;
+        lpop(...args:any[]): Multi;
+        brpop(args:any[], callback?:ResCallbackT<any>): Multi;
+        brpop(...args:any[]): Multi;
+        brpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
+        brpoplpush(...args:any[]): Multi;
+        blpop(args:any[], callback?:ResCallbackT<any>): Multi;
+        blpop(...args:any[]): Multi;
+        llen(args:any[], callback?:ResCallbackT<any>): Multi;
+        llen(...args:any[]): Multi;
+        lindex(args:any[], callback?:ResCallbackT<any>): Multi;
+        lindex(...args:any[]): Multi;
+        lset(args:any[], callback?:ResCallbackT<any>): Multi;
+        lset(...args:any[]): Multi;
+        lrange(args:any[], callback?:ResCallbackT<any>): Multi;
+        lrange(...args:any[]): Multi;
+        ltrim(args:any[], callback?:ResCallbackT<any>): Multi;
+        ltrim(...args:any[]): Multi;
+        lrem(args:any[], callback?:ResCallbackT<any>): Multi;
+        lrem(...args:any[]): Multi;
+        rpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
+        rpoplpush(...args:any[]): Multi;
+        sadd(args:any[], callback?:ResCallbackT<any>): Multi;
+        sadd(...args:any[]): Multi;
+        srem(args:any[], callback?:ResCallbackT<any>): Multi;
+        srem(...args:any[]): Multi;
+        smove(args:any[], callback?:ResCallbackT<any>): Multi;
+        smove(...args:any[]): Multi;
+        sismember(args:any[], callback?:ResCallbackT<any>): Multi;
+        sismember(...args:any[]): Multi;
+        scard(args:any[], callback?:ResCallbackT<any>): Multi;
+        scard(...args:any[]): Multi;
+        spop(args:any[], callback?:ResCallbackT<any>): Multi;
+        spop(...args:any[]): Multi;
+        srandmember(args:any[], callback?:ResCallbackT<any>): Multi;
+        srandmember(...args:any[]): Multi;
+        sinter(args:any[], callback?:ResCallbackT<any>): Multi;
+        sinter(...args:any[]): Multi;
+        sinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
+        sinterstore(...args:any[]): Multi;
+        sunion(args:any[], callback?:ResCallbackT<any>): Multi;
+        sunion(...args:any[]): Multi;
+        sunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
+        sunionstore(...args:any[]): Multi;
+        sdiff(args:any[], callback?:ResCallbackT<any>): Multi;
+        sdiff(...args:any[]): Multi;
+        sdiffstore(args:any[], callback?:ResCallbackT<any>): Multi;
+        sdiffstore(...args:any[]): Multi;
+        smembers(args:any[], callback?:ResCallbackT<any>): Multi;
+        smembers(...args:any[]): Multi;
+        zadd(args:any[], callback?:ResCallbackT<any>): Multi;
+        zadd(...args:any[]): Multi;
+        zincrby(args:any[], callback?:ResCallbackT<any>): Multi;
+        zincrby(...args:any[]): Multi;
+        zrem(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrem(...args:any[]): Multi;
+        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zremrangebyscore(...args:any[]): Multi;
+        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): Multi;
+        zremrangebyrank(...args:any[]): Multi;
+        zunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zunionstore(...args:any[]): Multi;
+        zinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zinterstore(...args:any[]): Multi;
+        zrange(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrange(...args:any[]): Multi;
+        zrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrangebyscore(...args:any[]): Multi;
+        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrevrangebyscore(...args:any[]): Multi;
+        zcount(args:any[], callback?:ResCallbackT<any>): Multi;
+        zcount(...args:any[]): Multi;
+        zrevrange(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrevrange(...args:any[]): Multi;
+        zcard(args:any[], callback?:ResCallbackT<any>): Multi;
+        zcard(...args:any[]): Multi;
+        zscore(args:any[], callback?:ResCallbackT<any>): Multi;
+        zscore(...args:any[]): Multi;
+        zrank(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrank(...args:any[]): Multi;
+        zrevrank(args:any[], callback?:ResCallbackT<any>): Multi;
+        zrevrank(...args:any[]): Multi;
+        hset(args:any[], callback?:ResCallbackT<any>): Multi;
+        hset(...args:any[]): Multi;
+        hsetnx(args:any[], callback?:ResCallbackT<any>): Multi;
+        hsetnx(...args:any[]): Multi;
+        hget(args:any[], callback?:ResCallbackT<any>): Multi;
+        hget(...args:any[]): Multi;
+        hmset(args:any[], callback?:ResCallbackT<any>): Multi;
+        hmset(key:string, hash:any, callback?:ResCallbackT<any>): Multi;
+        hmset(...args:any[]): Multi;
+        hmget(args:any[], callback?:ResCallbackT<any>): Multi;
+        hmget(...args:any[]): Multi;
+        hincrby(args:any[], callback?:ResCallbackT<any>): Multi;
+        hincrby(...args:any[]): Multi;
+        hdel(args:any[], callback?:ResCallbackT<any>): Multi;
+        hdel(...args:any[]): Multi;
+        hlen(args:any[], callback?:ResCallbackT<any>): Multi;
+        hlen(...args:any[]): Multi;
+        hkeys(args:any[], callback?:ResCallbackT<any>): Multi;
+        hkeys(...args:any[]): Multi;
+        hvals(args:any[], callback?:ResCallbackT<any>): Multi;
+        hvals(...args:any[]): Multi;
+        hgetall(args:any[], callback?:ResCallbackT<any>): Multi;
+        hgetall(...args:any[]): Multi;
+        hgetall(key:string, callback?:ResCallbackT<any>): Multi;
+        hexists(args:any[], callback?:ResCallbackT<any>): Multi;
+        hexists(...args:any[]): Multi;
+        incrby(args:any[], callback?:ResCallbackT<any>): Multi;
+        incrby(...args:any[]): Multi;
+        decrby(args:any[], callback?:ResCallbackT<any>): Multi;
+        decrby(...args:any[]): Multi;
+        getset(args:any[], callback?:ResCallbackT<any>): Multi;
+        getset(...args:any[]): Multi;
+        mset(args:any[], callback?:ResCallbackT<any>): Multi;
+        mset(...args:any[]): Multi;
+        msetnx(args:any[], callback?:ResCallbackT<any>): Multi;
+        msetnx(...args:any[]): Multi;
+        randomkey(args:any[], callback?:ResCallbackT<any>): Multi;
+        randomkey(...args:any[]): Multi;
+        select(args:any[], callback?:ResCallbackT<any>): void;
+        select(...args:any[]): Multi;
+        move(args:any[], callback?:ResCallbackT<any>): Multi;
+        move(...args:any[]): Multi;
+        rename(args:any[], callback?:ResCallbackT<any>): Multi;
+        rename(...args:any[]): Multi;
+        renamenx(args:any[], callback?:ResCallbackT<any>): Multi;
+        renamenx(...args:any[]): Multi;
+        expire(args:any[], callback?:ResCallbackT<any>): Multi;
+        expire(...args:any[]): Multi;
+        expireat(args:any[], callback?:ResCallbackT<any>): Multi;
+        expireat(...args:any[]): Multi;
+        keys(args:any[], callback?:ResCallbackT<any>): Multi;
+        keys(...args:any[]): Multi;
+        dbsize(args:any[], callback?:ResCallbackT<any>): Multi;
+        dbsize(...args:any[]): Multi;
+        auth(args:any[], callback?:ResCallbackT<any>): void;
+        auth(...args:any[]): void;
+        ping(args:any[], callback?:ResCallbackT<any>): Multi;
+        ping(...args:any[]): Multi;
+        echo(args:any[], callback?:ResCallbackT<any>): Multi;
+        echo(...args:any[]): Multi;
+        save(args:any[], callback?:ResCallbackT<any>): Multi;
+        save(...args:any[]): Multi;
+        bgsave(args:any[], callback?:ResCallbackT<any>): Multi;
+        bgsave(...args:any[]): Multi;
+        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): Multi;
+        bgrewriteaof(...args:any[]): Multi;
+        shutdown(args:any[], callback?:ResCallbackT<any>): Multi;
+        shutdown(...args:any[]): Multi;
+        lastsave(args:any[], callback?:ResCallbackT<any>): Multi;
+        lastsave(...args:any[]): Multi;
+        type(args:any[], callback?:ResCallbackT<any>): Multi;
+        type(...args:any[]): Multi;
+        multi(args:any[], callback?:ResCallbackT<any>): Multi;
+        multi(...args:any[]): Multi;
+        exec(args:any[], callback?:ResCallbackT<any>): Multi;
+        exec(...args:any[]): Multi;
+        discard(args:any[], callback?:ResCallbackT<any>): Multi;
+        discard(...args:any[]): Multi;
+        sync(args:any[], callback?:ResCallbackT<any>): Multi;
+        sync(...args:any[]): Multi;
+        flushdb(args:any[], callback?:ResCallbackT<any>): Multi;
+        flushdb(...args:any[]): Multi;
+        flushall(args:any[], callback?:ResCallbackT<any>): Multi;
+        flushall(...args:any[]): Multi;
+        sort(args:any[], callback?:ResCallbackT<any>): Multi;
+        sort(...args:any[]): Multi;
+        info(args:any[], callback?:ResCallbackT<any>): Multi;
+        info(...args:any[]): Multi;
+        monitor(args:any[], callback?:ResCallbackT<any>): Multi;
+        monitor(...args:any[]): Multi;
+        ttl(args:any[], callback?:ResCallbackT<any>): Multi;
+        ttl(...args:any[]): Multi;
+        persist(args:any[], callback?:ResCallbackT<any>): Multi;
+        persist(...args:any[]): Multi;
+        slaveof(args:any[], callback?:ResCallbackT<any>): Multi;
+        slaveof(...args:any[]): Multi;
+        debug(args:any[], callback?:ResCallbackT<any>): Multi;
+        debug(...args:any[]): Multi;
+        config(args:any[], callback?:ResCallbackT<any>): Multi;
+        config(...args:any[]): Multi;
+        subscribe(args:any[], callback?:ResCallbackT<any>): Multi;
+        subscribe(...args:any[]): Multi;
+        unsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
+        unsubscribe(...args:any[]): Multi;
+        psubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
+        psubscribe(...args:any[]): Multi;
+        punsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
+        punsubscribe(...args:any[]): Multi;
+        publish(args:any[], callback?:ResCallbackT<any>): Multi;
+        publish(...args:any[]): Multi;
+        watch(args:any[], callback?:ResCallbackT<any>): Multi;
+        watch(...args:any[]): Multi;
+        unwatch(args:any[], callback?:ResCallbackT<any>): Multi;
+        unwatch(...args:any[]): Multi;
+        cluster(args:any[], callback?:ResCallbackT<any>): Multi;
+        cluster(...args:any[]): Multi;
+        restore(args:any[], callback?:ResCallbackT<any>): Multi;
+        restore(...args:any[]): Multi;
+        migrate(args:any[], callback?:ResCallbackT<any>): Multi;
+        migrate(...args:any[]): Multi;
+        dump(args:any[], callback?:ResCallbackT<any>): Multi;
+        dump(...args:any[]): Multi;
+        object(args:any[], callback?:ResCallbackT<any>): Multi;
+        object(...args:any[]): Multi;
+        client(args:any[], callback?:ResCallbackT<any>): Multi;
+        client(...args:any[]): Multi;
+        eval(args:any[], callback?:ResCallbackT<any>): Multi;
+        eval(...args:any[]): Multi;
+        evalsha(args:any[], callback?:ResCallbackT<any>): Multi;
+        evalsha(...args:any[]): Multi;
+        quit(args:any[], callback?:ResCallbackT<any>): Multi;
+        quit(...args:any[]): Multi;
+    }
 }
diff --git a/redlock/redlock-test.ts b/redlock/redlock-test.ts
new file mode 100644
index 000000000..70a9341a7
--- /dev/null
+++ b/redlock/redlock-test.ts
@@ -0,0 +1,103 @@
+/// <reference path="./redlock.d.ts" />
+
+import Redlock = require('redlock');
+
+import NodeifyCallback = RedlockTypes.NodeifyCallback;
+import Lock = RedlockTypes.Lock;
+import RedlockOptions = RedlockTypes.RedlockOptions;
+
+module RedlockTest {
+	// constructor
+	{
+		let redlock: Redlock;
+		let client: any;
+		let options: RedlockOptions;
+		redlock = new Redlock([client]);
+		redlock = new Redlock([client], options);
+	}
+
+	// acquire, lock
+	{
+		let redlock: Redlock;
+		let resource: string;
+		let ttl: number;
+		let callback: NodeifyCallback<Lock>;
+		let result: Promise<Lock>;
+		result = redlock.acquire(resource, ttl);
+		result = redlock.acquire(resource, ttl, callback);
+		result = redlock.lock(resource, ttl);
+		result = redlock.lock(resource, ttl, callback);
+	}
+
+	// disposer
+	{
+		let redlock: Redlock;
+		let resource: string;
+		let ttl: number;
+		let result: any;
+		result = redlock.acquire(resource, ttl);
+	}
+
+	// release, unlock
+	{
+		let redlock: Redlock;
+		let lock: Lock;
+		let callback: NodeifyCallback<void>;
+		let result: Promise<void>;
+		result = redlock.release(lock);
+		result = redlock.release(lock, callback);
+		result = redlock.unlock(lock);
+		result = redlock.unlock(lock, callback);
+	}
+
+	// extend
+	{
+		let redlock: Redlock;
+		let lock: Lock;
+		let ttl: number;
+		let callback: NodeifyCallback<Lock>;
+		let result: Promise<Lock>;
+		result = redlock.extend(lock, ttl);
+		result = redlock.extend(lock, ttl, callback);
+	}
+
+	// _lock
+	{
+		let redlock: Redlock;
+		let resource: string;
+		let value: string;
+		let ttl: number;
+		let callback: NodeifyCallback<Lock>;
+		let result: Promise<Lock>;
+		result = redlock._lock(resource, value, ttl);
+		result = redlock._lock(resource, value, ttl, callback);
+	}
+
+	// _random
+	{
+		let redlock: Redlock;
+		let result: string;
+		result = redlock._random();
+	}
+}
+
+module LockTest {
+	// unlock
+	{
+		let lock: Lock;
+		let callback: NodeifyCallback<void>;
+		let result: Promise<void>;
+		result = lock.unlock();
+		result = lock.unlock(callback);
+	}
+
+	// extend
+	{
+		let lock: Lock;
+		let ttl: number;
+		let callback: NodeifyCallback<Lock>;
+		let result: Promise<Lock>;
+		result = lock.extend(ttl);
+		result = lock.extend(ttl, callback);
+	}
+}
diff --git a/redlock/redlock.d.ts b/redlock/redlock.d.ts
new file mode 100644
index 000000000..07760e102
--- /dev/null
+++ b/redlock/redlock.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for Redlock
+// Project: https://github.com/mike-marcacci/node-redlock
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../bluebird/bluebird.d.ts" />
+
+declare module RedlockTypes {
+	interface LockError extends Error {}
+
+	interface NodeifyCallback<T> {
+		(err: any, value?: T): void;
+	}
+
+	interface Lock {
+		redlock: Redlock;
+		resource: string;
+		value: any;
+		expiration: number;
+
+		unlock(callback?: NodeifyCallback<void>): Promise<void>;
+
+		extend(ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+	}
+
+	interface RedlockOptions {
+		driftFactor?: number;
+		retryCount?: number;
+		retryDelay?: number;
+	}
+
+	class Redlock {
+		LockError: LockError;
+
+		driftFactor: number;
+		retryCount: number;
+		retryDelay: number;
+
+		servers: any[]; // array of redis.RedisClient
+
+		constructor(clients: any[], options?: RedlockOptions);
+
+		acquire(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+		lock(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+
+		disposer(resource: string, ttl: number): any; // return bluebird.Disposer
+
+		release(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
+		unlock(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
+
+		extend(lock: Lock, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+
+		_lock(resource: string, value: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+
+		_random(): string;
+	}
+}
+
+declare module "redlock" {
+	import Redlock = RedlockTypes.Redlock;
+	export = Redlock;
+}
diff --git a/redux-action-utils/redux-action-utils-tests.ts b/redux-action-utils/redux-action-utils-tests.ts
new file mode 100644
index 000000000..d3994a153
--- /dev/null
+++ b/redux-action-utils/redux-action-utils-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="redux-action-utils.d.ts" />
+/// <reference path="../redux/redux.d.ts" />
+
+import { actionCreator, optionsActionCreator } from 'redux-action-utils';
+import { Action, ActionCreator } from 'redux-action-utils';
+
+let types = {
+    ADD_LESSON: 'ADD_LESSON',
+    IMPORT_LESSONS: 'IMPORT_LESSONS',
+    UPDATE_LESSON: 'UPDATE_LESSON'
+};
+var type: string;
+
+export default {
+    addLesson: actionCreator(types.ADD_LESSON),
+    importLessons: actionCreator(types.IMPORT_LESSONS, 'lessons'),
+    updateLesson: optionsActionCreator(types.UPDATE_LESSON, 'id', 'update')
+};
+
+var ac = actionCreator(types.ADD_LESSON);
+var action: Action = ac();
+type = action.type;
+
+
+class ImportLesson {
+    lessons: string[];
+}
+
+const importLessonAction = actionCreator<ImportLesson>(types.IMPORT_LESSONS, 'lessons');
+var importLesson = importLessonAction(['lesson 1', 'lesson 2']);
+// → {type: 'IMPORT_LESSONS', lessons: ['lesson 1', 'lesson 2']}
+
+var lessons: string[] = importLesson.lessons;
+type = importLesson.type;
+
+
+class UpdateLesson {
+    id: number;
+    update: {
+        text: string
+    }
+}
+
+const updateLessonAction = optionsActionCreator<UpdateLesson>(types.UPDATE_LESSON, 'id', 'update');
+let updateLesson = updateLessonAction({
+    id: 1,
+    update: {
+        text: '## Lesson 1'
+    }
+});
+/* →
+ {
+ type: 'UPDATE_LESSON',
+ id: 1,
+ update: {
+ text: '## Lesson 1'
+ }
+ }
+ */
+
+let id: number = updateLesson.id;
+type = updateLesson.type;
diff --git a/redux-action-utils/redux-action-utils.d.ts b/redux-action-utils/redux-action-utils.d.ts
new file mode 100644
index 000000000..8e565902d
--- /dev/null
+++ b/redux-action-utils/redux-action-utils.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for redux-action-utils 2.0.0
+// Project: https://github.com/insin/redux-action-utils
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "redux-action-utils" {
+    export interface Action {
+        type: string;
+    }
+
+    export interface ActionCreator<T> {
+        (...data: any[]): Action & T;
+    }
+
+    export interface OptionsActionCreator<T> {
+        (data: T): Action & T;
+    }
+
+    /**
+     * Creates an action creator which will create an action object with the given type.
+     */
+    export function actionCreator<T>(type: string, ...props: string[]): ActionCreator<T>;
+    /**
+     * Creates an action creator which will create an action object with the given type.
+     */
+    export function actionCreator<T>(type: string, props: string[]): ActionCreator<T>;
+
+    /**
+     * Creates an action creator which takes a single object argument and adds its properties to the action object.
+     */
+    export function optionsActionCreator<T>(type: string, ...props: string[]): OptionsActionCreator<T>;
+    /**
+     * Creates an action creator which takes a single object argument and adds its properties to the action object.
+     */
+    export function optionsActionCreator<T>(type: string, props: string[]): OptionsActionCreator<T>;
+}
+
diff --git a/redux-actions/redux-actions-tests.ts b/redux-actions/redux-actions-tests.ts
new file mode 100644
index 000000000..30dd00a97
--- /dev/null
+++ b/redux-actions/redux-actions-tests.ts
@@ -0,0 +1,56 @@
+/// <reference path="./redux-actions.d.ts" />
+
+const minimalAction: ReduxActions.Action = { type: 'INCREMENT' };
+const richerAction: ReduxActions.Action = {
+    type: 'INCREMENT',
+    payload: 2,
+    error: false,
+    meta: {
+        remote: true
+    }
+};
+
+const incrementAction: (...args: any[]) => ReduxActions.Action = ReduxActions.createAction<number>(
+    'INCREMENT',
+    (amount: number) => amount
+);
+const action: ReduxActions.Action = incrementAction(42);
+
+const incrementByAction: (...args: any[]) => ReduxActions.Action = ReduxActions.createAction<number>(
+    'INCREMENT_BY',
+    (amount: number) => amount,
+    amount => ({ remote: true })
+);
+
+let state: number;
+
+const actionHandler = ReduxActions.handleAction<number>(
+    'INCREMENT',
+    (state: number, action: ReduxActions.Action) => state + 1
+);
+state = actionHandler(0, { type: 'INCREMENT' });
+
+const actionHandlerWithReduceMap = ReduxActions.handleAction<number>(
+    'INCREMENT_BY', {
+        next(state: number, action: ReduxActions.Action) {
+            return state + action.payload;
+        },
+        throw(state: number) { return state }
+    }
+);
+state = actionHandlerWithReduceMap(0, { type: 'INCREMENT' });
+
+const actionsHandler = ReduxActions.handleActions<number>({
+    'INCREMENT': (state: number, action: ReduxActions.Action) => state + 1,
+    'DECREMENT': (state: number, action: ReduxActions.Action) => state - 1
+});
+state = actionsHandler(0, { type: 'INCREMENT' });
+
+const actionsHandlerWithInitialState = ReduxActions.handleActions<number>({
+    'INCREMENT': (state: number, action: ReduxActions.Action) => state + 1,
+    'DECREMENT': (state: number, action: ReduxActions.Action) => state - 1
+}, 0);
+state = actionsHandlerWithInitialState(0, { type: 'INCREMENT' });
+
+
+
diff --git a/redux-actions/redux-actions.d.ts b/redux-actions/redux-actions.d.ts
new file mode 100644
index 000000000..522f18462
--- /dev/null
+++ b/redux-actions/redux-actions.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for redux-actions v0.8.0
+// Project: https://github.com/acdlite/redux-actions
+// Definitions by: Jack Hsu <https://github.com/jaysoo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+declare module ReduxActions {
+    // FSA-compliant action.
+    // See: https://github.com/acdlite/flux-standard-action
+    type Action = {
+        type: string
+        payload?: any
+        error?: boolean
+        meta?: any
+    };
+
+    type PayloadCreator<T> = (...args: any[]) => T;
+    type MetaCreator = (...args: any[]) => any;
+
+    type Reducer<T> = (state: T, action: Action) => T;
+
+    type ReducerMap<T> = {
+        [actionType: string]: Reducer<T>
+    };
+
+    export function createAction<T>(actionType: string, payloadCreator?: PayloadCreator<T>, metaCreator?: MetaCreator): (...args: any[]) => Action;
+
+    export function handleAction<T>(actionType: string, reducer: Reducer<T> | ReducerMap<T>): Reducer<T>;
+
+    export function handleActions<T>(reducerMap: ReducerMap<T>, initialState?: T): Reducer<T>;
+}
+
+declare module 'redux-actions' {
+    export = ReduxActions;
+}
+
diff --git a/redux-devtools/redux-devtools-tests.tsx b/redux-devtools/redux-devtools-tests.tsx
new file mode 100644
index 000000000..c17aa38ab
--- /dev/null
+++ b/redux-devtools/redux-devtools-tests.tsx
@@ -0,0 +1,62 @@
+/// <reference path="redux-devtools.d.ts" />
+/// <reference path="../redux/redux.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+import { compose, createStore, applyMiddleware, Middleware, Reducer } from 'redux';
+import { devTools, persistState } from 'redux-devtools';
+import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react';
+import * as React from 'react';
+import { Component } from 'react';
+
+declare var m1: Middleware;
+declare var m2: Middleware;
+declare var m3: Middleware;
+declare var reducer: Reducer;
+class CounterApp extends Component<any, any> { };
+class Provider extends Component<{ store: any }, any> { };
+
+const finalCreateStore = compose(
+    // Enables your middleware:
+    applyMiddleware(m1, m2, m3), // any Redux middleware, e.g. redux-thunk
+    // Provides support for DevTools:
+    devTools(),
+    // Lets you write ?debug_session=<name> in address bar to persist debug sessions
+    persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/))
+)(createStore);
+const store = finalCreateStore(reducer);
+
+class Root extends Component<any, any> {
+    render() {
+        return (
+            <div>
+                <Provider store={store}>
+                    {() => <CounterApp />}
+                </Provider>
+                <DebugPanel top right bottom>
+                    <DevTools store={store} monitor={LogMonitor} />
+                </DebugPanel>
+            </div>
+        );
+    }
+}
+
+//
+// https://github.com/gaearon/redux-devtools/blob/master/examples/counter/containers/App.js
+//
+
+class App extends Component<any, any> {
+    render() {
+        return (
+            <div>
+                <Provider store={store}>
+                    {() => <CounterApp />}
+                </Provider>
+                <DebugPanel top right bottom>
+                    <DevTools store={store}
+                        monitor={LogMonitor}
+                        visibleOnLoad={true} />
+                </DebugPanel>
+            </div>
+        );
+    }
+}
diff --git a/redux-devtools/redux-devtools-tests.tsx.tscparams b/redux-devtools/redux-devtools-tests.tsx.tscparams
new file mode 100644
index 000000000..c90abf04f
--- /dev/null
+++ b/redux-devtools/redux-devtools-tests.tsx.tscparams
@@ -0,0 +1 @@
+--target es5 --noImplicitAny --experimentalDecorators --jsx react
diff --git a/redux-devtools/redux-devtools.d.ts b/redux-devtools/redux-devtools.d.ts
new file mode 100644
index 000000000..7612adb7c
--- /dev/null
+++ b/redux-devtools/redux-devtools.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for redux-devtools 2.1.4
+// Project: https://github.com/gaearon/redux-devtools
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../redux/redux.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+declare module "redux-devtools" {
+    export function devTools(): Function;
+    export function persistState(sessionId: any, stateDeserializer?: Function, actionDeserializer?: Function): Function;
+}
+
+declare module "redux-devtools/lib/react" {
+    import * as React from 'react';
+
+    export class DevTools extends React.Component<any, any> {
+
+    }
+
+    export interface DevToolsProps {
+        monitor: Function;
+        store: Store;
+    }
+
+    export interface Store {
+        devToolStore: DevToolStore;
+    }
+
+    export class DevToolStore extends React.Component<any, any> {
+        dispatch: Function;
+    }
+
+    export class DebugPanel extends React.Component<DebugPanelProps, any> { }
+
+    export interface DebugPanelProps {
+        position?: string;
+        zIndex?: number;
+        fontSize?: string;
+        overflow?: string;
+        opacity?: number;
+        color?: string;
+        left?: boolean|number;
+        right?: boolean|number;
+        top?: boolean|number;
+        bottom?: boolean|number;
+        maxHeight?: string;
+        maxWidth?: string;
+        wordWrap?: string;
+        boxSizing?: string;
+        boxShadow?: string;
+        getStyle?: () => DebugPanelProps;
+    }
+
+    export class LogMonitor extends React.Component<LogMonitorProps, any> { }
+
+    export interface LogMonitorProps {
+        computedStates?: ComputedState[];
+        currentStateIndex?: number;
+        monitorState?: MonitorState;
+        stagedActions?: Action[];
+        skippedActions?: boolean[];
+        reset?: Function;
+        commit?: Function;
+        rollback?: Function;
+        sweep?: Function;
+        toggleAction?: Function;
+        jumpToState?: Function;
+        setMonitorState?: Function;
+        select?: Function;
+        visibleOnLoad?: boolean;
+        theme?: Theme|string;
+    }
+
+    export interface ComputedState {
+        state?: any;
+        error?: string;
+    }
+
+    export interface MonitorState {
+        isViaible?: boolean;
+    }
+
+    export interface Action {
+        type: string;
+    }
+
+    export interface Theme {
+        scheme: string;
+        author: string;
+        base00: string;
+        base01: string;
+        base02: string;
+        base03: string;
+        base04: string;
+        base05: string;
+        base06: string;
+        base07: string;
+        base08: string;
+        base09: string;
+        base0A: string;
+        base0B: string;
+        base0C: string;
+        base0D: string;
+        base0E: string;
+        base0F: string;
+    }
+}
+
diff --git a/redux-logger/redux-logger-tests.ts b/redux-logger/redux-logger-tests.ts
new file mode 100644
index 000000000..b5dd3232f
--- /dev/null
+++ b/redux-logger/redux-logger-tests.ts
@@ -0,0 +1,21 @@
+/// <reference path="./redux-logger.d.ts" />
+
+import createLogger from 'redux-logger';
+import { applyMiddleware, createStore } from 'redux'
+
+let logger = createLogger();
+
+let loggerWithOpts = createLogger({
+  actionTransformer: actn => actn,
+  collapsed: true,
+  duration: true,
+  level: 'error',
+  logger: console,
+  predicate: (getState, action) => true,
+  timestamp: true,
+  transformer: state => state
+});
+
+let createStoreWithMiddleware = applyMiddleware(
+  logger, loggerWithOpts
+)(createStore);
diff --git a/redux-logger/redux-logger.d.ts b/redux-logger/redux-logger.d.ts
new file mode 100644
index 000000000..7f9cab9d7
--- /dev/null
+++ b/redux-logger/redux-logger.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for redux-logger v2.0.0
+// Project: https://github.com/fcomb/redux-logger
+// Definitions by: Alexander Rusakov <https://github.com/arusakov/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../redux/redux.d.ts" />
+
+declare module 'redux-logger' {
+
+  interface ReduxLoggerOptions {
+    actionTransformer?: (action: any) => any;
+    collapsed?: boolean;
+    duration?: boolean;
+    level?: string;
+    logger?: any;
+    predicate?: (getState: Function, action: any) => boolean;
+    timestamp?: boolean;
+    transformer?: (state:any) => any;
+  }
+
+  export default function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
+}
diff --git a/redux-thunk/redux-thunk-tests.ts b/redux-thunk/redux-thunk-tests.ts
new file mode 100644
index 000000000..56cf81f4f
--- /dev/null
+++ b/redux-thunk/redux-thunk-tests.ts
@@ -0,0 +1,127 @@
+/// <reference path="redux-thunk.d.ts" />
+/// <reference path="../redux/redux.d.ts" />
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+import { createStore, applyMiddleware, Store, Dispatch } from 'redux';
+import thunk from 'redux-thunk';
+import { ThunkInterface } from 'redux-thunk';
+import { Promise } from 'es6-promise';
+
+declare var rootReducer: Function;
+declare var fetch: any;
+
+// create a store that has redux-thunk middleware enabled
+const createStoreWithMiddleware = applyMiddleware(
+    thunk
+)(createStore);
+
+const store: Store = createStoreWithMiddleware(rootReducer);
+
+function fetchSecretSauce() {
+    return fetch('https://www.google.com/search?q=secret+sauce');
+}
+
+// These are the normal action creators you have seen so far.
+// The actions they return can be dispatched without any middleware.
+// However, they only express “facts” and not the “async flow”.
+
+function makeASandwich(forPerson: any, secretSauce?: any): any {
+    return {
+        type: 'MAKE_SANDWICH',
+        forPerson,
+        secretSauce
+    };
+}
+
+function apologize(fromPerson: any, toPerson?: any, error?: any): any {
+    return {
+        type: 'APOLOGIZE',
+        fromPerson,
+        toPerson,
+        error
+    };
+}
+
+function withdrawMoney(amount: number): any {
+    return {
+        type: 'WITHDRAW',
+        amount
+    };
+}
+
+// Even without middleware, you can dispatch an action:
+store.dispatch(withdrawMoney(100));
+
+// But what do you do when you need to start an asynchronous action,
+// such as an API call, or a router transition?
+
+// Meet thunks.
+// A thunk is a function that returns a function.
+// This is a thunk.
+
+function makeASandwichWithSecretSauce(forPerson: any): ThunkInterface {
+
+    // Invert control!
+    // Return a function that accepts `dispatch` so we can dispatch later.
+    // Thunk middleware knows how to turn thunk async actions into actions.
+
+    return function (dispatch: Dispatch): any {
+        return fetchSecretSauce().then(
+            (sauce: any) => dispatch(makeASandwich(forPerson, sauce)),
+            (error: any) => dispatch(apologize('The Sandwich Shop', forPerson, error))
+        );
+    };
+}
+
+// Thunk middleware lets me dispatch thunk async actions
+// as if they were actions!
+
+store.dispatch(
+    makeASandwichWithSecretSauce('Me')
+);
+
+// It even takes care to return the thunk’s return value
+// from the dispatch, so I can chain Promises as long as I return them.
+
+store.dispatch(
+    makeASandwichWithSecretSauce('My wife')
+).then(() => {
+    console.log('Done!');
+});
+
+// In fact I can write action creators that dispatch
+// actions and async actions from other action creators,
+// and I can build my control flow with Promises.
+
+function makeSandwichesForEverybody(): ThunkInterface {
+    return function (dispatch: Dispatch, getState: () => any): any {
+        if (!getState().sandwiches.isShopOpen) {
+
+            // You don’t have to return Promises, but it’s a handy convention
+            // so the caller can always call .then() on async dispatch result.
+
+            return Promise.resolve();
+        }
+
+        // We can dispatch both plain object actions and other thunks,
+        // which lets us compose the asynchronous actions in a single flow.
+
+        return dispatch(
+            makeASandwichWithSecretSauce('My Grandma')
+        ).then(() =>
+                Promise.all([
+                    dispatch(makeASandwichWithSecretSauce('Me')),
+                    dispatch(makeASandwichWithSecretSauce('My wife'))
+                ])
+        ).then(() =>
+                dispatch(makeASandwichWithSecretSauce('Our kids'))
+        ).then(() =>
+                dispatch(getState().myMoney > 42 ?
+                        withdrawMoney(42) :
+                        apologize('Me', 'The Sandwich Shop')
+                )
+        );
+    };
+}
+
diff --git a/redux-thunk/redux-thunk.d.ts b/redux-thunk/redux-thunk.d.ts
new file mode 100644
index 000000000..5e125e3bc
--- /dev/null
+++ b/redux-thunk/redux-thunk.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for redux-thunk
+// Project: https://github.com/gaearon/redux-thunk
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../redux/redux.d.ts" />
+
+declare module "redux-thunk" {
+    import { Middleware, Dispatch } from 'redux';
+
+    export interface Thunk extends Middleware { }
+
+    export interface ThunkInterface {
+        <T>(dispatch: Dispatch, getState?: () => T): any;
+    }
+
+    var thunk: Thunk;
+
+    export default thunk;
+}
+
diff --git a/redux/redux.d.ts b/redux/redux.d.ts
index 1f33d1559..1bcbedc63 100644
--- a/redux/redux.d.ts
+++ b/redux/redux.d.ts
@@ -44,8 +44,9 @@ declare module Redux {
     function bindActionCreators<T>(actionCreators: T, dispatch: Dispatch): T;
     function combineReducers(reducers: any): Reducer;
     function applyMiddleware(...middleware: Middleware[]): Function;
+    function compose<T extends Function>(...functions: Function[]): T;
 }
 
 declare module "redux" {
     export = Redux;
-}
\ No newline at end of file
+}
diff --git a/request-ip/request-ip-tests.ts b/request-ip/request-ip-tests.ts
new file mode 100644
index 000000000..8c5111e33
--- /dev/null
+++ b/request-ip/request-ip-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="../express/express.d.ts" />
+/// <reference path="request-ip.d.ts" />
+
+import express = require('express');
+import requestIp = require('request-ip');
+
+var ipMiddleware = function(req:express.Request, res:express.Response, next:Function) {
+    var clientIp = requestIp.getClientIp(req);
+    next();
+};
diff --git a/request-ip/request-ip.d.ts b/request-ip/request-ip.d.ts
new file mode 100644
index 000000000..e71ed1a37
--- /dev/null
+++ b/request-ip/request-ip.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for request-ip
+// Project: https://github.com/pbojinov/request-ip
+// Definitions by: Adam Babcock <https://github.com/mrhen>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "request-ip" {
+    interface Request {
+        headers: {
+            'x-client-ip'?: string;
+            'x-forwarded-for'?: string;
+            'x-real-ip'?: string;
+            'x-cluster-client-ip'?: string;
+            'x-forwarded'?: string;
+            'forwarded-for'?: string;
+            'forwarded'?: string;
+        };
+        connection: {
+            remoteAddress?: string;
+            socket?: {
+                remoteAddress?: string
+            };
+        };
+        info?: {
+            remoteAddress?: string
+        };
+        socket?: {
+            remoteAddress?: string
+        };
+    }
+
+    export function getClientIp(req:Request):string;
+}
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 9cee53eee..246f1e5d9 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Christopher Glantschnig <https://github.com/cglantschnig/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+// Change [0]: 2015/08/20 - Aya Morisawa <https://github.com/AyaMorisawa>
+
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../form-data/form-data.d.ts" />
 /// <reference path="../request/request.d.ts" />
@@ -22,7 +24,7 @@ declare module 'request-promise' {
     module RequestPromiseAPI {
         export interface Options extends request.Options {
             simple?: boolean;
-            transform?: (body: any, response: http.IncomingMessage) => number;
+            transform?: (body: any, response: http.IncomingMessage) => any;
             resolveWithFullResponse?: boolean;
         }
     }
diff --git a/request/request.d.ts b/request/request.d.ts
index e261d3615..4827bc7a6 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -62,12 +62,13 @@ declare module 'request' {
 			uri?: string;
 			callback?: (error: any, response: http.IncomingMessage, body: any) => void;
 			jar?: any; // CookieJar
+			formData?: any; // Object
 			form?: any; // Object or string
 			auth?: AuthOptions;
 			oauth?: OAuthOptions;
 			aws?: AWSOptions;
 			hawk ?: HawkOptions;
-			qs?: Object;
+			qs?: any;
 			json?: any;
 			multipart?: RequestPart[];
 			agentOptions?: any;
@@ -141,6 +142,7 @@ declare module 'request' {
 			pass?: string;
 			password?: string;
 			sendImmediately?: boolean;
+			bearer?: string;
 		}
 
 		export interface OAuthOptions {
diff --git a/requirejs/require.d.ts b/requirejs/require.d.ts
index 58fb4f6f1..5ca4b476a 100644
--- a/requirejs/require.d.ts
+++ b/requirejs/require.d.ts
@@ -166,8 +166,8 @@ interface RequireConfig {
 
 	/**
 	* Extra query string arguments appended to URLs that RequireJS
-	* uses to fetch resources.  Most useful to cachce bust when
-	* the browser or server is not configured correcty.
+	* uses to fetch resources.  Most useful to cache bust when
+	* the browser or server is not configured correctly.
 	*
 	* @example
 	* urlArgs: "bust= + (new Date()).getTime()
diff --git a/rest-io/rest-io-tests.ts b/rest-io/rest-io-tests.ts
new file mode 100644
index 000000000..5f558b77a
--- /dev/null
+++ b/rest-io/rest-io-tests.ts
@@ -0,0 +1,18 @@
+/// <reference path="rest-io.d.ts" />
+
+import express = require('express');
+import restIO = require('rest-io');
+import mongoose = require('mongoose');
+
+var app = express();
+
+// register the express app with rest.io
+restIO.restIO(app, {
+  resources: __dirname + '/resources'
+});
+
+mongoose.connect('mongodb://localhost:27017/test');
+app.listen(3000, function () {
+  console.log('Server has started under port: 3000');
+});
+module.exports = app;
\ No newline at end of file
diff --git a/rest-io/rest-io.d.ts b/rest-io/rest-io.d.ts
new file mode 100644
index 000000000..a2dac465b
--- /dev/null
+++ b/rest-io/rest-io.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for rest-io 4.0
+// Project: https://github.com/EnoF/rest-io
+// Definitions by: Andy Tang <https://github.com/EnoF>, Stefan Schacherl <https://github.com/TheBay0r>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../mongoose/mongoose.d.ts" />
+
+
+declare module 'rest-io' {
+import {Router, Application, Response, Request} from 'express';
+
+import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
+
+  function restIO(app: Application, config?: IRestIOConfig): RestIO;
+
+  export interface RestIO {
+    resource: ResourceModule
+  }
+
+  export interface IRestIOConfig {
+    resources: string;
+    db?: Mongoose;
+  }
+
+  export interface ResourceModule {
+    Resource: Resource;
+    AuthorizedResource: AuthorizedResource;
+    authorizedResource: AuthorizedResourceModule;
+    UserResource: UserResource;
+    SubResource: SubResource;
+  }
+
+  export class Resource {
+    baseUrl: string;
+    url: string;
+    parameterizedUrl: string;
+    model: Model<Document>;
+    resDef: IResource;
+    parentResource: Resource;
+    router: Router;
+    app: Application;
+    db: Mongoose;
+    paramId: string;
+    parentRef: string;
+    populate: string;
+
+    constructor(resDef: IResource);
+
+    createModel(resDef: IResource): Model<Document>;
+
+    toClassName(name: string): string;
+
+    setupRoutes(): void;
+
+    getAll(req: Request, res: Response): void;
+
+    buildParentSearch(req: Request): any;
+
+    getById(req: Request, res: Response): void;
+
+    create(req: Request, res: Response): void;
+
+    update(req: Request, res: Response): void;
+
+    del(req: Request, res: Response): void;
+
+    errorHandler(err: Error, res: Response): void;
+  }
+
+  export interface IResource {
+    name: string;
+    model: any;
+    parentRef?: string;
+    populate?: string;
+    plural?: string;
+    parentResource?: Resource;
+  }
+
+  export interface AuthorizedResourceModule {
+    AuthorizedResource: AuthorizedResource
+    ROLES: Roles
+  }
+
+  export interface Roles {
+    USER: string;
+    SUPER_USER: string;
+    MODERATOR: string;
+    ADMIN: string;
+  }
+
+  export class AuthorizedResource extends Resource {
+    methodAccess: IMethodAccess;
+
+    maxDays: number;
+
+    permissions: IMethodAccess;
+
+    isTokenExpired(createdAt: Date): boolean;
+
+    getRoles(id: string): Promise<Document>;
+
+    hasAuthorizedRole(roles: Array<any>, authorizedRoles: Array<string>): boolean;
+
+    hasAccessRightsDefined(req: Request, authorizedRoles: Array<string>): boolean;
+
+    isAuthorized(req: Request, authorizedRoles: Array<string>): boolean;
+
+    sendUnauthorized(error: Error, res: Response): void;
+  }
+
+  export interface IMethodAccess {
+    getAll: Array<string>;
+    getById: Array<string>;
+    create: Array<string>;
+    update: Array<string>;
+    del: Array<string>;
+  }
+
+  export class UserResource extends AuthorizedResource {
+    ensureBaseUserModel(model: any): void;
+
+    createRoleModel(): void;
+
+    isSelf(req: Request): boolean;
+
+    login(req: Request, res: Response): void;
+  }
+
+  export class SubResource extends Resource {
+    constructor(resDef: ISubResource);
+
+    createProjectionQuery(req: Request): any;
+
+    createPullQuery(req: Request): any;
+
+    createFindQuery(req: Request): any;
+
+    createSubUpdateQuery(req: Request): any;
+  }
+
+  export interface ISubResource {
+    name: string;
+    plural?: string;
+    parentResource: Resource;
+    populate?: string;
+  }
+}
\ No newline at end of file
diff --git a/rest/rest-tests.ts b/rest/rest-tests.ts
index 6d267c792..cedc11b00 100644
--- a/rest/rest-tests.ts
+++ b/rest/rest-tests.ts
@@ -117,24 +117,24 @@ var promiseOrResponse = interceptor({
 });
 
 client = rest
-    .wrap(defaultRequest)
-    .wrap(hateoas)
-    .wrap(location)
-    .wrap(mime)
-    .wrap(pathPrefix)
-    .wrap(basicAuth)
-    .wrap(oAuth)
-    .wrap(csrf)
-    .wrap(errorCode)
-    .wrap(retry)
-    .wrap(timeout)
-    .wrap(jsonp)
-    .wrap(xdomain)
-    .wrap(xhr)
-    .wrap(noop)
-    .wrap(fail)
-    .wrap(knownConfig, { prop: 'value' })
-    .wrap(transformedConfig, { prop: 'value' });
+    .wrap<any>(defaultRequest)
+    .wrap<any>(hateoas)
+    .wrap<any>(location)
+    .wrap<any>(mime)
+    .wrap<any>(pathPrefix)
+    .wrap<any>(basicAuth)
+    .wrap<any>(oAuth)
+    .wrap<any>(csrf)
+    .wrap<any>(errorCode)
+    .wrap<any>(retry)
+    .wrap<any>(timeout)
+    .wrap<any>(jsonp)
+    .wrap<any>(xdomain)
+    .wrap<any>(xhr)
+    .wrap<any>(noop)
+    .wrap<any>(fail)
+    .wrap<any>(knownConfig, { prop: 'value' })
+    .wrap<any>(transformedConfig, { prop: 'value' });
 
 import xhrClient = require('rest/client/xhr');
 import nodeClient = require('rest/client/node');
diff --git a/restangular/restangular-tests.ts b/restangular/restangular-tests.ts
index 33c46a421..9b5a9c30b 100644
--- a/restangular/restangular-tests.ts
+++ b/restangular/restangular-tests.ts
@@ -92,7 +92,8 @@ myApp.controller('TestCtrl', (
   Restangular.setMethodOverriders(["put", "patch"]);
 
   Restangular.setErrorInterceptor(function (response) {
-      console.error('' + response.status + ' ' + response.data);
+      let location: string = response.headers('Location');
+      console.error('' + response.status + ' ' + response.data + ' ' + location);
   });
 
   Restangular.setRequestSuffix('.json');
diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts
index 0c5f698ca..b09e4affd 100644
--- a/restangular/restangular.d.ts
+++ b/restangular/restangular.d.ts
@@ -6,6 +6,13 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
+// Support AMD require (copying angular.d.ts approach)
+// allows for import {IRequestConfig} from 'restangular' ES6 approach
+declare module 'restangular' {
+    export = restangular;
+}
+
+
 
 declare module restangular {
 
@@ -36,6 +43,7 @@ declare module restangular {
   interface IResponse {
     status: number;
     data: any;
+    headers(name: string): string;
     config: {
         method: string;
         url: string;
diff --git a/restful.js/restful.js-tests.ts b/restful.js/restful.js-tests.ts
new file mode 100644
index 000000000..80f3bd187
--- /dev/null
+++ b/restful.js/restful.js-tests.ts
@@ -0,0 +1,198 @@
+/// <reference path="restful.js.d.ts" />
+
+import restful, {
+    Api, MemberResponse, CollectionResponse, ResponseBody, CollectionEndpoint, MemberEndpoint,
+} from 'restful.js';
+
+class Article {
+    title: string;
+    body: string;
+}
+class Comment {
+    body: string;
+}
+class Author {
+    name: string;
+}
+
+var api: Api;
+
+api = restful('api.example.com');
+
+//
+// Usage
+//
+
+api = restful('api.example.com')
+    .header('AuthToken', 'test') // set global header
+    .prefixUrl('v1')
+    .protocol('https')
+    .port(8080);
+// resource now targets `https://api.example.com:8080/v1`
+
+
+var articlesCollection = api.all('articles');  // http://api.example.com/articles
+var articleMember = api.one('articles', 1);  // http://api.example.com/articles/1
+var articleMember = api.one('articles', 1);  // http://api.example.com/articles/1
+var commentsCollection = articleMember.all('comments');  // http://api.example.com/articles/1/comments
+
+var articleMember = api.oneUrl('articles', 'http://custom.url/article?id=1');  // http://custom.url/article?id=1
+var articlesCollection = api.allUrl('articles', 'http://custom.url/article/list');  // http://custom.url/article/list
+
+articleMember = api.one('articles', 1);  // http://api.example.com/articles/1
+articleMember.get().then((response: MemberResponse<Article>) => {
+    var articleEntity = response.body();
+
+    var article = articleEntity.data();
+    console.log(article.title); // hello, world!
+});
+
+commentsCollection = articleMember.all('comments');  // http://api.example.com/articles/1/comments
+commentsCollection.getAll().then((response: CollectionResponse<Comment>) => {
+    var commentEntities = response.body();
+
+    commentEntities.forEach((commentEntity: ResponseBody<Comment>) => {
+        var comment = commentEntity.data();
+        console.log(comment.body);
+    })
+});
+
+// fetch http://api.example.com/articles/1/comments/4
+articleMember = api.one('articles', 1);
+let commentMember = articleMember.one('comments', 4);
+commentMember.get().then((response) => {
+    //
+});
+// equivalent to
+commentsCollection = articleMember.all('comments');
+commentsCollection.get(4).then((response) => {
+    //
+});
+
+//
+// Entity Data
+//
+
+var articleCollection = api.all('articles');  // http://api.example.com/articles
+
+// http://api.example.com/articles/1
+api.one('articles', 1).get().then((response: MemberResponse<Article>) => {
+    var articleEntity = response.body();
+
+    // if the server response was { id: 1, title: 'test', body: 'hello' }
+    var article = articleEntity.data();
+    article.title; // returns `test`
+    article.body; // returns `hello`
+    // You can also edit it
+    article.title = 'test2';
+    // Finally you can easily update it or delete it
+    articleEntity.save(); // will perform a PUT request
+    articleEntity.remove(); // will perform a DELETE request
+}, (response: any) => {
+    // The reponse code is not >= 200 and < 400
+    throw new Error('Invalid response');
+});
+
+articleMember = api.one('articles', 1);  // http://api.example.com/articles/1
+commentMember = articleMember.one('comments', 3);  // http://api.example.com/articles/1/comments/3
+commentMember.get()
+    .then((response: MemberResponse<Comment>) => {
+    var commentEntity = response.body();
+
+    // You can also call `all` and `one` on an entity
+    return commentEntity.all('authors').getAll(); // http://api.example.com/articles/1/comments/3/authors
+}).then((response: CollectionResponse<Author>) => {
+    var authorEntities = response.body();
+
+    authorEntities.forEach((authorEntity: ResponseBody<Author>) => {
+        var author = authorEntity.data();
+        console.log(author.name);
+    });
+});
+
+// configure the api
+api.header('AuthToken', 'test');
+
+articlesCollection = api.all('articles');
+articlesCollection.get(1); // will send the `AuthToken` header
+// You can configure articlesCollection, too
+articlesCollection.header('foo', 'bar');
+
+//TODO: The line below was written in README.md but actually incorrect invocation, hence commented out
+//articlesCollection.one('comments', 1).get(); // will send both the AuthToken and foo headers
+
+
+// http://api.example.com/articles/1/comments/2/authors
+let authorsCollection = api.one('articles', 1).one('comments', 2).all('authors');
+authorsCollection.getAll().then(function(authorEntities) { /*  */ });
+authorsCollection.get(1).then(function(authorEntity) { /*  */ });
+
+
+//
+// Interceptors
+//
+
+var resource: Api;
+
+resource.addRequestInterceptor((data: any, headers: any, method: string, url: string) => {
+    // to edit the headers, just edit the headers object
+
+    // You always must return the data object
+    return data;
+});
+
+resource.addFullRequestInterceptor(function(params, headers, data, method, url) {
+    //...
+
+    // all args had been modified
+    return {
+        params: params,
+        headers: headers,
+        data: data,
+        method: method,
+        url: url
+    };
+
+    // just return modified arguments
+    return {
+        headers: headers,
+        data: data
+    };
+});
+
+resource.addFullResponseInterceptor(function(data, headers, method, url) {
+    // all args had been modified (method and url is read only)
+    return {
+        headers: headers,
+        data: data
+    };
+
+    // just return modified arguments
+    return {
+        headers: headers
+    };
+});
+
+//
+// Response methods
+//
+
+// http://api.example.com/articles/1/comments/2
+commentMember = api.one('articles', 1).one('comments', 2);
+commentMember.get().then(function(response) {
+    let commentEntity = response.body();
+    commentEntity.save();
+    commentEntity.remove();
+});
+
+//
+// Error Handling
+//
+
+commentMember = resource.one('articles', 1).one('comments', 2);
+commentMember
+    .get()
+    .then(function(commentEntity) { /*  */ })
+    .catch(function(err) {
+    // deal with the error
+});
diff --git a/restful.js/restful.js.d.ts b/restful.js/restful.js.d.ts
new file mode 100644
index 000000000..2d62f113c
--- /dev/null
+++ b/restful.js/restful.js.d.ts
@@ -0,0 +1,245 @@
+// Type definitions for restful.js 0.6.2
+// Project: https://github.com/marmelab/restful.js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
+declare module "restful.js" {
+    export interface Headers {
+        [key: string]: any
+    }
+
+    export interface Api extends Endpoint<Api> {
+        all(name: string): CollectionEndpoint;
+        allUrl(name: string, url: string): CollectionEndpoint;
+        one(name: string, id: any): MemberEndpoint;
+        oneUrl(name: string, url: string): MemberEndpoint;
+        protocol(protocol: string): Api;
+        protocol(): string;
+        baseUrl(protocol: string): Api;
+        baseUrl(): string;
+        port(port: number): Api;
+        port(): number;
+        prefixUrl(prefix: string): Api;
+        prefixUrl(): string;
+        customUrl(url: string): Api;
+        customUrl(): string;
+    }
+
+    export interface MemberEndpoint extends Endpoint<MemberEndpoint> {
+        /**
+         * Target a child collection name.
+         * @param name
+         */
+        all(name: string): CollectionEndpoint;
+        allUrl(name: string, url: string): CollectionEndpoint;
+        /**
+         * Target a child member in a collection name.
+         * @param name
+         * @param id
+         */
+        one(name: string, id: any): MemberEndpoint;
+        oneUrl(name: string, url: string): MemberEndpoint;
+        /**
+         * Get a member. Returns a promise with an entity.
+         * @param params
+         * @param headers
+         */
+        get<T>(params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Update a member. Returns a promise with the response.
+         * @param data
+         * @param headers
+         */
+        put<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Delete a member. Returns a promise with the response.
+         * @param data
+         * @param headers
+         */
+        delete<T>(data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Patch a member. Returns a promise with the response.
+         * @param data
+         * @param headers
+         */
+        patch<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Perform a HEAD request on a member. Returns a promise with the response.
+         * @param headers
+         */
+        head<T>(headers?: any): Promise<MemberResponse<T>>;
+        customUrl(url: string): MemberEndpoint;
+        customUrl(): string;
+    }
+
+    export interface CollectionEndpoint extends Endpoint<CollectionEndpoint> {
+        /**
+         * Get a member in a collection. Returns a promise with an entity.
+         * @param id
+         */
+        get<T>(id: any, params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Get a full collection. Returns a promise with an array of entities.
+         */
+        getAll<T>(params?: any, headers?: Headers): Promise<CollectionResponse<T>>;
+        /**
+         * Create a member in a collection. Returns a promise with the response.
+         */
+        post<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Update a member in a collection. Returns a promise with the response.
+         * @param id
+         * @param data
+         * @param headers
+         */
+        put<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Delete a member in a collection. Returns a promise with the response.
+         * @param id
+         * @param data
+         * @param headers
+         */
+        delete<T>(id: any, data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Patch a member in a collection. Returns a promise with the response.
+         * @param id
+         * @param data
+         * @param headers
+         */
+        patch<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+        /**
+         * Perform a HEAD request on a member in a collection. Returns a promise with the response.
+         * @param id
+         * @param headers
+         */
+        head<T>(id: any, headers?: Headers): Promise<MemberResponse<T>>;
+    }
+
+    export interface Endpoint<Self> {
+        /**
+         * Get the url.
+         */
+        url(): string;
+        /**
+         * Add a response interceptor. You can only alter data and headers.
+         */
+        addResponseInterceptor(interceptor: ResponseInterceptor): Self;
+        responseInterceptors(): ResponseInterceptor[];
+        /**
+         * Add a request interceptor.
+         */
+        addRequestInterceptor(interceptor: RequestInterceptor): Self;
+        requestInterceptors(): RequestInterceptor[];
+        /**
+         * Add a full response interceptor. You can alter data and headers.
+         */
+        addFullResponseInterceptor(interceptor: ResponseInterceptor): Self;
+        fullResponseInterceptors(): ResponseInterceptor[];
+        /**
+         * Add a full request interceptor. You can alter params, headers, data, method and url.
+         */
+        addFullRequestInterceptor(interceptor: FullRequestInterceptor): Self;
+        fullRequestInterceptors(): FullRequestInterceptor[];
+        /**
+         * Add a header.
+         * @param name
+         * @param value
+         */
+        header(name: string, value: any): Self;
+        headers(): Headers;
+    }
+
+    export interface MemberResponse<T> extends ResponseBase {
+        (): {
+            data: T;
+            headers: Headers;
+            status: number;
+            statusText: string;
+        }
+        body(): ResponseBody<T>;
+    }
+
+    export interface CollectionResponse<T> extends ResponseBase {
+        (): {
+            data: T[];
+            headers: Headers;
+            status: number;
+            statusText: string;
+        }
+        body(): ResponseBody<T>[];
+    }
+
+    export interface ResponseBase {
+        status(): number;
+        headers(): Headers;
+        config(): any;
+    }
+
+    export interface ResponseBody<T> {
+        /**
+         * Get the JS object unserialized from the response body (which must be in JSON)
+         */
+        data(): T;
+        (): T;
+        /**
+         * Query a collection child of the entity.
+         * @param entity
+         */
+        all(entity: string): CollectionEndpoint;
+        /**
+         * Query a member child of the entity.
+         * @param entity
+         * @param id
+         */
+        one(entity: string, id: any): MemberEndpoint;
+        /**
+         * Update the member link to the entity. Returns a promise with the response.
+         * @param headers
+         */
+        save(headers?: Headers): void;
+        /**
+         * Delete the member link to the entity. Returns a promise with the response.
+         */
+        remove(headers?: Headers): void;
+        /**
+         * Get the entity url.
+         */
+        url(): string;
+        /**
+         * Get the id of the entity.
+         */
+        id(): any;
+    }
+
+    export interface RequestInterceptor {
+        (data: any, headers: Headers, method: string, url: string): any;
+    }
+
+    export interface FullRequestInterceptor {
+        (params: any, headers: Headers, data: any, method: string, url: string): FullRequestInterceptorReturnValue;
+    }
+
+    export interface FullRequestInterceptorReturnValue {
+        params?: any;
+        headers?: Headers;
+        data?: any;
+        method?: string;
+        url?: string;
+    }
+
+    export interface ResponseInterceptor {
+        (data: any, headers: Headers, method: string, url: string): ResponseInterceptorReturnValue;
+    }
+
+    export interface ResponseInterceptorReturnValue {
+        headers?: Headers;
+        data?: any;
+        method?: string;
+        url?: string;
+    }
+
+    export default function restful(endpoint: string): Api;
+}
+
diff --git a/riotcontrol/riotcontrol-tests.ts b/riotcontrol/riotcontrol-tests.ts
new file mode 100644
index 000000000..b3eee8b2e
--- /dev/null
+++ b/riotcontrol/riotcontrol-tests.ts
@@ -0,0 +1,41 @@
+/// <reference path="./riotcontrol.d.ts" />
+
+import riotcontrol = require('riotcontrol');
+
+{
+	let store: RiotControl.Store;
+	let result: void;
+	result = riotcontrol.addStore(store);
+}
+
+{
+	let events: string;
+	let fn: Function;
+	let result: void;
+	result = riotcontrol.on(events, fn);
+}
+
+{
+	let name: string;
+	let fn: Function;
+	let result: void;
+	result = riotcontrol.one(name, fn);
+}
+
+{
+	let events: string;
+	let fn: Function;
+	let result: void;
+	result = riotcontrol.off(events);
+	result = riotcontrol.off(events, fn);
+}
+
+{
+	let name: string;
+	let arg: any;
+	let result: void;
+	result = riotcontrol.trigger(name);
+	result = riotcontrol.trigger(name, arg);
+	result = riotcontrol.trigger(name, arg, arg);
+	result = riotcontrol.trigger(name, arg, arg, arg);
+}
diff --git a/riotcontrol/riotcontrol.d.ts b/riotcontrol/riotcontrol.d.ts
new file mode 100644
index 000000000..0fcafcf28
--- /dev/null
+++ b/riotcontrol/riotcontrol.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for RiotControl
+// Project: https://github.com/jimsparkman/RiotControl
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module RiotControl {
+	interface Store {
+		on(events: string, fn: Function): Store;
+		one(name: string, fn: Function): Store;
+		off(events: string, fn?: Function): Store;
+		trigger(name: string, ...args: any[]): Store;
+	}
+
+	var _stores: Store[];
+
+	function addStore(store: Store): void;
+
+	function on(events: string, fn: Function): void;
+	function one(name: string, fn: Function): void;
+	function off(events: string, fn?: Function): void;
+	function trigger(name: string, ...args: any[]): void;
+}
+
+declare module "riotcontrol" {
+	export = RiotControl;
+}
diff --git a/rosie/rosie-tests.ts b/rosie/rosie-tests.ts
new file mode 100644
index 000000000..740f1e40c
--- /dev/null
+++ b/rosie/rosie-tests.ts
@@ -0,0 +1,32 @@
+///<reference path="./rosie.d.ts" />
+
+let resultObj: Object;
+let resultFactory: rosie.IFactory;
+
+declare var Factory:rosie.IFactoryStatic;
+
+resultFactory = Factory.define('person').attr('name', 'John').sequence('id');
+resultObj = Factory.build('person');
+
+resultFactory = Factory.define('some').sequence('id').attr('name', ['id'], (id: number) => { return 'Name ' + id.toString() });
+resultObj = Factory.build('some');
+
+Factory.define('coach')
+  .option('buildPlayer', false)
+  .sequence('id')
+  .attr('players', ['id', 'buildPlayer'], function(id: any, buildPlayer: boolean) {
+    if (buildPlayer) {
+      return [Factory.build('player', {coach_id: id})];
+    }
+  })
+  .after(function(coach: any, options: any) {
+    if (options.buildPlayer) {
+      console.log('built player:', coach.players[0]);
+    }
+  });
+
+Factory.build('coach', {}, {buildPlayer: true});
+
+import rosie = require('rosie');
+
+var Factory = rosie.Factory;
diff --git a/rosie/rosie.d.ts b/rosie/rosie.d.ts
new file mode 100644
index 000000000..31c7aa6f9
--- /dev/null
+++ b/rosie/rosie.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for rosie
+// Project: https://github.com/rosiejs/rosie
+// Definitions by: Abner Oliveira <https://github.com/abner/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+declare module rosie {
+  interface IFactoryStatic {
+
+
+    /**
+     * Defines a factory by name and constructor function. Call #attr and #option
+     * on the result to define the properties of this factory.
+     *
+     * @param {!string} name
+     * @param {function(object): *=} constructor
+     * @return {Factory}
+     */
+    define(name: String, constructor?: Function):  IFactory;
+
+    /**
+     * Locates a factory by name and calls #build on it.
+     *
+     * @param {string} name
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {*}
+     */
+    build(name: string, attributes?: any, options?: Object): Object;
+
+    /**
+     * Builds a collection of objects using the named factory.
+     *
+     * @param {string} name
+     * @param {number} size
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {Array.<*>}
+     */
+    buildList(name: string, size: number, attributes?: any, options?: Object): Object[];
+
+    /**
+     * Locates a factory by name and calls #attributes on it.
+     *
+     * @param {string} name
+     * @param {object} attributes
+     * @param {object} options
+     * @return {object}
+     */
+    attributes(name: string, attributes: Object, options?: Object): Object;
+  }
+
+  interface IFactory {
+    /**
+      * Define an attribute on this factory. Attributes can optionally define a
+      * default value, either as a value (e.g. a string or number) or as a builder
+      * function. For example:
+      *
+      *   // no default value for age
+      *   Factory.define('Person').attr('age')
+      *
+      *   // static default value for age
+      *   Factory.define('Person').attr('age', 18)
+      *
+      *   // dynamic default value for age
+      *   Factory.define('Person').attr('age', function() {
+      *      return Math.random() * 100;
+      *   })
+      *
+      * Attributes with dynamic default values can depend on options or other
+      * attributes:
+      *
+      *   Factory.define('Person').attr('age', ['name'], function(name) {
+      *     return name === 'Brian' ? 30 : 18;
+      *   });
+      *
+      * By default if the consumer of your factory provides a value for an
+      * attribute your builder function will not be called. You can override this
+      * behavior by declaring that your attribute depends on itself:
+      *
+      *   Factory.define('Person').attr('spouse', ['spouse'], function(spouse) {
+      *     return Factory.build('Person', spouse);
+      *   });
+      *
+      * As in the example above, this can be a useful way to fill in
+      * partially-specified child objects.
+      *
+      * @param {string} attr
+      * @param {Array.<string>=} | any dependenciesOrValue
+      * @param any
+      * @return {Factory}
+      */
+    attr(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
+
+    /**
+     * Define an option for this factory. Options are values that may inform
+     * dynamic attribute behavior but are not included in objects built by the
+     * factory. Like attributes, options may have dependencies. Unlike
+     * attributes, options may only depend on other options.
+     *
+     *   Factory.define('Person')
+     *     .option('includeRelationships', false)
+     *     .attr(
+     *       'spouse',
+     *       ['spouse', 'includeRelationships'],
+     *       function(spouse, includeRelationships) {
+     *         return includeRelationships ?
+     *           Factory.build('Person', spouse) :
+     *           null;
+     *       });
+     *
+     *   Factory.build('Person', null, { includeRelationships: true });
+     *
+     * Options may have either static or dynamic default values, just like
+     * attributes. Options without default values must have a value specified
+     * when building.
+     *
+     * @param {string} opt
+     * @param {Array.<string>=} | any dependencies or value
+     * @param {*=} value
+     * @return {Factory}
+     */
+    option(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
+
+    /**
+     * Defines an attribute that, by default, simply has an auto-incrementing
+     * numeric value starting at 1. You can provide your own builder function
+     * that accepts the number of the sequence and returns whatever value you'd
+     * like it to be.
+     *
+     * Sequence values are inherited such that a factory derived from another
+     * with a sequence will share the state of that sequence and they will never
+     * conflict.
+     *
+     *   Factory.define('Person').sequence('id');
+     *
+     * @param {string} attr
+     * @param {Array.<string>=} dependencies
+     * @param {function(number): *=} builder
+     * @return {Factory}
+     */
+    sequence(name: string, dependencies?: string[], builder?: Function) : IFactory;
+
+    /**
+     * Sets a post-processor callback that will receive built objects and the
+     * options for the build just before they are returned from the #build
+     * function.
+     *
+     * @param {function(object, ?object)} callback
+     * @return {Factory}
+     */
+    after(functionArg: Function): IFactory;
+
+    /**
+     * Sets the constructor for this factory to be another factory. This can be
+     * used to create more specific sub-types of factories.
+     *
+     * @param {Factory} parentFactory
+     * @return {Factory}
+     */
+    inherits(functionArg: Function): IFactory;
+
+    /**
+     * Builds a plain object containing values for each of the declared
+     * attributes. The result of this is the same as the result when using #build
+     * when there is no constructor registered.
+     *
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {object}
+     */
+    attributes(attributes:Object, options: Object): Object;
+
+    /**
+     * Generates values for all the registered options using the values given.
+     *
+     * @private
+     * @param {object} options
+     * @return {object}
+     */
+    options(options: Object): Object;
+
+    /**
+     * Builds objects by getting values for all attributes and optionally passing
+     * the result to a constructor function.
+     *
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {*}
+     */
+    build(attributes: Object, options: Object): Object;
+
+    buildList(size: number, attributes: Object, options: Object): Object[];
+
+  }
+
+}
+
+declare var rosie: { Factory: rosie.IFactoryStatic };
+
+declare module 'rosie' {
+    export = rosie;
+}
diff --git a/royalslider/royalslider-tests.ts b/royalslider/royalslider-tests.ts
index 6cafcb6d6..4246ec90b 100644
--- a/royalslider/royalslider-tests.ts
+++ b/royalslider/royalslider-tests.ts
@@ -10,10 +10,10 @@ $(".royalSlider").royalSlider({
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         thumbs: {
-            // thumbnails options go gere
+            // thumbnails options go here
             spacing: 10,
             arrowsAutoHide: true
         }
@@ -22,10 +22,10 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         fullscreen: {
-            // fullscreen options go gere
+            // fullscreen options go here
             enabled: true,
             nativeFS: true
         }
@@ -34,10 +34,10 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         deeplinking: {
-            // deep linking options go gere
+            // deep linking options go here
             enabled: true,
             prefix: 'slider-'
         }
@@ -47,10 +47,10 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         autoplay: {
-            // autoplay options go gere
+            // autoplay options go here
             enabled: true,
             pauseOnHover: true
         }
@@ -59,10 +59,10 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         video: {
-            // video options go gere
+            // video options go here
             autoHideBlocks: true,
             autoHideArrows: false
         }
@@ -71,10 +71,10 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         autoScaleSlider: true,
         block: {
-            // animated blocks options go gere
+            // animated blocks options go here
             fadeEffect: false,
             moveEffect: 'left'
         }
@@ -83,7 +83,7 @@ jQuery(document).ready(function () {
 
 jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
-        // general options go gere
+        // general options go here
         keyboardNavEnabled: true,
         visibleNearby: {
             enabled: true,
@@ -174,7 +174,7 @@ slider.ev.on('rsBeforeAnimStart', function (event) {
 slider.ev.on('rsBeforeMove', function (event: JQueryEventObject, type?: string, userAction?: boolean) {
     // before any transition start (including after drag release)
     // "type" - can be "next", "prev", or ID of slide to move
-    // userAction (Boolean) - defines if action is triggered by user (e.g. will be false if movement is triggered by autoPlay)
+    // userAction (Boolean) - defines if action is trighered by user (e.g. will be false if movement is trighered by autoPlay)
 });
 slider.ev.on('rsBeforeSizeSet', function (event) {
     // before size of slider is changed
diff --git a/rsmq-worker/rsmq-worker-tests.ts b/rsmq-worker/rsmq-worker-tests.ts
index 4568302dd..d5d974bd0 100644
--- a/rsmq-worker/rsmq-worker-tests.ts
+++ b/rsmq-worker/rsmq-worker-tests.ts
@@ -1,7 +1,10 @@
+/// <reference path="./rsmq-worker.d.ts" />
 
 import RSMQWorker = require('rsmq-worker');
 
-var worker = new RSMQWorker("my-queue");
+var worker: RSMQWorker.Client;
+
+worker = new RSMQWorker("my-queue");
 worker.changeInterval(1);
 worker.changeInterval([0, 1, 5, 10]);
 
@@ -18,4 +21,3 @@ worker.send('message2', 1, (e: Error, id:string) => {
 worker.send('message3', () => {});
 
 worker.stop();
-
diff --git a/rsmq-worker/rsmq-worker.d.ts b/rsmq-worker/rsmq-worker.d.ts
index 8783d914f..5d4f9079a 100644
--- a/rsmq-worker/rsmq-worker.d.ts
+++ b/rsmq-worker/rsmq-worker.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for rsmq-worker 0.3.5
 // Project: http://smrchy.github.io/rsmq/rsmq-worker/
-// Definitions by: Qubo <https://github.com/MugeSo>
+// Definitions by: TANAKA Koichi <https://github.com/MugeSo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path='../rsmq/rsmq.d.ts'/>
@@ -9,44 +9,45 @@ declare module "rsmq-worker" {
     import redis = require('redis');
     import events = require('events');
 
-    interface CallbackT<R> {
-        (e?:Error, res?:R): void;
+    module RSMQWorker {
+        export interface Client extends events.EventEmitter {
+            start(): Client;
+            stop(): Client;
+            send(message: string, delay?: number, cb?: CallbackT<string>): Client;
+            send(message: string, cb: CallbackT<string>): Client;
+            del(id: string, cb?: CallbackT<void>): Client;
+            changeInterval(interval: number|number[]): Client;
+        }
+
+        export interface Options {
+            interval?: number;
+            maxReceiveCount?: number;
+            invisibletime?: number;
+            defaultDelay?: number;
+            autostart?: boolean;
+            timeout?: number;
+            customExceedCheck?: CustomExceedCheckCallback;
+            rsmq?: RedisSMQ.Client;
+            redis?: redis.RedisClient;
+            redisPrefix?: string;
+            host?: string;
+            port?: number;
+            options?: redis.ClientOpts;
+        }
+
+        export interface CustomExceedCheckCallback {
+            (message: RedisSMQ.Message): boolean;
+        }
+
+        export interface CallbackT<R> {
+            (e?:Error, res?:R): void;
+        }
     }
 
     interface RSMQWorkerStatic {
-        new(queuename: string, options?: WorkerOptions): RSMQWorker;
+        new(queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
     }
 
-    interface WorkerOptions {
-        interval?: number;
-        maxReceiveCount?: number;
-        invisibletime?: number;
-        defaultDelay?: number;
-        autostart?: boolean;
-        timeout: number;
-        customExceedCheck?: CustomExceedCheckCallback;
-        rsmq?: RedisSMQ.Client;
-        redis?: redis.RedisClient;
-        redisPrefix?: string;
-        host?: string;
-        port?: number;
-        options?: redis.ClientOpts;
-    }
-
-    interface CustomExceedCheckCallback {
-        (message: RedisSMQ.Message): boolean;
-    }
-
-
-    interface RSMQWorker extends events.EventEmitter {
-        start(): RSMQWorker;
-        stop(): RSMQWorker;
-        send(message: string, delay?: number, cb?: CallbackT<string>): RSMQWorker;
-        send(message: string, cb: CallbackT<string>): RSMQWorker;
-        del(id: string, cb?: CallbackT<void>): RSMQWorker;
-        changeInterval(interval: number|number[]): RSMQWorker;
-    }
-
-    var worker: RSMQWorkerStatic;
-    export = worker;
+    var RSMQWorker: RSMQWorkerStatic;
+    export = RSMQWorker;
 }
diff --git a/run-sequence/run-sequence-tests.ts b/run-sequence/run-sequence-tests.ts
index 98e57d9f3..edc3266e9 100644
--- a/run-sequence/run-sequence-tests.ts
+++ b/run-sequence/run-sequence-tests.ts
@@ -5,7 +5,7 @@ import gulp = require("gulp");
 import tmp = require("run-sequence");
 var runSequence = tmp.use(gulp);
 
-gulp.task("run-sequence", callback => {
+gulp.task("run-sequence", (callback: any) => {
     runSequence("task1",
         ["task2", "task3"],
         "taks4",
diff --git a/run-sequence/run-sequence.d.ts b/run-sequence/run-sequence.d.ts
index 3a2cb449c..4507e80c0 100644
--- a/run-sequence/run-sequence.d.ts
+++ b/run-sequence/run-sequence.d.ts
@@ -7,9 +7,10 @@
 /// <reference path="../gulp/gulp.d.ts" />
 
 declare module "run-sequence" {
+    import gulp = require('gulp');
 
     interface IRunSequence {
-        (...streams: (string | string[] | gulp.ITaskCallback)[]): NodeJS.ReadWriteStream;
+        (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream;
 
         use(gulp: gulp.Gulp): IRunSequence;
     }
diff --git a/rx-angular/rx.angular.d.ts b/rx-angular/rx.angular.d.ts
index e2d0ec8c5..8b1b94d84 100644
--- a/rx-angular/rx.angular.d.ts
+++ b/rx-angular/rx.angular.d.ts
@@ -10,8 +10,18 @@
 declare module Rx {
 
     interface IObservable<T> {
-        safeApply($scope: ng.IScope, callback: (data: any) => void): Rx.Observable<any>;
+        safeApply($scope: ng.IScope, callback: (data: T) => void): Rx.Observable<T>;
     }
+    
+    export interface ScopeScheduler extends IScheduler {
+        constructor(scope: ng.IScope) : ScopeScheduler;
+    }
+
+    export interface ScopeSchedulerStatic extends SchedulerStatic {
+        new ($scope: angular.IScope): ScopeScheduler;
+    }
+
+    export var ScopeScheduler: ScopeSchedulerStatic;
 }
 
 declare module rx.angular {
diff --git a/rx/rx-lite.d.ts b/rx/rx-lite.d.ts
index 84f991449..10aec5d79 100644
--- a/rx/rx-lite.d.ts
+++ b/rx/rx-lite.d.ts
@@ -50,7 +50,6 @@ declare module Rx {
 	export module helpers {
 		function noop(): void;
 		function notDefined(value: any): boolean;
-		function isScheduler(value: any): boolean;
 		function identity<T>(value: T): T;
 		function defaultNow(): number;
 		function defaultComparer(left: any, right: any): boolean;
@@ -117,6 +116,7 @@ declare module Rx {
 
 	export interface IScheduler {
 		now(): number;
+	  isScheduler(value: any): boolean;
 
 		schedule(action: () => void): IDisposable;
 		scheduleWithState<TState>(state: TState, action: (scheduler: IScheduler, state: TState) => IDisposable): IDisposable;
@@ -242,6 +242,23 @@ declare module Rx {
 		combineLatest<T2, T3, T4, T5, TResult>(second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, fifth: Observable<T5>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => TResult): Observable<TResult>;
 		combineLatest<TOther, TResult>(souces: Observable<TOther>[], resultSelector: (firstValue: T, ...otherValues: TOther[]) => TResult): Observable<TResult>;
 		combineLatest<TOther, TResult>(souces: IPromise<TOther>[], resultSelector: (firstValue: T, ...otherValues: TOther[]) => TResult): Observable<TResult>;
+		withLatestFrom<T2, TResult>(second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T2, TResult>(second: IPromise<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, TResult>(second: Observable<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, TResult>(second: Observable<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, TResult>(second: IPromise<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, TResult>(second: IPromise<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: Observable<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: Observable<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: Observable<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: IPromise<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: IPromise<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: IPromise<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, TResult>(second: IPromise<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T2, T3, T4, T5, TResult>(second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, fifth: Observable<T5>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => TResult): Observable<TResult>;
+		withLatestFrom<TOther, TResult>(souces: Observable<TOther>[], resultSelector: (firstValue: T, ...otherValues: TOther[]) => TResult): Observable<TResult>;
+		withLatestFrom<TOther, TResult>(souces: IPromise<TOther>[], resultSelector: (firstValue: T, ...otherValues: TOther[]) => TResult): Observable<TResult>;
 		concat(...sources: Observable<T>[]): Observable<T>;
 		concat(...sources: IPromise<T>[]): Observable<T>;
 		concat(sources: Observable<T>[]): Observable<T>;
@@ -292,7 +309,7 @@ declare module Rx {
 		do(onNext?: (value: T) => void, onError?: (exception: any) => void, onCompleted?: () => void): Observable<T>;
 		doAction(onNext?: (value: T) => void, onError?: (exception: any) => void, onCompleted?: () => void): Observable<T>;	// alias for do
 		tap(onNext?: (value: T) => void, onError?: (exception: any) => void, onCompleted?: () => void): Observable<T>;	// alias for do
-		
+
 		doOnNext(onNext: (value: T) => void, thisArg?: any): Observable<T>;
 		doOnError(onError: (exception: any) => void, thisArg?: any): Observable<T>;
 		doOnCompleted(onCompleted: () => void, thisArg?: any): Observable<T>;
@@ -306,7 +323,7 @@ declare module Rx {
 		materialize(): Observable<Notification<T>>;
 		repeat(repeatCount?: number): Observable<T>;
 		retry(retryCount?: number): Observable<T>;
-		scan<TAcc>(seed: TAcc, accumulator: (acc: TAcc, value: T) => TAcc): Observable<TAcc>;
+		scan<TAcc>(accumulator: (acc: TAcc, value: T, seed: TAcc) => TAcc): Observable<TAcc>;
 		scan(accumulator: (acc: T, value: T) => T): Observable<T>;
 		skipLast(count: number): Observable<T>;
 		startWith(...values: T[]): Observable<T>;
@@ -323,12 +340,34 @@ declare module Rx {
 		selectMany<TResult>(selector: (value: T) => IPromise<TResult>): Observable<TResult>;
 		selectMany<TResult>(other: Observable<TResult>): Observable<TResult>;
 		selectMany<TResult>(other: IPromise<TResult>): Observable<TResult>;
+		selectMany<TResult>(selector: (value: T) => TResult[]): Observable<TResult>;	// alias for selectMany
 		flatMap<TOther, TResult>(selector: (value: T) => Observable<TOther>, resultSelector: (item: T, other: TOther) => TResult): Observable<TResult>;	// alias for selectMany
 		flatMap<TOther, TResult>(selector: (value: T) => IPromise<TOther>, resultSelector: (item: T, other: TOther) => TResult): Observable<TResult>;	// alias for selectMany
 		flatMap<TResult>(selector: (value: T) => Observable<TResult>): Observable<TResult>;	// alias for selectMany
 		flatMap<TResult>(selector: (value: T) => IPromise<TResult>): Observable<TResult>;	// alias for selectMany
 		flatMap<TResult>(other: Observable<TResult>): Observable<TResult>;	// alias for selectMany
 		flatMap<TResult>(other: IPromise<TResult>): Observable<TResult>;	// alias for selectMany
+		flatMap<TResult>(selector: (value: T) => TResult[]): Observable<TResult>;	// alias for selectMany
+
+		/**
+		 * Projects each notification of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+		 * @param {Function} onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
+		 * @param {Function} onError A transform function to apply when an error occurs in the source sequence.
+		 * @param {Function} onCompleted A transform function to apply when the end of the source sequence is reached.
+		 * @param {Any} [thisArg] An optional "this" to use to invoke each transform.
+		 * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
+		 */
+		selectManyObserver<T2, T3, T4>(onNext: (value: T, index: number) => Observable<T2>, onError: (exception: any) => Observable<T3>, onCompleted: () => Observable<T4>, thisArg?: any): Observable<T2 | T3 | T4>;
+
+		/**
+		 * Projects each notification of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
+		 * @param {Function} onNext A transform function to apply to each element; the second parameter of the function represents the index of the source element.
+		 * @param {Function} onError A transform function to apply when an error occurs in the source sequence.
+		 * @param {Function} onCompleted A transform function to apply when the end of the source sequence is reached.
+		 * @param {Any} [thisArg] An optional "this" to use to invoke each transform.
+		 * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function corresponding to each notification in the input sequence.
+		 */
+		flatMapObserver<T2, T3, T4>(onNext: (value: T, index: number) => Observable<T2>, onError: (exception: any) => Observable<T3>, onCompleted: () => Observable<T4>, thisArg?: any): Observable<T2 | T3 | T4>;
 
 		selectConcat<T2, R>(selector: (value: T, index: number) => Observable<T2>, resultSelector: (value1: T, value2: T2, index: number) => R): Observable<R>;
 		selectConcat<T2, R>(selector: (value: T, index: number) => IPromise<T2>, resultSelector: (value1: T, value2: T2, index: number) => R): Observable<R>;
@@ -337,30 +376,30 @@ declare module Rx {
 		selectConcat<R>(sequence: Observable<R>): Observable<R>;
 
 		/**
-		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then 
+		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then
 		*  transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
 		* @param selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
 		* @param [thisArg] Object to use as this when executing callback.
-		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences 
+		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences
 		*  and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
 		*/
 		selectSwitch<TResult>(selector: (value: T, index: number, source: Observable<T>) => Observable<TResult>, thisArg?: any): Observable<TResult>;
 		/**
-		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then 
+		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then
 		*  transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
 		* @param selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
 		* @param [thisArg] Object to use as this when executing callback.
-		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences 
+		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences
 		*  and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
 		*/
 		flatMapLatest<TResult>(selector: (value: T, index: number, source: Observable<T>) => Observable<TResult>, thisArg?: any): Observable<TResult>;	// alias for selectSwitch
 		/**
-		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then 
+		*  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then
 		*  transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
 		* @param selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
 		* @param [thisArg] Object to use as this when executing callback.
 		* @since 2.2.28
-		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences 
+		* @returns An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences
 		*  and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
 		*/
 		switchMap<TResult>(selector: (value: T, index: number, source: Observable<T>) => TResult, thisArg?: any): Observable<TResult>;	// alias for selectSwitch
@@ -384,7 +423,7 @@ declare module Rx {
 		* Converts an existing observable sequence to an ES6 Compatible Promise
 		* @example
 		* var promise = Rx.Observable.return(42).toPromise(RSVP.Promise);
-		* 
+		*
 		* // With config
 		* Rx.config.Promise = RSVP.Promise;
 		* var promise = Rx.Observable.return(42).toPromise();
@@ -471,36 +510,12 @@ declare module Rx {
 		fromArray<T>(array: T[], scheduler?: IScheduler): Observable<T>;
 		fromArray<T>(array: { length: number;[index: number]: T; }, scheduler?: IScheduler): Observable<T>;
 
-		/**
-		*  Converts an iterable into an Observable sequence
-		*  
-		* @example
-		*  var res = Rx.Observable.fromIterable(new Map());
-		*  var res = Rx.Observable.fromIterable(function* () { yield 42; });
-		*  var res = Rx.Observable.fromIterable(new Set(), Rx.Scheduler.timeout);
-		* @param generator Generator to convert from.
-		* @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.
-		*/
-		fromIterable<T>(generator: () => { next(): { done: boolean; value?: T; }; }, scheduler?: IScheduler): Observable<T>;
-
-		/**
-		*  Converts an iterable into an Observable sequence
-		*  
-		* @example
-		*  var res = Rx.Observable.fromIterable(new Map());
-		*  var res = Rx.Observable.fromIterable(new Set(), Rx.Scheduler.timeout);
-		* @param iterable Iterable to convert from.
-		* @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.
-		*/
-		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>;
 
 		/**
 		*  This method creates a new Observable instance with a variable number of arguments, regardless of number or type of the arguments.
-		* 
+		*
 		* @example
 		*  var res = Rx.Observable.of(1, 2, 3);
 		* @since 2.2.28
@@ -509,7 +524,7 @@ declare module Rx {
 		of<T>(...values: T[]): Observable<T>;
 
 		/**
-		*  This method creates a new Observable instance with a variable number of arguments, regardless of number or type of the arguments. 
+		*  This method creates a new Observable instance with a variable number of arguments, regardless of number or type of the arguments.
 		* @example
 		*  var res = Rx.Observable.ofWithScheduler(Rx.Scheduler.timeout, 1, 2, 3);
 		* @since 2.2.28
@@ -577,6 +592,38 @@ declare module Rx {
 		combineLatest<TOther, TResult>(souces: Observable<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
 		combineLatest<TOther, TResult>(souces: IPromise<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
 
+		withLatestFrom<T, T2, TResult>(first: Observable<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, TResult>(first: IPromise<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, TResult>(first: Observable<T>, second: IPromise<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, TResult>(first: IPromise<T>, second: IPromise<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: Observable<T>, second: Observable<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: Observable<T>, second: IPromise<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: Observable<T>, second: IPromise<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: IPromise<T>, second: Observable<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: IPromise<T>, second: Observable<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: IPromise<T>, second: IPromise<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: IPromise<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: IPromise<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: Observable<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: Observable<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: Observable<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: Observable<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		withLatestFrom<T, T2, T3, T4, T5, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, fifth: Observable<T5>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => TResult): Observable<TResult>;
+		withLatestFrom<TOther, TResult>(souces: Observable<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
+		withLatestFrom<TOther, TResult>(souces: IPromise<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
+
 		concat<T>(...sources: Observable<T>[]): Observable<T>;
 		concat<T>(...sources: IPromise<T>[]): Observable<T>;
 		concat<T>(sources: Observable<T>[]): Observable<T>;
@@ -618,6 +665,8 @@ declare module Rx {
 		* @returns An Observable sequence which wraps the existing promise success and failure.
 		*/
 		fromPromise<T>(promise: IPromise<T>): Observable<T>;
+
+		prototype: any;
 	}
 
 	export var Observable: ObservableStatic;
@@ -626,11 +675,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/rx/rx.aggregates.d.ts b/rx/rx.aggregates.d.ts
index 001d1b993..313cb5591 100644
--- a/rx/rx.aggregates.d.ts
+++ b/rx/rx.aggregates.d.ts
@@ -40,17 +40,9 @@ declare module Rx {
 		sequenceEqual(second: T[]): Observable<boolean>;
 
 		elementAt(index: number): Observable<T>;
-		elementAtOrDefault(index: number, defaultValue?: T): Observable<T>;
-
 		single(predicate?: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>;
-		singleOrDefault(predicate?: (value: T, index: number, source: Observable<T>) => boolean, defaultValue?: T, thisArg?: any): Observable<T>;
-
 		first(predicate?: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>;
-		firstOrDefault(predicate?: (value: T, index: number, source: Observable<T>) => boolean, defaultValue?: T, thisArg?: any): Observable<T>;
-
 		last(predicate?: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>;
-		lastOrDefault(predicate?: (value: T, index: number, source: Observable<T>) => boolean, defaultValue?: T, thisArg?: any): Observable<T>;
-
 		find(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>;
 		findIndex(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<number>;
 	}
@@ -58,4 +50,4 @@ declare module Rx {
 
 declare module "rx.aggregates" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.async-lite.d.ts b/rx/rx.async-lite.d.ts
index 94eb39800..8a725332f 100644
--- a/rx/rx.async-lite.d.ts
+++ b/rx/rx.async-lite.d.ts
@@ -65,7 +65,9 @@ declare module Rx {
 			<T>(func: Function, context?: any): (...args: any[]) => Observable<T>;
 		};
 
-		fromEvent<T>(element: any, eventName: string, selector?: (arguments: any[]) => T): Observable<T>;
-        fromEventPattern<T>(addHandler: (handler: Function) => void, removeHandler: (handler: Function) => void, selector?: (arguments: any[])=>T): Observable<T>;
+		fromEvent<T>(element: NodeList, eventName: string, selector?: (arguments: any[]) => T): Observable<T>;
+		fromEvent<T>(element: Node, eventName: string, selector?: (arguments: any[]) => T): Observable<T>;
+		fromEvent<T>(element: {on: (name: string, cb: (e: any) => any) => void; off: (name: string, cb: (e: any) => any) => void}, eventName: string, selector?: (arguments: any[]) => T): Observable<T>;
+		fromEventPattern<T>(addHandler: (handler: Function) => void, removeHandler: (handler: Function) => void, selector?: (arguments: any[])=>T): Observable<T>;
 	}
 }
diff --git a/rx/rx.async-tests.ts b/rx/rx.async-tests.ts
index 4f8c102c4..6fe10526c 100644
--- a/rx/rx.async-tests.ts
+++ b/rx/rx.async-tests.ts
@@ -81,4 +81,4 @@ module Rx.Tests.Async {
 	function startAsync() {
 		var o: Rx.Observable<string> = Rx.Observable.startAsync(() => <Rx.IPromise<string>>null);
 	}
-}
\ No newline at end of file
+}
diff --git a/rx/rx.async.d.ts b/rx/rx.async.d.ts
index 783f31d52..f1af9a600 100644
--- a/rx/rx.async.d.ts
+++ b/rx/rx.async.d.ts
@@ -40,4 +40,4 @@ declare module Rx {
 
 declare module "rx.async" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.backpressure.d.ts b/rx/rx.backpressure.d.ts
index 18ab4ddd9..549cd870a 100644
--- a/rx/rx.backpressure.d.ts
+++ b/rx/rx.backpressure.d.ts
@@ -8,4 +8,4 @@
 
 declare module "rx.backpressure" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.binding-lite.d.ts b/rx/rx.binding-lite.d.ts
index b798f342f..86db8922c 100644
--- a/rx/rx.binding-lite.d.ts
+++ b/rx/rx.binding-lite.d.ts
@@ -44,10 +44,10 @@ declare module Rx {
 		/**
 		* Returns an observable sequence that shares a single subscription to the underlying sequence.
 		* This operator is a specialization of publish which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-		* 
+		*
 		* @example
 		* var res = source.share();
-		* 
+		*
 		* @returns An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
 		*/
 		share(): Observable<T>;
@@ -58,10 +58,10 @@ declare module Rx {
 		/**
 		* Returns an observable sequence that shares a single subscription to the underlying sequence and starts with an initialValue.
 		* This operator is a specialization of publishValue which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-		* 
+		*
 		* @example
 		* var res = source.shareValue(42);
-		* 
+		*
 		* @param initialValue Initial value received by observers upon subscription.
 		* @returns An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
 		*/
diff --git a/rx/rx.binding.d.ts b/rx/rx.binding.d.ts
index b93411a52..2bd4c5b01 100644
--- a/rx/rx.binding.d.ts
+++ b/rx/rx.binding.d.ts
@@ -8,4 +8,4 @@
 
 declare module "rx.binding" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.coincidence-lite.d.ts b/rx/rx.coincidence-lite.d.ts
index 801e42168..ca1cc7347 100644
--- a/rx/rx.coincidence-lite.d.ts
+++ b/rx/rx.coincidence-lite.d.ts
@@ -9,24 +9,24 @@ declare module Rx {
 
 	interface Observable<T> {
 		/**
-		* Returns a new observable that triggers on the second and subsequent triggerings of the input observable. 
-		* The Nth triggering of the input observable passes the arguments from the N-1th and Nth triggering as a pair. 
+		* Returns a new observable that triggers on the second and subsequent triggerings of the input observable.
+		* The Nth triggering of the input observable passes the arguments from the N-1th and Nth triggering as a pair.
 		* The argument passed to the N-1th triggering is held in hidden internal state until the Nth triggering occurs.
 		* @returns An observable that triggers on successive pairs of observations from the input observable as an array.
 		*/
 		pairwise(): Observable<T[]>;
 
-		/** 
+		/**
 		* Returns two observables which partition the observations of the source by the given function.
-		* The first will trigger observations for those values for which the predicate returns true. 
-		* The second will trigger observations for those values where the predicate returns false. 
-		* The predicate is executed once for each subscribed observer. 
-		* Both also propagate all error observations arising from the source and each completes 
+		* The first will trigger observations for those values for which the predicate returns true.
+		* The second will trigger observations for those values where the predicate returns false.
+		* The predicate is executed once for each subscribed observer.
+		* Both also propagate all error observations arising from the source and each completes
 		* when the source completes.
-		* @param predicate 
+		* @param predicate
 		*    The function to determine which output Observable will trigger a particular observation.
 		* @returns
-		*    An array of observables. The first triggers when the predicate returns true, 
+		*    An array of observables. The first triggers when the predicate returns true,
 		*    and the second triggers when the predicate returns false.
 		*/
 		partition(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg: any): Observable<T>[];
diff --git a/rx/rx.coincidence.d.ts b/rx/rx.coincidence.d.ts
index 87fa6a55b..d06166224 100644
--- a/rx/rx.coincidence.d.ts
+++ b/rx/rx.coincidence.d.ts
@@ -33,4 +33,4 @@ declare module Rx {
 
 declare module "rx.coincidence" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.d.ts b/rx/rx.d.ts
index f1dc527d7..9b806119e 100644
--- a/rx/rx.d.ts
+++ b/rx/rx.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for RxJS v2.2.28
+// Type definitions for RxJS v2.5.3
 // Project: http://rx.codeplex.com/
 // Definitions by: gsino <http://www.codeplex.com/site/users/view/gsino>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -39,7 +39,7 @@ declare module Rx {
 		distinct(skipParameter: boolean, valueSerializer: (value: T) => string): Observable<T>;
 		distinct<TKey>(keySelector?: (value: T) => TKey, keySerializer?: (key: TKey) => string): Observable<T>;
 		groupBy<TKey, TElement>(keySelector: (value: T) => TKey, skipElementSelector?: boolean, keySerializer?: (key: TKey) => string): Observable<GroupedObservable<TKey, T>>;
-		groupBy<TKey, TElement>(keySelector: (value: T) => TKey, elementSelector: (value: T) => TElement, keySerializer?: (key: TKey) => string): Observable<GroupedObservable<TKey, T>>;
+		groupBy<TKey, TElement>(keySelector: (value: T) => TKey, elementSelector: (value: T) => TElement, keySerializer?: (key: TKey) => string): Observable<GroupedObservable<TKey, TElement>>;
 		groupByUntil<TKey, TDuration>(keySelector: (value: T) => TKey, skipElementSelector: boolean, durationSelector: (group: GroupedObservable<TKey, T>) => Observable<TDuration>, keySerializer?: (key: TKey) => string): Observable<GroupedObservable<TKey, T>>;
 		groupByUntil<TKey, TElement, TDuration>(keySelector: (value: T) => TKey, elementSelector: (value: T) => TElement, durationSelector: (group: GroupedObservable<TKey, TElement>) => Observable<TDuration>, keySerializer?: (key: TKey) => string): Observable<GroupedObservable<TKey, TElement>>;
 	}
diff --git a/rx/rx.experimental.d.ts b/rx/rx.experimental.d.ts
index 60aec86e1..e80ca0329 100644
--- a/rx/rx.experimental.d.ts
+++ b/rx/rx.experimental.d.ts
@@ -29,13 +29,13 @@ declare module Rx {
 		/**
 		 *  Repeats source as long as condition holds emulating a do while loop.
 		 * @param condition The condition which determines if the source will be repeated.
-		 * @returns An observable sequence which is repeated as long as the condition holds. 
+		 * @returns An observable sequence which is repeated as long as the condition holds.
 		 */
 		doWhile(condition: () => boolean): Observable<T>;
 
 		/**
 		 *  Expands an observable sequence by recursively invoking selector.
-		 *  
+		 *
 		 * @param selector Selector function to invoke for each produced element, resulting in another sequence to which the selector will be invoked recursively again.
 		 * @param [scheduler] Scheduler on which to perform the expansion. If not provided, this defaults to the current thread scheduler.
 		 * @returns An observable sequence containing all the elements produced by the recursive expansion.
@@ -64,7 +64,7 @@ declare module Rx {
 	interface ObservableStatic {
 		/**
 		 *  Determines whether an observable collection contains values. There is an alias for this method called 'ifThen' for browsers <IE9
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.if(condition, obs1, obs2);
 		 * @param condition The condition which determines if the thenSource or elseSource will be run.
@@ -79,7 +79,7 @@ declare module Rx {
 
 		/**
 		 *  Determines whether an observable collection contains values. There is an alias for this method called 'ifThen' for browsers <IE9
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.if(condition, obs1, scheduler);
 		 * @param condition The condition which determines if the thenSource or empty sequence will be run.
@@ -92,7 +92,7 @@ declare module Rx {
 
 		/**
 		 *  Determines whether an observable collection contains values. There is an alias for this method called 'ifThen' for browsers <IE9
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.if(condition, obs1, obs2);
 		 * @param condition The condition which determines if the thenSource or elseSource will be run.
@@ -107,7 +107,7 @@ declare module Rx {
 
 		/**
 		 *  Determines whether an observable collection contains values. There is an alias for this method called 'ifThen' for browsers <IE9
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.if(condition, obs1, scheduler);
 		 * @param condition The condition which determines if the thenSource or empty sequence will be run.
@@ -123,7 +123,7 @@ declare module Rx {
 		 * There is an alias for this method called 'forIn' for browsers <IE9
 		 * @param sources An array of values to turn into an observable sequence.
 		 * @param resultSelector A function to apply to each item in the sources array to turn it into an observable sequence.
-		 * @returns An observable sequence from the concatenated observable sequences.  
+		 * @returns An observable sequence from the concatenated observable sequences.
 		 */
 		for<T, TResult>(sources: T[], resultSelector: (item: T) => Observable<TResult>): Observable<TResult>;
 
@@ -132,7 +132,7 @@ declare module Rx {
 		 * There is an alias for this method called 'forIn' for browsers <IE9
 		 * @param sources An array of values to turn into an observable sequence.
 		 * @param resultSelector A function to apply to each item in the sources array to turn it into an observable sequence.
-		 * @returns An observable sequence from the concatenated observable sequences.  
+		 * @returns An observable sequence from the concatenated observable sequences.
 		 */
 		forIn<T, TResult>(sources: T[], resultSelector: (item: T) => Observable<TResult>): Observable<TResult>;
 
@@ -141,7 +141,7 @@ declare module Rx {
 		 * There is an alias for this method called 'whileDo' for browsers <IE9
 		 * @param condition The condition which determines if the source will be repeated.
 		 * @param source The observable sequence or promise that will be run if the condition function returns true.
-		 * @returns An observable sequence which is repeated as long as the condition holds.  
+		 * @returns An observable sequence which is repeated as long as the condition holds.
 		 */
 		while<T>(condition: () => boolean, source: Observable<T>): Observable<T>;
 		while<T>(condition: () => boolean, source: IPromise<T>): Observable<T>;
@@ -151,7 +151,7 @@ declare module Rx {
 		 * There is an alias for this method called 'whileDo' for browsers <IE9
 		 * @param condition The condition which determines if the source will be repeated.
 		 * @param source The observable sequence or promise that will be run if the condition function returns true.
-		 * @returns An observable sequence which is repeated as long as the condition holds.  
+		 * @returns An observable sequence which is repeated as long as the condition holds.
 		 */
 		whileDo<T>(condition: () => boolean, source: Observable<T>): Observable<T>;
 		whileDo<T>(condition: () => boolean, source: IPromise<T>): Observable<T>;
@@ -159,14 +159,14 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, obs0);
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param elseSource The observable sequence or promise that will be run if the sources are not matched.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		case<T>(selector: () => string, sources: { [key: string]: Observable<T>; }, elseSource: Observable<T>): Observable<T>;
 		case<T>(selector: () => string, sources: { [key: string]: IPromise<T>; }, elseSource: Observable<T>): Observable<T>;
@@ -176,16 +176,16 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 });
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, scheduler);
-		 * 
+		 *
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param scheduler Scheduler used to create Rx.Observabe.Empty.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		case<T>(selector: () => string, sources: { [key: string]: Observable<T>; }, scheduler?: IScheduler): Observable<T>;
 		case<T>(selector: () => string, sources: { [key: string]: IPromise<T>; }, scheduler?: IScheduler): Observable<T>;
@@ -193,14 +193,14 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, obs0);
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param elseSource The observable sequence or promise that will be run if the sources are not matched.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		case<T>(selector: () => number, sources: { [key: number]: Observable<T>; }, elseSource: Observable<T>): Observable<T>;
 		case<T>(selector: () => number, sources: { [key: number]: IPromise<T>; }, elseSource: Observable<T>): Observable<T>;
@@ -210,16 +210,16 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 });
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, scheduler);
-		 * 
+		 *
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param scheduler Scheduler used to create Rx.Observabe.Empty.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		case<T>(selector: () => number, sources: { [key: number]: Observable<T>; }, scheduler?: IScheduler): Observable<T>;
 		case<T>(selector: () => number, sources: { [key: number]: IPromise<T>; }, scheduler?: IScheduler): Observable<T>;
@@ -227,14 +227,14 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, obs0);
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param elseSource The observable sequence or promise that will be run if the sources are not matched.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		switchCase<T>(selector: () => string, sources: { [key: string]: Observable<T>; }, elseSource: Observable<T>): Observable<T>;
 		switchCase<T>(selector: () => string, sources: { [key: string]: IPromise<T>; }, elseSource: Observable<T>): Observable<T>;
@@ -244,16 +244,16 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 });
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, scheduler);
-		 * 
+		 *
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param scheduler Scheduler used to create Rx.Observabe.Empty.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		switchCase<T>(selector: () => string, sources: { [key: string]: Observable<T>; }, scheduler?: IScheduler): Observable<T>;
 		switchCase<T>(selector: () => string, sources: { [key: string]: IPromise<T>; }, scheduler?: IScheduler): Observable<T>;
@@ -261,14 +261,14 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, obs0);
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param elseSource The observable sequence or promise that will be run if the sources are not matched.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		switchCase<T>(selector: () => number, sources: { [key: number]: Observable<T>; }, elseSource: Observable<T>): Observable<T>;
 		switchCase<T>(selector: () => number, sources: { [key: number]: IPromise<T>; }, elseSource: Observable<T>): Observable<T>;
@@ -278,23 +278,23 @@ declare module Rx {
 		/**
 		 *  Uses selector to determine which source in sources to use.
 		 *  There is an alias 'switchCase' for browsers <IE9.
-		 *  
+		 *
 		 * @example
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 });
 		 *  res = Rx.Observable.case(selector, { '1': obs1, '2': obs2 }, scheduler);
-		 * 
+		 *
 		 * @param selector The function which extracts the value for to test in a case statement.
 		 * @param sources A object which has keys which correspond to the case statement labels.
 		 * @param scheduler Scheduler used to create Rx.Observabe.Empty.
-		 *       
-		 * @returns An observable sequence which is determined by a case statement.  
+		 *
+		 * @returns An observable sequence which is determined by a case statement.
 		 */
 		switchCase<T>(selector: () => number, sources: { [key: number]: Observable<T>; }, scheduler?: IScheduler): Observable<T>;
 		switchCase<T>(selector: () => number, sources: { [key: number]: IPromise<T>; }, scheduler?: IScheduler): Observable<T>;
 
 		/**
 		 *  Runs all observable sequences in parallel and collect their last elements.
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.forkJoin([obs1, obs2]);
 		 * @param sources Array of source sequences or promises.
@@ -305,7 +305,7 @@ declare module Rx {
 
 		/**
 		 *  Runs all observable sequences in parallel and collect their last elements.
-		 *  
+		 *
 		 * @example
 		 * res = Rx.Observable.forkJoin(obs1, obs2, ...);
 		 * @param args Source sequences or promises.
@@ -318,4 +318,4 @@ declare module Rx {
 
 declare module "rx.experimental" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.joinpatterns.d.ts b/rx/rx.joinpatterns.d.ts
index ce251a2db..fc20f8254 100644
--- a/rx/rx.joinpatterns.d.ts
+++ b/rx/rx.joinpatterns.d.ts
@@ -57,4 +57,4 @@ declare module Rx {
 
 declare module "rx.joinpatterns" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.lite.d.ts b/rx/rx.lite.d.ts
index f6785a1a7..66ec67849 100644
--- a/rx/rx.lite.d.ts
+++ b/rx/rx.lite.d.ts
@@ -12,4 +12,4 @@
 
 declare module "rx.lite" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.testing.d.ts b/rx/rx.testing.d.ts
index 466243784..58b074f75 100644
--- a/rx/rx.testing.d.ts
+++ b/rx/rx.testing.d.ts
@@ -61,4 +61,4 @@ declare module Rx {
 
 declare module "rx.testing" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.time-lite.d.ts b/rx/rx.time-lite.d.ts
index 3642377f8..f7a902685 100644
--- a/rx/rx.time-lite.d.ts
+++ b/rx/rx.time-lite.d.ts
@@ -19,11 +19,21 @@ declare module Rx {
 	export interface Observable<T> {
 		delay(dueTime: Date, scheduler?: IScheduler): Observable<T>;
 		delay(dueTime: number, scheduler?: IScheduler): Observable<T>;
+
+		debounce(dueTime: number, scheduler?: IScheduler): Observable<T>;
+		throttleWithTimeout(dueTime: number, scheduler?: IScheduler): Observable<T>;
+		/**
+		* @deprecated use #debounce or #throttleWithTimeout instead.
+		*/
 		throttle(dueTime: number, scheduler?: IScheduler): Observable<T>;
+
 		timeInterval(scheduler?: IScheduler): Observable<TimeInterval<T>>;
+
 		timestamp(scheduler?: IScheduler): Observable<Timestamp<T>>;
+
 		sample(interval: number, scheduler?: IScheduler): Observable<T>;
 		sample<TSample>(sampler: Observable<TSample>, scheduler?: IScheduler): Observable<T>;
+
 		timeout(dueTime: Date, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
 		timeout(dueTime: number, other?: Observable<T>, scheduler?: IScheduler): Observable<T>;
 	}
diff --git a/rx/rx.time.d.ts b/rx/rx.time.d.ts
index 3da66b95c..2e3ea0a09 100644
--- a/rx/rx.time.d.ts
+++ b/rx/rx.time.d.ts
@@ -13,7 +13,12 @@ declare module Rx {
 		delayWithSelector(subscriptionDelay: number, delayDurationSelector: (item: T) => number): Observable<T>;
 
 		timeoutWithSelector<TTimeout>(firstTimeout: Observable<TTimeout>, timeoutdurationSelector?: (item: T) => Observable<TTimeout>, other?: Observable<T>): Observable<T>;
-		throttleWithSelector<TTimeout>(throttleDurationSelector: (item: T) => Observable<TTimeout>): Observable<T>;
+
+		debounceWithSelector<TTimeout>(debounceDurationSelector: (item: T) => Observable<TTimeout>): Observable<T>;
+		/**
+		* @deprecated use #debounceWithSelector instead.
+		*/
+		throttleWithSelector<TTimeout>(debounceDurationSelector: (item: T) => Observable<TTimeout>): Observable<T>;
 
 		skipLastWithTime(duration: number, scheduler?: IScheduler): Observable<T>;
 		takeLastWithTime(duration: number, timerScheduler?: IScheduler, loopScheduler?: IScheduler): Observable<T>;
@@ -58,4 +63,4 @@ declare module Rx {
 
 declare module "rx.time" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/rx/rx.virtualtime.d.ts b/rx/rx.virtualtime.d.ts
index 25e894074..bac31a0d3 100644
--- a/rx/rx.virtualtime.d.ts
+++ b/rx/rx.virtualtime.d.ts
@@ -38,4 +38,4 @@ declare module Rx {
 
 declare module "rx.virtualtime" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/sammyjs/sammyjs.d.ts b/sammyjs/sammyjs.d.ts
index 1af796e41..5d980a09f 100644
--- a/sammyjs/sammyjs.d.ts
+++ b/sammyjs/sammyjs.d.ts
@@ -276,6 +276,10 @@ declare module Sammy {
 	}
 }
 
+declare module "sammy" {
+    export = Sammy;
+}
+
 interface JQueryStatic {
 	sammy: Sammy.SammyFunc;
 	log: Function;
diff --git a/satnav/satnav-tests.ts b/satnav/satnav-tests.ts
new file mode 100644
index 000000000..aae59ba1f
--- /dev/null
+++ b/satnav/satnav-tests.ts
@@ -0,0 +1,18 @@
+/// <reference path="satnav.d.ts" />
+Satnav({})
+.navigate({
+    path: 'product/{required}/?{optional}',
+    directions: (params) => {
+        // Logic for product route
+        console.log(params.required);
+        console.log(params.hasOwnProperty('optional'));
+    }
+})
+.otherwise('/product/1')
+.change(function (hash, params, old) {
+    // Logic for any change
+    console.log(hash);
+    console.log(params);
+    console.log(old);
+})
+.go(); //Resolve current route
\ No newline at end of file
diff --git a/satnav/satnav.d.ts b/satnav/satnav.d.ts
new file mode 100644
index 000000000..d57cf565d
--- /dev/null
+++ b/satnav/satnav.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for satnav
+// Project: https://github.com/f5io/satnav-js
+// Definitions by: Christian Holm Diget <https://github.com/DotNetNerd>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare type Callback = () => void;
+
+interface ISatnavOptions {
+    html5?: boolean,
+    force?: boolean,
+    poll?: number,
+    matchAll?: boolean
+}
+
+interface INavigationOptions {
+    path?: string,
+    directions?: (params : any) => any,
+    title?: string | Callback
+}
+
+interface ISatnav {
+    navigate(navigationOptions: INavigationOptions): ISatnav;
+    otherwise(route: string): ISatnav;
+    change(onChange: (hash: string, params: any, old: any) => any): ISatnav;
+    go(): ISatnav;
+}
+
+declare function Satnav(options?: ISatnavOptions): ISatnav;
\ No newline at end of file
diff --git a/seedrandom/seedrandom-tests.ts b/seedrandom/seedrandom-tests.ts
index 1f913a406..69a11622f 100644
--- a/seedrandom/seedrandom-tests.ts
+++ b/seedrandom/seedrandom-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./seedrandom.d.ts" />
+
 import seedrandom = require("seedrandom");
 
 var rng = seedrandom("hello.");
diff --git a/segment-analytics/segment-analytics-tests.ts b/segment-analytics/segment-analytics-tests.ts
new file mode 100644
index 000000000..b876ea1be
--- /dev/null
+++ b/segment-analytics/segment-analytics-tests.ts
@@ -0,0 +1,216 @@
+/// <reference path="segment-analytics.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+// Some random vals to use
+
+// Use for page props or user traits
+var testProps = {
+  favoriteCheese: "brie",
+  favoritePie: "apple"
+};
+
+// Segment options
+var testOpts = {
+  integrations: {
+    Mixpanel: true
+  }
+};
+
+var testCb = function() {};
+
+
+/////////////
+
+function test_load() {
+  analytics.load("YOUR_WRITE_KEY");
+}
+
+function test_identify() {
+  // userId and traits
+  analytics.identify('1e810c197e', {
+    name: 'Bill Lumbergh',
+    email: 'bill@initech.com'
+  });
+
+  // No traits
+  analytics.identify('1e810c197e');
+
+  // No userId
+  analytics.identify({
+    email: 'bill@initech.com',
+    newsletter: true,
+    industry: 'Technology'
+  });
+
+  // Callback
+  analytics.identify('1e810c197e', function(){
+    // Do something after the identify request has been sent, like
+    // submit a form or redirect to a new page.
+  });
+
+  // With options
+  analytics.identify('1e810c197e', testProps, testOpts);
+
+  // All args
+  analytics.identify('1e810c197e', testProps, testOpts, testCb);
+}
+
+function testTrack() {
+  analytics.track('Signed Up');
+
+  analytics.track('Signed Up', {
+    plan: 'Startup',
+    source: 'Analytics Academy'
+  });
+
+  analytics.track('Signed Up', testProps, testOpts, testCb);
+}
+
+function testPage() {
+  analytics.page();
+  analytics.page('Signup');
+
+  analytics.page('Pricing', {
+    title: 'Segment Pricing',
+    url: 'https://segment.com/pricing',
+    path: '/pricing',
+    referrer: 'https://segment.com'
+  });
+
+  analytics.page('Category', 'Signup');
+
+  analytics.page('Signup', testProps, testOpts, testCb);
+}
+
+function testAlias() {
+  analytics.alias('019mr8mf4r');
+  analytics.alias('newId', 'oldId');
+  analytics.alias('019mr8mf4r', testOpts, testCb);
+}
+
+function testGroup() {
+  analytics.group('test_group');
+  analytics.group('test_group', {
+    name: "Initech",
+    industry: "Technology",
+    employees: 329
+  });
+  analytics.group('test_group', testProps, testOpts, testCb);
+}
+
+function testTrackLink() {
+  var link1 = document.getElementById('free-trial-link');
+  var link2 = document.getElementById('free-trial-link-2');
+  var links = $('.free-trial-links');
+
+  analytics.trackLink(link1, 'Clicked Free-Trial Link');
+  analytics.trackLink(link1, 'Clicked Free-Trial Link', {
+    plan: 'Enterprise'
+  });
+
+  analytics.trackLink([link1, link2], 'Clicked Free-Trial Link', testProps);
+  analytics.trackLink(links, 'Clicked Free-Trial Link', testProps);
+
+  // With function name and properties
+  analytics.trackLink(links,
+    function(elm) {
+      return String(elm);
+    },
+    function(elm) {
+      return {
+        x: 123,
+        y: 456
+      };
+    });
+}
+
+function testTrackForm() {
+  var form1 = document.getElementById('signup-form');
+  var form2 = document.getElementById('signin-form');
+  var forms = $('.forms');
+
+  analytics.trackForm(form1, 'Signed up');
+  analytics.trackForm(form1, 'Signed Up', {
+    plan: 'Premium',
+    revenue: 99.00
+  });
+
+  analytics.trackForm([form1, form2], 'Clicked Free-Trial Link', testProps);
+  analytics.trackForm(forms, 'Clicked Free-Trial Link', testProps);
+
+  // With function name and properties
+  analytics.trackForm(forms,
+    function(elm) {
+      return String(elm);
+    },
+    function(elm) {
+      return {
+        x: 123,
+        y: 456
+      };
+    });
+}
+
+function testReady() {
+  analytics.ready(function(){
+    (<any> window).mixpanel.set_config({ verbose: true });
+  });
+}
+
+function testUserGroup() {
+  analytics.ready(function(){
+    var user = analytics.user();
+    var id = user.id();
+    var traits = user.traits();
+  });
+
+  analytics.ready(function(){
+    var group = analytics.group();
+    var id = group.id();
+    var traits = group.traits();
+  });
+}
+
+function testClearTraits() {
+  analytics.user().traits({});
+  analytics.group().traits({});
+}
+
+function testResetLogout() {
+  analytics.reset();
+}
+
+function testAnonId() {
+  analytics.user().anonymousId();
+  analytics.user().anonymousId('ABC-123-XYZ');
+
+  analytics.identify('123', {
+    gender: 'Male',
+  }, {
+    anonymousId: 'ABC-123-XYZ'
+  });
+
+  analytics.page({}, { anonymousId: 'ABC-123-XYZ' });
+
+  analytics.track('Clicked CTA', {
+    callToAction: 'Signup'
+  }, {
+    anonymousId: 'ABC-123-XYZ'
+  });
+}
+
+function testDebug() {
+  analytics.debug();
+  analytics.debug(false);
+}
+
+declare var bigdata: any;
+function testEmitter() {
+  analytics.on('track', function(event, properties, options){
+    bigdata.push(['recordEvent', event]);
+  });
+}
+
+function testTimeout() {
+  analytics.timeout(500);
+}
\ No newline at end of file
diff --git a/segment-analytics/segment-analytics.d.ts b/segment-analytics/segment-analytics.d.ts
new file mode 100644
index 000000000..3cdfbbc56
--- /dev/null
+++ b/segment-analytics/segment-analytics.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for Segment's analytics.js
+// Project: https://segment.com/docs/libraries/analytics.js/
+// Definitions by: Andrew Fong <https://github.com/fongandrew>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare module SegmentAnalytics {
+
+  // Generic options object with integrations
+  interface SegmentOpts {
+    integrations?: any;
+    anonymousId?: string;
+  }
+
+  // The actual analytics.js object
+  interface AnalyticsJS {
+
+    /* Configure Segment with write key */
+    load(writeKey: string): void;
+
+    /* The identify method is how you tie one of your users and their actions
+       to a recognizable userId and traits. */
+    identify(userId: string, traits?: Object, options?: SegmentOpts,
+             callback?: () => void): void;
+    identify(userId: string, traits: Object, callback?: () => void): void;
+    identify(userId: string, callback?: () => void): void;
+    identify(traits?: Object, options?: SegmentOpts,
+             callback?: () => void): void;
+    identify(traits?: Object, callback?: () => void): void;
+    identify(callback: () => void): void;
+
+    /* The track method lets you record any actions your users perform. */
+    track(event: string, properties?: Object, options?: SegmentOpts,
+          callback?: () => void): void;
+    track(event: string, properties?: Object,
+          callback?: () => void): void;
+    track(event: string, callback?: () => void): void;
+
+    /* The page method lets you record page views on your website, along with
+       optional extra information about the page being viewed. */
+    page(category: string, name: string, properties?: Object,
+         options?: SegmentOpts, callback?: () => void): void;
+    page(name?: string, properties?: Object,
+         options?: SegmentOpts, callback?: () => void): void;
+    page(name?: string, properties?: Object, callback?: () => void): void;
+    page(name?: string, callback?: () => void): void;
+    page(properties?: Object, options?: SegmentOpts,
+         callback?: () => void): void;
+    page(callback?: () => void): void;
+
+    /* The group method associates an individual user with a group. The group
+       can a company, organization, account, project, team or any other name
+       you came up with for the same concept. */
+    group(groupId: string, traits?: Object, options?: SegmentOpts,
+          callback?: () => void): void;
+    group(groupId: string, traits?: Object, callback?: () => void): void;
+    group(groupId: string, callback?: () => void): void;
+
+    /* The alias method combines two previously unassociated user identities.
+       This comes in handy if the same user visits from two different devices
+       and you want to combine their history.
+
+       Some providers also don’t alias automatically for you when an anonymous
+       user signs up (like Mixpanel), so you need to call alias manually right
+       after sign up with their brand new userId. */
+    alias(userId: string, previousId?: string, options?: SegmentOpts,
+          callback?: () => void): void;
+    alias(userId: string, previousId?: string, callback?: () => void): void;
+    alias(userId: string, callback?: () => void): void;
+    alias(userId: string, options?: SegmentOpts, callback?: () => void): void;
+
+    /* trackLink is a helper that binds a track call to whenever a link is
+       clicked. Usually the page would change before you could call track, but
+       with trackLink a small timeout is inserted to give the track call enough
+       time to fire. */
+    trackLink(elements: JQuery|Element[]|Element,
+              event: string|{ (elm: Element): string },
+              properties?: Object|{ (elm: Element): Object }): void;
+
+    /* trackForm is a helper that binds a track call to a form submission.
+       Usually the page would change before you could call track, but with
+       trackForm a small timeout is inserted to give the track call enough
+       time to fire. */
+    trackForm(elements: JQuery|Element[]|Element,
+              event: string|{ (elm: Element): string },
+              properties?: Object|{ (elm: Element): Object }): void;
+
+    /* The ready method allows you to pass in a callback that will be called as
+       soon as all of your enabled integrations have loaded. It’s like jQuery’s
+       ready method, except for integrations. */
+    ready(callback: () => void): void;
+
+    /* If you need to clear the user and group id and traits we’ve added a
+       reset function that is most commonly used when your identified users
+       logout of your application. */
+    reset(): void;
+
+    /* Once Analytics.js loaded, you can retrieve information about the
+       currently identified user or group like their id and traits. */
+    user(): {
+      id(): string;
+      logout(): void;
+      reset(): void;
+      anonymousId(newId?: string): string;
+      traits(newTraits?: Object): void;
+    }
+
+    group(): {
+      id(): string;
+      traits(newTraits?: Object): void;
+    }
+
+    /* Analytics.js has a debug mode that logs helpful messages to the
+       console. */
+    debug(state?: boolean): void;
+
+    /* The global analytics object emits events whenever you call alias, group,
+       identify, track or page. That way you can listen to those events and run
+       your own custom code. */
+    on(event: string,
+       callback: {
+        (event: string, properties: Object, options: SegmentOpts): void
+      }): void;
+
+    /* You can extend the length (in milliseconds) of the method callbacks and
+       helpers */
+    timeout(milliseconds: number): void;
+  }
+}
+
+declare var analytics: SegmentAnalytics.AnalyticsJS;
diff --git a/select2/select2-tests.ts b/select2/select2-tests.ts
index d3a21b188..b63d3cc1e 100644
--- a/select2/select2-tests.ts
+++ b/select2/select2-tests.ts
@@ -56,6 +56,7 @@ $("#e6").select2({
     ajax: {
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
+        cache: false,
         data: function (term, page) {
             return {
                 q: term,
@@ -195,4 +196,4 @@ $("#e8").select2("enable", false);
 $("#e8").select2("readonly", false);
 $("#e8").select2('container');
 $("#e8").select2('onSortStart');
-$("#e8").select2('onSortEnd');
\ No newline at end of file
+$("#e8").select2('onSortEnd');
diff --git a/select2/select2.d.ts b/select2/select2.d.ts
index 0b4543596..259dd16cf 100644
--- a/select2/select2.d.ts
+++ b/select2/select2.d.ts
@@ -26,6 +26,7 @@ interface Select2AjaxOptions {
     url?: any;
     dataType?: string;
     quietMillis?: number;
+    cache?: boolean;
     data?: (term: string, page: number, context: any) => any;
     results?: (term: any, page: number, context: any) => any;
 }
diff --git a/selectize/selectize-tests.ts b/selectize/selectize-tests.ts
index b5ea65829..caf0b06e3 100644
--- a/selectize/selectize-tests.ts
+++ b/selectize/selectize-tests.ts
@@ -212,7 +212,7 @@ interface Link {
 }
 
 $('#select-links').selectize({
-    theme: 'links',
+    // NOTE ( https://github.com/borisyankov/DefinitelyTyped/pull/5590 ) theme: 'links',
     maxItems: null,
     valueField: 'id',
     searchField: 'title',
@@ -418,4 +418,3 @@ $("#select-car").selectize({
     plugins: ['optgroup_columns'],
     openOnFocus: false
 });
-
diff --git a/selectize/selectize.d.ts b/selectize/selectize.d.ts
index 3ac665458..3a61334f5 100644
--- a/selectize/selectize.d.ts
+++ b/selectize/selectize.d.ts
@@ -183,6 +183,13 @@ declare module Selectize {
          */
         valueField?: string;
 
+        /**
+         * Option groups that options will be bucketed into.
+         * If your element is a <select> with <optgroup>s this property gets populated automatically.
+         * Make sure each object in the array has a property named whatever "optgroupValueField" is set to.
+         */
+        optgroups?: U[];
+
         /**
          * The name of the option group property that serves as its unique identifier.
          *
diff --git a/selenium-webdriver/selenium-webdriver-tests.ts b/selenium-webdriver/selenium-webdriver-tests.ts
index 4ad2a7be6..345a8efc5 100644
--- a/selenium-webdriver/selenium-webdriver-tests.ts
+++ b/selenium-webdriver/selenium-webdriver-tests.ts
@@ -109,7 +109,8 @@ function TestFirefoxProfile() {
 
 function TestExecutors() {
     var exec: webdriver.CommandExecutor = executors.createExecutor("url");
-    exec = executors.createExecutor(new webdriver.promise.Promise<string>());
+    var promise: webdriver.promise.Promise<string>;
+    exec = executors.createExecutor(promise);
 }
 
 function TestBuilder() {
@@ -191,6 +192,28 @@ function TestActionSequence() {
     sequence.perform().then(function () { });
 }
 
+function TestTouchSequence() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+    var element: webdriver.WebElement = new webdriver.WebElement(driver, { ELEMENT: 'id' });
+
+    var sequence: webdriver.TouchSequence = new webdriver.TouchSequence(driver);
+
+    sequence = sequence.tap(element);
+    sequence = sequence.doubleTap(element);
+    sequence = sequence.longPress(element);
+    sequence = sequence.tapAndHold({ x: 100, y: 100 });
+    sequence = sequence.move({ x: 100, y: 100 });
+    sequence = sequence.release({ x: 100, y: 100 });
+    sequence = sequence.scroll({ x: 100, y: 100 });
+    sequence = sequence.scrollFromElement(element, { x: 100, y: 100 });
+    sequence = sequence.flick({ xspeed: 100, yspeed: 100 });
+    sequence = sequence.flickElement(element, { x: 100, y: 100 }, 100);
+
+    sequence.perform().then(function () { });
+}
+
 function TestAlert() {
     var driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
@@ -506,15 +529,29 @@ function TestLocator() {
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
-    var locator: webdriver.Locator = webdriver.By.className('class');
+    var locator: webdriver.Locator = new webdriver.Locator('class name', 'class');
 
-    var locatorStr: string = locator.toString();
+    var locatorOrFn: webdriver.Locator|Function;
+
+    locatorOrFn = webdriver.Locator.Strategy.className;
+    locatorOrFn = webdriver.Locator.Strategy.css;
+    locatorOrFn = webdriver.Locator.Strategy.id;
+    locatorOrFn = webdriver.Locator.Strategy.js;
+    locatorOrFn = webdriver.Locator.Strategy.linkText;
+    locatorOrFn = webdriver.Locator.Strategy.name;
+    locatorOrFn = webdriver.Locator.Strategy.partialLinkText;
+    locatorOrFn = webdriver.Locator.Strategy.tagName;
+    locatorOrFn = webdriver.Locator.Strategy.xpath;
+
+    locatorOrFn = webdriver.Locator.checkLocator(locator);
+    locatorOrFn = webdriver.Locator.checkLocator({ className: 'class' });
+    locatorOrFn = webdriver.Locator.checkLocator(Error);
 
     var using: string = locator.using;
     var value: string = locator.value;
-
     var str: string = locator.toString();
 
+    locator = webdriver.By.className('class');
     locator = webdriver.By.css('css');
     locator = webdriver.By.id('id');
     locator = webdriver.By.linkText('link');
@@ -523,6 +560,19 @@ function TestLocator() {
     locator = webdriver.By.tagName('tag');
     locator = webdriver.By.xpath('xpath');
 
+    // Can import "By" without import declarations
+    var By = webdriver.By;
+
+    var locatorHash: webdriver.By.Hash;
+    locatorHash = { className: 'class' };
+    locatorHash = { css: 'css' };
+    locatorHash = { id: 'id' };
+    locatorHash = { linkText: 'link' };
+    locatorHash = { name: 'name' };
+    locatorHash = { partialLinkText: 'text' };
+    locatorHash = { tagName: 'tag' };
+    locatorHash = { xpath: 'xpath' };
+
     webdriver.By.js('script', 1, 2, 3)(driver).then(function (abc: number) { });
 }
 
@@ -549,6 +599,16 @@ function TestUnhandledAlertError() {
     }
 }
 
+function TestWebDriverFileDetector() {
+    var driver: webdriver.WebDriver = new webdriver.Builder().
+        withCapabilities(webdriver.Capabilities.chrome()).
+        build();
+
+    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+
+    fileDetector.handleFile(driver, 'path/to/file').then(function(path: string) {});
+}
+
 function TestWebDriverLogs() {
     var driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
@@ -647,7 +707,7 @@ function TestWebDriverWindow() {
 
 function TestWebDriver() {
     var session: webdriver.Session = new webdriver.Session('ABC', webdriver.Capabilities.android());
-    var sessionPromise: webdriver.promise.Promise<webdriver.Session> = new webdriver.promise.Promise<webdriver.Session>();
+    var sessionPromise: webdriver.promise.Promise<webdriver.Session>;
     var executor: webdriver.CommandExecutor = executors.createExecutor("http://someserver");
     var flow: webdriver.promise.ControlFlow = new webdriver.promise.ControlFlow();
     var driver: webdriver.WebDriver = new webdriver.WebDriver(session, executor);
@@ -660,11 +720,13 @@ function TestWebDriver() {
     var booleanPromise: webdriver.promise.Promise<boolean>;
 
     var actions: webdriver.ActionSequence = driver.actions();
+    var touchActions: webdriver.TouchSequence = driver.touchActions();
 
     // call
-    stringPromise = driver.call<string>(function(){});
-    stringPromise = driver.call<string>(function(){ var d: any = this;}, driver);
-    stringPromise = driver.call<string>(function(a: number){}, driver, 1);
+    stringPromise = driver.call<string>(function(){ return 'value'; });
+    stringPromise = driver.call<string>(function(){ return stringPromise; });
+    stringPromise = driver.call<string>(function(){ var d: any = this; return 'value'; }, driver);
+    stringPromise = driver.call<string>(function(a: number){ return 'value'; }, driver, 1);
 
     voidPromise = driver.close();
     flow = driver.controlFlow();
@@ -685,14 +747,14 @@ function TestWebDriver() {
     var element: webdriver.WebElement;
     element = driver.findElement(webdriver.By.id('ABC'));
     element = driver.findElement({id: 'ABC'});
-    element = driver.findElement(webdriver.By.js('function(){}'), 1, 2, 3);
-    element = driver.findElement({js: 'function(){}'}, 1, 2, 3);
+    element = driver.findElement(webdriver.By.js('function(){}'));
+    element = driver.findElement({js: 'function(){}'});
 
     // findElements
     driver.findElements(webdriver.By.className('ABC')).then(function (elements: webdriver.WebElement[]) { });
     driver.findElements({ className: 'ABC' }).then(function (elements: webdriver.WebElement[]) { });
-    driver.findElements(webdriver.By.js('function(){}'), 1, 2, 3).then(function (elements: webdriver.WebElement[]) { });
-    driver.findElements({ js: 'function(){}' }, 1, 2, 3).then(function (elements: webdriver.WebElement[]) { });
+    driver.findElements(webdriver.By.js('function(){}')).then(function (elements: webdriver.WebElement[]) { });
+    driver.findElements({ js: 'function(){}' }).then(function (elements: webdriver.WebElement[]) { });
 
     voidPromise = driver.get('http://www.google.com');
     driver.getAllWindowHandles().then(function (handles: string[]) { });
@@ -705,34 +767,47 @@ function TestWebDriver() {
 
     booleanPromise = driver.isElementPresent(webdriver.By.className('ABC'));
     booleanPromise = driver.isElementPresent({className: 'ABC'});
-    booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'), 1, 2, 3);
-    booleanPromise = driver.isElementPresent({js: 'function(){}'}, 1, 2, 3);
+    booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'));
+    booleanPromise = driver.isElementPresent({js: 'function(){}'});
 
     var options: webdriver.WebDriverOptions = driver.manage();
     var navigation: webdriver.WebDriverNavigation = driver.navigate();
     var locator: webdriver.WebDriverTargetLocator = driver.switchTo();
 
+    var fileDetector: webdriver.FileDetector = new webdriver.FileDetector();
+    driver.setFileDetector(fileDetector);
+
     voidPromise = driver.quit();
     voidPromise = driver.schedule<void>(new webdriver.Command(webdriver.CommandName.CLICK), 'ABC');
     voidPromise = driver.sleep(123);
     stringPromise = driver.takeScreenshot();
 
-    booleanPromise = driver.wait(function() { return true; }, 123);
-    booleanPromise = driver.wait(function() { return true; }, 123, 'Message');
+    var booleanCondition: webdriver.until.Condition<boolean>;
+    booleanPromise = driver.wait(booleanPromise);
+    booleanPromise = driver.wait(booleanCondition);
+    booleanPromise = driver.wait(function(driver: webdriver.WebDriver) { return true; });
+    booleanPromise = driver.wait(booleanPromise, 123);
+    booleanPromise = driver.wait(booleanPromise, 123, 'Message');
 
     driver = webdriver.WebDriver.attachToSession(executor, 'ABC');
     driver = webdriver.WebDriver.createSession(executor, webdriver.Capabilities.android());
 }
 
+function TestSerializable() {
+    var serializable: webdriver.Serializable<string>;
+    var serial: string|webdriver.promise.Promise<string> = serializable.serialize();
+}
+
 function TestWebElement() {
     var driver: webdriver.WebDriver = new webdriver.Builder().
         withCapabilities(webdriver.Capabilities.chrome()).
         build();
 
+    var promise: webdriver.promise.Promise<webdriver.IWebElementId>;
     var element: webdriver.WebElement;
 
     element = new webdriver.WebElement(driver, { ELEMENT: 'ID' });
-    element = new webdriver.WebElement(driver, new webdriver.promise.Promise<webdriver.IWebElementId>());
+    element = new webdriver.WebElement(driver, promise);
 
     var voidPromise: webdriver.promise.Promise<void>;
     var stringPromise: webdriver.promise.Promise<string>;
@@ -763,11 +838,15 @@ function TestWebElement() {
     booleanPromise = element.isEnabled();
     booleanPromise = element.isSelected();
     voidPromise = element.sendKeys('A', 'B', 'C');
+    voidPromise = element.sendKeys(stringPromise, stringPromise, stringPromise);
     voidPromise = element.submit();
-    element.getId().then(function (id: webdriver.IWebElementId) { });
+    element.getId().then(function (id: typeof webdriver.WebElement.Id) { });
+    element.getRawId().then(function (id: string) { });
+    element.serialize().then(function (id: typeof webdriver.WebElement.Id) { });
 
     booleanPromise = webdriver.WebElement.equals(element, new webdriver.WebElement(driver, { ELEMENT: 'ID2' }));
 
+    var id: typeof webdriver.WebElement.Id = webdriver.WebElement.Id;
     var key: string = webdriver.WebElement.ELEMENT_KEY;
 }
 
@@ -845,12 +924,12 @@ function TestPromiseModule() {
     var str: string = cancellationError.message;
     str = cancellationError.name;
 
-    var stringPromise: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>();
+    var stringPromise: webdriver.promise.Promise<string>;
     var numberPromise: webdriver.promise.Promise<number>;
     var booleanPromise: webdriver.promise.Promise<boolean>;
     var voidPromise: webdriver.promise.Promise<void>;
 
-    webdriver.promise.all([new webdriver.promise.Promise<string>()]).then(function (values: string[]) { });
+    webdriver.promise.all([stringPromise]).then(function (values: string[]) { });
 
     webdriver.promise.asap('abc', function(value: any){ return true; });
     webdriver.promise.asap('abc', function(value: any){}, function(err: any) { return 'ABC'; });
@@ -943,8 +1022,8 @@ function TestUntilModule() {
 
     var conditionB: webdriver.until.Condition<boolean> = new webdriver.until.Condition<boolean>('message', function (driver: webdriver.WebDriver) { return true; });
     var conditionBBase: webdriver.until.Condition<boolean> = conditionB;
-    var conditionWebElement: webdriver.until.Condition<webdriver.IWebElement>;
-    var conditionWebElements: webdriver.until.Condition<webdriver.IWebElement[]>;
+    var conditionWebElement: webdriver.until.Condition<webdriver.WebElement>;
+    var conditionWebElements: webdriver.until.Condition<webdriver.WebElement[]>;
 
     conditionB = webdriver.until.ableToSwitchToFrame(5);
     var conditionAlert: webdriver.until.Condition<webdriver.Alert> = webdriver.until.alertIsPresent();
@@ -970,10 +1049,6 @@ function TestUntilModule() {
 function TestControlFlow() {
     var flow: webdriver.promise.ControlFlow;
     flow = new webdriver.promise.ControlFlow();
-    flow = new webdriver.promise.ControlFlow({clearInterval: function(a: number) {},
-                                            clearTimeout: function(a: number) {},
-                                            setInterval: function(a: () => void, b: number) { return 2; },
-                                            setTimeout: function(a: () => void, b: number) { return 2; }});
 
     var emitter: webdriver.EventEmitter = flow;
 
@@ -984,34 +1059,26 @@ function TestControlFlow() {
     eventType = webdriver.promise.ControlFlow.EventType.SCHEDULE_TASK;
     eventType = webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION;
 
-    var e: any = flow.annotateError(new Error('Error'));
-
     var stringPromise: webdriver.promise.Promise<string>;
-
-    stringPromise = flow.await(stringPromise);
-
-    flow.clearHistory();
-
+    stringPromise = flow.execute(function() { return 'value'; });
     stringPromise = flow.execute(function() { return stringPromise; });
     stringPromise = flow.execute(function() { return stringPromise; }, 'Description');
 
-    var history: string[] = flow.getHistory();
-
-    var schedule: string = flow.getSchedule();
+    var schedule: string;
+    schedule = flow.toString();
+    schedule = flow.getSchedule();
+    schedule = flow.getSchedule(true);
 
     flow.reset();
 
     var voidPromise: webdriver.promise.Promise<void> = flow.timeout(123);
     voidPromise = flow.timeout(123, 'Description');
 
-    voidPromise = flow.wait(function() { return true; }, 123);
-    voidPromise = flow.wait(function() { return true; }, 123, 'Timeout Message');
-    voidPromise = flow.wait(function() { return stringPromise; }, 123, 'Timeout Message');
+    stringPromise = flow.wait(stringPromise);
 
-    var timer: webdriver.promise.IControlFlowTimer = flow.timer;
-
-    timer = webdriver.promise.ControlFlow.defaultTimer;
-    var loopFrequency: number = webdriver.promise.ControlFlow.EVENT_LOOP_FREQUENCY;
+    voidPromise = flow.wait<void>(function() { return true; });
+    voidPromise = flow.wait<void>(function() { return true; }, 123);
+    voidPromise = flow.wait<void>(function() { return stringPromise; }, 123, 'Timeout Message');
 }
 
 function TestDeferred() {
@@ -1031,7 +1098,17 @@ function TestDeferred() {
 }
 
 function TestPromiseClass() {
-    var promise: webdriver.promise.Promise<string> = new webdriver.promise.Promise<string>();
+    var controlFlow: webdriver.promise.ControlFlow;
+    var promise: webdriver.promise.Promise<string>;
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: string)=>void,
+          onRejected: ()=>void) { });
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: webdriver.promise.Promise<string>)=>void,
+          onRejected: ()=>void) { });
+    promise = new webdriver.promise.Promise<string>(function(
+          onFulfilled: (value: string)=>void,
+          onRejected: ()=>void) { }, controlFlow);
 
     promise.cancel('Abort');
 
diff --git a/selenium-webdriver/selenium-webdriver.d.ts b/selenium-webdriver/selenium-webdriver.d.ts
index 3950f7814..a10bcb8e1 100644
--- a/selenium-webdriver/selenium-webdriver.d.ts
+++ b/selenium-webdriver/selenium-webdriver.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Selenium WebDriverJS 2.44.0
 // Project: https://code.google.com/p/selenium/
-// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>
+// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>, Yuki Kokubun <https://github.com/Kuniwak>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module chrome {
@@ -726,7 +726,7 @@ declare module webdriver {
                 UNKNOWN_COMMAND: string;
                 UNKNOWN_ERROR: string;
                 UNSUPPORTED_OPERATION: string;
-            }
+            };
 
             //endregion
 
@@ -1407,28 +1407,39 @@ declare module webdriver {
             static isImplementation(object: any): boolean;
         }
 
+        interface IFulfilledCallback<T> {
+          (value: T|IThenable<T>|Thenable<T>|void): void;
+        }
+
+        interface IRejectedCallback {
+          (reason: any): void;
+        }
+
         /**
          * Represents the eventual value of a completed operation. Each promise may be
-         * in one of three states: pending, resolved, or rejected. Each promise starts
+         * in one of three states: pending, fulfilled, or rejected. Each promise starts
          * in the pending state and may make a single transition to either a
-         * fulfilled or failed state.
+         * fulfilled or rejected state, at which point the promise is considered
+         * resolved.
          *
-         * <p/>This class is based on the Promise/A proposal from CommonJS. Additional
-         * functions are provided for API compatibility with Dojo Deferred objects.
-         *
-         * @see http://wiki.commonjs.org/wiki/Promises/A
+         * @implements {promise.Thenable<T>}
+         * @template T
+         * @see http://promises-aplus.github.io/promises-spec/
          */
         class Promise<T> implements IThenable<T> {
-
-            //region Constructors
-
             /**
-            * @constructor
-            * @see http://wiki.commonjs.org/wiki/Promises/A
+             * @param {function(
+             *           function((T|IThenable<T>|Thenable)=),
+             *           function(*=))} resolver
+             *     Function that is invoked immediately to begin computation of this
+             *     promise's value. The function should accept a pair of callback functions,
+             *     one for fulfilling the promise and another for rejecting it.
+             * @param {promise.ControlFlow=} opt_flow The control flow
+             *     this instance was created under. Defaults to the currently active flow.
+             * @constructor
             */
-            constructor();
-
-            //endregion
+            constructor(resolver: (onFulfilled: IFulfilledCallback<T>, onRejected: IRejectedCallback)=>void, opt_flow?: ControlFlow);
+            constructor(); // For angular-protractor/angular-protractor-tests.ts
 
             //region Methods
 
@@ -1582,7 +1593,7 @@ declare module webdriver {
                 PENDING: number;
                 REJECTED: number;
                 RESOLVED: number;
-            }
+            };
 
             //region Properties
 
@@ -1636,58 +1647,34 @@ declare module webdriver {
          * the ordered scheduled, starting each task only once those before it have
          * completed.
          *
-         * <p>Each task scheduled within this flow may return a
+         * Each task scheduled within this flow may return a
          * {@link webdriver.promise.Promise} to indicate it is an asynchronous
          * operation. The ControlFlow will wait for such promises to be resolved before
          * marking the task as completed.
          *
-         * <p>Tasks and each callback registered on a {@link webdriver.promise.Deferred}
+         * Tasks and each callback registered on a {@link webdriver.promise.Promise}
          * will be run in their own ControlFlow frame.  Any tasks scheduled within a
-         * frame will have priority over previously scheduled tasks. Furthermore, if
-         * any of the tasks in the frame fails, the remainder of the tasks in that frame
-         * will be discarded and the failure will be propagated to the user through the
+         * frame will take priority over previously scheduled tasks. Furthermore, if any
+         * of the tasks in the frame fail, the remainder of the tasks in that frame will
+         * be discarded and the failure will be propagated to the user through the
          * callback/task's promised result.
          *
-         * <p>Each time a ControlFlow empties its task queue, it will fire an
-         * {@link webdriver.promise.ControlFlow.EventType.IDLE} event. Conversely,
+         * Each time a ControlFlow empties its task queue, it will fire an
+         * {@link webdriver.promise.ControlFlow.EventType.IDLE IDLE} event. Conversely,
          * whenever the flow terminates due to an unhandled error, it will remove all
          * remaining tasks in its queue and fire an
-         * {@link webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION} event. If
-         * there are no listeners registered with the flow, the error will be
-         * rethrown to the global error handler.
+         * {@link webdriver.promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION
+         * UNCAUGHT_EXCEPTION} event. If there are no listeners registered with the
+         * flow, the error will be rethrown to the global error handler.
          *
-         * @extends {webdriver.EventEmitter}
+         * @extends {EventEmitter}
+         * @final
          */
         class ControlFlow extends EventEmitter {
-
-            //region Constructors
-
             /**
-             * @param {webdriver.promise.ControlFlow.Timer=} opt_timer The timer object
-             *     to use. Should only be set for testing.
              * @constructor
              */
-            constructor(opt_timer?: IControlFlowTimer);
-
-            //endregion
-
-            //region Properties
-
-            /**
-             * The timer used by this instance.
-             * @type {webdriver.promise.ControlFlow.Timer}
-             */
-            timer: IControlFlowTimer;
-
-            //endregion
-
-            //region Static Properties
-
-            /**
-             * The default timer object, which uses the global timer functions.
-             * @type {webdriver.promise.ControlFlow.Timer}
-             */
-            static defaultTimer: IControlFlowTimer;
+            constructor();
 
             /**
              * Events that may be emitted by an {@link webdriver.promise.ControlFlow}.
@@ -1713,15 +1700,12 @@ declare module webdriver {
             };
 
             /**
-             * How often, in milliseconds, the event loop should run.
-             * @type {number}
-             * @const
+             * Returns a string representation of this control flow, which is its current
+             * {@link #getSchedule() schedule}, sans task stack traces.
+             * @return {string} The string representation of this contorl flow.
+             * @override
              */
-            static EVENT_LOOP_FREQUENCY: number;
-
-            //endregion
-
-            //region Methods
+            toString(): string;
 
             /**
              * Resets this instance, clearing its queue and removing all event listeners.
@@ -1729,44 +1713,32 @@ declare module webdriver {
             reset(): void;
 
             /**
-             * Returns a summary of the recent task activity for this instance. This
-             * includes the most recently completed task, as well as any parent tasks. In
-             * the returned summary, the task at index N is considered a sub-task of the
-             * task at index N+1.
-             * @return {!Array.<string>} A summary of this instance's recent task
-             *     activity.
+             * Generates an annotated string describing the internal state of this control
+             * flow, including the currently executing as well as pending tasks. If
+             * {@code opt_includeStackTraces === true}, the string will include the
+             * stack trace from when each task was scheduled.
+             * @param {string=} opt_includeStackTraces Whether to include the stack traces
+             *     from when each task was scheduled. Defaults to false.
+             * @return {string} String representation of this flow's internal state.
              */
-            getHistory(): string[];
-
-            /** Clears this instance's task history. */
-            clearHistory(): void;
-
-            /**
-             * Appends a summary of this instance's recent task history to the given
-             * error's stack trace. This function will also ensure the error's stack trace
-             * is in canonical form.
-             * @param {!(Error|goog.testing.JsUnitException)} e The error to annotate.
-             * @return {!(Error|goog.testing.JsUnitException)} The annotated error.
-             */
-            annotateError(e: any): any;
-
-            /**
-             * @return {string} The scheduled tasks still pending with this instance.
-             */
-            getSchedule(): string;
+            getSchedule(opt_includeStackTraces?: boolean): string;
 
             /**
              * Schedules a task for execution. If there is nothing currently in the
-             * queue, the task will be executed in the next turn of the event loop.
+             * queue, the task will be executed in the next turn of the event loop. If
+             * the task function is a generator, the task will be executed using
+             * {@link webdriver.promise.consume}.
              *
-             * @param {!Function} fn The function to call to start the task. If the
-             *     function returns a {@link webdriver.promise.Promise}, this instance
-             *     will wait for it to be resolved before starting the next task.
+             * @param {function(): (T|promise.Promise<T>)} fn The function to
+             *     call to start the task. If the function returns a
+             *     {@link webdriver.promise.Promise}, this instance will wait for it to be
+             *     resolved before starting the next task.
              * @param {string=} opt_description A description of the task.
-             * @return {!webdriver.promise.Promise} A promise that will be resolved with
-             *     the result of the action.
+             * @return {!promise.Promise<T>} A promise that will be resolved
+             *     with the result of the action.
+             * @template T
              */
-            execute<T>(fn: Function, opt_description?: string): Promise<T>;
+            execute<T>(fn: ()=>(T|Promise<T>), opt_description?: string): Promise<T>;
 
             /**
              * Inserts a {@code setTimeout} into the command queue. This is equivalent to
@@ -1783,38 +1755,39 @@ declare module webdriver {
              * Schedules a task that shall wait for a condition to hold. Each condition
              * function may return any value, but it will always be evaluated as a boolean.
              *
-             * <p>Condition functions may schedule sub-tasks with this instance, however,
+             * Condition functions may schedule sub-tasks with this instance, however,
              * their execution time will be factored into whether a wait has timed out.
              *
-             * <p>In the event a condition returns a Promise, the polling loop will wait for
+             * In the event a condition returns a Promise, the polling loop will wait for
              * it to be resolved before evaluating whether the condition has been satisfied.
              * The resolution time for a promise is factored into whether a wait has timed
              * out.
              *
-             * <p>If the condition function throws, or returns a rejected promise, the
+             * If the condition function throws, or returns a rejected promise, the
              * wait task will fail.
              *
-             * @param {!Function} condition The condition function to poll.
-             * @param {number} timeout How long to wait, in milliseconds, for the condition
-             *     to hold before timing out.
+             * If the condition is defined as a promise, the flow will wait for it to
+             * settle. If the timeout expires before the promise settles, the promise
+             * returned by this function will be rejected.
+             *
+             * If this function is invoked with `timeout === 0`, or the timeout is omitted,
+             * the flow will wait indefinitely for the condition to be satisfied.
+             *
+             * @param {(!promise.Promise<T>|function())} condition The condition to poll,
+             *     or a promise to wait on.
+             * @param {number=} opt_timeout How long to wait, in milliseconds, for the
+             *     condition to hold before timing out. If omitted, the flow will wait
+             *     indefinitely.
              * @param {string=} opt_message An optional error message to include if the
              *     wait times out; defaults to the empty string.
-             * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-             *     condition has been satisified. The promise shall be rejected if the wait
-             *     times out waiting for the condition.
+             * @return {!promise.Promise<T>} A promise that will be fulfilled
+             *     when the condition has been satisified. The promise shall be rejected if
+             *     the wait times out waiting for the condition.
+             * @throws {TypeError} If condition is not a function or promise or if timeout
+             *     is not a number >= 0.
+             * @template T
              */
-            wait(condition: Function, timeout: number, opt_message?: string): Promise<void>;
-
-            /**
-             * Schedules a task that will wait for another promise to resolve.  The resolved
-             * promise's value will be returned as the task result.
-             * @param {!webdriver.promise.Promise} promise The promise to wait on.
-             * @return {!webdriver.promise.Promise} A promise that will resolve when the
-             *     task has completed.
-             */
-            await<T>(promise: Promise<T>): Promise<T>;
-
-            //endregion
+            wait<T>(condition: Promise<T>|Function, opt_timeout?: number, opt_message?: string): Promise<T>;
         }
     }
 
@@ -1961,11 +1934,7 @@ declare module webdriver {
          *     The frame identifier.
          * @return {!until.Condition.<boolean>} A new condition.
          */
-        function ableToSwitchToFrame(frame: number): Condition<boolean>;
-        function ableToSwitchToFrame(frame: IWebElement): Condition<boolean>;
-        function ableToSwitchToFrame(frame: Locator): Condition<boolean>;
-        function ableToSwitchToFrame(frame: (webdriver: WebDriver) => IWebElement): Condition<boolean>;
-        function ableToSwitchToFrame(frame: any): Condition<boolean>;
+        function ableToSwitchToFrame(frame: number|WebElement|Locator|By.Hash|((webdriver: WebDriver)=>WebElement)): Condition<boolean>;
 
         /**
          * Creates a condition that waits for an alert to be opened. Upon success, the
@@ -1982,7 +1951,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isEnabled
          */
-        function elementIsDisabled(element: IWebElement): Condition<boolean>;
+        function elementIsDisabled(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element to be enabled.
@@ -1991,7 +1960,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isEnabled
          */
-        function elementIsEnabled(element: IWebElement): Condition<boolean>;
+        function elementIsEnabled(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element to be deselected.
@@ -2000,7 +1969,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isSelected
          */
-        function elementIsNotSelected(element: IWebElement): Condition<boolean>;
+        function elementIsNotSelected(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element to be in the DOM,
@@ -2010,7 +1979,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isDisplayed
          */
-        function elementIsNotVisible(element: IWebElement): Condition<boolean>;
+        function elementIsNotVisible(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element to be selected.
@@ -2018,7 +1987,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isSelected
          */
-        function elementIsSelected(element: IWebElement): Condition<boolean>;
+        function elementIsSelected(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element to become visible.
@@ -2027,7 +1996,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#isDisplayed
          */
-        function elementIsVisible(element: IWebElement): Condition<boolean>;
+        function elementIsVisible(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will loop until an element is
@@ -2037,8 +2006,7 @@ declare module webdriver {
          *     to use.
          * @return {!until.Condition.<!webdriver.WebElement>} The new condition.
          */
-        function elementLocated(locator: Locator): Condition<IWebElement>;
-        function elementLocated(locator: any): Condition<IWebElement>;
+        function elementLocated(locator: Locator|By.Hash|Function): Condition<WebElement>;
 
         /**
          * Creates a condition that will wait for the given element's
@@ -2050,7 +2018,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#getText
          */
-        function elementTextContains(element: IWebElement, substr: string): Condition<boolean>;
+        function elementTextContains(element: WebElement, substr: string): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element's
@@ -2062,7 +2030,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#getText
          */
-        function elementTextIs(element: IWebElement, text: string): Condition<boolean>;
+        function elementTextIs(element: WebElement, text: string): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the given element's
@@ -2074,7 +2042,7 @@ declare module webdriver {
          * @return {!until.Condition.<boolean>} The new condition.
          * @see webdriver.WebDriver#getText
          */
-        function elementTextMatches(element: IWebElement, regex: RegExp): Condition<boolean>;
+        function elementTextMatches(element: WebElement, regex: RegExp): Condition<boolean>;
 
         /**
          * Creates a condition that will loop until at least one element is
@@ -2085,8 +2053,7 @@ declare module webdriver {
          * @return {!until.Condition.<!Array.<!webdriver.WebElement>>} The new
          *     condition.
          */
-        function elementsLocated(locator: Locator): Condition<IWebElement[]>;
-        function elementsLocated(locator: any): Condition<IWebElement[]>;
+        function elementsLocated(locator: Locator|By.Hash|Function): Condition<WebElement[]>;
 
         /**
          * Creates a condition that will wait for the given element to become stale. An
@@ -2096,7 +2063,7 @@ declare module webdriver {
          * @param {!webdriver.WebElement} element The element that should become stale.
          * @return {!until.Condition.<boolean>} The new condition.
          */
-        function stalenessOf(element: IWebElement): Condition<boolean>;
+        function stalenessOf(element: WebElement): Condition<boolean>;
 
         /**
          * Creates a condition that will wait for the current page's title to contain
@@ -2148,7 +2115,7 @@ declare module webdriver {
         RIGHT: number;
     }
 
-    var Button: IButton
+    var Button: IButton;
 
     /**
      * Representations of pressable keys that aren't text.  These are stored in
@@ -2286,7 +2253,7 @@ declare module webdriver {
          *     Defaults to (0, 0).
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        mouseMove(location: IWebElement, opt_offset?: ILocation): ActionSequence;
+        mouseMove(location: WebElement, opt_offset?: ILocation): ActionSequence;
         mouseMove(location: ILocation): ActionSequence;
 
         /**
@@ -2311,7 +2278,7 @@ declare module webdriver {
          *     first argument.
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        mouseDown(opt_elementOrButton?: IWebElement, opt_button?: number): ActionSequence;
+        mouseDown(opt_elementOrButton?: WebElement, opt_button?: number): ActionSequence;
         mouseDown(opt_elementOrButton?: number): ActionSequence;
 
         /**
@@ -2334,7 +2301,7 @@ declare module webdriver {
          *     first argument.
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        mouseUp(opt_elementOrButton?: IWebElement, opt_button?: number): ActionSequence;
+        mouseUp(opt_elementOrButton?: WebElement, opt_button?: number): ActionSequence;
         mouseUp(opt_elementOrButton?: number): ActionSequence;
 
         /**
@@ -2346,8 +2313,8 @@ declare module webdriver {
          *     location to drag to, either as another WebElement or an offset in pixels.
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        dragAndDrop(element: IWebElement, location: IWebElement): ActionSequence;
-        dragAndDrop(element: IWebElement, location: ILocation): ActionSequence;
+        dragAndDrop(element: WebElement, location: WebElement): ActionSequence;
+        dragAndDrop(element: WebElement, location: ILocation): ActionSequence;
 
         /**
          * Clicks a mouse button.
@@ -2365,7 +2332,7 @@ declare module webdriver {
          *     first argument.
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        click(opt_elementOrButton?: IWebElement, opt_button?: number): ActionSequence;
+        click(opt_elementOrButton?: WebElement, opt_button?: number): ActionSequence;
         click(opt_elementOrButton?: number): ActionSequence;
 
         /**
@@ -2387,7 +2354,7 @@ declare module webdriver {
          *     first argument.
          * @return {!webdriver.ActionSequence} A self reference.
          */
-        doubleClick(opt_elementOrButton?: IWebElement, opt_button?: number): ActionSequence;
+        doubleClick(opt_elementOrButton?: WebElement, opt_button?: number): ActionSequence;
         doubleClick(opt_elementOrButton?: number): ActionSequence;
 
         /**
@@ -2425,6 +2392,143 @@ declare module webdriver {
         //endregion
     }
 
+
+    /**
+     * Class for defining sequences of user touch interactions. Each sequence
+     * will not be executed until {@link #perform} is called.
+     *
+     * Example:
+     *
+     *     new webdriver.TouchSequence(driver).
+     *         tapAndHold({x: 0, y: 0}).
+     *         move({x: 3, y: 4}).
+     *         release({x: 10, y: 10}).
+     *         perform();
+     */
+    class TouchSequence {
+      /*
+       * @param {!webdriver.WebDriver} driver The driver instance to use.
+       * @constructor
+       */
+      constructor(driver: WebDriver);
+
+
+      /**
+       * Executes this action sequence.
+       * @return {!webdriver.promise.Promise} A promise that will be resolved once
+       *     this sequence has completed.
+       */
+      perform(): webdriver.promise.Promise<void>;
+
+
+      /**
+       * Taps an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to tap.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      tap(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Double taps an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to double tap.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      doubleTap(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Long press on an element.
+       *
+       * @param {!webdriver.WebElement} elem The element to long press.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      longPress(elem: WebElement): TouchSequence;
+
+
+      /**
+       * Touch down at the given location.
+       *
+       * @param {{ x: number, y: number }} location The location to touch down at.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      tapAndHold(location: ILocation): TouchSequence;
+
+
+      /**
+       * Move a held {@linkplain #tapAndHold touch} to the specified location.
+       *
+       * @param {{x: number, y: number}} location The location to move to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      move(location: ILocation): TouchSequence;
+
+
+      /**
+       * Release a held {@linkplain #tapAndHold touch} at the specified location.
+       *
+       * @param {{x: number, y: number}} location The location to release at.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      release(location: ILocation): TouchSequence;
+
+
+      /**
+       * Scrolls the touch screen by the given offset.
+       *
+       * @param {{x: number, y: number}} offset The offset to scroll to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      scroll(offset: IOffset): TouchSequence;
+
+
+      /**
+       * Scrolls the touch screen, starting on `elem` and moving by the specified
+       * offset.
+       *
+       * @param {!webdriver.WebElement} elem The element where scroll starts.
+       * @param {{x: number, y: number}} offset The offset to scroll to.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      scrollFromElement(elem: WebElement, offset: IOffset): TouchSequence;
+
+
+      /**
+       * Flick, starting anywhere on the screen, at speed xspeed and yspeed.
+       *
+       * @param {{xspeed: number, yspeed: number}} speed The speed to flick in each
+       direction, in pixels per second.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      flick(speed: ISpeed): TouchSequence;
+
+
+      /**
+       * Flick starting at elem and moving by x and y at specified speed.
+       *
+       * @param {!webdriver.WebElement} elem The element where flick starts.
+       * @param {{x: number, y: number}} offset The offset to flick to.
+       * @param {number} speed The speed to flick at in pixels per second.
+       * @return {!webdriver.TouchSequence} A self reference.
+       */
+      flickElement(elem: WebElement, offset: IOffset, speed: number): TouchSequence;
+    }
+
+
+    interface IOffset {
+      x: number;
+      y: number;
+    }
+
+
+    interface ISpeed {
+      xspeed: number;
+      yspeed: number;
+    }
+
+
     /**
      * Represents a modal dialog such as {@code alert}, {@code confirm}, or
      * {@code prompt}. Provides functions to retrieve the message displayed with
@@ -2536,7 +2640,7 @@ declare module webdriver {
         HTMLUNIT: string;
     }
 
-    var Browser: IBrowser
+    var Browser: IBrowser;
 
     interface ProxyConfig {
         proxyType: string;
@@ -3232,6 +3336,7 @@ declare module webdriver {
         //endregion
     }
 
+
     /**
      * Interface for navigating back and forth in the browser history.
      */
@@ -3251,29 +3356,29 @@ declare module webdriver {
         /**
          * Schedules a command to navigate to a new URL.
          * @param {string} url The URL to navigate to.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     URL has been loaded.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the URL has been loaded.
          */
         to(url: string): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to move backwards in the browser history.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     navigation event has completed.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
          */
         back(): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to move forwards in the browser history.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     navigation event has completed.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
          */
         forward(): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to refresh the current page.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     navigation event has completed.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the navigation event has completed.
          */
         refresh(): webdriver.promise.Promise<void>;
 
@@ -3626,6 +3731,41 @@ declare module webdriver {
         //endregion
     }
 
+    /**
+     * Used with {@link webdriver.WebElement#sendKeys WebElement#sendKeys} on file
+     * input elements ({@code <input type="file">}) to detect when the entered key
+     * sequence defines the path to a file.
+     *
+     * By default, {@linkplain webdriver.WebElement WebElement's} will enter all
+     * key sequences exactly as entered. You may set a
+     * {@linkplain webdriver.WebDriver#setFileDetector file detector} on the parent
+     * WebDriver instance to define custom behavior for handling file elements. Of
+     * particular note is the {@link selenium-webdriver/remote.FileDetector}, which
+     * should be used when running against a remote
+     * [Selenium Server](http://docs.seleniumhq.org/download/).
+     */
+    class FileDetector {
+      /** @constructor */
+      constructor();
+
+      /**
+       * Handles the file specified by the given path, preparing it for use with
+       * the current browser. If the path does not refer to a valid file, it will
+       * be returned unchanged, otherwisee a path suitable for use with the current
+       * browser will be returned.
+       *
+       * This default implementation is a no-op. Subtypes may override this
+       * function for custom tailored file handling.
+       *
+       * @param {!webdriver.WebDriver} driver The driver for the current browser.
+       * @param {string} path The path to process.
+       * @return {!webdriver.promise.Promise<string>} A promise for the processed
+       *     file path.
+       * @package
+       */
+      handleFile(driver: webdriver.WebDriver, path: string): webdriver.promise.Promise<string>;
+    }
+
     /**
      * Creates a new WebDriver client, which provides control over a browser.
      *
@@ -3721,23 +3861,35 @@ declare module webdriver {
          */
         schedule<T>(command: Command, description: string): webdriver.promise.Promise<T>;
 
+
         /**
-         * @return {!webdriver.promise.Promise} A promise for this client's session.
+         * Sets the {@linkplain webdriver.FileDetector file detector} that should be
+         * used with this instance.
+         * @param {webdriver.FileDetector} detector The detector to use or {@code null}.
+         */
+        setFileDetector(detector: FileDetector): void;
+
+
+        /**
+         * @return {!webdriver.promise.Promise.<!webdriver.Session>} A promise for this
+         *     client's session.
          */
         getSession(): webdriver.promise.Promise<Session>;
 
+
         /**
-         * @return {!webdriver.promise.Promise} A promise that will resolve with the
-         *     this instance's capabilities.
+         * @return {!webdriver.promise.Promise.<!webdriver.Capabilities>} A promise
+         *     that will resolve with the this instance's capabilities.
          */
         getCapabilities(): webdriver.promise.Promise<Capabilities>;
 
+
         /**
          * Schedules a command to quit the current session. After calling quit, this
          * instance will be invalidated and may no longer be used to issue commands
          * against the browser.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the command has completed.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the command has completed.
          */
         quit(): webdriver.promise.Promise<void>;
 
@@ -3756,6 +3908,22 @@ declare module webdriver {
          */
         actions(): ActionSequence;
 
+
+        /**
+         * Creates a new touch sequence using this driver. The sequence will not be
+         * scheduled for execution until {@link webdriver.TouchSequence#perform} is
+         * called. Example:
+         *
+         *     driver.touchActions().
+         *         tap(element1).
+         *         doubleTap(element2).
+         *         perform();
+         *
+         * @return {!webdriver.TouchSequence} A new touch sequence for this instance.
+         */
+        touchActions(): TouchSequence;
+
+
         /**
          * Schedules a command to execute JavaScript in the context of the currently
          * selected frame or window. The script fragment will be executed as the body
@@ -3778,20 +3946,20 @@ declare module webdriver {
          * If the script has a return value (i.e. if the script contains a return
          * statement), then the following steps will be taken for resolving this
          * functions return value:
-         * <ul>
-         * <li>For a HTML element, the value will resolve to a
-         *     {@code webdriver.WebElement}</li>
-         * <li>Null and undefined return values will resolve to null</li>
-         * <li>Booleans, numbers, and strings will resolve as is</li>
-         * <li>Functions will resolve to their string representation</li>
-         * <li>For arrays and objects, each member item will be converted according to
-         *     the rules above</li>
-         * </ul>
+         *
+         * - For a HTML element, the value will resolve to a
+         *     {@link webdriver.WebElement}
+         * - Null and undefined return values will resolve to null</li>
+         * - Booleans, numbers, and strings will resolve as is</li>
+         * - Functions will resolve to their string representation</li>
+         * - For arrays and objects, each member item will be converted according to
+         *     the rules above
          *
          * @param {!(string|Function)} script The script to execute.
          * @param {...*} var_args The arguments to pass to the script.
-         * @return {!webdriver.promise.Promise} A promise that will resolve to the
+         * @return {!webdriver.promise.Promise.<T>} A promise that will resolve to the
          *    scripts return value.
+         * @template T
          */
         executeScript<T>(script: string, ...var_args: any[]): webdriver.promise.Promise<T>;
         executeScript<T>(script: Function, ...var_args: any[]): webdriver.promise.Promise<T>;
@@ -3809,128 +3977,150 @@ declare module webdriver {
          * Arrays and objects may also be used as script arguments as long as each item
          * adheres to the types previously mentioned.
          *
-         * Unlike executing synchronous JavaScript with
-         * {@code webdriver.WebDriver.prototype.executeScript}, scripts executed with
-         * this function must explicitly signal they are finished by invoking the
-         * provided callback. This callback will always be injected into the
-         * executed function as the last argument, and thus may be referenced with
-         * {@code arguments[arguments.length - 1]}. The following steps will be taken
-         * for resolving this functions return value against the first argument to the
-         * script's callback function:
-         * <ul>
-         * <li>For a HTML element, the value will resolve to a
-         *     {@code webdriver.WebElement}</li>
-         * <li>Null and undefined return values will resolve to null</li>
-         * <li>Booleans, numbers, and strings will resolve as is</li>
-         * <li>Functions will resolve to their string representation</li>
-         * <li>For arrays and objects, each member item will be converted according to
-         *     the rules above</li>
-         * </ul>
+         * Unlike executing synchronous JavaScript with {@link #executeScript},
+         * scripts executed with this function must explicitly signal they are finished
+         * by invoking the provided callback. This callback will always be injected
+         * into the executed function as the last argument, and thus may be referenced
+         * with {@code arguments[arguments.length - 1]}. The following steps will be
+         * taken for resolving this functions return value against the first argument
+         * to the script's callback function:
          *
-         * Example #1: Performing a sleep that is synchronized with the currently
+         * - For a HTML element, the value will resolve to a
+         *     {@link webdriver.WebElement}
+         * - Null and undefined return values will resolve to null
+         * - Booleans, numbers, and strings will resolve as is
+         * - Functions will resolve to their string representation
+         * - For arrays and objects, each member item will be converted according to
+         *     the rules above
+         *
+         * __Example #1:__ Performing a sleep that is synchronized with the currently
          * selected window:
-         * <code><pre>
-         * var start = new Date().getTime();
-         * driver.executeAsyncScript(
-         *     'window.setTimeout(arguments[arguments.length - 1], 500);').
-         *     then(function() {
-         *       console.log('Elapsed time: ' + (new Date().getTime() - start) + ' ms');
-         *     });
-         * </pre></code>
          *
-         * Example #2: Synchronizing a test with an AJAX application:
-         * <code><pre>
-         * var button = driver.findElement(By.id('compose-button'));
-         * button.click();
-         * driver.executeAsyncScript(
-         *     'var callback = arguments[arguments.length - 1];' +
-         *     'mailClient.getComposeWindowWidget().onload(callback);');
-         * driver.switchTo().frame('composeWidget');
-         * driver.findElement(By.id('to')).sendKEys('dog@example.com');
-         * </pre></code>
+         *     var start = new Date().getTime();
+         *     driver.executeAsyncScript(
+         *         'window.setTimeout(arguments[arguments.length - 1], 500);').
+         *         then(function() {
+         *           console.log(
+         *               'Elapsed time: ' + (new Date().getTime() - start) + ' ms');
+         *         });
          *
-         * Example #3: Injecting a XMLHttpRequest and waiting for the result. In this
-         * example, the inject script is specified with a function literal. When using
-         * this format, the function is converted to a string for injection, so it
+         * __Example #2:__ Synchronizing a test with an AJAX application:
+         *
+         *     var button = driver.findElement(By.id('compose-button'));
+         *     button.click();
+         *     driver.executeAsyncScript(
+         *         'var callback = arguments[arguments.length - 1];' +
+         *         'mailClient.getComposeWindowWidget().onload(callback);');
+         *     driver.switchTo().frame('composeWidget');
+         *     driver.findElement(By.id('to')).sendKeys('dog@example.com');
+         *
+         * __Example #3:__ Injecting a XMLHttpRequest and waiting for the result. In
+         * this example, the inject script is specified with a function literal. When
+         * using this format, the function is converted to a string for injection, so it
          * should not reference any symbols not defined in the scope of the page under
          * test.
-         * <code><pre>
-         * driver.executeAsyncScript(function() {
-         *   var callback = arguments[arguments.length - 1];
-         *   var xhr = new XMLHttpRequest();
-         *   xhr.open("GET", "/resource/data.json", true);
-         *   xhr.onreadystatechange = function() {
-         *     if (xhr.readyState == 4) {
-         *       callback(xhr.resposneText);
-         *     }
-         *   }
-         *   xhr.send('');
-         * }).then(function(str) {
-         *   console.log(JSON.parse(str)['food']);
-         * });
-         * </pre></code>
+         *
+         *     driver.executeAsyncScript(function() {
+         *       var callback = arguments[arguments.length - 1];
+         *       var xhr = new XMLHttpRequest();
+         *       xhr.open("GET", "/resource/data.json", true);
+         *       xhr.onreadystatechange = function() {
+         *         if (xhr.readyState == 4) {
+         *           callback(xhr.responseText);
+         *         }
+         *       }
+         *       xhr.send('');
+         *     }).then(function(str) {
+         *       console.log(JSON.parse(str)['food']);
+         *     });
          *
          * @param {!(string|Function)} script The script to execute.
          * @param {...*} var_args The arguments to pass to the script.
-         * @return {!webdriver.promise.Promise} A promise that will resolve to the
+         * @return {!webdriver.promise.Promise.<T>} A promise that will resolve to the
          *    scripts return value.
+         * @template T
          */
-        executeAsyncScript<T>(script: string, ...var_args: any[]): webdriver.promise.Promise<T>;
-        executeAsyncScript<T>(script: Function, ...var_args: any[]): webdriver.promise.Promise<T>;
+        executeAsyncScript<T>(script: string|Function, ...var_args: any[]): webdriver.promise.Promise<T>;
 
         /**
          * Schedules a command to execute a custom function.
-         * @param {!Function} fn The function to execute.
+         * @param {function(...): (T|webdriver.promise.Promise.<T>)} fn The function to
+         *     execute.
          * @param {Object=} opt_scope The object in whose scope to execute the function.
          * @param {...*} var_args Any arguments to pass to the function.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     function's result.
+         * @return {!webdriver.promise.Promise.<T>} A promise that will be resolved'
+         *     with the function's result.
+         * @template T
          */
-        call<T>(fn: Function, opt_scope?: any, ...var_args: any[]): webdriver.promise.Promise<T>;
+        call<T>(fn: (...var_args: any[])=>(T|webdriver.promise.Promise<T>), opt_scope?: any, ...var_args: any[]): webdriver.promise.Promise<T>;
 
         /**
-         * Schedules a command to wait for a condition to hold, as defined by some
-         * user supplied function. If any errors occur while evaluating the wait, they
-         * will be allowed to propagate.
+         * Schedules a command to wait for a condition to hold. The condition may be
+         * specified by a {@link webdriver.until.Condition}, as a custom function, or
+         * as a {@link webdriver.promise.Promise}.
          *
-         * <p>In the event a condition returns a {@link webdriver.promise.Promise}, the
+         * For a {@link webdriver.until.Condition} or function, the wait will repeatedly
+         * evaluate the condition until it returns a truthy value. If any errors occur
+         * while evaluating the condition, they will be allowed to propagate. In the
+         * event a condition returns a {@link webdriver.promise.Promise promise}, the
          * polling loop will wait for it to be resolved and use the resolved value for
-         * evaluating whether the condition has been satisfied. The resolution time for
+         * whether the condition has been satisified. Note the resolution time for
          * a promise is factored into whether a wait has timed out.
          *
-         * @param {!(webdriver.until.Condition.<T>|
-         *           function(!webdriver.WebDriver): T)} condition Either a condition
-         *     object, or a function to evaluate as a condition.
-         * @param {number} timeout How long to wait for the condition to be true.
+         * *Example:* waiting up to 10 seconds for an element to be present and visible
+         * on the page.
+         *
+         *     var button = driver.wait(until.elementLocated(By.id('foo'), 10000);
+         *     button.click();
+         *
+         * This function may also be used to block the command flow on the resolution
+         * of a {@link webdriver.promise.Promise promise}. When given a promise, the
+         * command will simply wait for its resolution before completing. A timeout may
+         * be provided to fail the command if the promise does not resolve before the
+         * timeout expires.
+         *
+         * *Example:* Suppose you have a function, `startTestServer`, that returns a
+         * promise for when a server is ready for requests. You can block a `WebDriver`
+         * client on this promise with:
+         *
+         *     var started = startTestServer();
+         *     driver.wait(started, 5 * 1000, 'Server should start within 5 seconds');
+         *     driver.get(getServerUrl());
+         *
+         * @param {!(webdriver.promise.Promise<T>|
+         *           webdriver.until.Condition<T>|
+         *           function(!webdriver.WebDriver): T)} condition The condition to
+         *     wait on, defined as a promise, condition object, or  a function to
+         *     evaluate as a condition.
+         * @param {number=} opt_timeout How long to wait for the condition to be true.
          * @param {string=} opt_message An optional message to use if the wait times
          *     out.
-         * @return {!webdriver.promise.Promise.<T>} A promise that will be fulfilled
+         * @return {!webdriver.promise.Promise<T>} A promise that will be fulfilled
          *     with the first truthy value returned by the condition function, or
          *     rejected if the condition times out.
          * @template T
          */
-        wait<T>(condition: webdriver.until.Condition<T>, timeout: number, opt_message?: string): webdriver.promise.Promise<T>;
-        wait<T>(condition: (webdriver: WebDriver) => any, timeout: number, opt_message?: string): webdriver.promise.Promise<T>;
+        wait<T>(condition: webdriver.promise.Promise<T>|webdriver.until.Condition<T>|((driver: WebDriver)=>T), timeout?: number, opt_message?: string): webdriver.promise.Promise<T>;
 
         /**
          * Schedules a command to make the driver sleep for the given amount of time.
          * @param {number} ms The amount of time, in milliseconds, to sleep.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     sleep has finished.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the sleep has finished.
          */
         sleep(ms: number): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to retrieve they current window handle.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     current window handle.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current window handle.
          */
         getWindowHandle(): webdriver.promise.Promise<string>;
 
         /**
          * Schedules a command to retrieve the current list of available window handles.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with an
-         *     array of window handles.
+         * @return {!webdriver.promise.Promise.<!Array.<string>>} A promise that will
+         *     be resolved with an array of window handles.
          */
         getAllWindowHandles(): webdriver.promise.Promise<string[]>;
 
@@ -3939,59 +4129,73 @@ declare module webdriver {
          * returned is a representation of the underlying DOM: do not expect it to be
          * formatted or escaped in the same way as the response sent from the web
          * server.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     current page source.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current page source.
          */
         getPageSource(): webdriver.promise.Promise<string>;
 
         /**
          * Schedules a command to close the current window.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     this command has completed.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when this command has completed.
          */
         close(): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to navigate to the given URL.
          * @param {string} url The fully qualified URL to open.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when the
-         *     document has finished loading.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the document has finished loading.
          */
         get(url: string): webdriver.promise.Promise<void>;
 
         /**
          * Schedules a command to retrieve the URL of the current page.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     current URL.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current URL.
          */
         getCurrentUrl(): webdriver.promise.Promise<string>;
 
         /**
          * Schedules a command to retrieve the current page's title.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     current page's title.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the current page's title.
          */
         getTitle(): webdriver.promise.Promise<string>;
 
         /**
          * Schedule a command to find an element on the page. If the element cannot be
-         * found, a {@code bot.ErrorCode.NO_SUCH_ELEMENT} result will be returned
+         * found, a {@link bot.ErrorCode.NO_SUCH_ELEMENT} result will be returned
          * by the driver. Unlike other commands, this error cannot be suppressed. In
          * other words, scheduling a command to find an element doubles as an assert
          * that the element is present on the page. To test whether an element is
-         * present on the page, use {@code #isElementPresent} instead.
+         * present on the page, use {@link #isElementPresent} instead.
          *
-         * <p>The search criteria for find an element may either be a
-         * {@code webdriver.Locator} object, or a simple JSON object whose sole key
-         * is one of the accepted locator strategies, as defined by
-         * {@code webdriver.Locator.Strategy}. For example, the following two statements
+         * The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
          * are equivalent:
-         * <code><pre>
-         * var e1 = driver.findElement(By.id('foo'));
-         * var e2 = driver.findElement({id:'foo'});
-         * </pre></code>
          *
-         * <p>When running in the browser, a WebDriver cannot manipulate DOM elements
+         *     var e1 = driver.findElement(By.id('foo'));
+         *     var e2 = driver.findElement({id:'foo'});
+         *
+         * You may also provide a custom locator function, which takes as input
+         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
+         * promise that will resolve to a WebElement. For example, to find the first
+         * visible link on a page, you could write:
+         *
+         *     var link = driver.findElement(firstVisibleLink);
+         *
+         *     function firstVisibleLink(driver) {
+         *       var links = driver.findElements(By.tagName('a'));
+         *       return webdriver.promise.filter(links, function(link) {
+         *         return links.isDisplayed();
+         *       }).then(function(visibleLinks) {
+         *         return visibleLinks[0];
+         *       });
+         *     }
+         *
+         * When running in the browser, a WebDriver cannot manipulate DOM elements
          * directly; it may do so only through a {@link webdriver.WebElement} reference.
          * This function may be used to generate a WebElement from a DOM element. A
          * reference to the DOM element will be stored in a known location and this
@@ -4000,48 +4204,38 @@ declare module webdriver {
          * one this instance is currently focused on), a
          * {@link bot.ErrorCode.NO_SUCH_ELEMENT} error will be returned.
          *
-         * @param {!(webdriver.Locator|Object.<string>|Element)} locatorOrElement The
-         *     locator strategy to use when searching for the element, or the actual
-         *     DOM element to be located by the server.
-         * @param {...} var_args Arguments to pass to {@code #executeScript} if using a
-         *     JavaScript locator.  Otherwise ignored.
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Element|Function)} locator The
+         *     locator to use.
          * @return {!webdriver.WebElement} A WebElement that can be used to issue
          *     commands against the located element. If the element is not found, the
          *     element will be invalidated and all scheduled commands aborted.
          */
-        findElement(locatorOrElement: Locator, ...var_args: any[]): WebElementPromise;
-        findElement(locatorOrElement: any, ...var_args: any[]): WebElementPromise;
+        findElement(locatorOrElement: Locator|By.Hash|WebElement|Function): WebElementPromise;
 
         /**
          * Schedules a command to test if an element is present on the page.
          *
-         * <p>If given a DOM element, this function will check if it belongs to the
+         * If given a DOM element, this function will check if it belongs to the
          * document the driver is currently focused on. Otherwise, the function will
          * test if at least one element can be found with the given search criteria.
          *
-         * @param {!(webdriver.Locator|Object.<string>|Element)} locatorOrElement The
-         *     locator strategy to use when searching for the element, or the actual
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Element|
+         *           Function)} locatorOrElement The locator to use, or the actual
          *     DOM element to be located by the server.
-         * @param {...} var_args Arguments to pass to {@code #executeScript} if using a
-         *     JavaScript locator.  Otherwise ignored.
-         * @return {!webdriver.promise.Promise} A promise that will resolve to whether
-         *     the element is present on the page.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will resolve
+         *     with whether the element is present on the page.
          */
-        isElementPresent(locatorOrElement: Locator, ...var_args: any[]): webdriver.promise.Promise<boolean>;
-        isElementPresent(locatorOrElement: any, ...var_args: any[]): webdriver.promise.Promise<boolean>;
+        isElementPresent(locatorOrElement: Locator|By.Hash|WebElement|Function): webdriver.promise.Promise<boolean>;
 
         /**
          * Schedule a command to search for multiple elements on the page.
          *
-         * @param {webdriver.Locator|Object.<string>} locator The locator
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
          *     strategy to use when searching for the element.
-         * @param {...} var_args Arguments to pass to {@code #executeScript} if using a
-         *     JavaScript locator.  Otherwise ignored.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved to an
-         *     array of the located {@link webdriver.WebElement}s.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
          */
-        findElements(locator: Locator, ...var_args: any[]): webdriver.promise.Promise<WebElement[]>;
-        findElements(locator: any, ...var_args: any[]): webdriver.promise.Promise<WebElement[]>;
+        findElements(locator: Locator|By.Hash|Function): webdriver.promise.Promise<WebElement[]>;
 
         /**
          * Schedule a command to take a screenshot. The driver makes a best effort to
@@ -4053,8 +4247,8 @@ declare module webdriver {
          *   <li>The screenshot of the entire display containing the browser
          * </ol>
          *
-         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
-         *     screenshot as a base-64 encoded PNG.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved to the screenshot as a base-64 encoded PNG.
          */
         takeScreenshot(): webdriver.promise.Promise<string>;
 
@@ -4083,6 +4277,26 @@ declare module webdriver {
         ELEMENT: string;
     }
 
+    /**
+     * Defines an object that can be asynchronously serialized to its WebDriver
+     * wire representation.
+     *
+     * @constructor
+     * @template T
+     */
+    interface Serializable<T> {
+        /**
+         * Returns either this instance's serialized represention, if immediately
+         * available, or a promise for its serialized representation. This function is
+         * conceptually equivalent to objects that have a {@code toJSON()} property,
+         * except the serialize() result may be a promise or an object containing a
+         * promise (which are not directly JSON friendly).
+         *
+         * @return {!(T|IThenable.<!T>)} This instance's serialized wire format.
+         */
+        serialize(): T|webdriver.promise.IThenable<T>;
+    }
+
     /**
      * Represents a DOM element. WebElements can be found by searching from the
      * document root using a {@code webdriver.WebDriver} instance, or by searching
@@ -4106,7 +4320,6 @@ declare module webdriver {
      *   });
      * </code></pre>
      */
-
     interface IWebElement {
         //region Methods
 
@@ -4282,367 +4495,6 @@ declare module webdriver {
          */
         getOuterHtml(): webdriver.promise.Promise<string>;
 
-        /**
-         * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
-         *     that resolves to this element's JSON representation as defined by the
-         *     WebDriver wire protocol.
-         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
-         */
-        getId(): webdriver.promise.Promise<IWebElementId>
-
-        /**
-         * Schedules a command to retrieve the inner HTML of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's inner HTML.
-         */
-        getInnerHtml(): webdriver.promise.Promise<string>;
-
-        //endregion
-    }
-
-    interface IWebElementFinders {
-        /**
-         * Schedule a command to find a descendant of this element. If the element
-         * cannot be found, a {@code bot.ErrorCode.NO_SUCH_ELEMENT} result will
-         * be returned by the driver. Unlike other commands, this error cannot be
-         * suppressed. In other words, scheduling a command to find an element doubles
-         * as an assert that the element is present on the page. To test whether an
-         * element is present on the page, use {@code #isElementPresent} instead.
-         *
-         * <p>The search criteria for an element may be defined using one of the
-         * factories in the {@link webdriver.By} namespace, or as a short-hand
-         * {@link webdriver.By.Hash} object. For example, the following two statements
-         * are equivalent:
-         * <code><pre>
-         * var e1 = element.findElement(By.id('foo'));
-         * var e2 = element.findElement({id:'foo'});
-         * </pre></code>
-         *
-         * <p>You may also provide a custom locator function, which takes as input
-         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
-         * promise that will resolve to a WebElement. For example, to find the first
-         * visible link on a page, you could write:
-         * <code><pre>
-         * var link = element.findElement(firstVisibleLink);
-         *
-         * function firstVisibleLink(element) {
-         *   var links = element.findElements(By.tagName('a'));
-         *   return webdriver.promise.filter(links, function(link) {
-         *     return links.isDisplayed();
-         *   }).then(function(visibleLinks) {
-         *     return visibleLinks[0];
-         *   });
-         * }
-         * </pre></code>
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the element.
-         * @return {!webdriver.WebElement} A WebElement that can be used to issue
-         *     commands against the located element. If the element is not found, the
-         *     element will be invalidated and all scheduled commands aborted.
-         */
-        findElement(locator: Locator): WebElementPromise;
-        findElement(locator: any): WebElementPromise;
-
-        /**
-         * Schedules a command to test if there is at least one descendant of this
-         * element that matches the given search criteria.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the element.
-         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
-         *     resolved with whether an element could be located on the page.
-         */
-        isElementPresent(locator: Locator): webdriver.promise.Promise<boolean>;
-        isElementPresent(locator: any): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Schedules a command to find all of the descendants of this element that
-         * match the given search criteria.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the elements.
-         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
-         *     promise that will resolve to an array of WebElements.
-         */
-        findElements(locator: Locator): webdriver.promise.Promise<WebElement[]>;
-        findElements(locator: any): webdriver.promise.Promise<WebElement[]>;
-    }
-
-    class WebElement implements IWebElement, IWebElementFinders {
-        //region Constructors
-
-        /**
-         * @param {!webdriver.WebDriver} driver The parent WebDriver instance for this
-         *     element.
-         * @param {!(webdriver.promise.Promise.<webdriver.WebElement.Id>|
-         *           webdriver.WebElement.Id)} id The server-assigned opaque ID for the
-         *     underlying DOM element.
-         * @constructor
-         */
-        constructor(driver: WebDriver, id: webdriver.promise.Promise<IWebElementId>);
-        constructor(driver: WebDriver, id: IWebElementId);
-
-        //endregion
-
-        //region Static Properties
-
-        /**
-         * The property key used in the wire protocol to indicate that a JSON object
-         * contains the ID of a WebElement.
-         * @type {string}
-         * @const
-         */
-        static ELEMENT_KEY: string;
-
-        //endregion
-
-        //region Methods
-
-        /**
-         * @return {!webdriver.WebDriver} The parent driver for this instance.
-         */
-        getDriver(): WebDriver;
-
-        /**
-         * Schedule a command to find a descendant of this element. If the element
-         * cannot be found, a {@code bot.ErrorCode.NO_SUCH_ELEMENT} result will
-         * be returned by the driver. Unlike other commands, this error cannot be
-         * suppressed. In other words, scheduling a command to find an element doubles
-         * as an assert that the element is present on the page. To test whether an
-         * element is present on the page, use {@code #isElementPresent} instead.
-         *
-         * <p>The search criteria for an element may be defined using one of the
-         * factories in the {@link webdriver.By} namespace, or as a short-hand
-         * {@link webdriver.By.Hash} object. For example, the following two statements
-         * are equivalent:
-         * <code><pre>
-         * var e1 = element.findElement(By.id('foo'));
-         * var e2 = element.findElement({id:'foo'});
-         * </pre></code>
-         *
-         * <p>You may also provide a custom locator function, which takes as input
-         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
-         * promise that will resolve to a WebElement. For example, to find the first
-         * visible link on a page, you could write:
-         * <code><pre>
-         * var link = element.findElement(firstVisibleLink);
-         *
-         * function firstVisibleLink(element) {
-         *   var links = element.findElements(By.tagName('a'));
-         *   return webdriver.promise.filter(links, function(link) {
-         *     return links.isDisplayed();
-         *   }).then(function(visibleLinks) {
-         *     return visibleLinks[0];
-         *   });
-         * }
-         * </pre></code>
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the element.
-         * @return {!webdriver.WebElement} A WebElement that can be used to issue
-         *     commands against the located element. If the element is not found, the
-         *     element will be invalidated and all scheduled commands aborted.
-         */
-        findElement(locator: Locator): WebElementPromise;
-        findElement(locator: any): WebElementPromise;
-
-        /**
-         * Schedules a command to test if there is at least one descendant of this
-         * element that matches the given search criteria.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the element.
-         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
-         *     resolved with whether an element could be located on the page.
-         */
-        isElementPresent(locator: Locator): webdriver.promise.Promise<boolean>;
-        isElementPresent(locator: any): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Schedules a command to find all of the descendants of this element that
-         * match the given search criteria.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
-         *     locator strategy to use when searching for the elements.
-         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
-         *     promise that will resolve to an array of WebElements.
-         */
-        findElements(locator: Locator): webdriver.promise.Promise<WebElement[]>;
-        findElements(locator: any): webdriver.promise.Promise<WebElement[]>;
-
-        /**
-         * Schedules a command to click on this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the click command has completed.
-         */
-        click(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to type a sequence on the DOM element represented by this
-         * instance.
-         * <p/>
-         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
-         * processed in the keysequence, that key state is toggled until one of the
-         * following occurs:
-         * <ul>
-         * <li>The modifier key is encountered again in the sequence. At this point the
-         * state of the key is toggled (along with the appropriate keyup/down events).
-         * </li>
-         * <li>The {@code webdriver.Key.NULL} key is encountered in the sequence. When
-         * this key is encountered, all modifier keys current in the down state are
-         * released (with accompanying keyup events). The NULL key can be used to
-         * simulate common keyboard shortcuts:
-         * <code>
-         *     element.sendKeys("text was",
-         *                      webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
-         *                      "now text is");
-         *     // Alternatively:
-         *     element.sendKeys("text was",
-         *                      webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
-         *                      "now text is");
-         * </code></li>
-         * <li>The end of the keysequence is encountered. When there are no more keys
-         * to type, all depressed modifier keys are released (with accompanying keyup
-         * events).
-         * </li>
-         * </ul>
-         * <strong>Note:</strong> On browsers where native keyboard events are not yet
-         * supported (e.g. Firefox on OS X), key events will be synthesized. Special
-         * punctionation keys will be synthesized according to a standard QWERTY en-us
-         * keyboard layout.
-         *
-         * @param {...string} var_args The sequence of keys to
-         *     type. All arguments will be joined into a single sequence (var_args is
-         *     permitted for convenience).
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when all
-         *     keys have been typed.
-         */
-        sendKeys(...var_args: string[]): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to query for the tag/node name of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's tag name.
-         */
-        getTagName(): webdriver.promise.Promise<string>;
-
-        /**
-         * Schedules a command to query for the computed style of the element
-         * represented by this instance. If the element inherits the named style from
-         * its parent, the parent will be queried for its value.  Where possible, color
-         * values will be converted to their hex representation (e.g. #00ff00 instead of
-         * rgb(0, 255, 0)).
-         * <p/>
-         * <em>Warning:</em> the value returned will be as the browser interprets it, so
-         * it may be tricky to form a proper assertion.
-         *
-         * @param {string} cssStyleProperty The name of the CSS style property to look
-         *     up.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     requested CSS value.
-         */
-        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string>;
-
-        /**
-         * Schedules a command to query for the value of the given attribute of the
-         * element. Will return the current value even if it has been modified after the
-         * page has been loaded. More exactly, this method will return the value of the
-         * given attribute, unless that attribute is not present, in which case the
-         * value of the property with the same name is returned. If neither value is
-         * set, null is returned. The "style" attribute is converted as best can be to a
-         * text representation with a trailing semi-colon. The following are deemed to
-         * be "boolean" attributes and will be returned as thus:
-         *
-         * <p>async, autofocus, autoplay, checked, compact, complete, controls, declare,
-         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
-         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
-         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
-         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
-         * selected, spellcheck, truespeed, willvalidate
-         *
-         * <p>Finally, the following commonly mis-capitalized attribute/property names
-         * are evaluated as expected:
-         * <ul>
-         *   <li>"class"
-         *   <li>"readonly"
-         * </ul>
-         * @param {string} attributeName The name of the attribute to query.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     attribute's value.
-         */
-        getAttribute(attributeName: string): webdriver.promise.Promise<string>;
-
-        /**
-         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
-         * sub-elements, without any leading or trailing whitespace.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's visible text.
-         */
-        getText(): webdriver.promise.Promise<string>;
-
-        /**
-         * Schedules a command to compute the size of this element's bounding box, in
-         * pixels.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's size as a {@code {width:number, height:number}} object.
-         */
-        getSize(): webdriver.promise.Promise<ISize>;
-
-        /**
-         * Schedules a command to compute the location of this element in page space.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
-         *     element's location as a {@code {x:number, y:number}} object.
-         */
-        getLocation(): webdriver.promise.Promise<ILocation>;
-
-        /**
-         * Schedules a command to query whether the DOM element represented by this
-         * instance is enabled, as dicted by the {@code disabled} attribute.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently enabled.
-         */
-        isEnabled(): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Schedules a command to query whether this element is selected.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently selected.
-         */
-        isSelected(): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Schedules a command to submit the form containing this element (or this
-         * element if it is a FORM element). This command is a no-op if the element is
-         * not contained in a form.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the form has been submitted.
-         */
-        submit(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to clear the {@code value} of this element. This command
-         * has no effect if the underlying DOM element is neither a text INPUT element
-         * nor a TEXTAREA element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the element has been cleared.
-         */
-        clear(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to test whether this element is currently displayed.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently visible on the page.
-         */
-        isDisplayed(): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Schedules a command to retrieve the outer HTML of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     the element's outer HTML.
-         */
-        getOuterHtml(): webdriver.promise.Promise<string>;
-
         /**
          * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
          *     that resolves to this element's JSON representation as defined by the
@@ -4659,8 +4511,427 @@ declare module webdriver {
         getInnerHtml(): webdriver.promise.Promise<string>;
 
         //endregion
+    }
 
-        //region Static Methods
+    interface IWebElementFinders {
+        /**
+         * Schedule a command to find a descendant of this element. If the element
+         * cannot be found, a {@code bot.ErrorCode.NO_SUCH_ELEMENT} result will
+         * be returned by the driver. Unlike other commands, this error cannot be
+         * suppressed. In other words, scheduling a command to find an element doubles
+         * as an assert that the element is present on the page. To test whether an
+         * element is present on the page, use {@code #isElementPresent} instead.
+         *
+         * <p>The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
+         * are equivalent:
+         * <code><pre>
+         * var e1 = element.findElement(By.id('foo'));
+         * var e2 = element.findElement({id:'foo'});
+         * </pre></code>
+         *
+         * <p>You may also provide a custom locator function, which takes as input
+         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
+         * promise that will resolve to a WebElement. For example, to find the first
+         * visible link on a page, you could write:
+         * <code><pre>
+         * var link = element.findElement(firstVisibleLink);
+         *
+         * function firstVisibleLink(element) {
+         *   var links = element.findElements(By.tagName('a'));
+         *   return webdriver.promise.filter(links, function(link) {
+         *     return links.isDisplayed();
+         *   }).then(function(visibleLinks) {
+         *     return visibleLinks[0];
+         *   });
+         * }
+         * </pre></code>
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.WebElement} A WebElement that can be used to issue
+         *     commands against the located element. If the element is not found, the
+         *     element will be invalidated and all scheduled commands aborted.
+         */
+        findElement(locator: Locator|By.Hash|Function): WebElementPromise;
+
+        /**
+         * Schedules a command to test if there is at least one descendant of this
+         * element that matches the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether an element could be located on the page.
+         */
+        isElementPresent(locator: Locator|By.Hash|Function): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to find all of the descendants of this element that
+         * match the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the elements.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
+         */
+        findElements(locator: Locator|By.Hash|Function): webdriver.promise.Promise<WebElement[]>;
+    }
+
+
+    /**
+     * Defines an object that can be asynchronously serialized to its WebDriver
+     * wire representation.
+     *
+     * @constructor
+     * @template T
+     */
+    interface Serializable<T> {
+        /**
+         * Returns either this instance's serialized represention, if immediately
+         * available, or a promise for its serialized representation. This function is
+         * conceptually equivalent to objects that have a {@code toJSON()} property,
+         * except the serialize() result may be a promise or an object containing a
+         * promise (which are not directly JSON friendly).
+         *
+         * @return {!(T|IThenable.<!T>)} This instance's serialized wire format.
+         */
+        serialize(): T|webdriver.promise.IThenable<T>;
+    }
+
+
+    /**
+     * Represents a DOM element. WebElements can be found by searching from the
+     * document root using a {@link webdriver.WebDriver} instance, or by searching
+     * under another WebElement:
+     *
+     *     driver.get('http://www.google.com');
+     *     var searchForm = driver.findElement(By.tagName('form'));
+     *     var searchBox = searchForm.findElement(By.name('q'));
+     *     searchBox.sendKeys('webdriver');
+     *
+     * The WebElement is implemented as a promise for compatibility with the promise
+     * API. It will always resolve itself when its internal state has been fully
+     * resolved and commands may be issued against the element. This can be used to
+     * catch errors when an element cannot be located on the page:
+     *
+     *     driver.findElement(By.id('not-there')).then(function(element) {
+     *       alert('Found an element that was not expected to be there!');
+     *     }, function(error) {
+     *       alert('The element was not found, as expected');
+     *     });
+     *
+     * @extends {webdriver.Serializable.<webdriver.WebElement.Id>}
+     */
+    class WebElement implements Serializable<IWebElementId> {
+        /**
+         * @param {!webdriver.WebDriver} driver The parent WebDriver instance for this
+         *     element.
+         * @param {!(webdriver.promise.Promise.<webdriver.WebElement.Id>|
+         *           webdriver.WebElement.Id)} id The server-assigned opaque ID for the
+         *     underlying DOM element.
+         * @constructor
+         */
+        constructor(driver: WebDriver, id: webdriver.promise.Promise<IWebElementId>|IWebElementId);
+
+        /**
+         * Wire protocol definition of a WebElement ID.
+         * @typedef {{ELEMENT: string}}
+         * @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol
+         */
+        static Id: IWebElementId;
+
+        /**
+         * The property key used in the wire protocol to indicate that a JSON object
+         * contains the ID of a WebElement.
+         * @type {string}
+         * @const
+         */
+        static ELEMENT_KEY: string;
+
+
+        /**
+         * @return {!webdriver.WebDriver} The parent driver for this instance.
+         */
+        getDriver(): WebDriver;
+
+        /**
+         * Schedule a command to find a descendant of this element. If the element
+         * cannot be found, a {@link bot.ErrorCode.NO_SUCH_ELEMENT} result will
+         * be returned by the driver. Unlike other commands, this error cannot be
+         * suppressed. In other words, scheduling a command to find an element doubles
+         * as an assert that the element is present on the page. To test whether an
+         * element is present on the page, use {@link #isElementPresent} instead.
+         *
+         * The search criteria for an element may be defined using one of the
+         * factories in the {@link webdriver.By} namespace, or as a short-hand
+         * {@link webdriver.By.Hash} object. For example, the following two statements
+         * are equivalent:
+         *
+         *     var e1 = element.findElement(By.id('foo'));
+         *     var e2 = element.findElement({id:'foo'});
+         *
+         * You may also provide a custom locator function, which takes as input
+         * this WebDriver instance and returns a {@link webdriver.WebElement}, or a
+         * promise that will resolve to a WebElement. For example, to find the first
+         * visible link on a page, you could write:
+         *
+         *     var link = element.findElement(firstVisibleLink);
+         *
+         *     function firstVisibleLink(element) {
+         *       var links = element.findElements(By.tagName('a'));
+         *       return webdriver.promise.filter(links, function(link) {
+         *         return links.isDisplayed();
+         *       }).then(function(visibleLinks) {
+         *         return visibleLinks[0];
+         *       });
+         *     }
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.WebElement} A WebElement that can be used to issue
+         *     commands against the located element. If the element is not found, the
+         *     element will be invalidated and all scheduled commands aborted.
+         */
+        findElement(locator: Locator|By.Hash|Function): WebElementPromise;
+
+        /**
+         * Schedules a command to test if there is at least one descendant of this
+         * element that matches the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the element.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether an element could be located on the page.
+         */
+        isElementPresent(locator: Locator|By.Hash|Function): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to find all of the descendants of this element that
+         * match the given search criteria.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The
+         *     locator strategy to use when searching for the elements.
+         * @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
+         *     promise that will resolve to an array of WebElements.
+         */
+        findElements(locator: Locator|By.Hash|Function): webdriver.promise.Promise<WebElement[]>;
+
+        /**
+         * Schedules a command to click on this element.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the click command has completed.
+         */
+        click(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to type a sequence on the DOM element represented by this
+         * instance.
+         *
+         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
+         * processed in the keysequence, that key state is toggled until one of the
+         * following occurs:
+         *
+         * - The modifier key is encountered again in the sequence. At this point the
+         *   state of the key is toggled (along with the appropriate keyup/down events).
+         * - The {@link webdriver.Key.NULL} key is encountered in the sequence. When
+         *   this key is encountered, all modifier keys current in the down state are
+         *   released (with accompanying keyup events). The NULL key can be used to
+         *   simulate common keyboard shortcuts:
+         *
+         *         element.sendKeys("text was",
+         *                          webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
+         *                          "now text is");
+         *         // Alternatively:
+         *         element.sendKeys("text was",
+         *                          webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
+         *                          "now text is");
+         *
+         * - The end of the keysequence is encountered. When there are no more keys
+         *   to type, all depressed modifier keys are released (with accompanying keyup
+         *   events).
+         *
+         * If this element is a file input ({@code <input type="file">}), the
+         * specified key sequence should specify the path to the file to attach to
+         * the element. This is analgous to the user clicking "Browse..." and entering
+         * the path into the file select dialog.
+         *
+         *     var form = driver.findElement(By.css('form'));
+         *     var element = form.findElement(By.css('input[type=file]'));
+         *     element.sendKeys('/path/to/file.txt');
+         *     form.submit();
+         *
+         * For uploads to function correctly, the entered path must reference a file
+         * on the _browser's_ machine, not the local machine running this script. When
+         * running against a remote Selenium server, a {@link webdriver.FileDetector}
+         * may be used to transparently copy files to the remote machine before
+         * attempting to upload them in the browser.
+         *
+         * __Note:__ On browsers where native keyboard events are not supported
+         * (e.g. Firefox on OS X), key events will be synthesized. Special
+         * punctionation keys will be synthesized according to a standard QWERTY en-us
+         * keyboard layout.
+         *
+         * @param {...(string|!webdriver.promise.Promise<string>)} var_args The sequence
+         *     of keys to type. All arguments will be joined into a single sequence.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when all keys have been typed.
+         */
+        sendKeys(...var_args: Array<string|webdriver.promise.Promise<string>>): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to query for the tag/node name of this element.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's tag name.
+         */
+        getTagName(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the computed style of the element
+         * represented by this instance. If the element inherits the named style from
+         * its parent, the parent will be queried for its value.  Where possible, color
+         * values will be converted to their hex representation (e.g. #00ff00 instead of
+         * rgb(0, 255, 0)).
+         *
+         * _Warning:_ the value returned will be as the browser interprets it, so
+         * it may be tricky to form a proper assertion.
+         *
+         * @param {string} cssStyleProperty The name of the CSS style property to look
+         *     up.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the requested CSS value.
+         */
+        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to query for the value of the given attribute of the
+         * element. Will return the current value, even if it has been modified after
+         * the page has been loaded. More exactly, this method will return the value of
+         * the given attribute, unless that attribute is not present, in which case the
+         * value of the property with the same name is returned. If neither value is
+         * set, null is returned (for example, the "value" property of a textarea
+         * element). The "style" attribute is converted as best can be to a
+         * text representation with a trailing semi-colon. The following are deemed to
+         * be "boolean" attributes and will return either "true" or null:
+         *
+         * async, autofocus, autoplay, checked, compact, complete, controls, declare,
+         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
+         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
+         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
+         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+         * selected, spellcheck, truespeed, willvalidate
+         *
+         * Finally, the following commonly mis-capitalized attribute/property names
+         * are evaluated as expected:
+         *
+         * - "class"
+         * - "readonly"
+         *
+         * @param {string} attributeName The name of the attribute to query.
+         * @return {!webdriver.promise.Promise.<?string>} A promise that will be
+         *     resolved with the attribute's value. The returned value will always be
+         *     either a string or null.
+         */
+        getAttribute(attributeName: string): webdriver.promise.Promise<string>;
+
+        /**
+         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
+         * sub-elements, without any leading or trailing whitespace.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's visible text.
+         */
+        getText(): webdriver.promise.Promise<string>;
+
+        /**
+         * Schedules a command to compute the size of this element's bounding box, in
+         * pixels.
+         * @return {!webdriver.promise.Promise.<{width: number, height: number}>} A
+         *     promise that will be resolved with the element's size as a
+         *     {@code {width:number, height:number}} object.
+         */
+        getSize(): webdriver.promise.Promise<ISize>;
+
+        /**
+         * Schedules a command to compute the location of this element in page space.
+         * @return {!webdriver.promise.Promise.<{x: number, y: number}>} A promise that
+         *     will be resolved to the element's location as a
+         *     {@code {x:number, y:number}} object.
+         */
+        getLocation(): webdriver.promise.Promise<ILocation>;
+
+        /**
+         * Schedules a command to query whether the DOM element represented by this
+         * instance is enabled, as dicted by the {@code disabled} attribute.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently enabled.
+         */
+        isEnabled(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to query whether this element is selected.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently selected.
+         */
+        isSelected(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to submit the form containing this element (or this
+         * element if it is a FORM element). This command is a no-op if the element is
+         * not contained in a form.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the form has been submitted.
+         */
+        submit(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to clear the {@code value} of this element. This command
+         * has no effect if the underlying DOM element is neither a text INPUT element
+         * nor a TEXTAREA element.
+         * @return {!webdriver.promise.Promise.<void>} A promise that will be resolved
+         *     when the element has been cleared.
+         */
+        clear(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to test whether this element is currently displayed.
+         * @return {!webdriver.promise.Promise.<boolean>} A promise that will be
+         *     resolved with whether this element is currently visible on the page.
+         */
+        isDisplayed(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Schedules a command to retrieve the outer HTML of this element.
+         * @return {!webdriver.promise.Promise.<string>} A promise that will be
+         *     resolved with the element's outer HTML.
+         */
+        getOuterHtml(): webdriver.promise.Promise<string>;
+
+        /**
+         * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
+         *     that resolves to this element's JSON representation as defined by the
+         *     WebDriver wire protocol.
+         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
+         */
+        getId(): webdriver.promise.Promise<IWebElementId>;
+
+        /**
+         * Returns the raw ID string ID for this element.
+         * @return {!webdriver.promise.Promise<string>} A promise that resolves to this
+         *     element's raw ID as a string value.
+         * @package
+         */
+        getRawId(): webdriver.promise.Promise<string>;
+
+        /** @override */
+        serialize(): webdriver.promise.Promise<IWebElementId>;
+
+        /**
+         * Schedules a command to retrieve the inner HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's inner HTML.
+         */
+        getInnerHtml(): webdriver.promise.Promise<string>;
 
         /**
          * Compares to WebElements for equality.
@@ -4670,8 +4941,6 @@ declare module webdriver {
          *     whether the two WebElements are equal.
          */
         static equals(a: WebElement, b: WebElement): webdriver.promise.Promise<boolean>;
-
-        //endregion
     }
 
     /**
@@ -4808,26 +5077,174 @@ declare module webdriver {
         thenFinally<R>(callback: () => any): webdriver.promise.Promise<R>;
     }
 
-    interface ILocatorStrategy {
-        className(value: string): Locator;
-        css(value: string): Locator;
-        id(value: string): Locator;
-        js(script: any, ...var_args: any[]): (WebDriver: webdriver.WebDriver) => webdriver.promise.Promise<any>;
-        linkText(value: string): Locator;
-        name(value: string): Locator;
-        partialLinkText(value: string): Locator;
-        tagName(value: string): Locator;
-        xpath(value: string): Locator;
-    }
+    module By {
+        /**
+         * Locates elements that have a specific class name. The returned locator
+         * is equivalent to searching for elements with the CSS selector ".clazz".
+         *
+         * @param {string} className The class name to search for.
+         * @return {!webdriver.Locator} The new locator.
+         * @see http://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
+         * @see http://www.w3.org/TR/CSS2/selector.html#class-html
+         */
+        function className(value: string): Locator;
 
-    var By: ILocatorStrategy;
+        /**
+         * Locates elements using a CSS selector. For browsers that do not support
+         * CSS selectors, WebDriver implementations may return an
+         * {@linkplain bot.Error.State.INVALID_SELECTOR invalid selector} error. An
+         * implementation may, however, emulate the CSS selector API.
+         *
+         * @param {string} selector The CSS selector to use.
+         * @return {!webdriver.Locator} The new locator.
+         * @see http://www.w3.org/TR/CSS2/selector.html
+         */
+        function css(value: string): Locator;
+
+        /**
+         * Locates an element by its ID.
+         *
+         * @param {string} id The ID to search for.
+         * @return {!webdriver.Locator} The new locator.
+         */
+        function id(value: string): Locator;
+
+        /**
+         * Locates link elements whose {@linkplain webdriver.WebElement#getText visible
+         * text} matches the given string.
+         *
+         * @param {string} text The link text to search for.
+         * @return {!webdriver.Locator} The new locator.
+         */
+        function linkText(value: string): Locator;
+
+        /**
+         * Locates an elements by evaluating a
+         * {@linkplain webdriver.WebDriver#executeScript JavaScript expression}.
+         * The result of this expression must be an element or list of elements.
+         *
+         * @param {!(string|Function)} script The script to execute.
+         * @param {...*} var_args The arguments to pass to the script.
+         * @return {function(!webdriver.WebDriver): !webdriver.promise.Promise} A new,
+         *     JavaScript-based locator function.
+         */
+        function js(script: any, ...var_args: any[]): (WebDriver: webdriver.WebDriver) => webdriver.promise.Promise<any>;
+
+        /**
+         * Locates elements whose {@code name} attribute has the given value.
+         *
+         * @param {string} name The name attribute to search for.
+         * @return {!webdriver.Locator} The new locator.
+         */
+        function name(value: string): Locator;
+
+        /**
+         * Locates link elements whose {@linkplain webdriver.WebElement#getText visible
+         * text} contains the given substring.
+         *
+         * @param {string} text The substring to check for in a link's visible text.
+         * @return {!webdriver.Locator} The new locator.
+         */
+        function partialLinkText(value: string): Locator;
+
+        /**
+         * Locates elements with a given tag name. The returned locator is
+         * equivalent to using the
+         * [getElementsByTagName](https://developer.mozilla.org/en-US/docs/Web/API/Element.getElementsByTagName)
+         * DOM function.
+         *
+         * @param {string} text The substring to check for in a link's visible text.
+         * @return {!webdriver.Locator} The new locator.
+         * @see http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html
+         */
+        function tagName(value: string): Locator;
+
+        /**
+         * Locates elements matching a XPath selector. Care should be taken when
+         * using an XPath selector with a {@link webdriver.WebElement} as WebDriver
+         * will respect the context in the specified in the selector. For example,
+         * given the selector {@code "//div"}, WebDriver will search from the
+         * document root regardless of whether the locator was used with a
+         * WebElement.
+         *
+         * @param {string} xpath The XPath selector to use.
+         * @return {!webdriver.Locator} The new locator.
+         * @see http://www.w3.org/TR/xpath/
+         */
+        function xpath(value: string): Locator;
+
+        /**
+         * Short-hand expressions for the primary element locator strategies.
+         * For example the following two statements are equivalent:
+         *
+         *     var e1 = driver.findElement(webdriver.By.id('foo'));
+         *     var e2 = driver.findElement({id: 'foo'});
+         *
+         * Care should be taken when using JavaScript minifiers (such as the
+         * Closure compiler), as locator hashes will always be parsed using
+         * the un-obfuscated properties listed.
+         *
+         * @typedef {(
+         *     {className: string}|
+         *     {css: string}|
+         *     {id: string}|
+         *     {js: string}|
+         *     {linkText: string}|
+         *     {name: string}|
+         *     {partialLinkText: string}|
+         *     {tagName: string}|
+         *     {xpath: string})}
+         */
+        type Hash = {className: string}|
+            {css: string}|
+            {id: string}|
+            {js: string}|
+            {linkText: string}|
+            {name: string}|
+            {partialLinkText: string}|
+            {tagName: string}|
+            {xpath: string};
+    }
 
     /**
      * An element locator.
      */
-    interface Locator {
+    class Locator {
+        /**
+         * An element locator.
+         * @param {string} using The type of strategy to use for this locator.
+         * @param {string} value The search target of this locator.
+         * @constructor
+         */
+        constructor(using: string, value: string);
 
-        //region Properties
+
+        /**
+         * Maps {@link webdriver.By.Hash} keys to the appropriate factory function.
+         * @type {!Object.<string, function(string): !(Function|webdriver.Locator)>}
+         * @const
+         */
+        static Strategy: {
+            className: typeof webdriver.By.className;
+            css: typeof webdriver.By.css;
+            id: typeof webdriver.By.id;
+            js: typeof webdriver.By.js;
+            linkText: typeof webdriver.By.linkText;
+            name: typeof webdriver.By.name;
+            partialLinkText: typeof webdriver.By.partialLinkText;
+            tagName: typeof webdriver.By.tagName;
+            xpath: typeof webdriver.By.xpath;
+        };
+
+        /**
+         * Verifies that a {@code value} is a valid locator to use for searching for
+         * elements on the page.
+         *
+         * @param {*} value The value to check is a valid locator.
+         * @return {!(webdriver.Locator|Function)} A valid locator object or function.
+         * @throws {TypeError} If the given value is an invalid locator.
+         */
+        static checkLocator(value: any): Locator | Function;
 
         /**
          * The search strategy to use when searching for an element.
@@ -4841,14 +5258,8 @@ declare module webdriver {
          */
         value: string;
 
-        //endregion
-
-        //region Methods
-
         /** @return {string} String representation of this locator. */
         toString(): string;
-
-        //endregion
     }
 
     /**
diff --git a/semaphore/semaphore-tests.ts b/semaphore/semaphore-tests.ts
new file mode 100644
index 000000000..d6df36030
--- /dev/null
+++ b/semaphore/semaphore-tests.ts
@@ -0,0 +1,14 @@
+/// <reference path="semaphore.d.ts"/>
+
+import semaphore = require('semaphore');
+
+var sem: semaphore.Semaphore = semaphore(10);
+
+function task() {
+  console.log('My task');
+  sem.leave();
+}
+
+sem.take(task);
+sem.take(2, task);
+sem.leave(2);
diff --git a/semaphore/semaphore.d.ts b/semaphore/semaphore.d.ts
new file mode 100644
index 000000000..0a2855b82
--- /dev/null
+++ b/semaphore/semaphore.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for semaphore v1.0.3
+// Project: https://github.com/abrkn/semaphore.js
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'semaphore' {
+
+  function semaphore(capacity?: number): semaphore.Semaphore;
+
+  module semaphore {
+
+    interface Task {
+      (): void;
+    }
+
+    interface Semaphore {
+      capacity: number;
+
+      take(task: Task): void;
+      take(n: number, task: Task): void;
+
+      leave(n?: number): void;
+    }
+  }
+  export = semaphore;
+}
diff --git a/sequelize-fixtures/sequelize-fixtures-tests.ts b/sequelize-fixtures/sequelize-fixtures-tests.ts
index 567cf5967..c6edfd28f 100644
--- a/sequelize-fixtures/sequelize-fixtures-tests.ts
+++ b/sequelize-fixtures/sequelize-fixtures-tests.ts
@@ -15,7 +15,8 @@ SequelizeFixtures.loadFiles([], {}, { log: m => { } }).then(() => { });
 SequelizeFixtures.loadFixture({}, {}).then(() => { });
 sequelize.transaction(function (tx) {
     SequelizeFixtures.loadFixture({}, {}, { transaction: tx }).then(() => { });
+    return null;
 });
 
 SequelizeFixtures.loadFixtures([], {}).then(() => { });
-SequelizeFixtures.loadFixtures([], {}, { transformFixtureDataFn: (data) => { return data; } }).then(() => { });
\ No newline at end of file
+SequelizeFixtures.loadFixtures([], {}, { transformFixtureDataFn: (data) => { return data; } }).then(() => { });
diff --git a/sequelize-fixtures/sequelize-fixtures.d.ts b/sequelize-fixtures/sequelize-fixtures.d.ts
index 3cdf3fe8d..5358110f1 100644
--- a/sequelize-fixtures/sequelize-fixtures.d.ts
+++ b/sequelize-fixtures/sequelize-fixtures.d.ts
@@ -18,14 +18,14 @@ declare module "sequelize-fixtures"
         }
 
         interface SequelizeFixturesStatic {
-            loadFile(file: string, models: any, options?: Options): Sequelize.Promise;
-            loadFiles(files: string[], models: any, options?: Options): Sequelize.Promise;
-            loadFixture(fixture: any, models: any, options?: Options): Sequelize.Promise;
-            loadFixtures(fixtures: any[], models: any, options?: Options): Sequelize.Promise;
+            loadFile(file: string, models: any, options?: Options): Promise<any>;
+            loadFiles(files: string[], models: any, options?: Options): Promise<any>;
+            loadFixture(fixture: any, models: any, options?: Options): Promise<any>;
+            loadFixtures(fixtures: any[], models: any, options?: Options): Promise<any>;
         }
     }
 
     var sequelizeFixtures: SequelizeFixtures.SequelizeFixturesStatic;
 
     export = sequelizeFixtures;
-}
\ No newline at end of file
+}
diff --git a/sequelize/sequelize-2.0.0.d.ts b/sequelize/sequelize-2.0.0.d.ts
new file mode 100644
index 000000000..1bb6be593
--- /dev/null
+++ b/sequelize/sequelize-2.0.0.d.ts
@@ -0,0 +1,2787 @@
+// Type definitions for Sequelize 2.0.0 dev13
+// Project: http://sequelizejs.com
+// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../lodash/lodash.d.ts" />
+
+declare module "sequelize"
+{
+    module sequelize {
+        interface SequelizeStaticAndInstance {
+
+            /**
+             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
+             * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
+             * your project.
+             */
+            Utils: Utils;
+
+            /**
+             * A modified version of bluebird promises, that allows listening for sql events.
+             *
+             * @see Promise
+             */
+            Promise: Promise;
+
+            /**
+             * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
+             * both on the instance, and on the constructor.
+             *
+             * @see Validator
+             */
+            Validator: Validator;
+
+            QueryTypes: QueryTypes;
+
+            /**
+             * A general error class.
+             */
+            Error: Error;
+
+            /**
+             * Emitted when a validation fails.
+             *
+             * @see ValidationError
+             */
+            ValidationError: ValidationError;
+
+            /**
+             * Creates a object representing a database function. This can be used in search queries, both in where and order
+             * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
+             * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
+             *
+             * @param fn The function you want to call.
+             * @param args All further arguments will be passed as arguments to the function.
+             */
+            fn(fn: string, ...args: Array<any>): any;
+
+            /**
+             * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
+             * raw string arguments to fn will be escaped.
+             *
+             * @param col The name of the column
+             */
+            col(col: string): Col;
+
+            /**
+             * Creates a object representing a call to the cast function.
+             *
+             * @param val The value to cast.
+             * @param type The type to cast it to.
+             */
+            cast(val: any, type: string): Cast;
+
+            /**
+             * Creates a object representing a literal, i.e. something that will not be escaped.
+             *
+             * @param val Value to convert to a literal.
+             */
+            literal(val: any): Literal;
+
+            /**
+             * An AND query.
+             *
+             * @param args Each argument (string or object) will be joined by AND.
+             */
+            and(...args: Array<any>): And;
+
+            /**
+             * An OR query.
+             *
+             * @param args Each argument (string or object) will be joined by OR.
+             */
+            or(...args: Array<any>): Or;
+
+            /**
+             * A way of specifying attr = condition. Mostly used internally.
+             *
+             * @param attr          The attribute
+             * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
+             */
+            where(attr: string, condition: any): Where;
+        }
+
+        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
+            /**
+             * Instantiate sequelize with name of database and username
+             * @param database database name
+             * @param username user name
+             */
+            new (database: string, username: string): Sequelize;
+
+            /**
+             * Instantiate sequelize with name of database, username and password
+             * @param database database name
+             * @param username user name
+             * @param password password
+             */
+            new (database: string, username: string, password: string): Sequelize;
+
+            /**
+             * Instantiate sequelize with name of database, username, password, and options.
+             * @param database database name
+             * @param username user name
+             * @param password password
+             * @param options options. @see Options
+             */
+            new (database: string, username: string, password: string, options: Options): Sequelize;
+
+            /**
+             * Instantiate sequelize with name of database, username, and options.
+             *
+             * @param database database name
+             * @param username user name
+             * @param options options. @see Options
+             */
+            new (database: string, username: string, options: Options): Sequelize;
+
+            /**
+             * Instantiate sequlize with an URI
+             * @param connectionString A full database URI
+             * @param options Options for sequelize. @see Options
+             */
+            new (connectionString: string, options?: Options): Sequelize;
+        }
+
+        interface Sequelize extends SequelizeStaticAndInstance {
+            /**
+             * Sequelize configuration (undocumented).
+             */
+            config: Config;
+
+            /**
+             * Sequelize options (undocumented).
+             */
+            options: Options;
+
+            /**
+             * Models are stored here under the name given to sequelize.define
+             */
+            models: any;
+            modelManager: ModelManager;
+            daoFactoryManager: ModelManager;
+            transactionManager: TransactionManager;
+            importCache: any;
+
+            /**
+             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
+             *
+             * @see Transaction
+             */
+            Transaction: TransactionStatic;
+
+            /**
+             * Returns the specified dialect.
+             */
+            getDialect(): string;
+
+            /**
+             * Returns the singleton instance of QueryInterface.
+             */
+            getQueryInterface(): QueryInterface;
+
+            /**
+             * Returns the singleton instance of Migrator.
+             * @param options Migration options
+             * @param force A flag that defines if the migrator should get instantiated or not.
+             */
+            getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
+
+            /**
+             * Define a new model, representing a table in the DB.
+             *
+             * @param daoName The name of the entity (table). Typically specified in singular form.
+             * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
+             *                   or can be an object defining the attribute and its options. Note attributes is not fully
+             *                   typed since TypeScript does not support union types--it can be either a string or an
+             *                   options object. @see AttributeOptions.
+             * @param options Table options. @see DefineOptions.
+             */
+            define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
+
+            /**
+             * Fetch a DAO factory which is already defined.
+             *
+             * @param daoName The name of a model defined with Sequelize.define.
+             */
+            model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
+
+            /**
+             * Checks whether a model with the given name is defined.
+             *
+             * @param daoName The name of a model defined with Sequelize.define.
+             */
+            isDefined(daoName: string): boolean;
+
+            /**
+             * Imports a model defined in another file.
+             *
+             * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
+             *              resolved relatively to the calling file
+             */
+            import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
+
+            /**
+             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+             *
+             * @param sql           SQL statement to execute.
+             *
+             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+             *
+             * @param options       Query options.
+             *
+             * @param replacements  Either an object of named parameter replacements in the format :param or an array of
+             *                      unnamed replacements to replace ? in your SQL.
+             */
+            query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
+
+            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
+
+            /**
+             * Create a new database schema.
+             *
+             * @param schema Name of the schema.
+             */
+            createSchema(schema: string): EventEmitter;
+
+            /**
+             * Show all defined schemas.
+             */
+            showAllSchemas(): EventEmitter;
+
+            /**
+             * Drop a single schema.
+             *
+             * @param schema Name of the schema.
+             */
+            dropSchema(schema: string): EventEmitter;
+
+            /**
+             * Drop all schemas.
+             */
+            dropAllSchemas(): EventEmitter;
+
+            /**
+             * Sync all defined DAOs to the DB.
+             *
+             * @param options Options.
+             */
+            sync(options?: SyncOptions): EventEmitter;
+
+            /**
+             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
+             *
+             * @param options The options passed to each call to Model.drop.
+             */
+            drop(options: DropOptions): EventEmitter;
+
+            /**
+             * Test the connection by trying to authenticate. Alias for 'validate'.
+             */
+            authenticate(): EventEmitter;
+
+            /**
+             * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
+             */
+            validate(): EventEmitter;
+
+            /**
+             * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return, 
+             * the transaction will be committed or rejected based on the promise chain returned to the callback. 
+             * 
+             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+             * for the query to happen under that transaction.
+             *
+             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+             *                  argument (overload available for error and transaction arguments too).
+             */
+            transaction(callback: (transaction: Transaction) => boolean): Promise;
+
+            /**
+             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+             * for the query to happen under that transaction.
+             *
+             * @param options   Transaction options.
+             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+             *                  argument (overload available for error and transaction arguments too).
+             */
+            transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
+
+            close(): void;
+        }
+
+        interface Config {
+            database?: string;
+            username?: string;
+            password?: string;
+            host?: string;
+            port?: number;
+            pool?: PoolOptions;
+            protocol?: string;
+            queue?: boolean;
+            native?: boolean;
+            ssl?: boolean;
+            replication?: ReplicationOptions;
+            dialectModulePath?: string;
+            maxConcurrentQueries?: number;
+            dialectOptions?: any;
+        }
+
+        interface Model<TInstance, TPojo> extends Hooks, Associations {
+            /**
+             * A reference to the sequelize instance.
+             */
+            sequelize: Sequelize;
+
+            /**
+             * The name of the model, typically singular.
+             */
+            name: string;
+
+            /**
+             * The name of the underlying database table, typically plural.
+             */
+            tableName: string;
+
+            options: DefineOptions;
+            attributes: any;
+            rawAttributes: any;
+            modelManager: ModelManager;
+            daoFactoryManager: ModelManager;
+            associations: any;
+            scopeObj: any;
+
+            /**
+             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
+             * instance (this).
+             */
+            sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
+
+            /**
+             * Drop the table represented by this Model.
+             *
+             * @param options
+             */
+            drop(options?: DropOptions): Promise;
+
+            /**
+             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
+             * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
+             * 'schema.tablename'.
+             *
+             * @param schema    The name of the schema.
+             * @param options   Schema options.
+             */
+            schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
+
+            /**
+             * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
+             * model has no schema, or an object with tableName, schema and delimiter properties.
+             */
+            getTableName(): any;
+
+            /**
+             * Apply a scope created in define to the model.
+             *
+             * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
+             *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
+             *                with a method property. The value can either be a string, if the method does not take any
+             *                arguments, or an array, where the first element is the name of the method, and consecutive
+             *                elements are arguments to that method. Pass null to remove all scopes, including the default.
+             */
+            scope(options: any): Model<TInstance, TPojo>;
+
+            /**
+             * Search for multiple instances..
+             *
+             * @param options       A hash of options to describe the scope of the search.
+             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+             *                      Instances. See sequelize.query for options.
+             */
+            findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
+
+            /**
+             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+             *
+             * @param options       A hash of options to describe the scope of the search.
+             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+             *                      Instances. See sequelize.query for options
+             */
+            find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+            /**
+             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+             *
+             * @param options       A number to search by id.
+             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+             *                      Instances. See sequelize.query for options
+             */
+            find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+            /**
+             * Run an aggregation method on the specified field.
+             *
+             * @param field                 The field to aggregate over. Can be a field name or *.
+             * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
+             * @param options               Query options, particularly options.dataType.
+             */
+            aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
+
+            /**
+             * Count the number of records matching the provided where clause.
+             *
+             * @param options Conditions and options for the query.
+             */
+            count(options?: FindOptions): PromiseT<number>;
+
+            /**
+             * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
+             * matching your query. This is very usefull for paging.
+             *
+             * @param findOptions   Filtering options
+             * @param queryOptions  Query options
+             */
+            findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
+
+            /**
+             * Find the maximum value of field.
+             *
+             * @param field
+             * @param options
+             */
+            max<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+            /**
+             * Find the minimum value of field.
+             *
+             * @param field
+             * @param options
+             */
+            min<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+            /**
+             * Find the sum of field.
+             *
+             * @param field
+             * @param options
+             */
+            sum(field: string, options?: FindOptions): PromiseT<number>;
+
+            /**
+             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+             *
+             * @param values    any from which to build entity instance.
+             * @param options   any construction options.
+             */
+            build(values: TPojo, options?: BuildOptions): TInstance;
+
+            /**
+             * Builds a new model instance and calls save on it..
+             *
+             * @param values
+             * @param options
+             */
+            create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
+
+            /**
+             * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
+             * of the promise will be (instance, initialized) - Make sure to use .spread().
+             *
+             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
+             *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
+             * @param defaults  Default values to use if building a new instance
+             * @param options   Options passed to the find call
+             */
+            findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
+
+            /**
+             * Find a row that matches the query, or build and save the row if none is found The successfull result of the
+             * promise will be (instance, created) - Make sure to use .spread().
+             *
+             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
+             *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
+             * @param defaults  Default values to use if creating a new instance
+             * @param options   Options passed to the find and create calls.
+             */
+            findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
+
+            /**
+             * Create and insert multiple instances in bulk.
+             *
+             * @param records   List of objects (key/value pairs) to create instances from.
+             * @param options
+             */
+            bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
+
+            /**
+             * Delete multiple instances.
+             */
+            destroy(where?: any, options?: DestroyOptions): Promise;
+
+            /**
+             * Update multiple instances that match the where options.
+             *
+             * @param attrValueHash A hash of fields to change and their new values
+             * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
+             *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
+             */
+            update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
+
+            /**
+             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
+             * types.
+             */
+            describe(): PromiseT<any>;
+
+            /**
+             *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
+             *  The returned instance already has all the fields property populated with the field of the model.
+             */
+            dataset(): any;
+        }
+
+        interface Instance<TInstance, TPojo> {
+            /**
+             * Returns true if this instance has not yet been persisted to the database.
+             */
+            isNewRecord: boolean;
+
+            /**
+             * Returns the Model the instance was created from.
+             */
+            Model: Model<TInstance, TPojo>;
+
+            /**
+             * A reference to the sequelize instance.
+             */
+            sequelize: Sequelize;
+
+            /**
+             * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
+             * Otherwise, always returns false.
+             */
+            isDeleted: boolean;
+
+            /**
+             * Get the values of this Instance. Proxies to this.get.
+             */
+            values: TPojo;
+
+            /**
+             * A getter for this.changed(). Returns true if any keys have changed.
+             */
+            isDirty: boolean;
+
+            /**
+             *  Get the values of the primary keys of this instance.
+             */
+            primaryKeyValues: TPojo;
+
+            /**
+             * Get the value of the underlying data value.
+             *
+             * @param key   Field to retrieve.
+             */
+            getDataValue(key: string): any;
+
+            /**
+             * Update the underlying data value.
+             *
+             * @param key   Field to set.
+             * @param value Value to set.
+             */
+            setDataValue(key: string, value: any): void;
+
+            /**
+             * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
+             * invoking virtual getters.
+             */
+            get(key?: string): any;
+
+            /**
+             * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
+             * that nothing will be persisted before you actually call save).
+             */
+            set(key: string, value: any, options?: SetOptions): void;
+
+            /**
+             * If changed is called with a string it will return a boolean indicating whether the value of that key in
+             * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+             * return an array of keys that have changed.
+             */
+            changed(key: string): any;
+
+            /**
+               * If changed is called with a string it will return a boolean indicating whether the value of that key in
+               * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+               * return an array of keys that have changed.
+               */
+            changed(): Array<string>;
+
+            /**
+             * Returns the previous value for key from _previousDataValues.
+             */
+            previous(key: string): any;
+
+            /**
+             * Validate this instance, and if the validation passes, persist it to the database.
+             */
+            save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
+
+            /**
+             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
+             * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
+             * With this method, all references to the Instance are updated with the new data and no new objects are created.
+             */
+            reload(options?: FindOptions): PromiseT<TInstance>;
+
+            /**
+             * Validate the attribute of this instance according to validation rules set in the model definition.
+             */
+            validate(options?: ValidateOptions): PromiseT<Error>;
+
+            /**
+             * This is the same as calling setAttributes, then calling save.
+             */
+            updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
+
+            /**
+             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
+             * completely deleted, or have its deletedAt timestamp set to the current time.
+             *
+             * @param options   Allows caller to specify if delete should be forced.
+             */
+            destroy(options?: DestroyInstanceOptions): Promise;
+
+            /**
+             * Increment the value of one or more columns. This is done in the database, which means it does not use the
+             * values currently stored on the Instance.
+             *
+             * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
+             *                  array is provided, the same is true for each column. If and object is provided, each column is
+             *                  incremented by the value given.
+             * @param options   Increment options.
+             */
+            increment(fields: any, options?: IncrementOptions): Promise;
+
+            /**
+             * Decrement the value of one or more columns. This is done in the database, which means it does not use the
+             * values currently stored on the Instance.
+             *
+             * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
+             *                  array is provided, the same is true for each column. If and object is provided, each column is
+             *                  decremented by the value given.
+             * @param options   Decrement options.
+             */
+            decrement(fields: any, options?: IncrementOptions): Promise;
+
+            /**
+             * Check whether all values of this and other Instance are the same.
+             */
+            equal(other: TInstance): boolean;
+
+            /**
+             * Check if this is eqaul to one of others by calling equals.
+             *
+             * @param others    Other instances to compare to.
+             */
+            equalsOneOf(others: Array<TInstance>): boolean;
+
+            /**
+             * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
+             * gotten from the DB, and apply all custom getters.
+             */
+            toJSON(): TPojo;
+        }
+
+        interface Transaction extends TransactionStatic {
+            /**
+             * Commit the transaction.
+             */
+            commit(): Transaction;
+
+            /**
+             * Rollback (abort) the transaction.
+             */
+            rollback(): Transaction;
+        }
+
+        interface TransactionStatic {
+            /**
+             * The possible isolation levels to use when starting a transaction
+             */
+            ISOLATION_LEVELS: TransactionIsolationLevels;
+
+            /**
+             * Possible options for row locking. Used in conjuction with find calls.
+             */
+            LOCK: TransactionLocks;
+        }
+
+        interface TransactionIsolationLevels {
+            READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
+            READ_COMMITTED: string;  // "READ COMMITTED"
+            REPEATABLE_READ: string; // "REPEATABLE READ"
+            SERIALIZABLE: string;    // "SERIALIZABLE"
+        }
+
+        interface TransactionLocks {
+            UPDATE: string;  // UPDATE
+            SHARE: string;   // SHARE
+        }
+
+        interface Hooks {
+
+            /**
+             * Add a named hook to the model.
+             *
+             * @param hooktype
+             */
+            addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
+
+            /**
+             * Add a hook to the model.
+             *
+             * @param hooktype
+             */
+            addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
+
+            /**
+             * A named hook that is run before validation.
+             */
+            beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+            /**
+             * A hook that is run before validation.
+             */
+            beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+            /**
+             * A named hook that is run before validation.
+             */
+            afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run before validation.
+             */
+            afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run before creating a single instance.
+             */
+            beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run before creating a single instance.
+             */
+            beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run after creating a single instance.
+             */
+            afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run after creating a single instance.
+             */
+            afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run before destroying a single instance.
+             */
+            beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run before destroying a single instance.
+             */
+            beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run after destroying a single instance.
+             */
+            afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run after destroying a single instance.
+             */
+            afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run before updating a single instance.
+             */
+            beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run before updating a single instance.
+             */
+            beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run after updating a single instance.
+             */
+            afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run after updating a single instance.
+             */
+            afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run before creating instances in bulk.
+             */
+            beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run before creating instances in bulk.
+             */
+            beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run after creating instances in bulk.
+             */
+            afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A hook that is run after creating instances in bulk.
+             */
+            afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+            /**
+             * A named hook that is run before destroying instances in bulk.
+             */
+            beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+            /**
+             * A hook that is run before destroying instances in bulk.
+             */
+            beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+            /**
+             * A named hook that is run after destroying instances in bulk.
+             */
+            afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+            /**
+             * A hook that is run after destroying instances in bulk.
+             */
+            afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+            /**
+             * A named hook that is run before updating instances in bulk.
+             */
+            beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+            /**
+             * A hook that is run before updating instances in bulk.
+             */
+            beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+            /**
+             * A named hook that is run after updating instances in bulk.
+             */
+            afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+            /**
+             * A hook that is run after updating instances in bulk.
+             */
+            afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+        }
+
+        interface Associations {
+            /**
+             * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
+             *
+             * @param target
+             * @param options
+             */
+            hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+            /**
+             * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
+             *
+             * @param target
+             * @param options
+             */
+            belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+            /**
+             * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
+             *
+             * @param target
+             * @param options
+             */
+            belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+            /**
+             * Create an association that is either 1:m or n:m.
+             *
+             * @param target
+             * @param options
+             */
+            hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+        }
+
+        /**
+         * Extension of external project that doesn't have definitions.
+         *
+         * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+         */
+        interface Validator {
+
+        }
+
+        /**
+         * Custom class defined, but no extra methods or functionality even.
+         */
+        interface ValidationError extends Error {
+
+        }
+
+        interface QueryChainer {
+            /**
+             * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
+             * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
+             * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
+             * cumbersome, but it is used when you want to run queries in serial.
+             *
+             * @param emitterOrKlass
+             * @param method
+             * @param params
+             * @param options
+             */
+            add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
+
+            /**
+             * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
+             * began executing as soon as you invoked their methods.
+             */
+            run(): EventEmitter;
+
+            /**
+             * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
+             *
+             * @param options @see QueryChainerRunSeriallyOptions
+             */
+            runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
+        }
+
+        interface QueryInterface {
+
+            /**
+             * Returns the dialect-specific sql generator.
+             */
+            QueryGenerator: QueryGenerator;
+
+            /**
+             * Queries the schema (table list).
+             *
+             * @param schema The schema to query. Applies only to Postgres.
+             */
+            createSchema(schema?: string): EventEmitter;
+
+            /**
+             * Drops the specified schema (table).
+             *
+             * @param schema The name of the table to drop.
+             */
+            dropSchema(schema: string): EventEmitter;
+
+            /**
+             * Drops all tables.
+             */
+            dropAllSchemas(): EventEmitter;
+
+            /**
+             * Queries all table names in the database.
+             *
+             * @param options
+             */
+            showAllSchemas(options?: QueryOptions): EventEmitter;
+
+            /**
+             * Creates a table with specified attributes.
+             * @param tableName     Name of table to create
+             * @param attributes    Hash of attributes, key is attribute name, value is data type
+             * @param options       Query options.
+             *
+             * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
+             */
+            createTable(tableName: string, attributes: any, options?: QueryOptions): any;
+
+            /**
+             * Drops the specified table.
+             *
+             * @param tableName Table name.
+             * @param options   Query options, particularly "force".
+             */
+            dropTable(tableName: string, options?: QueryOptions): EventEmitter;
+            dropAllTables(options?: QueryOptions): EventEmitter;
+            dropAllEnums(options?: QueryOptions): EventEmitter;
+            renameTable(before: string, after: string): EventEmitter;
+            showAllTables(options?: QueryOptions): EventEmitter;
+            describeTable(tableName: string, options?: QueryOptions): EventEmitter;
+            addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
+            removeColumn(tableName: string, attributeName: string): EventEmitter;
+            changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
+            renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
+            addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
+            showIndex(tableName: string, options?: QueryOptions): EventEmitter;
+            getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
+            removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
+            removeIndex(tableName: string, indexName: string): EventEmitter;
+            insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
+            /**
+             * Inserts several records into the specified table.
+             * @param tableName     Table to insert into.
+             * @param records       Array of key/value pairs to insert as records.
+             * @param options       Query options
+             * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
+             */
+            bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
+
+            update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+            bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
+            delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
+            bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
+            bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
+            select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
+            increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+            rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
+            /**
+             * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
+             *
+             * @param tableName
+             * @param triggerName
+             * @param timingType
+             * @param fireOnArray
+             * @param functionName
+             * @param functionParams
+             * @param optionsArray
+             */
+            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
+            /**
+             * Postgres only. Drops the specified trigger.
+             *
+             * @param tableName
+             * @param triggerName
+             */
+            dropTrigger(tableName: string, triggerName: string): EventEmitter;
+            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
+            createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
+            dropFunction(functionName: string, params: Array<any>): EventEmitter;
+            renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
+            /**
+             * Escape an identifier (e.g. a table or attribute name). If force is true,
+             * the identifier will be quoted even if the `quoteIdentifiers` option is
+             * false.
+             */
+            quoteIdentifier(identifier: string, force: boolean): EventEmitter;
+            quoteTable(tableName: string): EventEmitter;
+            quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
+            escape(value: string): EventEmitter;
+            setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
+            setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
+            startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+            commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+            rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+        }
+
+        interface QueryGenerator {
+            createSchema(schemaName: string): string;
+            dropSchema(schemaName: string): string;
+            showSchemasQuery(): string;
+            addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
+            createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
+            describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
+            dropTableQuery(tableName: string, options?: { cascade: string }): string;
+            renameTableQuery(before: string, after: string): string;
+            showTablesQuery(): string;
+            addColumnQuery(tableName: string, attributes: any): string;
+            removeColumnQuery(tableName: string, attributeName: string): string;
+            changeColumnQuery(tableName: string, attributes: any): string;
+            renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
+            insertQuery(table: string, valueHash: any, modelAttributes: any): string;
+            bulkInsertQuery(tableName: string, attrValueHashes: any): string;
+            updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
+            deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
+            deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
+            /**
+             * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
+             * 
+             * @param tableName
+             * @param attrValueHash
+             * @param where
+             * @param options
+             */
+            incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
+            addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
+            /**
+             * Return indices for a table. Not options may be passed but is not used, so can be anything.
+             * @param tableName
+             * @param options
+             */
+            showIndexQuery(tableName: string, options?: any): string; // options is actually not used
+            removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
+            removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
+            attributesToSQL(attributes: Array<any>): string;
+            findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
+            quoteTable(param: any, as: boolean): string;
+            quote(obj: any, parent: any, force: boolean): string;
+            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
+            dropTrigger(tableName: string, triggerName: string): string;
+            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
+            createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
+            dropFunction(functionName: string, params: Array<TriggerParam>): string;
+            renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
+            quoteIdentifier(identifier: string, force?: boolean): string;
+            quoteIdentifiers(identifiers: string, force?: boolean): string;
+            /**
+             * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
+             *
+             * @param value
+             * @param field
+             */
+            escape(value: any, field: any): string;
+            getForeignKeysQuery(tableName: string, schemaName: string): string;
+            dropForeignKeyQuery(tableName: string, foreignKey: string): string;
+            selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+            selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+            selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+            setAutocommitQuery(value: boolean): string;
+            setIsolationLevelQuery(value: string): string;
+            /**
+             * Returns start transaction query. Options is not used.
+             * @param options
+             */
+            startTransactionQuery(options?: any): string;
+            /**
+             * Returns start transaction query. Options is not used.
+             * @param options
+             */
+            commitTransactionQuery(options?: any): string;
+            /**
+             * Returns start transaction query. Options is not used.
+             * @param options
+             */
+            rollbackTransactionQuery(options?: any): string;
+            addLimitAndOffset(options: SelectOptions, query?: string): string;
+            getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
+            prependTableNameToHash(tableName: string, hash?: any): string;
+            findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
+            getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
+            isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
+            getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
+            getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
+            arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
+            hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
+            booleanValue(value: boolean): string;
+        }
+
+        interface Schema {
+            tableName: string;
+            table: string;
+            name: string;
+            schema: string;
+            delimiter: string;
+        }
+
+        interface QueryTypes {
+            SELECT: string;
+            BULKUPDATE: string;
+            BULKDELETE: string;
+        }
+
+        interface ModelManager {
+            daos: Array<Model<any, any>>;
+            sequelize: Sequelize;
+            addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
+            removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
+            getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
+            all: Array<Model<any, any>>;
+
+            /**
+             * Iterate over DAOs in an order suitable for e.g. creating tables. Will
+             * take foreign key constraints into account so that dependencies are visited
+             * before dependents.
+             */
+            forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
+        }
+
+        interface TransactionManager {
+            sequelize: Sequelize;
+            connectorManagers: any;
+            getConnectorManager(uuid?: string): ConnectorManager;
+            releaseConnectionManager(uuid?: string): void;
+
+            /**
+             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+             *
+             * @param sql           SQL statement to execute.
+             *
+             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+             *
+             * @param options       Query options.
+             *
+             */
+            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
+        }
+
+        interface ConnectorManager {
+
+            /**
+             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+             *
+             * @param sql           SQL statement to execute.
+             *
+             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+             *
+             * @param options       Query options.
+             *
+             */
+            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+            afterTransactionSetup(callback: () => void): void;
+            connect(): void;
+            disconnect(): void;
+            reconnect(): void;
+            cleanup(): void;
+        }
+
+        interface Migrator {
+            queryInterface: QueryInterface;
+            migrate(options?: MigratorOptions): EventEmitter;
+            getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
+            findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
+            exec(filename: string, options?: MigratorExecOptions): EventEmitter;
+            getLastMigrationFromDatabase(): EventEmitter;
+            getLastMigrationIdFromDatabase(): EventEmitter;
+            getFormattedDateString(s: string): string;
+            stringToDate(s: string): Date;
+            saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
+            deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
+            execute(options?: MigrationExecuteOptions): EventEmitter;
+            isBefore(date: Date, options?: MigrationCompareOptions): boolean;
+            isAfter(date: Date, options?: MigrationCompareOptions): boolean;
+
+        }
+
+        interface Migration extends QueryInterface {
+            migrator: Migrator;
+            path: string;
+            filename: string;
+            migrationId: number;
+            date: Date;
+            queryInterface: QueryInterface;
+            migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
+
+        }
+
+        interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
+
+        interface EventEmitterT<R> extends NodeJS.EventEmitter {
+            /**
+             * Create a new emitter instance.
+             *
+             * @param handler
+             */
+            new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
+
+            /**
+             * Run the function that was passed when the emitter was instantiated.
+             */
+            run(): EventEmitterT<R>;
+
+            /**
+             * Listen for success events.
+             *
+             * @param onSuccess
+             */
+            success(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+            /**
+             * Alias for success(handler). Listen for success events.
+             *
+             * @param onSuccess
+             */
+            ok(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+            /**
+             * Listen for error events.
+             *
+             * @param onError
+             */
+            error(onError: (err: Error) => void): EventEmitterT<R>;
+
+            /**
+             * Alias for error(handler). Listen for error events.
+             *
+             * @param onError
+             */
+            fail(onError: (err: Error) => void): EventEmitterT<R>;
+
+            /**
+             * Alias for error(handler). Listen for error events.
+             *
+             * @param onError
+             */
+            failure(onError: (err: Error) => void): EventEmitterT<R>;
+
+            /**
+             * Listen for both success and error events.
+             *
+             * @param onDone
+             */
+            done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+            /**
+             * Alias for done(handler). Listen for both success and error events.
+             *
+             * @param onDone
+             */
+            complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+            /**
+             * Attach a function that is called every time the function that created this emitter executes a query.
+             *
+             * @param onSQL
+             */
+            sql(onSQL: (sql: string) => void): EventEmitterT<R>;
+
+            /**
+             * Proxy every event of this event emitter to another one.
+             *
+             * @param emitter   The event emitter that should receive the events.
+             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+             */
+            proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
+
+
+        }
+
+        interface Options {
+            /**
+             * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
+             * Default is mysql.
+             */
+            dialect?: string;
+
+            /**
+             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
+             * connecting to a pg database, you should specify 'pg.js' here
+             */
+            dialectModulePath?: string;
+
+            /**
+             * The host of the relational database. Default 'localhost'.
+             */
+            host?: string;
+
+            /**
+             * Integer    The port of the relational database.
+             */
+            port?: number;
+
+            /**
+             * The protocol of the relational database. Default 'tcp'.
+             */
+            protocol?: string;
+
+            /**
+             * Default options for model definitions. See sequelize.define for options.
+             */
+            define?: DefineOptions;
+
+            /**
+             * Default options for sequelize.query
+             */
+            query?: QueryOptions;
+
+            /**
+             * Default options for sequelize.sync
+             */
+            sync?: SyncOptions;
+
+            /**
+             * The timezone used when converting a date from the database into a javascript date. The timezone is also used to 
+             * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time 
+             * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
+             * Default '+00:00'.
+             */
+            timezone?: string;
+
+            /**
+             * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
+             *
+             * Set to "false" to disable logging.
+             */
+            logging?: any;
+
+            /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
+             * A flag that defines if null values should be passed to SQL queries or not.
+             */
+            omitNull?: boolean;
+
+            /**
+             * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
+             * queries will be executed immediately.
+             */
+            queue?: boolean;
+
+            /**
+             * The maximum number of queries that should be executed at once if queue is true.
+             */
+            maxConcurrentQueries?: number;
+
+            /**
+             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+             */
+            native?: boolean;
+
+            /**
+             * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
+             * should be an object (a single server for handling writes), and read an array of object (several servers to
+             * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
+             */
+            replication?: ReplicationOptions;
+
+            /**
+             * Connection pool options.
+             *
+             */
+            pool?: PoolOptions;
+
+            /**
+             * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
+             * Default true.
+             */
+            quoteIdentifiers?: boolean;
+
+            /**
+             * Language. Default "en".
+             */
+            language?: string;
+        }
+
+        interface PoolOptions {
+            maxConnections?: number;
+
+            minConnections?: number;
+
+            /**
+             * The maximum time, in milliseconds, that a connection can be idle before being released.
+             */
+            maxIdleTime?: number;
+
+            /**
+             * A function that validates a connection. Called with client. The default function checks that client is an
+             * object, and that its state is not disconnected.
+             *
+             * Note, this is not documented, and after reading code I'm not sure what client's type is.
+             */
+            validateConnection?: (client?: any) => boolean;
+        }
+
+        interface AttributeOptions {
+            /**
+             * A string or a data type
+             */
+            type?: string;
+
+            /**
+             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
+             * is saved.
+             */
+            allowNull?: boolean;
+
+            /**
+             * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
+             */
+            defaultValue?: any;
+
+            /**
+             * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
+             * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
+             */
+            unique?: any;
+
+            primaryKey?: boolean;
+
+            /**
+             * If set, sequelize will map the attribute name to a different name in the database.
+             */
+            field?: string;
+
+            autoIncrement?: boolean;
+
+            comment?: string;
+
+            /**
+             * If this column references another table, provide it here as a Model, or a string.
+             */
+            references?: any;
+
+            /**
+             * The column of the foreign table that this column references. Default 'id'.
+             */
+            referencesKey?: string;
+
+            /**
+             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+             * NO ACTION.
+             */
+            onUpdate?: string;
+
+            /**
+             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+             * NO ACTION.
+             */
+            onDelete?: string;
+
+            /**
+             * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
+             */
+            get?: () => any;
+
+            /**
+             * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
+             */
+            set?: (value?: any) => void;
+
+            /**
+             * An object of validations to execute for this column every time the model is saved. Can be either the name of a
+             * validation provided by validator.js, a validation function provided by extending validator.js (see the
+             * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
+             * with the value of the field, and can possibly take a second callback argument, to signal that they are
+             * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
+             * the callback should be called with the error text.
+             */
+            validate?: any;
+        }
+
+        interface ForeignKeyAttributeOptions extends AttributeOptions {
+            /**
+             * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
+             */
+            fieldName: string;
+        }
+
+        interface DefineOptions {
+            /**
+             * Define the default search scope to use for this model. Scopes have the same form as the options passed to
+             * find / findAll.
+             */
+            defaultScope?: FindOptions;
+
+            /**
+             * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
+             * scopes are defined, and what you can do with them
+             */
+            scopes?: any;
+
+            /**
+             * Don't persits null values. This means that all columns with null values will not be saved.
+             */
+            omitNull?: boolean;
+
+            /**
+             * Adds createdAt and updatedAt timestamps to the model. Default true.
+             */
+            timestamps?: boolean;
+
+            /**
+             * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
+             * timestamps=true to work. Default false.
+             */
+            paranoid?: boolean;
+
+            /**
+             * Converts all camelCased columns to underscored if true. Default false.
+             */
+            underscored?: boolean;
+
+            /**
+             * Converts camelCased model names to underscored tablenames if true. Default false.
+             */
+            underscoredAll?: boolean;
+
+            /**
+             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
+             * dao name will be pluralized. Default false.
+             */
+            freezeTableName?: boolean;
+
+            /**
+             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
+             */
+            createdAt?: any;
+
+            /**
+             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
+             */
+            updatedAt?: any;
+
+            /**
+             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
+             */
+            deletedAt?: any;
+
+            /**
+             * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
+             */
+            tableName?: string;
+
+            /**
+             * Provide getter functions that work like those defined per column. If you provide a getter method with the same
+             * name as a column, it will be used to access the value of that column. If you provide a name that does not match
+             * a column, this function will act as a virtual getter, that can fetch multiple other values.
+             */
+            getterMethods?: any;
+
+            /**
+             * Provide setter functions that work like those defined per column. If you provide a setter method with the same
+             * name as a column, it will be used to update the value of that column. If you provide a name that does not match
+             * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
+             * persisted
+             */
+            setterMethods?: any;
+
+            /**
+             * Provide functions that are added to each instance (DAO).
+             */
+            instanceMethods?: any;
+
+            /**
+             * Provide functions that are added to the model (Model).
+             */
+            classMethods?: any;
+
+            /**
+             * Default 'public'.
+             */
+            schema?: string;
+            schemaDelimiter?: string;
+            engine?: string;
+            charset?: string;
+            comment?: string;
+            collate?: string;
+            whereCollection?: any;
+            language?: string;
+
+            /**
+             * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
+             * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+             * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
+             * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
+             * either be a function, or an array of functions.
+             */
+            hooks?: Hooks;
+
+            /**
+             * An object of model wide validations. Validations have access to all model values via this. If the validator
+             * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
+             * error.
+             */
+            validate?: any;
+
+            /**
+             * 
+             */
+            indexes?: Array<DefineIndexOptions>;
+        }
+
+        interface DefineIndexOptions {
+            /**
+             * The name of the index. Defaults to model name + _ + fields concatenated.
+             */
+            name?: string;
+
+            /**
+             * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
+             */
+            type: string;
+
+            /**
+             * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres, 
+             * and postgres additionally supports GIST and GIN.
+             */
+            method: string;
+
+            /**
+             * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE", 
+             * then true).
+             */
+            unique?: boolean;
+
+            /**
+             * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
+             */
+            concurrently?: boolean;
+
+            /**
+             * An array of the fields to index. Each field can either be a string containing the name of the field, or an object 
+             * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the 
+             * direction the column should be sorted in), collate (the collation (sort order) for the column)
+             */
+            fields: Array<any>;
+        }
+
+        interface QueryOptions {
+            /**
+             * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
+             * result.
+             */
+            raw?: boolean;
+
+            /**
+             * The transaction that the query should be executed under.
+             */
+            transaction?: Transaction;
+
+            /**
+             * The type of query you are executing. The query type affects how results are formatted before they are passed
+             * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
+             * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
+             * are SELECT, BULKUPDATE and BULKDELETE.
+             *
+             * Default is SELECT.
+             */
+            type?: string;
+
+            /**
+             * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
+             * transaction.LOCK.SHARE. See transaction.LOCK for an example.
+             */
+            lock?: string;
+
+            /**
+             * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
+             * type of that field, otherwise defaults to float.
+             */
+            dataType?: any;
+
+            /**
+             * A function that logs sql queries, or false for no logging.
+             */
+            logging?: any;
+
+            /**
+             * If plain is true, then sequelize will only return the first record of the result set. In case of false it will 
+             * all records.
+             */
+            plain?: boolean;
+        }
+
+        interface SyncOptions {
+            /**
+             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
+             * Default false.
+             */
+            force?: boolean;
+
+            /**
+             * A function that logs sql queries, or false for no logging.
+             */
+            logging?: any;
+
+            /**
+             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
+             * Default 'public'.
+             */
+            schema?: string;
+        }
+
+        interface ReplicationOptions {
+            read?: Array<Server>;
+            write?: Server;
+        }
+
+        interface Server {
+            host?: string;
+            port?: number;
+            database?: string;
+            username?: string;
+            password?: string;
+        }
+
+        interface DropOptions {
+            /**
+             * Also drop all objects depending on this table, such as views. Only works in postgres.
+             *
+             * Default false.
+             */
+            cascade?: boolean;
+        }
+
+        interface SchemaOptions {
+            /**
+             * The character(s) that separates the schema name from the table name. Default '.'.
+             */
+            schemaDelimiter?: string;
+        }
+
+        interface FindOptions {
+            /**
+             * A hash of attributes to describe your search.
+             */
+            where?: any;
+
+            /**
+             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two 
+             * elements - the first is the name of the attribute in the DB (or some kind of expression such as 
+             * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the 
+             * returned instance
+             */
+            attributes?: Array<any>;
+
+            /**
+             * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
+             * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
+             * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
+             * specify attributes to specify what columns to load, where to limit the relations, and include to load further
+             * nested relations
+             */
+            include?: any;
+
+            /**
+             * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
+             * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
+             * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
+             * this way the column will be escaped, but the direction will not.
+             */
+            order?: any;
+
+            limit?: number;
+
+            offset?: number;
+        }
+
+        interface BuildOptions {
+            /**
+             * If set to true, values will ignore field and virtual setters. Default false.
+             */
+            raw?: boolean;
+
+            /**
+             * Default true.
+             */
+            isNewRecord?: boolean;
+
+            /**
+             * Default true.
+             */
+            isDirty?: boolean;
+
+            /**
+             * an array of include options - Used to build prefetched/included model instances. See set.
+             */
+            include?: Array<any>;
+        }
+
+        interface CopyOptions extends BuildOptions {
+            /**
+             * If set, only columns matching those in fields will be saved.
+             */
+            fields?: Array<string>;
+
+            /**
+             *
+             */
+            transaction?: Transaction;
+        }
+
+        interface FindOrCreateOptions extends FindOptions, QueryOptions {
+
+        }
+
+        interface BulkCreateOptions {
+            /**
+             * Fields to insert (defaults to all fields).
+             */
+            fields?: Array<string>;
+
+            /**
+             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+             * validation. Default false.
+             */
+            validate?: boolean;
+
+            /**
+             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
+             */
+            hooks?: boolean;
+
+            /**
+             * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
+             */
+            ignoreDuplicates?: boolean;
+        }
+
+        interface DestroyOptions {
+            /**
+             * If set to true, destroy will find all records within the where parameter and will execute before-/ after
+             * bulkDestroy hooks on each row.
+             */
+            hooks?: boolean;
+
+            /**
+             * How many rows to delete
+             */
+            limit?: number;
+
+            /**
+             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
+             * where and limit options are ignored.
+             */
+            truncate?: boolean;
+        }
+
+        interface DestroyInstanceOptions {
+            /**
+             * If set to true, paranoid models will actually be deleted.
+             */
+            force: boolean;
+        }
+
+        interface InsertOptions {
+            limit?: number;
+            returning?: string;
+            allowNull?: string;
+        }
+
+        interface UpdateOptions {
+            /**
+             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+             * validation. Default true.
+             */
+            validate?: boolean;
+
+            /**
+             * Run before / after bulkUpdate hooks? Default false.
+             */
+            hooks?: boolean;
+
+            /**
+             * How many rows to update (only for mysql and mariadb).
+             */
+            limit?: number;
+        }
+
+        interface SetOptions {
+            /**
+             * If set to true, field and virtual setters will be ignored. Default false.
+             */
+            raw?: boolean;
+
+            /**
+             * Clear all previously set data values. Default false.
+             */
+            reset?: boolean;
+
+            include?: any;
+        }
+
+        interface SaveOptions {
+            /**
+             * An alternative way of setting which fields should be persisted.
+             */
+            fields?: any;
+
+            /**
+             * If true, the updatedAt timestamp will not be updated. Default false.
+             */
+            silent?: boolean;
+
+            transaction?: Transaction;
+        }
+
+        interface ValidateOptions {
+            /**
+             * An array of strings. All properties that are in this array will not be validated.
+             */
+            skip: Array<string>;
+        }
+
+        interface IncrementOptions {
+            /**
+             * The number to increment by. Default 1.
+             */
+            by?: number;
+
+            transaction?: Transaction;
+        }
+
+        interface IndexOptions {
+            indicesType?: string;
+            indexType?: string;
+            indexName?: string;
+            parser?: any;
+        }
+
+        interface ProxyOptions {
+            /**
+             * An array of the events to proxy. Defaults to sql, error and success.
+             */
+            events: Array<string>;
+        }
+
+        interface AssociationOptions {
+            /**
+             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
+             * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
+             * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
+             * Default false.
+             */
+            hooks?: boolean;
+
+            /**
+             * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
+             * if you want to define the junction table yourself and add extra attributes to it.
+             */
+            through?: any;
+
+            /**
+             * The alias of this model. If you create multiple associations between the same tables, you should provide an
+             * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
+             * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
+             * version of target.name
+             */
+            as?: string;
+
+            /**
+             * The foreignKey can be either a string name of the foreign key in the target table,
+             * or can be an object defining the foreign key and its options. Note foreignKey is not fully
+             * typed since TypeScript does not support union types--it can be either a string or an
+             * options object. String name defaults to the name of source + primary key of source.
+             * 
+             * @see ForeignKeyAttributeOptions.
+             */
+            foreignKey?: any;
+
+            /**
+             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+             * NO ACTION. Default SET NULL.
+             */
+            onDelete?: string;
+
+            /**
+             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+             * NO ACTION. Default CASCADE.
+             */
+            onUpdate?: string;
+
+            /**
+             * Should on update and on delete constraints be enabled on the foreign key.
+             */
+            constraints?: boolean;
+        }
+
+        interface TriggerOptions {
+            insert?: Array<string>;
+            update?: Array<string>;
+            delete?: Array<string>;
+            truncate?: Array<string>;
+        }
+
+        interface TriggerParam {
+            type: string;
+            direction?: string;
+            name?: string;
+        }
+
+        interface SelectOptions {
+            limit?: number;
+            offset?: number;
+            attributes?: Array<any>;
+            hasIncludeWhere?: boolean;
+            hasIncludeRequired?: boolean;
+            hasMultiAssociation?: boolean;
+            tableAs?: string;
+            table?: string;
+            include?: Array<any>;
+            includeIgnoreAttributes?: boolean;
+            where?: any;
+            /**
+             * String field name or array of strings of field names.
+             */
+            group?: any;
+            having?: any;
+            order?: any;
+            lock?: string;
+        }
+
+        interface HashToWhereConditionsOption {
+            include?: boolean;
+            keysEscaped?: boolean;
+        }
+
+        interface ModelMangerGetDaoOptions {
+            attribute: string;
+        }
+
+        interface ModelManagerForEachDaoOptions {
+            /**
+             * Default true.
+             */
+            reverse: boolean;
+        }
+
+        interface MigratorOptions {
+            /**
+             * A flag that defines if the migrator should get instantiated or not..
+             */
+            force: boolean;
+        }
+
+        interface FindAndCountResult<T> {
+            /**
+             * The matching model instances.
+             */
+            rows?: Array<T>;
+
+            /**
+             * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
+             */
+            count?: number;
+        }
+
+        interface Col {
+            /**
+             * Column name.
+             */
+            col: string;
+        }
+
+        interface Cast {
+            /**
+             * The value to cast.
+             */
+            val: any;
+
+            /**
+             * The type to cast it to.
+             */
+            type: string;
+        }
+
+        interface Literal {
+            val: any;
+        }
+
+        interface And {
+            /**
+             * Each argument (string or object) will be joined by AND.
+             */
+            args: Array<any>;
+        }
+
+        interface Or {
+            /**
+             * Each argument (string or object) will be joined by OR.
+             */
+            args: Array<any>;
+        }
+
+        interface Where {
+            /**
+             * The attribute.
+             */
+            attribute: string;
+
+            /**
+             * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
+             */
+            logic: any;
+        }
+
+        interface TransactionOptions {
+            /**
+             *
+             */
+            autocommit?: boolean;
+
+            /**
+             * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
+             */
+            isolationLevel?: string;
+        }
+
+        interface QueryChainerRunSeriallyOptions {
+            /**
+             * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
+             */
+            skipOnError: boolean;
+        }
+
+        interface CreateTableQueryOptions {
+            comment?: string;
+            uniqueKeys?: Array<any>;
+            charset?: string;
+        }
+
+        interface MigratorExecOptions {
+            before?: (migrator: Migrator) => void;
+            after?: (migrator: Migrator) => void;
+            success?: (migrator: Migrator) => void;
+        }
+
+        interface MigrationExecuteOptions {
+            method: string;
+        }
+
+        interface MigrationCompareOptions {
+            /**
+             * Default false.
+             */
+            withoutEquals: boolean;
+        }
+
+        interface Promise {
+            /**
+             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+             *
+             * @param evt Event
+             * @param fct Handler
+             */
+            on(evt: string, fct: () => void): void;
+
+            /**
+             * Emit an event from the emitter.
+             *
+             * @param type  The type of event.
+             * @param value All other arguments will be passed to the event listeners.
+             */
+            emit(type: string, ...value: Array<any>): void;
+
+            /**
+             * Listen for success events.
+             */
+            success(onSuccess: () => void): Promise;
+
+            /**
+             * Alias for success(handler). Listen for success events.
+             */
+            ok(onSuccess: () => void): Promise;
+
+            /**
+             * Listen for error events.
+             *
+             * @param onError Error handler.
+             */
+            error(onError: (err?: Error) => void): Promise;
+
+            /**
+             * Alias for error(handler). Listen for error events.
+             *
+             * @param onError Error handler.
+             */
+            fail(onError: (err?: Error) => void): Promise;
+
+            /**
+             * Alias for error(handler). Listen for error events.
+             *
+             * @param onError Error handler.
+             */
+            failure(onError: (err?: Error) => void): Promise;
+
+            /**
+             * Listen for both success and error events..
+             */
+            done(handler: (err: Error, result?: any) => void): Promise;
+
+            /**
+             * Alias for done(handler). Listen for both success and error events..
+             */
+            complete(handler: (err: Error, result?: any) => void): Promise;
+
+            /**
+             * Attach a function that is called every time the function that created this emitter executes a query.
+             *
+             * @param onSQL
+             */
+            sql(onSQL: (sql: string) => void): Promise;
+
+            /**
+             * Proxy every event of this promise to another one.
+             *
+             * @param promise   The promise that should receive the events.
+             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+             */
+            proxy(promise: Promise, options?: ProxyOptions): Promise;
+
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
+             * as opposed to then which will only recieve the first argument.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+             * @param onRejected
+             */
+            spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch(onRejected: (result?: any) => Promise): Promise;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch(onRejected: (result?: any) => void): Promise;
+        }
+
+        interface PromiseT<T> extends Promise {
+            /**
+             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+             *
+             * @param evt Event
+             * @param fct Handler
+             */
+            on(evt: string, fct: (t: T) => void): void;
+
+            /**
+             * Emit an event from the emitter.
+             *
+             * @param type  The type of event.
+             * @param value All other arguments will be passed to the event listeners.
+             */
+            emit(type: string, ...value: Array<T>): void;
+
+            /**
+             * Listen for success events.
+             */
+            success(onSuccess: (t: T) => void): PromiseT<T>;
+
+            /**
+             * Alias for success(handler). Listen for success events.
+             */
+            ok(onSuccess: (t: T) => void): PromiseT<T>;
+
+            /**
+             * Listen for both success and error events..
+             */
+            done(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+            /**
+             * Alias for done(handler). Listen for both success and error events..
+             */
+            complete(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+            /**
+             * Attach a function that is called every time the function that created this emitter executes a query.
+             *
+             * @param onSQL
+             */
+            sql(onSQL: (sql: string) => void): PromiseT<T>;
+
+            /**
+             * Proxy every event of this promise to another one.
+             *
+             * @param promise   The promise that should receive the events.
+             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+             */
+            proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Attach listeners to the emitter, promise style.
+             * 
+             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
+             *                          Note that this function will always only be called with one argument, as per 
+             *                          the promises/A spec. For functions that emit multiple arguments 
+             *                          (e.g. findOrCreate) @see spread
+             * @param onRejected
+             */
+            then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch(onRejected: (result?: T) => Promise): Promise;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+            /**
+             * Shorthand for then(null, onRejected)
+             */
+            catch(onRejected: (result?: T) => void): Promise;
+        }
+
+        interface Utils {
+            _: Lodash;
+
+            /**
+             * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
+             * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
+             * @param dialect   SQL Dialect.
+             */
+            format(arr: Array<any>, dialect?: string): string;
+
+            /**
+             * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
+             *
+             * @param sql           String to format.
+             * @param parameters    Key/value hash with values to replace in string.
+             * @param dialect       SQL Dialect
+             */
+            formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
+
+            injectScope(scope: string, merge: boolean): any;
+
+            smartWhere(whereArg: any, dialect: string): any;
+
+            compileSmartWhere(obj: any, dialect: string): Array<any>;
+
+            getWhereLogic(logic: string, val?: any): string;
+
+            isHash(obj: any): boolean;
+
+            hasChanged(attrValue: any, value: any): boolean;
+
+            argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
+
+            /**
+             * Consistently combines two table names such that the alphabetically first name always comes first when combined.
+             *
+             * @param table1
+             * @param table2
+             */
+            combineTableNames(table1: string, table2: string): string;
+
+            singularize(s: string, language?: string): string;
+
+            pluralize(s: string, language: string): string;
+
+            /**
+             * Same concept as _.merge, but don't overwrite properties that have already been assigned
+             */
+            mergeDefaults: typeof _.merge;
+
+            lowercaseFirst(str: string): string;
+
+            uppercaseFirst(str: string): string;
+
+            spliceStr(str: string, index: number, count: number, add: string): string;
+
+            camelize(str: string): string;
+
+            removeCommentsFromFunctionString(s: string): string;
+
+            toDefaultValue(value: any): any;
+
+            defaultValueSchemable(value: any): boolean;
+            setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
+            removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
+            firstValueOfHash(obj: any): any;
+            inherit(subClass: any, superClass: any): any;
+            stack(): string;
+            now(dialect: string): Date;
+
+            /**
+             * Runs provided function on next tick, depending on environment.
+             *
+             * @param f
+             */
+            tick(f: Function): void;
+
+            /**
+             * Surrounds a string with tick marks while removing all existing tick marks from the string.
+             * @param s         String to tick
+             * @param tickChar  Tick mark. Default `
+             */
+            addTicks(s: string, tickChar?: string): string;
+
+            removeTicks(s: string, tickChar?: string): string;
+
+            generateUUID(): string;
+
+            validateParameter(value: any, expectation: any): boolean;
+
+            CustomEventEmitter: EventEmitter;
+            Promise: Promise;
+            QueryChainer: QueryChainer;
+            Lingo: any; // external project, no definitions yet}
+        }
+
+        interface Lodash extends _.LoDashStatic {
+            camelizeIf(str: string, condition: boolean): string;
+            camelizeIf(str: string, condition: any): string;
+            underscoredIf(str: string, condition: boolean): string;
+            underscoredIf(str: string, condition: any): string;
+            /**
+             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
+             *
+             * @param arr Array to compact.
+             */
+            compactLite<T>(arr: Array<T>): Array<T>;
+        }
+
+        interface MetaPojo {
+            from: string;
+            to: string;
+        }
+        interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
+
+        }
+
+        interface DataTypeStringBase {
+            BINARY: DataTypeString;
+        }
+        interface DataTypeNumberBase {
+            UNSIGNED: boolean;
+            ZEROFILL: boolean;
+        }
+
+        interface DataTypeString extends DataTypeStringBase {
+        }
+        interface DataTypeChar extends DataTypeStringBase {
+        }
+        interface DataTypeInteger extends DataTypeNumberBase {
+        }
+        interface DataTypeBigInt extends DataTypeNumberBase {
+        }
+        interface DataTypeFloat extends DataTypeNumberBase {
+        }
+        interface DataTypeBlob {
+        }
+        interface DataTypeDecimal {
+            PRECISION: number;
+            SCALE: number;
+        }
+
+        interface DataTypeVirtual {
+        }
+        interface DataTypeEnum {
+            (...values: Array<string>): DataTypeEnum;
+        }
+        interface DataTypeArray {
+        }
+        interface DataTypeHstore {
+        }
+
+        interface DataTypes {
+            STRING: DataTypeString;
+            CHAR: DataTypeChar;
+            TEXT: string;
+            INTEGER: DataTypeInteger;
+            BIGINT: DataTypeBigInt;
+            DATE: string;
+            BOOLEAN: string;
+            FLOAT: DataTypeFloat;
+            NOW: string;
+            BLOB: DataTypeBlob;
+            DECIMAL: DataTypeDecimal;
+            UUID: string;
+            UUIDV1: string;
+            UUIDV4: string;
+            VIRTUAL: DataTypeVirtual;
+            NONE: DataTypeVirtual;
+            ENUM: DataTypeEnum;
+            ARRAY: DataTypeArray;
+            HSTORE: DataTypeHstore;
+        }
+    }
+
+    var sequelize: sequelize.SequelizeStatic;
+
+    export = sequelize;
+}
diff --git a/sequelize/sequelize-tests-2.0.0.ts b/sequelize/sequelize-tests-2.0.0.ts
new file mode 100644
index 000000000..d35074e08
--- /dev/null
+++ b/sequelize/sequelize-tests-2.0.0.ts
@@ -0,0 +1,427 @@
+/// <reference path="sequelize-2.0.0.d.ts" />
+
+import Sequelize = require('sequelize');
+
+var opts: Sequelize.Options;
+var defOpts: Sequelize.DefineOptions = {
+  indexes: [{
+    fields: [""],
+    type: "",
+    method: ""
+  }]
+};
+var attrOpts: Sequelize.AttributeOptions;
+var defIndexOpts: Sequelize.DefineIndexOptions;
+var indexOpts: Sequelize.IndexOptions;
+var dropOpts: Sequelize.DropOptions;
+var transOpts: Sequelize.TransactionOptions;
+var syncOpts: Sequelize.SyncOptions;
+var assocOpts: Sequelize.AssociationOptions;
+var schemaOpts: Sequelize.SchemaOptions;
+var findOpts: Sequelize.FindOptions
+var findCrOpts: Sequelize.FindOrCreateOptions;
+var queryOpts: Sequelize.QueryOptions;
+var buildOpts: Sequelize.BuildOptions;
+var copyOpts: Sequelize.CopyOptions;
+var bulkCrOpts: Sequelize.BulkCreateOptions;
+var destroyOpts: Sequelize.DestroyOptions;
+var destroyInstOpts: Sequelize.DestroyInstanceOptions;
+var updateOpts: Sequelize.UpdateOptions;
+var saveOpts: Sequelize.SaveOptions;
+var valOpts: Sequelize.ValidateOptions;
+var incrOpts: Sequelize.IncrementOptions;
+
+var promiseMe: Sequelize.Promise;
+var emitMe: Sequelize.EventEmitter;
+
+var sequelize = new Sequelize("", "");
+sequelize = new Sequelize("", opts);
+sequelize = new Sequelize("", "", "");
+sequelize = new Sequelize("", "", opts);
+sequelize = new Sequelize("", "", "", opts);
+
+interface modelPojo {
+  name: string;
+}
+
+interface modelInst extends Sequelize.Instance<modelInst, modelPojo>, modelPojo {
+    
+};
+
+var myModelInst: modelInst;
+var myModelPojo: modelPojo;
+
+sequelize.define<modelInst, modelPojo>("MyTable", attrOpts, defOpts);
+var model: Sequelize.Model<modelInst, modelPojo> = sequelize.model<modelInst, modelPojo>("MyTable");
+model = sequelize.import<modelInst, modelPojo>("");
+emitMe = sequelize.authenticate();
+sequelize.cast({}, "");
+sequelize.col("myCol");
+sequelize.models.MyTable;
+emitMe = sequelize.drop(dropOpts);
+emitMe = sequelize.createSchema("schema");
+emitMe = sequelize.dropAllSchemas();
+emitMe = sequelize.dropSchema("dbo");
+emitMe = sequelize.fn("upper", sequelize.col("username"));
+sequelize.literal("");
+sequelize.literal(1234);
+sequelize.and("", 1234);
+sequelize.or("", 123);
+sequelize.where("", "");
+sequelize.where("", sequelize.and("", ""));
+promiseMe= sequelize.transaction(transOpts);
+promiseMe = sequelize.transaction(transOpts, function (t:Sequelize.Transaction): boolean { return true; });
+emitMe = sequelize.query<modelInst, modelPojo>("", model).complete(function (err, result) { });
+emitMe = sequelize.query("");
+var dialect: string = sequelize.getDialect();
+emitMe = sequelize.showAllSchemas();
+emitMe = sequelize.sync(syncOpts);
+
+model.addHook("", "", function () { });
+model.addHook("", function () { });
+model.beforeValidate("", function () { });
+model.afterValidate("", function () { });
+model.beforeCreate("", function () { });
+model.afterCreate("", function () { });
+model.beforeDestroy("", function () { });
+model.afterDestroy("", function () { });
+model.beforeUpdate("", function () { });
+model.afterUpdate("", function () { });
+model.beforeBulkCreate("", function () { });
+model.afterBulkCreate("", function () { });
+model.beforeBulkDestroy("", function () { });
+model.afterBulkDestroy("", function () { });
+model.beforeBulkUpdate("", function () { });
+model.afterBulkUpdate("", function () { });
+
+
+model.hasOne<modelInst, modelPojo>(model);
+model.hasOne<modelInst, modelPojo>(model, assocOpts);
+model.belongsTo<modelInst, modelPojo>(model);
+model.belongsTo<modelInst, modelPojo>(model, assocOpts);
+model.hasMany<modelInst, modelPojo>(model);
+model.hasMany<modelInst, modelPojo>(model, assocOpts);
+model.belongsToMany<modelInst, modelPojo>(model);
+model.belongsToMany<modelInst, modelPojo>(model, assocOpts);
+
+promiseMe = model.sync();
+promiseMe = model.drop(dropOpts);
+model.schema("", schemaOpts);
+model.getTableName();
+model = model.scope({});
+model = model.scope("");
+model = model.scope([]);
+model = model.scope(null);
+
+model.find().then(function () { }, function () { });
+model.find().then(function () { });
+model.find().then(null, function () { });
+model.find().then(function (result: modelInst) { });
+model.find().then<modelInst>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) });
+model.find().then<modelInst, any>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) }, function (): Sequelize.PromiseT<any> { return model.find(1) });
+
+model.find().catch(function () { });
+model.find().catch(function (result: modelInst) { });
+model.find().catch(function (result: modelInst): Sequelize.Promise { return model.find(1) });
+
+model.find().spread(function () { }, function () { });
+model.find().spread(function () { });
+model.find().spread(null, function () { });
+model.find().spread(function (result: modelInst) { });
+model.find().spread(function (result1: modelInst, result2: any) { });
+model.find().spread(null, function (result1: any, result2: boolean) { });
+model.find().spread(function (result: modelInst): Sequelize.Promise { return model.find(1) });
+model.find().spread<modelInst>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) });
+model.find().spread<modelInst>(function (result: modelInst) { }, function (): Sequelize.PromiseT<modelInst> { return model.find(1) });
+model.find().spread<modelInst, any>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) }, function (): Sequelize.PromiseT<any> { return model.find(1) });
+
+promiseMe = model.findAll(findOpts, queryOpts);
+promiseMe = model.findAll(findOpts);
+promiseMe = model.findAll();
+promiseMe = model.find(findOpts, queryOpts);
+promiseMe = model.find(findOpts);
+promiseMe = model.find(1, queryOpts);
+promiseMe = model.find(1);
+promiseMe = model.find();
+promiseMe = model.aggregate<number>("", "", findOpts);
+promiseMe = model.count();
+promiseMe = model.count(findOpts);
+promiseMe = model.findAndCountAll(findOpts, queryOpts);
+promiseMe = model.findAndCountAll(findOpts);
+promiseMe = model.findAndCountAll();
+promiseMe = model.max<number>("", findOpts);
+promiseMe = model.max<number>("");
+promiseMe = model.min<number>("", findOpts);
+promiseMe = model.min<number>("");
+promiseMe = model.sum("", findOpts);
+promiseMe = model.sum("");
+myModelInst = model.build(myModelPojo, buildOpts);
+myModelInst = model.build(myModelPojo);
+promiseMe = model.create(myModelPojo, copyOpts);
+promiseMe = model.create(myModelPojo);
+promiseMe = model.findOrInitialize({}, myModelPojo, queryOpts);
+promiseMe = model.findOrInitialize({}, myModelPojo);
+promiseMe = model.findOrInitialize({});
+promiseMe = model.findOrCreate({}, myModelPojo, findCrOpts);
+promiseMe = model.findOrCreate({}, myModelPojo);
+promiseMe = model.findOrCreate({});
+promiseMe = model.bulkCreate([myModelPojo], bulkCrOpts);
+promiseMe = model.bulkCreate([myModelPojo]);
+promiseMe = model.destroy({}, destroyOpts);
+promiseMe = model.destroy({});
+promiseMe = model.destroy();
+promiseMe = model.update(myModelPojo, {}, updateOpts);
+promiseMe = model.update(myModelPojo, {});
+promiseMe = model.describe();
+model.dataset;
+//var isDefined: boolean = sequelize.isDefined("");
+
+model.find().spread(function (arg1: string, arg2: number) {
+  return model.find();
+});
+
+var isBool: boolean;
+var strArr: Array<string>;
+
+isBool = myModelInst.isNewRecord;
+model = myModelInst.Model;
+sequelize = myModelInst.sequelize;
+isBool = myModelInst.isDeleted;
+myModelPojo = myModelInst.values;
+isBool = myModelInst.isDirty;
+myModelPojo = myModelInst.primaryKeyValues;
+myModelInst.getDataValue("");
+myModelInst.setDataValue("", "");
+myModelInst.setDataValue("", 123);
+myModelInst.get("");
+myModelInst.set("", "");
+myModelInst.set("", 123);
+isBool = myModelInst.changed("");
+strArr = myModelInst.changed();
+myModelInst.previous("");
+promiseMe = myModelInst.save(["", ""], saveOpts);
+promiseMe = myModelInst.save(["", ""]);
+promiseMe = myModelInst.reload();
+promiseMe = myModelInst.reload(findOpts);
+promiseMe = myModelInst.validate(valOpts);
+promiseMe = myModelInst.validate();
+promiseMe = myModelInst.updateAttributes(myModelPojo, saveOpts);
+promiseMe = myModelInst.destroy(destroyInstOpts);
+promiseMe = myModelInst.destroy();
+promiseMe = myModelInst.increment({}, incrOpts);
+promiseMe = myModelInst.increment({});
+promiseMe = myModelInst.decrement({}, incrOpts);
+isBool = myModelInst.equal(myModelInst);
+isBool = myModelInst.equalsOneOf([myModelInst]);
+myModelPojo = myModelInst.toJSON();
+
+
+// data types test
+var types:any = Sequelize.STRING;
+types = Sequelize.STRING(12);
+types = Sequelize.STRING(12, true);
+types = Sequelize.STRING.BINARY;
+types = Sequelize.STRING(12).BINARY;
+types = Sequelize.STRING.BINARY(12);
+types = Sequelize.STRING({length:12, binary:true});
+types = Sequelize.STRING({length:12}).BINARY;
+
+types = Sequelize.CHAR;
+types = Sequelize.CHAR(12);
+types = Sequelize.CHAR(12, true);
+types = Sequelize.CHAR.BINARY;
+types = Sequelize.CHAR(12).BINARY;
+types = Sequelize.CHAR.BINARY(12);
+types = Sequelize.CHAR({length:12, binary:true});
+types = Sequelize.CHAR({length:12}).BINARY;
+
+types = Sequelize.TEXT;
+types = Sequelize.TEXT('tiny');
+types = Sequelize.TEXT({length:'tiny'});
+
+types = Sequelize.NUMBER;
+var numberOptions = {length:12, zerofill:true, decimals:1, precision:1, scale:1, unsigned:true};
+types = Sequelize.NUMBER(numberOptions);
+
+types = Sequelize.INTEGER;
+types = Sequelize.INTEGER.ZEROFILL;
+types = Sequelize.INTEGER.UNSIGNED;
+types = Sequelize.INTEGER.ZEROFILL.UNSIGNED;
+types = Sequelize.INTEGER.UNSIGNED.ZEROFILL;
+types = Sequelize.INTEGER(12);
+types = Sequelize.INTEGER(12).ZEROFILL;
+types = Sequelize.INTEGER(12).UNSIGNED;
+types = Sequelize.INTEGER(12).ZEROFILL.UNSIGNED;
+types = Sequelize.INTEGER(12).UNSIGNED.ZEROFILL;
+types = Sequelize.INTEGER(numberOptions);
+types = Sequelize.INTEGER(numberOptions).ZEROFILL;
+types = Sequelize.INTEGER(numberOptions).UNSIGNED;
+types = Sequelize.INTEGER(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.INTEGER(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.BIGINT;
+types = Sequelize.BIGINT.ZEROFILL;
+types = Sequelize.BIGINT.UNSIGNED;
+types = Sequelize.BIGINT.ZEROFILL.UNSIGNED;
+types = Sequelize.BIGINT.UNSIGNED.ZEROFILL;
+types = Sequelize.BIGINT(12);
+types = Sequelize.BIGINT(12).ZEROFILL;
+types = Sequelize.BIGINT(12).UNSIGNED;
+types = Sequelize.BIGINT(12).ZEROFILL.UNSIGNED;
+types = Sequelize.BIGINT(12).UNSIGNED.ZEROFILL;
+types = Sequelize.BIGINT(numberOptions);
+types = Sequelize.BIGINT(numberOptions).ZEROFILL;
+types = Sequelize.BIGINT(numberOptions).UNSIGNED;
+types = Sequelize.BIGINT(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.BIGINT(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.FLOAT;
+types = Sequelize.FLOAT.ZEROFILL;
+types = Sequelize.FLOAT.UNSIGNED;
+types = Sequelize.FLOAT.ZEROFILL.UNSIGNED;
+types = Sequelize.FLOAT.UNSIGNED.ZEROFILL;
+types = Sequelize.FLOAT(12);
+types = Sequelize.FLOAT(12).ZEROFILL;
+types = Sequelize.FLOAT(12).UNSIGNED;
+types = Sequelize.FLOAT(12).ZEROFILL.UNSIGNED;
+types = Sequelize.FLOAT(12).UNSIGNED.ZEROFILL;
+types = Sequelize.FLOAT(12,12);
+types = Sequelize.FLOAT(12,12).ZEROFILL;
+types = Sequelize.FLOAT(12,12).UNSIGNED;
+types = Sequelize.FLOAT(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.FLOAT(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.FLOAT(numberOptions);
+types = Sequelize.FLOAT(numberOptions).ZEROFILL;
+types = Sequelize.FLOAT(numberOptions).UNSIGNED;
+types = Sequelize.FLOAT(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.FLOAT(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.DOUBLE;
+types = Sequelize.DOUBLE.ZEROFILL;
+types = Sequelize.DOUBLE.UNSIGNED;
+types = Sequelize.DOUBLE.ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE.UNSIGNED.ZEROFILL;
+types = Sequelize.DOUBLE(12);
+types = Sequelize.DOUBLE(12).ZEROFILL;
+types = Sequelize.DOUBLE(12).UNSIGNED;
+types = Sequelize.DOUBLE(12).ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE(12).UNSIGNED.ZEROFILL;
+types = Sequelize.DOUBLE(12,12);
+types = Sequelize.DOUBLE(12,12).ZEROFILL;
+types = Sequelize.DOUBLE(12,12).UNSIGNED;
+types = Sequelize.DOUBLE(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.DOUBLE(numberOptions);
+types = Sequelize.DOUBLE(numberOptions).ZEROFILL;
+types = Sequelize.DOUBLE(numberOptions).UNSIGNED;
+types = Sequelize.DOUBLE(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.TIME;
+types = Sequelize.DATE;
+types = Sequelize.DATEONLY;
+types = Sequelize.BOOLEAN;
+types = Sequelize.NOW;
+
+types = Sequelize.BLOB;
+types = Sequelize.BLOB('tiny');
+types = Sequelize.BLOB({length:'tiny'});
+
+types = Sequelize.DECIMAL;
+types = Sequelize.DECIMAL.ZEROFILL;
+types = Sequelize.DECIMAL.UNSIGNED;
+types = Sequelize.DECIMAL.ZEROFILL.UNSIGNED;
+types = Sequelize.DECIMAL.UNSIGNED.ZEROFILL;
+types = Sequelize.DECIMAL(12,12);
+types = Sequelize.DECIMAL(12,12).ZEROFILL;
+types = Sequelize.DECIMAL(12,12).UNSIGNED;
+types = Sequelize.DECIMAL(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.DECIMAL(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.DECIMAL(numberOptions);
+types = Sequelize.DECIMAL(numberOptions).ZEROFILL;
+types = Sequelize.DECIMAL(numberOptions).UNSIGNED;
+types = Sequelize.DECIMAL(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.DECIMAL(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.NUMERIC;
+types = Sequelize.NUMERIC.ZEROFILL;
+types = Sequelize.NUMERIC.UNSIGNED;
+types = Sequelize.NUMERIC.ZEROFILL.UNSIGNED;
+types = Sequelize.NUMERIC.UNSIGNED.ZEROFILL;
+types = Sequelize.NUMERIC(12,12);
+types = Sequelize.NUMERIC(12,12).ZEROFILL;
+types = Sequelize.NUMERIC(12,12).UNSIGNED;
+types = Sequelize.NUMERIC(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.NUMERIC(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.NUMERIC(numberOptions);
+types = Sequelize.NUMERIC(numberOptions).ZEROFILL;
+types = Sequelize.NUMERIC(numberOptions).UNSIGNED;
+types = Sequelize.NUMERIC(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.NUMERIC(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.UUID;
+types = Sequelize.UUIDV1;
+types = Sequelize.UUIDV4;
+types = Sequelize.HSTORE;
+types = Sequelize.JSON;
+types = Sequelize.JSONB;
+types = Sequelize.VIRTUAL;
+
+types = Sequelize.ARRAY(Sequelize.INTEGER(12));
+types = Sequelize.ARRAY({type: Sequelize.BLOB});
+var obj = {};
+var isbool:boolean = types.is(obj, obj);
+
+types = Sequelize.NONE;
+types = Sequelize.ENUM("one", "two", 'three');
+
+types = Sequelize.RANGE(Sequelize.INTEGER(12));
+types = Sequelize.RANGE({subtype: Sequelize.BLOB});
+
+types = Sequelize.REAL;
+types = Sequelize.REAL.ZEROFILL;
+types = Sequelize.REAL.UNSIGNED;
+types = Sequelize.REAL.ZEROFILL.UNSIGNED;
+types = Sequelize.REAL.UNSIGNED.ZEROFILL;
+types = Sequelize.REAL(12,12);
+types = Sequelize.REAL(12,12).ZEROFILL;
+types = Sequelize.REAL(12,12).UNSIGNED;
+types = Sequelize.REAL(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.REAL(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.REAL(numberOptions);
+types = Sequelize.REAL(numberOptions).ZEROFILL;
+types = Sequelize.REAL(numberOptions).UNSIGNED;
+types = Sequelize.REAL(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.REAL(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize.DOUBLE;
+types = Sequelize.DOUBLE.ZEROFILL;
+types = Sequelize.DOUBLE.UNSIGNED;
+types = Sequelize.DOUBLE.ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE.UNSIGNED.ZEROFILL;
+types = Sequelize.DOUBLE(12,12);
+types = Sequelize.DOUBLE(12,12).ZEROFILL;
+types = Sequelize.DOUBLE(12,12).UNSIGNED;
+types = Sequelize.DOUBLE(12,12).ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE(12,12).UNSIGNED.ZEROFILL;
+types = Sequelize.DOUBLE(numberOptions);
+types = Sequelize.DOUBLE(numberOptions).ZEROFILL;
+types = Sequelize.DOUBLE(numberOptions).UNSIGNED;
+types = Sequelize.DOUBLE(numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize.DOUBLE(numberOptions).UNSIGNED.ZEROFILL;
+
+types = Sequelize["DOUBLE PRECISION"];
+types = Sequelize["DOUBLE PRECISION"].ZEROFILL;
+types = Sequelize["DOUBLE PRECISION"].UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"].ZEROFILL.UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"].UNSIGNED.ZEROFILL;
+types = Sequelize["DOUBLE PRECISION"](12,12);
+types = Sequelize["DOUBLE PRECISION"](12,12).ZEROFILL;
+types = Sequelize["DOUBLE PRECISION"](12,12).UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"](12,12).ZEROFILL.UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"](12,12).UNSIGNED.ZEROFILL;
+types = Sequelize["DOUBLE PRECISION"](numberOptions);
+types = Sequelize["DOUBLE PRECISION"](numberOptions).ZEROFILL;
+types = Sequelize["DOUBLE PRECISION"](numberOptions).UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"](numberOptions).ZEROFILL.UNSIGNED;
+types = Sequelize["DOUBLE PRECISION"](numberOptions).UNSIGNED.ZEROFILL;
\ No newline at end of file
diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
index 58d85086d..ae6fd7af4 100644
--- a/sequelize/sequelize-tests.ts
+++ b/sequelize/sequelize-tests.ts
@@ -1,427 +1,1254 @@
 /// <reference path="sequelize.d.ts" />
 
-import Sequelize = require('sequelize');
+import Sequelize = require("sequelize");
 
-var opts: Sequelize.Options;
-var defOpts: Sequelize.DefineOptions = {
-  indexes: [{
-    fields: [""],
-    type: "",
-    method: ""
-  }]
-};
-var attrOpts: Sequelize.AttributeOptions;
-var defIndexOpts: Sequelize.DefineIndexOptions;
-var indexOpts: Sequelize.IndexOptions;
-var dropOpts: Sequelize.DropOptions;
-var transOpts: Sequelize.TransactionOptions;
-var syncOpts: Sequelize.SyncOptions;
-var assocOpts: Sequelize.AssociationOptions;
-var schemaOpts: Sequelize.SchemaOptions;
-var findOpts: Sequelize.FindOptions
-var findCrOpts: Sequelize.FindOrCreateOptions;
-var queryOpts: Sequelize.QueryOptions;
-var buildOpts: Sequelize.BuildOptions;
-var copyOpts: Sequelize.CopyOptions;
-var bulkCrOpts: Sequelize.BulkCreateOptions;
-var destroyOpts: Sequelize.DestroyOptions;
-var destroyInstOpts: Sequelize.DestroyInstanceOptions;
-var updateOpts: Sequelize.UpdateOptions;
-var saveOpts: Sequelize.SaveOptions;
-var valOpts: Sequelize.ValidateOptions;
-var incrOpts: Sequelize.IncrementOptions;
+//
+//  Fixtures
+// ~~~~~~~~~~
+//
 
-var promiseMe: Sequelize.Promise;
-var emitMe: Sequelize.EventEmitter;
+interface AnyAttributes { };
+interface AnyInstance extends Sequelize.Instance<AnyInstance, AnyAttributes> { };
 
-var sequelize = new Sequelize("", "");
-sequelize = new Sequelize("", opts);
-sequelize = new Sequelize("", "", "");
-sequelize = new Sequelize("", "", opts);
-sequelize = new Sequelize("", "", "", opts);
+var s         = new Sequelize( '' );
+var sequelize = s;
+var DataTypes = Sequelize;
+var User      = s.define<AnyInstance, AnyAttributes>( 'user', {} );
+var user      = User.build();
+var Task      = s.define<AnyInstance, AnyAttributes>( 'task', {} );
+var Group     = s.define<AnyInstance, AnyAttributes>( 'group', {} );
+var Comment   = s.define<AnyInstance, AnyAttributes>( 'comment', {} );
+var Post      = s.define<AnyInstance, AnyAttributes>( 'post', {} );
+var t : Sequelize.Transaction = null;
+s.transaction().then( ( a ) => t = a );
 
-interface modelPojo {
-  name: string;
+//
+//  Generics
+// ~~~~~~~~~~
+//
+
+interface GUserAttributes {
+    id? : number;
+    username? : string;
 }
 
-interface modelInst extends Sequelize.Instance<modelInst, modelPojo>, modelPojo {
-    
+interface GUserInstance extends Sequelize.Instance<GUserInstance, GUserAttributes> {}
+var GUser = s.define<GUserInstance, GUserAttributes>( 'user', { id: Sequelize.INTEGER, username : Sequelize.STRING });
+GUser.create({ id : 1, username : 'one' }).then( ( guser ) => guser.save() );
+
+var schema : Sequelize.DefineAttributes = {
+    key : { type : Sequelize.STRING, primaryKey : true },
+    value : Sequelize.STRING
 };
 
-var myModelInst: modelInst;
-var myModelPojo: modelPojo;
+s.define('user', schema);
 
-sequelize.define<modelInst, modelPojo>("MyTable", attrOpts, defOpts);
-var model: Sequelize.Model<modelInst, modelPojo> = sequelize.model<modelInst, modelPojo>("MyTable");
-model = sequelize.import<modelInst, modelPojo>("");
-emitMe = sequelize.authenticate();
-sequelize.cast({}, "");
-sequelize.col("myCol");
-sequelize.models.MyTable;
-emitMe = sequelize.drop(dropOpts);
-emitMe = sequelize.createSchema("schema");
-emitMe = sequelize.dropAllSchemas();
-emitMe = sequelize.dropSchema("dbo");
-emitMe = sequelize.fn("upper", sequelize.col("username"));
-sequelize.literal("");
-sequelize.literal(1234);
-sequelize.and("", 1234);
-sequelize.or("", 123);
-sequelize.where("", "");
-sequelize.where("", sequelize.and("", ""));
-promiseMe= sequelize.transaction(transOpts);
-promiseMe = sequelize.transaction(transOpts, function (t:Sequelize.Transaction): boolean { return true; });
-emitMe = sequelize.query<modelInst, modelPojo>("", model).complete(function (err, result) { });
-emitMe = sequelize.query("");
-var dialect: string = sequelize.getDialect();
-emitMe = sequelize.showAllSchemas();
-emitMe = sequelize.sync(syncOpts);
+interface GTaskAttributes {
+    revision? : number;
+    name? : string;
+}
+interface GTaskInstance extends Sequelize.Instance<GTaskInstance, GTaskAttributes> {
+  upRevision(): void;
+}
+var GTask = s.define<GTaskInstance, GTaskAttributes>( 'task', { revision : Sequelize.INTEGER, name : Sequelize.STRING });
 
-model.addHook("", "", function () { });
-model.addHook("", function () { });
-model.beforeValidate("", function () { });
-model.afterValidate("", function () { });
-model.beforeCreate("", function () { });
-model.afterCreate("", function () { });
-model.beforeDestroy("", function () { });
-model.afterDestroy("", function () { });
-model.beforeUpdate("", function () { });
-model.afterUpdate("", function () { });
-model.beforeBulkCreate("", function () { });
-model.afterBulkCreate("", function () { });
-model.beforeBulkDestroy("", function () { });
-model.afterBulkDestroy("", function () { });
-model.beforeBulkUpdate("", function () { });
-model.afterBulkUpdate("", function () { });
+GUser.hasMany(GTask);
+
+GTask.create({ revision: 1, name: 'test' }).then( (gtask) => gtask.upRevision() );
 
 
-model.hasOne<modelInst, modelPojo>(model);
-model.hasOne<modelInst, modelPojo>(model, assocOpts);
-model.belongsTo<modelInst, modelPojo>(model);
-model.belongsTo<modelInst, modelPojo>(model, assocOpts);
-model.hasMany<modelInst, modelPojo>(model);
-model.hasMany<modelInst, modelPojo>(model, assocOpts);
-model.belongsToMany<modelInst, modelPojo>(model);
-model.belongsToMany<modelInst, modelPojo>(model, assocOpts);
+//
+//  Associations
+// ~~~~~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/tree/v3.4.1/test/integration/associations
+//
 
-promiseMe = model.sync();
-promiseMe = model.drop(dropOpts);
-model.schema("", schemaOpts);
-model.getTableName();
-model = model.scope({});
-model = model.scope("");
-model = model.scope([]);
-model = model.scope(null);
+User.hasOne( Task );
+User.hasOne( Task, { foreignKey : 'primaryGroupId', as : 'primaryUsers' } );
+User.hasOne( Task, { foreignKey : 'userCoolIdTag' } );
+User.hasOne( Task, { foreignKey : 'userId', keyType : Sequelize.STRING, constraints : false } );
+Task.hasOne( User, { foreignKey : { name : 'taskId', field : 'task_id' } } );
+User.hasOne( Task, { foreignKey : { name : 'uid', allowNull : false } } );
+User.hasOne( Task, { onDelete : 'cascade' } );
+User.hasOne( Task, { onUpdate : 'cascade' } );
+User.hasOne( Task, { onDelete : 'cascade', hooks : true } );
+User.hasOne( Task, { foreignKey : { allowNull : false } } );
+User.hasOne( Task, { foreignKeyConstraint : true } );
 
-model.find().then(function () { }, function () { });
-model.find().then(function () { });
-model.find().then(null, function () { });
-model.find().then(function (result: modelInst) { });
-model.find().then<modelInst>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) });
-model.find().then<modelInst, any>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) }, function (): Sequelize.PromiseT<any> { return model.find(1) });
+User.belongsTo( Task );
+User.belongsTo( Task, { foreignKey : 'primaryGroupId', as : 'primaryUsers' } );
+Task.belongsTo( User, { foreignKey : 'user_id' } );
+Task.belongsTo( User, { foreignKey : 'user_name', targetKey : 'username' } );
+User.belongsTo( User, { foreignKey : 'userId', keyType : Sequelize.STRING, constraints : false } );
+User.belongsTo( Post, { foreignKey : { name : 'AccountId', field : 'account_id' } } );
+Task.belongsTo( User, { foreignKey : { allowNull : false, name : 'uid' } } );
+Task.belongsTo( User, { constraints : false } );
+Task.belongsTo( User, { onDelete : 'cascade' } );
+Task.belongsTo( User, { onUpdate : 'restrict' } );
+User.belongsTo( User, {
+    as : 'parentBlocks',
+    foreignKey : 'child',
+    foreignKeyConstraint : true
+} );
 
-model.find().catch(function () { });
-model.find().catch(function (result: modelInst) { });
-model.find().catch(function (result: modelInst): Sequelize.Promise { return model.find(1) });
+User.hasMany( User );
+User.hasMany( User, { foreignKey : 'primaryGroupId', as : 'primaryUsers' } );
+User.hasMany( Task, { foreignKey : 'userId' } );
+User.hasMany( Task, { foreignKey : 'userId', as : 'activeTasks', scope : { active : true } } );
+User.hasMany( Task, { foreignKey : 'userId', keyType : Sequelize.STRING, constraints : false } );
+User.hasMany( Task, { foreignKey : { name : 'uid', allowNull : false } } );
+User.hasMany( Task, { foreignKey : { allowNull : true } } );
+User.hasMany( Task, { as : 'Children' } );
+User.hasMany( Task, { as : { singular : 'task', plural : 'taskz' } } );
+User.hasMany( Task, { constraints : false } );
+User.hasMany( Task, { onDelete : 'cascade' } );
+User.hasMany( Task, { onUpdate : 'cascade' } );
+Post.hasMany( Task, { foreignKey : 'commentable_id', scope : { commentable : 'post' } } );
+User.hasMany( User, {
+    as : 'childBlocks',
+    foreignKey : 'parent',
+    foreignKeyConstraint : true
+} );
 
-model.find().spread(function () { }, function () { });
-model.find().spread(function () { });
-model.find().spread(null, function () { });
-model.find().spread(function (result: modelInst) { });
-model.find().spread(function (result1: modelInst, result2: any) { });
-model.find().spread(null, function (result1: any, result2: boolean) { });
-model.find().spread(function (result: modelInst): Sequelize.Promise { return model.find(1) });
-model.find().spread<modelInst>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) });
-model.find().spread<modelInst>(function (result: modelInst) { }, function (): Sequelize.PromiseT<modelInst> { return model.find(1) });
-model.find().spread<modelInst, any>(function (result: modelInst): Sequelize.PromiseT<modelInst> { return model.find(1) }, function (): Sequelize.PromiseT<any> { return model.find(1) });
+User.belongsToMany( Task, { through : 'UserTasks' } );
+User.belongsToMany( User, { through : Task } );
+User.belongsToMany( Group, { as : 'groups', through : Task, foreignKey : 'id_user' } );
+User.belongsToMany( Task, { as : 'activeTasks', through : Task, scope : { active : true } } );
+User.belongsToMany( Task, { as : 'startedTasks', through : { model : Task, scope : { started : true } } } );
+User.belongsToMany( Group, { through : 'group_members', foreignKey : 'group_id', otherKey : 'member_id' } );
+User.belongsToMany( User, { as : 'Participants', through : User } );
+User.belongsToMany( Group, { through : 'user_places', foreignKey : 'user_id' } );
+User.belongsToMany( Group, {
+    through : 'user_projects',
+    as : 'Projects',
+    foreignKey : {
+        field : 'user_id',
+        name : 'userId'
+    },
+    otherKey : {
+        field : 'project_id',
+        name : 'projectId'
+    }
+} );
+User.belongsToMany( Task, { onDelete : 'RESTRICT', through : 'tasksusers' } );
+User.belongsToMany( Task, { constraints : false, through : 'tasksusers' } );
+User.belongsToMany( Task, { foreignKey : { name : 'user_id', defaultValue : 42 }, through : 'UserProjects' } );
+User.belongsToMany( Post, { through : User } );
+Post.belongsToMany( User, { as : 'categories', through : User, scope : { type : 'category' } } );
+Post.belongsToMany( User, { as : 'tags', through : User, scope : { type : 'tag' } } );
+Post.belongsToMany( User, {
+    through : {
+        model : User,
+        unique : false,
+        scope : {
+            taggable : 'post'
+        }
+    },
+    foreignKey : 'taggable_id',
+    constraints : false
+} );
+Post.belongsToMany( Post, { through : { model : Post, unique : false }, foreignKey : 'tag_id' } );
+Post.belongsToMany( Post, { as : 'Parents', through : 'Family', foreignKey : 'ChildId', otherKey : 'PersonId' } );
 
-promiseMe = model.findAll(findOpts, queryOpts);
-promiseMe = model.findAll(findOpts);
-promiseMe = model.findAll();
-promiseMe = model.find(findOpts, queryOpts);
-promiseMe = model.find(findOpts);
-promiseMe = model.find(1, queryOpts);
-promiseMe = model.find(1);
-promiseMe = model.find();
-promiseMe = model.aggregate<number>("", "", findOpts);
-promiseMe = model.count();
-promiseMe = model.count(findOpts);
-promiseMe = model.findAndCountAll(findOpts, queryOpts);
-promiseMe = model.findAndCountAll(findOpts);
-promiseMe = model.findAndCountAll();
-promiseMe = model.max<number>("", findOpts);
-promiseMe = model.max<number>("");
-promiseMe = model.min<number>("", findOpts);
-promiseMe = model.min<number>("");
-promiseMe = model.sum("", findOpts);
-promiseMe = model.sum("");
-myModelInst = model.build(myModelPojo, buildOpts);
-myModelInst = model.build(myModelPojo);
-promiseMe = model.create(myModelPojo, copyOpts);
-promiseMe = model.create(myModelPojo);
-promiseMe = model.findOrInitialize({}, myModelPojo, queryOpts);
-promiseMe = model.findOrInitialize({}, myModelPojo);
-promiseMe = model.findOrInitialize({});
-promiseMe = model.findOrCreate({}, myModelPojo, findCrOpts);
-promiseMe = model.findOrCreate({}, myModelPojo);
-promiseMe = model.findOrCreate({});
-promiseMe = model.bulkCreate([myModelPojo], bulkCrOpts);
-promiseMe = model.bulkCreate([myModelPojo]);
-promiseMe = model.destroy({}, destroyOpts);
-promiseMe = model.destroy({});
-promiseMe = model.destroy();
-promiseMe = model.update(myModelPojo, {}, updateOpts);
-promiseMe = model.update(myModelPojo, {});
-promiseMe = model.describe();
-model.dataset;
-//var isDefined: boolean = sequelize.isDefined("");
+//
+//  DataTypes
+// ~~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/unit/sql/data-types.test.js
+//
 
-model.find().spread(function (arg1: string, arg2: number) {
-  return model.find();
-});
+Sequelize.STRING;
+Sequelize.STRING( 1234 );
+Sequelize.STRING( { length : 1234 } );
+Sequelize.STRING( 1234 ).BINARY;
+Sequelize.STRING.BINARY;
+Sequelize.TEXT;
+Sequelize.TEXT( 'tiny' );
+Sequelize.TEXT( { length : 'tiny' } );
+Sequelize.TEXT( 'medium' );
+Sequelize.TEXT( 'long' );
+Sequelize.CHAR;
+Sequelize.CHAR( 12 );
+Sequelize.CHAR( { length : 12 } );
+Sequelize.CHAR( 12 ).BINARY;
+Sequelize.CHAR.BINARY;
+Sequelize.BOOLEAN;
+Sequelize.DATE;
+Sequelize.UUID;
+Sequelize.UUIDV1;
+Sequelize.UUIDV4;
+Sequelize.NOW;
+Sequelize.INTEGER;
+Sequelize.INTEGER.UNSIGNED;
+Sequelize.INTEGER.UNSIGNED.ZEROFILL;
+Sequelize.INTEGER( 11 );
+Sequelize.INTEGER( { length : 11 } );
+Sequelize.INTEGER( 11 ).UNSIGNED;
+Sequelize.INTEGER( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.INTEGER( 11 ).ZEROFILL;
+Sequelize.INTEGER( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.BIGINT;
+Sequelize.BIGINT.UNSIGNED;
+Sequelize.BIGINT.UNSIGNED.ZEROFILL;
+Sequelize.BIGINT( 11 );
+Sequelize.BIGINT( { length : 11 } );
+Sequelize.BIGINT( 11 ).UNSIGNED;
+Sequelize.BIGINT( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.BIGINT( 11 ).ZEROFILL;
+Sequelize.BIGINT( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.REAL.UNSIGNED;
+Sequelize.REAL( 11 );
+Sequelize.REAL( { length : 11 } );
+Sequelize.REAL( 11 ).UNSIGNED;
+Sequelize.REAL( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.REAL( 11 ).ZEROFILL;
+Sequelize.REAL( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.REAL( 11, 12 );
+Sequelize.REAL( 11, 12 ).UNSIGNED;
+Sequelize.REAL( { length : 11, decimals : 12 } ).UNSIGNED;
+Sequelize.REAL( 11, 12 ).UNSIGNED.ZEROFILL;
+Sequelize.REAL( 11, 12 ).ZEROFILL;
+Sequelize.REAL( 11, 12 ).ZEROFILL.UNSIGNED;
+Sequelize.DOUBLE;
+Sequelize.DOUBLE.UNSIGNED;
+Sequelize.DOUBLE( 11 );
+Sequelize.DOUBLE( 11 ).UNSIGNED;
+Sequelize.DOUBLE( { length : 11 } ).UNSIGNED;
+Sequelize.DOUBLE( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.DOUBLE( 11 ).ZEROFILL;
+Sequelize.DOUBLE( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.DOUBLE( 11, 12 );
+Sequelize.DOUBLE( 11, 12 ).UNSIGNED;
+Sequelize.DOUBLE( 11, 12 ).UNSIGNED.ZEROFILL;
+Sequelize.DOUBLE( 11, 12 ).ZEROFILL;
+Sequelize.DOUBLE( 11, 12 ).ZEROFILL.UNSIGNED;
+Sequelize.FLOAT;
+Sequelize.FLOAT.UNSIGNED;
+Sequelize.FLOAT( 11 );
+Sequelize.FLOAT( 11 ).UNSIGNED;
+Sequelize.FLOAT( 11 ).UNSIGNED.ZEROFILL;
+Sequelize.FLOAT( 11 ).ZEROFILL;
+Sequelize.FLOAT( { length : 11 } ).ZEROFILL;
+Sequelize.FLOAT( 11 ).ZEROFILL.UNSIGNED;
+Sequelize.FLOAT( 11, 12 );
+Sequelize.FLOAT( 11, 12 ).UNSIGNED;
+Sequelize.FLOAT( { length : 11, decimals : 12 } ).UNSIGNED;
+Sequelize.FLOAT( 11, 12 ).UNSIGNED.ZEROFILL;
+Sequelize.FLOAT( 11, 12 ).ZEROFILL;
+Sequelize.FLOAT( 11, 12 ).ZEROFILL.UNSIGNED;
+Sequelize.NUMERIC;
+Sequelize.NUMERIC( 15, 5 );
+Sequelize.DECIMAL;
+Sequelize.DECIMAL( 10, 2 );
+Sequelize.DECIMAL( { precision : 10, scale : 2 } );
+Sequelize.DECIMAL( 10 );
+Sequelize.DECIMAL( { precision : 10 } );
+Sequelize.ENUM( 'value 1', 'value 2' );
+Sequelize.BLOB;
+Sequelize.BLOB( 'tiny' );
+Sequelize.BLOB( 'medium' );
+Sequelize.BLOB( { length : 'medium' } );
+Sequelize.BLOB( 'long' );
+Sequelize.ARRAY( Sequelize.STRING );
+Sequelize.ARRAY( Sequelize.STRING( 100 ) );
+Sequelize.ARRAY( Sequelize.INTEGER );
+Sequelize.ARRAY( Sequelize.HSTORE );
+Sequelize.ARRAY( Sequelize.ARRAY( Sequelize.STRING ) );
+Sequelize.ARRAY( Sequelize.TEXT );
+Sequelize.ARRAY( Sequelize.DATE );
+Sequelize.ARRAY( Sequelize.BOOLEAN );
+Sequelize.ARRAY( Sequelize.DECIMAL );
+Sequelize.ARRAY( Sequelize.DECIMAL( 6 ) );
+Sequelize.ARRAY( Sequelize.DECIMAL( 6, 4 ) );
+Sequelize.ARRAY( Sequelize.DOUBLE );
+Sequelize.ARRAY( Sequelize.REAL );
+Sequelize.ARRAY( Sequelize.JSON );
+Sequelize.ARRAY( Sequelize.JSONB );
+Sequelize.GEOMETRY;
+Sequelize.GEOMETRY( 'POINT' );
+Sequelize.GEOMETRY( 'LINESTRING' );
+Sequelize.GEOMETRY( 'POLYGON' );
+Sequelize.GEOMETRY( 'POINT', 4326 );
 
-var isBool: boolean;
-var strArr: Array<string>;
+//
+//  Deferrable
+// ~~~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/sequelize/deferrable.test.js
+//
 
-isBool = myModelInst.isNewRecord;
-model = myModelInst.Model;
-sequelize = myModelInst.sequelize;
-isBool = myModelInst.isDeleted;
-myModelPojo = myModelInst.values;
-isBool = myModelInst.isDirty;
-myModelPojo = myModelInst.primaryKeyValues;
-myModelInst.getDataValue("");
-myModelInst.setDataValue("", "");
-myModelInst.setDataValue("", 123);
-myModelInst.get("");
-myModelInst.set("", "");
-myModelInst.set("", 123);
-isBool = myModelInst.changed("");
-strArr = myModelInst.changed();
-myModelInst.previous("");
-promiseMe = myModelInst.save(["", ""], saveOpts);
-promiseMe = myModelInst.save(["", ""]);
-promiseMe = myModelInst.reload();
-promiseMe = myModelInst.reload(findOpts);
-promiseMe = myModelInst.validate(valOpts);
-promiseMe = myModelInst.validate();
-promiseMe = myModelInst.updateAttributes(myModelPojo, saveOpts);
-promiseMe = myModelInst.destroy(destroyInstOpts);
-promiseMe = myModelInst.destroy();
-promiseMe = myModelInst.increment({}, incrOpts);
-promiseMe = myModelInst.increment({});
-promiseMe = myModelInst.decrement({}, incrOpts);
-isBool = myModelInst.equal(myModelInst);
-isBool = myModelInst.equalsOneOf([myModelInst]);
-myModelPojo = myModelInst.toJSON();
+Sequelize.Deferrable.NOT;
+Sequelize.Deferrable.INITIALLY_IMMEDIATE;
+Sequelize.Deferrable.INITIALLY_DEFERRED;
+Sequelize.Deferrable.SET_DEFERRED;
+Sequelize.Deferrable.SET_DEFERRED( ['taskTableName_user_id_fkey'] );
+Sequelize.Deferrable.SET_IMMEDIATE;
+Sequelize.Deferrable.SET_IMMEDIATE( ['taskTableName_user_id_fkey'] );
 
+//
+//  Errors
+// ~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/error.test.js
+//
 
-// data types test
-var types:any = Sequelize.STRING;
-types = Sequelize.STRING(12);
-types = Sequelize.STRING(12, true);
-types = Sequelize.STRING.BINARY;
-types = Sequelize.STRING(12).BINARY;
-types = Sequelize.STRING.BINARY(12);
-types = Sequelize.STRING({length:12, binary:true});
-types = Sequelize.STRING({length:12}).BINARY;
+Sequelize.Error;
+Sequelize.ValidationError;
+s.Error;
+s.ValidationError;
+new s.ValidationError( 'Validation Error', [
+    new s.ValidationErrorItem( '<field name> cannot be null', 'notNull Violation', '<field name>', null )
+    , new s.ValidationErrorItem( '<field name> cannot be an array or an object', 'string violation',
+        '<field name>', null )
+] );
+new s.Error();
+new s.ValidationError();
+new s.ValidationErrorItem( 'invalid', 'type', 'first_name', null );
+new s.ValidationErrorItem( 'invalid', 'type', 'last_name', null );
+new s.DatabaseError( new Error( 'original database error message' ) );
+new s.ConnectionError( new Error( 'original connection error message' ) );
+new s.ConnectionRefusedError( new Error( 'original connection error message' ) );
+new s.AccessDeniedError( new Error( 'original connection error message' ) );
+new s.HostNotFoundError( new Error( 'original connection error message' ) );
+new s.HostNotReachableError( new Error( 'original connection error message' ) );
+new s.InvalidConnectionError( new Error( 'original connection error message' ) );
+new s.ConnectionTimedOutError( new Error( 'original connection error message' ) );
 
-types = Sequelize.CHAR;
-types = Sequelize.CHAR(12);
-types = Sequelize.CHAR(12, true);
-types = Sequelize.CHAR.BINARY;
-types = Sequelize.CHAR(12).BINARY;
-types = Sequelize.CHAR.BINARY(12);
-types = Sequelize.CHAR({length:12, binary:true});
-types = Sequelize.CHAR({length:12}).BINARY;
+//
+//  Hooks
+// ~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/hooks.test.js
+//
 
-types = Sequelize.TEXT;
-types = Sequelize.TEXT('tiny');
-types = Sequelize.TEXT({length:'tiny'});
+User.addHook( 'afterCreate', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function ) { next(); } );
+User.addHook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function) { next(); } );
+s.addHook( 'beforeInit', function( config : Object, options : Object ) { } );
+User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function) { next(); } );
+User.hook( 'afterCreate', 'myHook', function( instance : Sequelize.Instance<any, any>, options : Object, next : Function ) { next(); } );
 
-types = Sequelize.NUMBER;
-var numberOptions = {length:12, zerofill:true, decimals:1, precision:1, scale:1, unsigned:true};
-types = Sequelize.NUMBER(numberOptions);
+User.removeHook( 'afterCreate', 'myHook' );
 
-types = Sequelize.INTEGER;
-types = Sequelize.INTEGER.ZEROFILL;
-types = Sequelize.INTEGER.UNSIGNED;
-types = Sequelize.INTEGER.ZEROFILL.UNSIGNED;
-types = Sequelize.INTEGER.UNSIGNED.ZEROFILL;
-types = Sequelize.INTEGER(12);
-types = Sequelize.INTEGER(12).ZEROFILL;
-types = Sequelize.INTEGER(12).UNSIGNED;
-types = Sequelize.INTEGER(12).ZEROFILL.UNSIGNED;
-types = Sequelize.INTEGER(12).UNSIGNED.ZEROFILL;
-types = Sequelize.INTEGER(numberOptions);
-types = Sequelize.INTEGER(numberOptions).ZEROFILL;
-types = Sequelize.INTEGER(numberOptions).UNSIGNED;
-types = Sequelize.INTEGER(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.INTEGER(numberOptions).UNSIGNED.ZEROFILL;
+User.hasHook( 'afterCreate' );
+User.hasHooks( 'afterCreate' );
 
-types = Sequelize.BIGINT;
-types = Sequelize.BIGINT.ZEROFILL;
-types = Sequelize.BIGINT.UNSIGNED;
-types = Sequelize.BIGINT.ZEROFILL.UNSIGNED;
-types = Sequelize.BIGINT.UNSIGNED.ZEROFILL;
-types = Sequelize.BIGINT(12);
-types = Sequelize.BIGINT(12).ZEROFILL;
-types = Sequelize.BIGINT(12).UNSIGNED;
-types = Sequelize.BIGINT(12).ZEROFILL.UNSIGNED;
-types = Sequelize.BIGINT(12).UNSIGNED.ZEROFILL;
-types = Sequelize.BIGINT(numberOptions);
-types = Sequelize.BIGINT(numberOptions).ZEROFILL;
-types = Sequelize.BIGINT(numberOptions).UNSIGNED;
-types = Sequelize.BIGINT(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.BIGINT(numberOptions).UNSIGNED.ZEROFILL;
+User.beforeValidate( function( user, options ) { user.isNewRecord; } );
+User.beforeValidate( 'myHook', function( user, options ) { user.isNewRecord; } );
 
-types = Sequelize.FLOAT;
-types = Sequelize.FLOAT.ZEROFILL;
-types = Sequelize.FLOAT.UNSIGNED;
-types = Sequelize.FLOAT.ZEROFILL.UNSIGNED;
-types = Sequelize.FLOAT.UNSIGNED.ZEROFILL;
-types = Sequelize.FLOAT(12);
-types = Sequelize.FLOAT(12).ZEROFILL;
-types = Sequelize.FLOAT(12).UNSIGNED;
-types = Sequelize.FLOAT(12).ZEROFILL.UNSIGNED;
-types = Sequelize.FLOAT(12).UNSIGNED.ZEROFILL;
-types = Sequelize.FLOAT(12,12);
-types = Sequelize.FLOAT(12,12).ZEROFILL;
-types = Sequelize.FLOAT(12,12).UNSIGNED;
-types = Sequelize.FLOAT(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.FLOAT(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.FLOAT(numberOptions);
-types = Sequelize.FLOAT(numberOptions).ZEROFILL;
-types = Sequelize.FLOAT(numberOptions).UNSIGNED;
-types = Sequelize.FLOAT(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.FLOAT(numberOptions).UNSIGNED.ZEROFILL;
+User.afterValidate( function( user, options ) { user.isNewRecord; } );
+User.afterValidate( 'myHook', function( user, options ) { user.isNewRecord; } );
 
-types = Sequelize.DOUBLE;
-types = Sequelize.DOUBLE.ZEROFILL;
-types = Sequelize.DOUBLE.UNSIGNED;
-types = Sequelize.DOUBLE.ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE.UNSIGNED.ZEROFILL;
-types = Sequelize.DOUBLE(12);
-types = Sequelize.DOUBLE(12).ZEROFILL;
-types = Sequelize.DOUBLE(12).UNSIGNED;
-types = Sequelize.DOUBLE(12).ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE(12).UNSIGNED.ZEROFILL;
-types = Sequelize.DOUBLE(12,12);
-types = Sequelize.DOUBLE(12,12).ZEROFILL;
-types = Sequelize.DOUBLE(12,12).UNSIGNED;
-types = Sequelize.DOUBLE(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.DOUBLE(numberOptions);
-types = Sequelize.DOUBLE(numberOptions).ZEROFILL;
-types = Sequelize.DOUBLE(numberOptions).UNSIGNED;
-types = Sequelize.DOUBLE(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE(numberOptions).UNSIGNED.ZEROFILL;
+User.beforeCreate( function( user, options ) { user.isNewRecord; } );
+User.beforeCreate( function( user, options, fn ) {fn();} );
+User.beforeCreate( 'myHook', function( user, options ) { user.isNewRecord; } );
 
-types = Sequelize.TIME;
-types = Sequelize.DATE;
-types = Sequelize.DATEONLY;
-types = Sequelize.BOOLEAN;
-types = Sequelize.NOW;
+User.afterCreate( function( user, options ) { user.isNewRecord; } );
+User.afterCreate( function( user, options, fn ) {fn();} );
+User.afterCreate( 'myHook', function( user, options ) { user.isNewRecord; } );
 
-types = Sequelize.BLOB;
-types = Sequelize.BLOB('tiny');
-types = Sequelize.BLOB({length:'tiny'});
+User.beforeDestroy( function( user, options ) {throw new Error( 'Whoops!' );} );
+User.beforeDestroy( function( user, options, fn ) {fn();} );
+User.beforeDestroy( 'myHook', function( user, options ) {throw new Error( 'Whoops!' );} );
+User.beforeDelete( function( user, options ) {throw new Error( 'Whoops!' );} );
+User.beforeDelete( 'myHook', function( user, options ) {throw new Error( 'Whoops!' );} );
 
-types = Sequelize.DECIMAL;
-types = Sequelize.DECIMAL.ZEROFILL;
-types = Sequelize.DECIMAL.UNSIGNED;
-types = Sequelize.DECIMAL.ZEROFILL.UNSIGNED;
-types = Sequelize.DECIMAL.UNSIGNED.ZEROFILL;
-types = Sequelize.DECIMAL(12,12);
-types = Sequelize.DECIMAL(12,12).ZEROFILL;
-types = Sequelize.DECIMAL(12,12).UNSIGNED;
-types = Sequelize.DECIMAL(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.DECIMAL(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.DECIMAL(numberOptions);
-types = Sequelize.DECIMAL(numberOptions).ZEROFILL;
-types = Sequelize.DECIMAL(numberOptions).UNSIGNED;
-types = Sequelize.DECIMAL(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.DECIMAL(numberOptions).UNSIGNED.ZEROFILL;
+User.afterDestroy( function( user, options ) {throw new Error( 'Whoops!' );} );
+User.afterDestroy( 'myHook', function( user, options ) {throw new Error( 'Whoops!' );} );
+User.afterDestroy( function( user, options, fn ) {fn();} );
+User.afterDelete( function( user, options ) {throw new Error( 'Whoops!' );} );
+User.afterDelete( 'myHook', function( user, options ) {throw new Error( 'Whoops!' );} );
 
-types = Sequelize.NUMERIC;
-types = Sequelize.NUMERIC.ZEROFILL;
-types = Sequelize.NUMERIC.UNSIGNED;
-types = Sequelize.NUMERIC.ZEROFILL.UNSIGNED;
-types = Sequelize.NUMERIC.UNSIGNED.ZEROFILL;
-types = Sequelize.NUMERIC(12,12);
-types = Sequelize.NUMERIC(12,12).ZEROFILL;
-types = Sequelize.NUMERIC(12,12).UNSIGNED;
-types = Sequelize.NUMERIC(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.NUMERIC(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.NUMERIC(numberOptions);
-types = Sequelize.NUMERIC(numberOptions).ZEROFILL;
-types = Sequelize.NUMERIC(numberOptions).UNSIGNED;
-types = Sequelize.NUMERIC(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.NUMERIC(numberOptions).UNSIGNED.ZEROFILL;
+User.beforeUpdate( function( user, options ) {throw new Error( 'Whoops!' ); } );
+User.beforeUpdate( 'myHook', function( user, options ) {throw new Error( 'Whoops!' ); } );
 
-types = Sequelize.UUID;
-types = Sequelize.UUIDV1;
-types = Sequelize.UUIDV4;
-types = Sequelize.HSTORE;
-types = Sequelize.JSON;
-types = Sequelize.JSONB;
-types = Sequelize.VIRTUAL;
+User.afterUpdate( function( user, options ) {throw new Error( 'Whoops!' );} );
+User.afterUpdate( 'myHook', function( user, options ) {throw new Error( 'Whoops!' );} );
 
-types = Sequelize.ARRAY(Sequelize.INTEGER(12));
-types = Sequelize.ARRAY({type: Sequelize.BLOB});
-var obj = {};
-var isbool:boolean = types.is(obj, obj);
+User.beforeBulkCreate( function( daos, options ) { throw new Error( 'Whoops!' );} );
+User.beforeBulkCreate( 'myHook', function( daos, options ) { throw new Error( 'Whoops!' );} );
+User.beforeBulkCreate( function( daos, options, fn ) {fn();} );
 
-types = Sequelize.NONE;
-types = Sequelize.ENUM("one", "two", 'three');
+User.afterBulkCreate( function( daos, options ) {throw new Error( 'Whoops!' ); } );
+User.afterBulkCreate( 'myHook', function( daos, options ) {throw new Error( 'Whoops!' ); } );
+User.afterBulkCreate( function( daos, options, fn ) {fn();} );
 
-types = Sequelize.RANGE(Sequelize.INTEGER(12));
-types = Sequelize.RANGE({subtype: Sequelize.BLOB});
+User.beforeBulkDestroy( function( options ) {throw new Error( 'Whoops!' );} );
+User.beforeBulkDestroy( function( options, fn ) {fn();} );
+User.beforeBulkDestroy( 'myHook', function( options, fn ) {fn();} );
+User.beforeBulkDelete( 'myHook', function( options, fn ) {fn();} );
 
-types = Sequelize.REAL;
-types = Sequelize.REAL.ZEROFILL;
-types = Sequelize.REAL.UNSIGNED;
-types = Sequelize.REAL.ZEROFILL.UNSIGNED;
-types = Sequelize.REAL.UNSIGNED.ZEROFILL;
-types = Sequelize.REAL(12,12);
-types = Sequelize.REAL(12,12).ZEROFILL;
-types = Sequelize.REAL(12,12).UNSIGNED;
-types = Sequelize.REAL(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.REAL(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.REAL(numberOptions);
-types = Sequelize.REAL(numberOptions).ZEROFILL;
-types = Sequelize.REAL(numberOptions).UNSIGNED;
-types = Sequelize.REAL(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.REAL(numberOptions).UNSIGNED.ZEROFILL;
+User.afterBulkDestroy( function( options ) {throw new Error( 'Whoops!' );} );
+User.afterBulkDestroy( function( options, fn ) {fn();} );
+User.afterBulkDestroy( 'myHook', function( options, fn ) {fn();} );
+User.afterBulkDelete( 'myHook', function( options, fn ) {fn();} );
 
-types = Sequelize.DOUBLE;
-types = Sequelize.DOUBLE.ZEROFILL;
-types = Sequelize.DOUBLE.UNSIGNED;
-types = Sequelize.DOUBLE.ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE.UNSIGNED.ZEROFILL;
-types = Sequelize.DOUBLE(12,12);
-types = Sequelize.DOUBLE(12,12).ZEROFILL;
-types = Sequelize.DOUBLE(12,12).UNSIGNED;
-types = Sequelize.DOUBLE(12,12).ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE(12,12).UNSIGNED.ZEROFILL;
-types = Sequelize.DOUBLE(numberOptions);
-types = Sequelize.DOUBLE(numberOptions).ZEROFILL;
-types = Sequelize.DOUBLE(numberOptions).UNSIGNED;
-types = Sequelize.DOUBLE(numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize.DOUBLE(numberOptions).UNSIGNED.ZEROFILL;
+User.beforeBulkUpdate( function( options ) {throw new Error( 'Whoops!' );} );
+User.beforeBulkUpdate( 'myHook', function( options ) {throw new Error( 'Whoops!' );} );
 
-types = Sequelize["DOUBLE PRECISION"];
-types = Sequelize["DOUBLE PRECISION"].ZEROFILL;
-types = Sequelize["DOUBLE PRECISION"].UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"].ZEROFILL.UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"].UNSIGNED.ZEROFILL;
-types = Sequelize["DOUBLE PRECISION"](12,12);
-types = Sequelize["DOUBLE PRECISION"](12,12).ZEROFILL;
-types = Sequelize["DOUBLE PRECISION"](12,12).UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"](12,12).ZEROFILL.UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"](12,12).UNSIGNED.ZEROFILL;
-types = Sequelize["DOUBLE PRECISION"](numberOptions);
-types = Sequelize["DOUBLE PRECISION"](numberOptions).ZEROFILL;
-types = Sequelize["DOUBLE PRECISION"](numberOptions).UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"](numberOptions).ZEROFILL.UNSIGNED;
-types = Sequelize["DOUBLE PRECISION"](numberOptions).UNSIGNED.ZEROFILL;
\ No newline at end of file
+User.afterBulkUpdate( function( options ) {throw new Error( 'Whoops!' );} );
+User.afterBulkUpdate( 'myHook', function( options ) {throw new Error( 'Whoops!' );} );
+
+User.beforeFind( function( options ) {} );
+User.beforeFind( 'myHook', function( options ) {} );
+
+User.beforeFindAfterExpandIncludeAll( function( options ) {} );
+User.beforeFindAfterExpandIncludeAll( 'myHook', function( options ) {} );
+
+User.beforeFindAfterOptions( function( options ) {} );
+User.beforeFindAfterOptions( 'myHook', function( options ) {} );
+
+User.afterFind( function( user ) {} );
+User.afterFind( 'myHook', function( user ) {} );
+
+s.beforeDefine( function( attributes, options ) {} );
+s.beforeDefine( 'myHook', function( attributes, options ) {} );
+
+s.afterDefine( function( model ) {} );
+s.afterDefine( 'myHook', function( model ) {} );
+
+s.beforeInit( function( config, options ) {} );
+s.beforeInit( 'myHook', function( attributes, options ) {} );
+
+s.afterInit( function( model ) {} );
+s.afterInit( 'myHook', function( model ) {} );
+
+s.define( 'User', {}, {
+    hooks : {
+        beforeValidate : function( user, options, fn ) {fn();},
+        afterValidate : function( user, options, fn ) {fn();},
+        beforeCreate : function( user, options, fn ) {fn();},
+        afterCreate : function( user, options, fn ) {fn();},
+        beforeDestroy : function( user, options, fn ) {fn();},
+        afterDestroy : function( user, options, fn ) {fn();},
+        beforeDelete : function( user, options, fn ) {fn();},
+        afterDelete : function( user, options, fn ) {fn();},
+        beforeUpdate : function( user, options, fn ) {fn();},
+        afterUpdate : function( user, options, fn ) {fn();}
+    }
+} );
+
+//
+//  Instance
+// ~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/instance.test.js
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/instance/update.test.js
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/instance/values.test.js
+//
+
+user.isNewRecord = true;
+
+user.Model.build( { a : 'b' } );
+
+user.sequelize.close();
+
+user.where();
+
+user.getDataValue( '' );
+
+user.setDataValue( '', '' );
+user.setDataValue( '', {} );
+
+user.get( 'aNumber', { plain : true, clone : true } );
+user.get();
+
+user.set( 'email', 'B' );
+user.set( { name : 'B', bio : 'B' } ).save().then( ( p ) => p );
+user.set( 'birthdate', new Date() );
+user.set( { id : 1, t : 'c', q : [{ id : 1, n : 'a' }, { id : 2, n : 'Beta' }], u : { id : 1, f : 'b', l : 'd' } } );
+user.setAttributes( { a : 3 } );
+user.setAttributes( { id : 1, a : 'n', c : [{ id : 1 }, { id : 2, f : 'e' }], x : { id : 1, f : 'h', l : 'd' } } );
+
+user.changed( 'name' );
+user.changed();
+
+user.previous( 'name' );
+
+user.save().then( ( p ) => p );
+user.save( { fields : ['a'] } ).then( ( p ) => p );
+user.save( { transaction : t } );
+
+user.reload();
+user.reload( { attributes : ['bNumber'] } );
+user.reload( { transaction : t } );
+
+user.validate();
+
+user.update( { bNumber : 2 }, { where : { id : 1 } } );
+user.update( { username : 'userman' }, { silent : true } );
+user.update( { username : 'yolo' }, { logging : function() { } } );
+user.update( { username : 'bar' }, { where : { username : 'foo' }, transaction : t } ).then( ( p ) => p );
+user.updateAttributes( { a : 3 } ).then( ( p ) => p );
+user.updateAttributes( { a : 3 }, { fields : ['secretValue'], logging : function(  ) {} } );
+
+user.destroy().then( ( p ) => p );
+user.destroy( { logging : function(  ) {} } );
+user.destroy( { transaction : t } ).then( ( p ) => p );
+
+user.restore();
+
+user.increment( 'number', { by : 2 } ).then( ( p ) => p );
+user.increment( ['aNumber'], { by : 2, where : { bNumber : 1 } } ).then( ( p ) => p );
+user.increment( ['aNumber'], { by : 2 } ).then( ( p ) => p );
+user.increment( 'aNumber' ).then( ( p ) => p );
+user.increment( { 'aNumber' : 1, 'bNumber' : 2 } ).then( ( p ) => p );
+user.increment( 'number', { by : 2, transaction : t } ).then( ( p ) => p );
+
+user.decrement( 'aNumber', { by : 2 } ).then( ( p ) => p );
+user.decrement( ['aNumber'], { by : 2 } ).then( ( p ) => p );
+user.decrement( 'aNumber' ).then( ( p ) => p );
+user.decrement( { 'aNumber' : 1, 'bNumber' : 2 } ).then( ( p ) => p );
+user.decrement( 'number', { by : 2, transaction : t } ).then( ( p ) => p );
+
+user.equals( user );
+
+user.equalsOneOf( [user, user] );
+
+user.toJSON();
+
+//
+//  Model
+// ~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/model.test.js
+//
+
+User.removeAttribute( 'id' );
+
+User.sync( { force : true } ).then( function() { } );
+User.sync( { force : true, logging : function() { } } );
+
+User.drop();
+
+User.schema( 'special' );
+User.schema( 'special' ).create( { age : 3 }, { logging : function(  ) {} } );
+
+User.getTableName();
+
+User.scope( 'lowAccess' ).count();
+User.scope( { where : { parent_id : 2 } } );
+
+User.findAll();
+User.findAll( { where : { data : { employment : null } } } );
+User.findAll( { where : { aNumber : { gte : 10 } } } ).then( ( u ) => u[0].isNewRecord );
+User.findAll( { where : [s.or( { u : 'b' }, { u : ';' } ), s.and( { id : [1, 2] } )], include : [{ model : User }] } );
+User.findAll( {
+    where : [s.or( { a : 'b' }, { c : 'd' } ), s.and( { id : [1, 2, 3] },
+        s.or( { deletedAt : null }, { deletedAt : { gt : new Date( 0 ) } } ) )]
+} );
+User.findAll( { paranoid : false, where : [' IS NOT NULL '], include : [{ model : User }] } );
+User.findAll( { transaction : t } );
+User.findAll( { where : { data : { name : { last : 's' }, employment : { $ne : 'a' } } }, order : [['id', 'ASC']] } );
+User.findAll( { where : { username : ['boo', 'boo2'] } } );
+User.findAll( { where : { username : { like : '%2' } } } );
+User.findAll( { where : { theDate : { '..' : ['2013-01-02', '2013-01-11'] } } } );
+User.findAll( { where : { intVal : { '!..' : [8, 10] } } } );
+User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] } } } );
+User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] }, intVal : 10 } } );
+User.findAll( { where : { theDate : { between : ['2012-12-10', '2013-01-02'] } } } );
+User.findAll( { where : { theDate : { nbetween : ['2013-01-04', '2013-01-20'] } } } );
+User.findAll( { order : [s.col( 'name' )] } );
+User.findAll( { order : [['theDate', 'DESC']] } );
+User.findAll( { include : [User], order : [[User, User, 'numYears', 'c']] } );
+User.findAll( { include : [{ model : User, include : [User, { model : User, as : 'residents' }] }] } );
+User.findAll( { order : [[User, { model : User, as : 'residents' }, 'lastName', 'c']] } );
+User.findAll( { include : [User], order : [[User, 'name', 'c']] } );
+User.findAll( { include : [{ all : 'HasMany', attributes : ['name'] }] } );
+User.findAll( { include : [{ all : true }, { model : User, attributes : ['id'] }] } );
+User.findAll( { include : [{ all : 'BelongsTo' }] } );
+User.findAll( { include : [{ all : true }] } );
+User.findAll( { where : { username : 'barfooz' }, raw : true } );
+User.findAll( { where : { name : 'worker' }, include : [{ model : User, as : 'ToDos' }] } );
+User.findAll( { where : { user_id : 1 }, attributes : ['a', 'b'], include : [{ model : User, attributes : ['c'] }] } );
+User.findAll( { order : s.literal( 'email =' ) } );
+User.findAll( { order : [s.literal( 'email = ' + s.escape( 'test@sequelizejs.com' ) )] } );
+User.findAll( { order : [['id', ';DELETE YOLO INJECTIONS']] } );
+User.findAll( { include : [User], order : [[User, 'id', ';DELETE YOLO INJECTIONS']] } );
+User.findAll( { include : [User], order : [['id', 'ASC NULLS LAST'], [User, 'id', 'DESC NULLS FIRST']] } );
+User.findAll( { include : [{ model : User, where : { title : 'DoDat' }, include : [{ model : User }] }] } );
+
+User.findById( 'a string' );
+
+User.findOne( { where : { username : 'foo' } } );
+User.findOne( { where : { id : 1 }, attributes : ['id', ['username', 'name']] } );
+User.findOne( { where : { id : 1 }, attributes : ['id'] } );
+User.findOne( { where : { username : 'foo' }, logging : function(  ) { } } );
+User.findOne( { limit : 10 } );
+User.findOne( { include : [1] } );
+User.findOne( { where : { title : 'homework' }, include : [User] } );
+User.findOne( { where : { name : 'environment' }, include : [{ model : User, as : 'PrivateDomain' }] } );
+User.findOne( { where : { username : 'foo' }, transaction : t } ).then( ( p ) => p );
+User.findOne( { include : [User] } );
+User.findOne( { include : [{ model : User, as : 'Work' }] } );
+User.findOne( { where : { name : 'worker' }, include : [{ model : User, as : 'ToDo' }] } );
+User.findOne( { include : [{ model : User, as : 'ToDo' }, { model : User, as : 'DoTo' }] } );
+User.findOne( { where : { name : 'worker' }, include : [User] } );
+User.findOne( { where : { name : 'Boris' }, include : [User, { model : User, as : 'Photos' }] } );
+User.findOne( { where : { username : 'someone' }, include : [User] } );
+User.findOne( { where : { username : 'barfooz' }, raw : true } );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+User.findOne( { updatedAt : { ne : null } } );
+ */
+User.find( { where : { intVal : { gt : 5 } } } );
+User.find( { where : { intVal : { lte : 5 } } } );
+
+User.count();
+User.count( { transaction : t } );
+User.count().then( function( c ) { c.toFixed() } );
+User.count( { where : ["username LIKE '%us%'"] } );
+User.count( { include : [{ model : User, required : false }] } );
+User.count( { distinct : true, include : [{ model : User, required : false }] } );
+User.count( { attributes : ['data'], group : ['data'] } );
+User.count( { where : { access_level : { gt : 5 } } } );
+
+User.findAndCountAll( { offset : 5, limit : 1, include : [User, { model : User, as : 'a' }] } );
+
+User.max( 'age', { transaction : t } );
+User.max( 'age' );
+User.max( 'age', { logging : function(  ) { } } );
+
+User.min( 'age', { transaction : t } );
+User.min( 'age' );
+User.min( 'age', { logging : function(  ) { } } );
+
+User.sum( 'order' );
+User.sum( 'age', { where : { 'gender' : 'male' } } );
+User.sum( 'age', { logging : function(  ) { } } );
+
+User.build( { username : 'John Wayne' } ).save();
+User.build();
+User.build( { id : 1, T : [{ n : 'a' }, { id : 2 }], A : { id : 1, n : 'a', c : 'a' } }, { include : [User, Task] } );
+User.build( { id : 1, }, { include : [{ model : User, as : 'followers' }, { model : Task, as : 'categories' }] } );
+
+User.create();
+User.create( { createdAt : 1, updatedAt : 2 }, { silent : true } );
+User.create( {}, { returning : true } );
+User.create( { intVal : s.literal( 'CAST(1-2 AS' ) } );
+User.create( { secretValue : s.fn( 'upper', 'sequelize' ) } );
+User.create( { myvals : [1, 2, 3, 4], mystr : ['One', 'Two', 'Three', 'Four'] } );
+User.create( { name : 'Fluffy Bunny', smth : 'else' }, { logging : function(  ) {} } );
+User.create( {}, { fields : [] } );
+User.create( { name : 'Yolo Bear', email : 'yolo@bear.com' }, { fields : ['name'] } );
+User.create( { title : 'Chair', User : { first_name : 'Mick', last_name : 'Broadstone' } }, { include : [User] } );
+User.create( { title : 'Chair', creator : { first_name : 'Matt', last_name : 'Hansen' } }, { include : [User] } );
+User.create( { id : 1, title : 'e', Tags : [{ id : 1, name : 'c' }, { id : 2, name : 'd' }] }, { include : [User] } );
+User.create( { id : 'My own ID!' } ).then( ( i ) => i.isNewRecord );
+
+User.findOrInitialize( { where : { username : 'foo' } } ).then( ( p ) => p );
+User.findOrInitialize( { where : { username : 'foo' }, transaction : t } );
+User.findOrInitialize( { where : { username : 'foo' }, defaults : { foo : 'asd' }, transaction : t } );
+
+User.findOrCreate( { where : { a : 'b' }, defaults : { json : { a : { b : 'c' }, d : [1, 2, 3] } } } );
+User.findOrCreate( { where : { a : 'b' }, defaults : { json : 'a', data : 'b' } } );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+User.findOrCreate( { where : { a : 'b' }, transaction : t, lock : t.LOCK.UPDATE } );
+ */
+User.findOrCreate( { where : { a : 'b' }, logging : function(  ) { } } );
+User.findOrCreate( { where : { username : 'Username' }, defaults : { data : 'some data' }, transaction : t } );
+User.findOrCreate( { where : { objectId : 'asdasdasd' }, defaults : { username : 'gottlieb' } } );
+User.findOrCreate( { where : { id : undefined }, defaults : { name : Math.random().toString() } } );
+User.findOrCreate( { where : { email : 'unique.email.@d.com', companyId : Math.floor( Math.random() * 5 ) } } );
+User.findOrCreate( { where : { objectId : 1 }, defaults : { bool : false } } );
+User.findOrCreate( { where : 'c', defaults : {} } );
+
+User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
+
+User.bulkCreate( [{ aNumber : 10 }, { aNumber : 12 }] ).then( ( i ) => i[0].isNewRecord );
+User.bulkCreate( [{ username : 'bar' }, { username : 'bar' }, { username : 'bar' }] );
+User.bulkCreate( [{}, {}], { validate : true, individualHooks : true } );
+User.bulkCreate( [{ style : 'ipa' }], { logging : function() { } } );
+User.bulkCreate( [{ a : 'b', c : 'd', e : 'f' }, { a : 'b', c : 'd', e : 'f' }], { fields : ['a', 'b'] } );
+User.bulkCreate( [{ name : 'foo', code : '123' }, { code : 'c' }, { name : 'bar', code : '1' }], { validate : true } );
+User.bulkCreate( [{ name : 'foo', code : '123' }, { code : '1234' }], { fields : ['code'], validate : true } );
+User.bulkCreate( [{ name : 'a', c : 'b' }, { name : 'e', c : 'f' }], { fields : ['e', 'f'], ignoreDuplicates : true } );
+
+User.truncate();
+
+User.destroy( { where : { client_id : 13 } } ).then( ( a ) => a.toFixed() );
+User.destroy( { force : true } );
+User.destroy( { where : {}, transaction : t } );
+User.destroy( { where : { access_level : { lt : 5 } } } );
+User.destroy( { truncate : true } );
+User.destroy( { where : {} } );
+
+User.restore( { where : { secretValue : '42' } } );
+
+User.update( { username : 'ruben' }, { where : {} } );
+User.update( { username : 'ruben' }, { where : { access_level : { lt : 5 } } } );
+User.update( { username : 'ruben' }, { where : { username : 'dan' } } );
+User.update( { username : 'bar' }, { where : { username : 'foo' }, transaction : t } );
+User.update( { username : 'Bill', secretValue : '43' }, { where : { secretValue : '42' }, fields : ['username'] } );
+User.update( { username : s.cast( '1', 'char' ) }, { where : { username : 'John' } } );
+User.update( { username : s.fn( 'upper', s.col( 'username' ) ) }, { where : { username : 'John' } } );
+User.update( { username : 'Bill' }, { where : { secretValue : '42' }, returning : true } );
+User.update( { secretValue : '43' }, { where : { username : 'Peter' }, limit : 1 } );
+User.update( { name : Math.random().toString() }, { where : { id : '1' } } );
+User.update( { a : { b : 10, c : 'd' } }, { where : { username : 'Jan' }, sideEffects : false } );
+User.update( { geometry : { type : 'Point', coordinates : [49.807222, -86.984722] } }, {
+    where : {
+        u : {
+            u : 'u',
+            geometry : { type : 'Point', coordinates : [49.807222, -86.984722] }
+        }
+    }
+} );
+User.update( {
+    geometry : {
+        type : 'Polygon',
+        coordinates : [[[100.0, 0.0], [102.0, 0.0], [102.0, 1.0], [100.0, 1.0], [100.0, 0.0]]]
+    }
+}, {
+    where : {
+        username : {
+            username : 'username',
+            geometry : { type : 'Point', coordinates : [49.807222, -86.984722] }
+        }
+    }
+} );
+
+User.unscoped().find( { where : { username : 'bob' } } );
+User.unscoped().count();
+
+//
+//  Query Interface
+// ~~~~~~~~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/query-interface.test.js
+//
+
+var queryInterface = s.getQueryInterface();
+
+queryInterface.dropAllTables();
+queryInterface.showAllTables( { logging : function() { } } );
+queryInterface.createTable( 'table', { name : Sequelize.STRING }, { logging : function() { } } );
+queryInterface.createTable( 'skipme', { name : Sequelize.STRING } );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+queryInterface.dropAllTables( { skip : ['skipme'] } );
+ */
+queryInterface.dropTable( 'Group', { logging : function() { } } );
+queryInterface.addIndex( 'Group', ['username', 'isAdmin'], { logging : function() { } } );
+queryInterface.showIndex( 'Group', { logging : function() { } } );
+queryInterface.removeIndex( 'Group', ['username', 'isAdmin'], { logging : function() { } } );
+queryInterface.showIndex( 'Group' );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+queryInterface.createTable( 'table', { name : { type : Sequelize.STRING } }, { schema : 'schema' } );
+ */
+queryInterface.addIndex( { schema : 'a', tableName : 'c' }, ['d', 'e'], { logging : function() {} }, 'schema_table' );
+queryInterface.showIndex( { schema : 'schema', tableName : 'table' }, { logging : function() {} } );
+queryInterface.addIndex( 'Group', ['from'] );
+queryInterface.describeTable( '_Users', { logging : function() {} } );
+queryInterface.createTable( 's', { table_id : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true } } );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+queryInterface.insert( null, 'TableWithPK', {}, { raw : true, returning : true, plain : true } );
+ */
+queryInterface.createTable( 'SomeTable', { someEnum : Sequelize.ENUM( 'value1', 'value2', 'value3' ) } );
+queryInterface.createTable( 'SomeTable', { someEnum : { type : Sequelize.ENUM, values : ['b1', 'b2', 'b3'] } } );
+queryInterface.createTable( 't', { someEnum : { type : Sequelize.ENUM, values : ['c1', 'c2', 'c3'], field : 'd' } } );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+queryInterface.createTable( 'User', { name : { type : Sequelize.STRING } }, { schema : 'hero' } );
+queryInterface.rawSelect( 'User', { schema : 'hero', logging : function() {} }, 'name' );
+ */
+queryInterface.renameColumn( '_Users', 'username', 'pseudo', { logging : function() {} } );
+queryInterface.renameColumn( { schema : 'archive', tableName : 'Users' }, 'username', 'pseudo' );
+queryInterface.renameColumn( '_Users', 'username', 'pseudo' );
+queryInterface.createTable( { tableName : 'y', schema : 'a' },
+    { id : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true }, currency : Sequelize.INTEGER } );
+queryInterface.changeColumn( { tableName : 'a', schema : 'b' }, 'c', { type : Sequelize.FLOAT },
+    { logging : () => s } );
+queryInterface.createTable( 'users', { id : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true } } );
+queryInterface.createTable( 'level', { id : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true } } );
+queryInterface.addColumn( 'users', 'someEnum', Sequelize.ENUM( 'value1', 'value2', 'value3' ) );
+queryInterface.addColumn( 'users', 'so', { type : Sequelize.ENUM, values : ['value1', 'value2', 'value3'] } );
+queryInterface.createTable( 'hosts', {
+    id : {
+        type : Sequelize.INTEGER,
+        primaryKey : true,
+        autoIncrement : true
+    },
+    admin : {
+        type : Sequelize.INTEGER,
+        references : {
+            model : User,
+            key : 'id'
+        }
+    },
+    operator : {
+        type : Sequelize.INTEGER,
+        references : {
+            model : User,
+            key : 'id'
+        },
+        onUpdate : 'cascade'
+    },
+    owner : {
+        type : Sequelize.INTEGER,
+        references : {
+            model : User,
+            key : 'id'
+        },
+        onUpdate : 'cascade',
+        onDelete : 'set null'
+    }
+} );
+
+//
+//  Query Types
+// ~~~~~~~~~~~~~
+//
+
+s.getDialect();
+s.validate();
+s.authenticate();
+s.isDefined( '' );
+s.model( 'pp' );
+s.query( '', { raw : true } );
+s.query( '' );
+s.query( '' ).then( function( res ) {} );
+s.query( '' ).spread( function(  ) {}, function( b ) {} );
+s.query( { query : 'select ? as foo, ? as bar', values : [1, 2] }, { raw : true, replacements : [1, 2] } );
+s.query( '', { raw : true, nest : false } );
+s.query( 'select ? as foo, ? as bar', { type : this.sequelize.QueryTypes.SELECT, replacements : [1, 2] } );
+s.query( { query : 'select ? as foo, ? as bar', values : [1, 2] }, { type : s.QueryTypes.SELECT } );
+s.query( 'select :one as foo, :two as bar', { raw : true, replacements : { one : 1, two : 2 } } );
+s.transaction().then( function( t ) { s.set( { foo : 'bar' }, { transaction : t } ) } );
+s.define( 'foo', { bar : Sequelize.STRING }, { collate : 'utf8_bin' } );
+s.define( 'Foto', { name : Sequelize.STRING }, { tableName : 'photos' } );
+s.databaseVersion().then( function( version ) { } );
+
+//
+//  Sequelize
+// ~~~~~~~~~~~
+//
+
+new Sequelize( 'db', 'user', 'pw', { logging : false } );
+new Sequelize( 'db', 'user', 'pass', {
+    dialect : '',
+    port : 99999,
+    pool : {}
+} );
+new Sequelize( '' ).query( '', { type : s.QueryTypes.FOREIGNKEYS, logging : function() {} } );
+new Sequelize( 'sqlite://test.sqlite' );
+new Sequelize( 'wat', 'trololo', 'wow', { port : 99999 } );
+new Sequelize( 'localhost', 'wtf', 'lol', { port : 99999 } );
+new Sequelize( 'sequelize', null, null, {
+    replication : {
+        read : {
+            host : 'localhost',
+            username : 'omg',
+            password : 'lol'
+        }
+    }
+} );
+
+s.model( 'Project' );
+s.define( 'Project', {
+    name : Sequelize.STRING
+} );
+
+var s         = new Sequelize( '' );
+var testModel = s.define( 'User', {
+    username : Sequelize.STRING,
+    secretValue : Sequelize.STRING,
+    data : Sequelize.STRING,
+    intVal : Sequelize.INTEGER,
+    theDate : Sequelize.DATE,
+    aBool : Sequelize.BOOLEAN
+} );
+var testModel = s.define( 'FrozenUser', {}, { freezeTableName : true } );
+s.define( 'UserWithClassAndInstanceMethods', {}, {
+    classMethods : { doSmth : function() { return 1; } },
+    instanceMethods : { makeItSo : function() { return 2; } }
+} );
+s.define( 'UserCol', {
+    id : {
+        type : Sequelize.STRING,
+        defaultValue : 'User',
+        primaryKey : true
+    }
+} );
+s.define( 'UserWithTwoAutoIncrements', {
+    userid : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true },
+    userscore : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true }
+} );
+s.define( 'Foo', {
+    field : Sequelize.INTEGER
+}, {
+    validate : {
+        field : function() {}
+    }
+} );
+var UserTable = s.define( 'UserCol', {
+    aNumber : Sequelize.INTEGER,
+    createdAt : {
+        type : Sequelize.DATE,
+        defaultValue : new Date()
+    },
+    updatedAt : {
+        type : Sequelize.DATE,
+        defaultValue : new Date()
+    }
+}, { timestamps : true } );
+
+s.define( 'UserCol', {
+    aNumber : Sequelize.INTEGER
+}, {
+    timestamps : true,
+    updatedAt : 'updatedOn',
+    createdAt : 'dateCreated',
+    deletedAt : 'deletedAtThisTime',
+    paranoid : true
+} );
+s.define( 'UpdatingUser', {
+    name : Sequelize.STRING
+}, {
+    timestamps : true,
+    updatedAt : false,
+    createdAt : false,
+    deletedAt : 'deletedAtThisTime',
+    paranoid : true
+} );
+s.define( 'TaskBuild', {
+    title : {
+        type : Sequelize.STRING( 50 ),
+        allowNull : false,
+        defaultValue : ''
+    }
+}, {
+    setterMethods : {
+        title : function() { }
+    }
+} );
+s.define( 'UserCol', {
+    aNumber : Sequelize.INTEGER
+}, {
+    paranoid : true,
+    underscored : true
+} );
+
+s.define( 'UserWithUniqueUsername', {
+    username : { type : Sequelize.STRING, unique : { name : 'user_and_email', msg : 'User and email must be unique' } },
+    email : { type : Sequelize.STRING, unique : 'user_and_email' }
+} );
+/* NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+s.define( 'UserWithUniqueUsername', {
+    user_id : { type : Sequelize.INTEGER },
+    email : { type : Sequelize.STRING }
+}, {
+    indexes : [
+        {
+            name : 'user_and_email_index',
+            msg : 'User and email must be unique',
+            unique : true,
+            method : 'BTREE',
+            fields : ['user_id', { attribute : 'email', collate : 'en_US', order : 'DESC', length : 5 }]
+        }]
+} );
+ */
+s.define( 'TaskBuild', {
+    title : { type : Sequelize.STRING, defaultValue : 'a task!' },
+    foo : { type : Sequelize.INTEGER, defaultValue : 2 },
+    bar : { type : Sequelize.DATE },
+    foobar : { type : Sequelize.TEXT, defaultValue : 'asd' },
+    flag : { type : Sequelize.BOOLEAN, defaultValue : false }
+} );
+s.define( 'ProductWithSettersAndGetters1', {
+    price : {
+        type : Sequelize.INTEGER,
+        get : function() {
+            return 'answer = ' + this.getDataValue( 'price' );
+        },
+        set : function( v ) {
+            return this.setDataValue( 'price', v + 42 );
+        }
+    }
+} );
+s.define( 'ProductWithSettersAndGetters2', {
+    priceInCents : Sequelize.INTEGER
+}, {
+    setterMethods : {
+        price : function( value ) {
+            this.dataValues.priceInCents = value * 100;
+        }
+    },
+    getterMethods : {
+        price : function() {
+            return '$' + (this.getDataValue( 'priceInCents' ) / 100);
+        },
+
+        priceInCents : function() {
+            return this.dataValues.priceInCents;
+        }
+    }
+} );
+
+s.define( 'post', {
+    title : Sequelize.STRING,
+    authorId : { type : Sequelize.INTEGER, references : testModel, referencesKey : 'id' }
+} );
+s.define( 'post', {
+    title : Sequelize.STRING,
+    authorId : { type : Sequelize.INTEGER, references : { model : testModel, key : 'id' } }
+} );
+
+s.define( 'User', {
+    username : Sequelize.STRING,
+    geometry : Sequelize.GEOMETRY( 'POINT' )
+} );
+
+s.define( 'ScopeMe', {
+    username : Sequelize.STRING,
+    email : Sequelize.STRING,
+    access_level : Sequelize.INTEGER,
+    other_value : Sequelize.INTEGER,
+    parent_id : Sequelize.INTEGER
+}, {
+    defaultScope : {
+        where : {
+            access_level : {
+                gte : 5
+            }
+        }
+    },
+    scopes : {
+        isTony : {
+            where : {
+                username : 'tony'
+            }
+        },
+    }
+} );
+s.define( 'company', {
+    active : Sequelize.BOOLEAN
+}, {
+    defaultScope : {
+        where : { active : true }
+    },
+    scopes : {
+        notActive : {
+            where : {
+                active : false
+            }
+        },
+        reversed : {
+            order : [['id', 'DESC']]
+        }
+    }
+} );
+s.define( 'profile', {
+    active : Sequelize.BOOLEAN
+}, {
+    defaultScope : {
+        where : { active : true }
+    },
+    scopes : {
+        notActive : {
+            where : {
+                active : false
+            }
+        },
+    }
+} );
+
+s.define( 'ScopeMe', {
+    username : Sequelize.STRING,
+    email : Sequelize.STRING,
+    access_level : Sequelize.INTEGER,
+    other_value : Sequelize.INTEGER
+}, {
+    defaultScope : {
+        where : {
+            access_level : {
+                gte : 5
+            }
+        }
+    },
+    scopes : {
+        lowAccess : {
+            where : {
+                access_level : {
+                    lte : 5
+                }
+            }
+        },
+        withOrder : {
+            order : 'username'
+        }
+    }
+} );
+
+s.define( 'ScopeMe', {
+    username : Sequelize.STRING,
+    email : Sequelize.STRING,
+    access_level : Sequelize.INTEGER,
+    other_value : Sequelize.INTEGER
+}, {
+    defaultScope : {
+        where : {
+            access_level : {
+                gte : 5
+            }
+        }
+    },
+    scopes : {
+        lowAccess : {
+            where : {
+                access_level : {
+                    lte : 5
+                }
+            }
+        }
+    }
+} );
+
+s.define( 'user', {
+    id : {
+        type : Sequelize.INTEGER,
+        allowNull : false,
+        primaryKey : true,
+        autoIncrement : true,
+        field : 'userId'
+    },
+    name : {
+        type : Sequelize.STRING,
+        field : 'full_name'
+    },
+    taskCount : {
+        type : Sequelize.INTEGER,
+        field : 'task_count',
+        defaultValue : 0,
+        allowNull : false
+    }
+}, {
+    tableName : 'users',
+    timestamps : false
+} );
+s.define( 'task', {
+    id : {
+        type : Sequelize.INTEGER,
+        allowNull : false,
+        primaryKey : true,
+        autoIncrement : true,
+        field : 'taskId'
+    },
+    title : {
+        type : Sequelize.STRING,
+        field : 'name'
+    }
+}, {
+    tableName : 'tasks',
+    timestamps : false
+} );
+s.define( 'comment', {
+    id : {
+        type : Sequelize.INTEGER,
+        allowNull : false,
+        primaryKey : true,
+        autoIncrement : true,
+        field : 'commentId'
+    },
+    text : {
+        type : Sequelize.STRING,
+        field : 'comment_text'
+    },
+    notes : {
+        type : Sequelize.STRING,
+        field : 'notes'
+    }
+}, {
+    tableName : 'comments',
+    timestamps : false
+} );
+s.define( 'test', {
+    id : {
+        type : Sequelize.INTEGER,
+        field : 'test_id',
+        autoIncrement : true,
+        primaryKey : true,
+        validate : {
+            min : 1
+        }
+    },
+    title : {
+        allowNull : false,
+        type : Sequelize.STRING( 255 ),
+        field : 'test_title'
+    }
+}, {
+    timestamps : true,
+    underscored : true,
+    freezeTableName : true
+} );
+
+s.define( 'User', {
+    deletedAt : {
+        type : Sequelize.DATE,
+        field : 'deleted_at'
+    }
+}, {
+    timestamps : true,
+    paranoid : true
+} );
+
+//
+//  Transaction
+// ~~~~~~~~~~~~~
+//
+//  https://github.com/sequelize/sequelize/blob/v3.4.1/test/integration/transaction.test.js
+//
+
+s.transaction().then( function( t ) {
+
+    t.commit();
+    t.rollback();
+
+    User.find( {
+        where : {
+            username : 'John'
+        },
+        include : [User],
+        lock : t.LOCK.UPDATE,
+        transaction : t
+    } );
+    User.find( {
+        where : {
+            username : 'John'
+        },
+        include : [User],
+        lock : {
+            level : t.LOCK.UPDATE,
+            of : User
+        },
+        transaction : t
+    } );
+    User.update( {
+        active : true
+    }, {
+        where : {
+            active : false
+        },
+        transaction : t
+    } );
+    User.find( {
+        where : {
+            username : 'jan'
+        },
+        lock : t.LOCK.NO_KEY_UPDATE,
+        transaction : t
+    } );
+    User.find( {
+        where : {
+            username : 'jan'
+        },
+        lock : t.LOCK.KEY_SHARE,
+        transaction : t
+    } );
+
+} );
+
+s.transaction( function() {
+    return Promise.resolve();
+} );
+s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Promise.resolve(); } );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Promise.resolve() );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Promise.resolve() );
diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index eb5b0296f..ba8d03d94 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -1,1017 +1,2929 @@
-// Type definitions for Sequelize 2.0.0 dev13
+// Type definitions for Sequelize 3.4.1
 // Project: http://sequelizejs.com
-// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>
+// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>, Ivan Drinchev <https://github.com/drinchev>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
-/// <reference path="../node/node.d.ts" />
 /// <reference path="../lodash/lodash.d.ts" />
+/// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../validator/validator.d.ts" />
+
+declare module "sequelize" {
 
-declare module "sequelize"
-{
     module sequelize {
-        interface SequelizeStaticAndInstance {
 
-            /**
-             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
-             * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
-             * your project.
-             */
-            Utils: Utils;
+        //
+        //  Associations
+        // ~~~~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/tree/v3.4.1/lib/associations
+        //
 
-            /**
-             * A modified version of bluebird promises, that allows listening for sql events.
-             *
-             * @see Promise
-             */
-            Promise: Promise;
 
-            /**
-             * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
-             * both on the instance, and on the constructor.
-             *
-             * @see Validator
-             */
-            Validator: Validator;
-
-            QueryTypes: QueryTypes;
-
-            /**
-             * A general error class.
-             */
-            Error: Error;
-
-            /**
-             * Emitted when a validation fails.
-             *
-             * @see ValidationError
-             */
-            ValidationError: ValidationError;
-
-            /**
-             * Creates a object representing a database function. This can be used in search queries, both in where and order
-             * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
-             * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
-             *
-             * @param fn The function you want to call.
-             * @param args All further arguments will be passed as arguments to the function.
-             */
-            fn(fn: string, ...args: Array<any>): any;
-
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
-             * raw string arguments to fn will be escaped.
-             *
-             * @param col The name of the column
-             */
-            col(col: string): Col;
-
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast.
-             * @param type The type to cast it to.
-             */
-            cast(val: any, type: string): Cast;
-
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val Value to convert to a literal.
-             */
-            literal(val: any): Literal;
-
-            /**
-             * An AND query.
-             *
-             * @param args Each argument (string or object) will be joined by AND.
-             */
-            and(...args: Array<any>): And;
-
-            /**
-             * An OR query.
-             *
-             * @param args Each argument (string or object) will be joined by OR.
-             */
-            or(...args: Array<any>): Or;
-
-            /**
-             * A way of specifying attr = condition. Mostly used internally.
-             *
-             * @param attr          The attribute
-             * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
-             */
-            where(attr: string, condition: any): Where;
+        /**
+         * The options for the get mixin of the BelongsTo association.
+         * @see BelongsToAssociationGetMixin
+         */
+        interface BelongsToAssociationGetMixinOptions {
+          /**
+           * Apply a scope on the related model, or remove its default scope by passing false.
+           */
+            scope: string | boolean;
         }
 
-        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
-            /**
-             * Instantiate sequelize with name of database and username
-             * @param database database name
-             * @param username user name
-             */
-            new (database: string, username: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username and password
-             * @param database database name
-             * @param username user name
-             * @param password password
-             */
-            new (database: string, username: string, password: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, password, and options.
-             * @param database database name
-             * @param username user name
-             * @param password password
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, password: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, and options.
-             *
-             * @param database database name
-             * @param username user name
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequlize with an URI
-             * @param connectionString A full database URI
-             * @param options Options for sequelize. @see Options
-             */
-            new (connectionString: string, options?: Options): Sequelize;
+        /**
+         * The get association mixin applied to models with BelongsTo.
+         * An example of usage is as follows:
+         *
+         * ```js
+         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
+         *    getRole: Sequelize.BelongsToAssociationGetMixin<RoleInstance>;
+         *    // setRole...
+         *    // createRole...
+         * }
+         * ```
+         *
+         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+         * @see Instance
+         */
+        interface BelongsToAssociationGetMixin<TInstance> {
+          /**
+           * Get the associated instance.
+           * @param options The obtions to use when getting the association.
+           */
+          (options?: BelongsToAssociationGetMixinOptions): Promise<TInstance>
         }
 
-        interface Sequelize extends SequelizeStaticAndInstance {
-            /**
-             * Sequelize configuration (undocumented).
-             */
-            config: Config;
-
-            /**
-             * Sequelize options (undocumented).
-             */
-            options: Options;
-
-            /**
-             * Models are stored here under the name given to sequelize.define
-             */
-            models: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            transactionManager: TransactionManager;
-            importCache: any;
-
-            /**
-             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
-             *
-             * @see Transaction
-             */
-            Transaction: TransactionStatic;
-
-            /**
-             * Returns the specified dialect.
-             */
-            getDialect(): string;
-
-            /**
-             * Returns the singleton instance of QueryInterface.
-             */
-            getQueryInterface(): QueryInterface;
-
-            /**
-             * Returns the singleton instance of Migrator.
-             * @param options Migration options
-             * @param force A flag that defines if the migrator should get instantiated or not.
-             */
-            getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
-
-            /**
-             * Define a new model, representing a table in the DB.
-             *
-             * @param daoName The name of the entity (table). Typically specified in singular form.
-             * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
-             *                   or can be an object defining the attribute and its options. Note attributes is not fully
-             *                   typed since TypeScript does not support union types--it can be either a string or an
-             *                   options object. @see AttributeOptions.
-             * @param options Table options. @see DefineOptions.
-             */
-            define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Fetch a DAO factory which is already defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
-
-            /**
-             * Checks whether a model with the given name is defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            isDefined(daoName: string): boolean;
-
-            /**
-             * Imports a model defined in another file.
-             *
-             * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
-             *              resolved relatively to the calling file
-             */
-            import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             * @param replacements  Either an object of named parameter replacements in the format :param or an array of
-             *                      unnamed replacements to replace ? in your SQL.
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
-
-            /**
-             * Create a new database schema.
-             *
-             * @param schema Name of the schema.
-             */
-            createSchema(schema: string): EventEmitter;
-
-            /**
-             * Show all defined schemas.
-             */
-            showAllSchemas(): EventEmitter;
-
-            /**
-             * Drop a single schema.
-             *
-             * @param schema Name of the schema.
-             */
-            dropSchema(schema: string): EventEmitter;
-
-            /**
-             * Drop all schemas.
-             */
-            dropAllSchemas(): EventEmitter;
-
-            /**
-             * Sync all defined DAOs to the DB.
-             *
-             * @param options Options.
-             */
-            sync(options?: SyncOptions): EventEmitter;
-
-            /**
-             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
-             *
-             * @param options The options passed to each call to Model.drop.
-             */
-            drop(options: DropOptions): EventEmitter;
-
-            /**
-             * Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            authenticate(): EventEmitter;
-
-            /**
-             * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            validate(): EventEmitter;
-
-            /**
-             * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return, 
-             * the transaction will be committed or rejected based on the promise chain returned to the callback. 
-             * 
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(callback: (transaction: Transaction) => boolean): Promise;
-
-            /**
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param options   Transaction options.
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
-
-            close(): void;
+        /**
+         * The options for the set mixin of the BelongsTo association.
+         * @see BelongsToAssociationSetMixin
+         */
+        interface BelongsToAssociationSetMixinOptions {
+          /**
+           * Skip saving this after setting the foreign key if false.
+           */
+            save: boolean;
         }
 
-        interface Config {
-            database?: string;
-            username?: string;
-            password?: string;
-            host?: string;
-            port?: number;
-            pool?: PoolOptions;
-            protocol?: string;
-            queue?: boolean;
-            native?: boolean;
-            ssl?: boolean;
-            replication?: ReplicationOptions;
-            dialectModulePath?: string;
-            maxConcurrentQueries?: number;
-            dialectOptions?: any;
+        /**
+         * The set association mixin applied to models with BelongsTo.
+         * An example of usage is as follows:
+         *
+         * ```js
+         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+         *    // getRole...
+         *    setRole: BelongsToAssociationSetMixin<RoleInstance, RoleId>;
+         *    // createRole...
+         * }
+         * ```
+         *
+         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+         * @see Instance
+         */
+        interface BelongsToAssociationSetMixin<TInstance, TInstancePrimaryKey> {
+          /**
+           * Get the associated instance.
+           * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
+           * @param options The obtions to use when setting the association.
+           */
+          (newAssociation: TInstance | TInstancePrimaryKey, options?: BelongsToAssociationSetMixinOptions): Promise<void>
         }
 
-        interface Model<TInstance, TPojo> extends Hooks, Associations {
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
+        /**
+         * The options for the create mixin of the BelongsTo association.
+         * @see BelongsToAssociationCreateMixin
+         */
+        interface BelongsToAssociationCreateMixinOptions extends CreateOptions, BelongsToAssociationSetMixinOptions {}
 
-            /**
-             * The name of the model, typically singular.
-             */
-            name: string;
-
-            /**
-             * The name of the underlying database table, typically plural.
-             */
-            tableName: string;
-
-            options: DefineOptions;
-            attributes: any;
-            rawAttributes: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            associations: any;
-            scopeObj: any;
-
-            /**
-             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
-             * instance (this).
-             */
-            sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
-
-            /**
-             * Drop the table represented by this Model.
-             *
-             * @param options
-             */
-            drop(options?: DropOptions): Promise;
-
-            /**
-             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
-             * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
-             * 'schema.tablename'.
-             *
-             * @param schema    The name of the schema.
-             * @param options   Schema options.
-             */
-            schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
-             * model has no schema, or an object with tableName, schema and delimiter properties.
-             */
-            getTableName(): any;
-
-            /**
-             * Apply a scope created in define to the model.
-             *
-             * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
-             *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
-             *                with a method property. The value can either be a string, if the method does not take any
-             *                arguments, or an array, where the first element is the name of the method, and consecutive
-             *                elements are arguments to that method. Pass null to remove all scopes, including the default.
-             */
-            scope(options: any): Model<TInstance, TPojo>;
-
-            /**
-             * Search for multiple instances..
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options.
-             */
-            findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A number to search by id.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Run an aggregation method on the specified field.
-             *
-             * @param field                 The field to aggregate over. Can be a field name or *.
-             * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
-             * @param options               Query options, particularly options.dataType.
-             */
-            aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
-
-            /**
-             * Count the number of records matching the provided where clause.
-             *
-             * @param options Conditions and options for the query.
-             */
-            count(options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
-             * matching your query. This is very usefull for paging.
-             *
-             * @param findOptions   Filtering options
-             * @param queryOptions  Query options
-             */
-            findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
-
-            /**
-             * Find the maximum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            max<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the minimum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            min<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the sum of field.
-             *
-             * @param field
-             * @param options
-             */
-            sum(field: string, options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
-             *
-             * @param values    any from which to build entity instance.
-             * @param options   any construction options.
-             */
-            build(values: TPojo, options?: BuildOptions): TInstance;
-
-            /**
-             * Builds a new model instance and calls save on it..
-             *
-             * @param values
-             * @param options
-             */
-            create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
-             * of the promise will be (instance, initialized) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
-             *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
-             * @param defaults  Default values to use if building a new instance
-             * @param options   Options passed to the find call
-             */
-            findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build and save the row if none is found The successfull result of the
-             * promise will be (instance, created) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
-             *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
-             * @param defaults  Default values to use if creating a new instance
-             * @param options   Options passed to the find and create calls.
-             */
-            findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
-
-            /**
-             * Create and insert multiple instances in bulk.
-             *
-             * @param records   List of objects (key/value pairs) to create instances from.
-             * @param options
-             */
-            bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Delete multiple instances.
-             */
-            destroy(where?: any, options?: DestroyOptions): Promise;
-
-            /**
-             * Update multiple instances that match the where options.
-             *
-             * @param attrValueHash A hash of fields to change and their new values
-             * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
-             *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
-             */
-            update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
-
-            /**
-             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
-             * types.
-             */
-            describe(): PromiseT<any>;
-
-            /**
-             *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
-             *  The returned instance already has all the fields property populated with the field of the model.
-             */
-            dataset(): any;
+        /**
+         * The create association mixin applied to models with BelongsTo.
+         * An example of usage is as follows:
+         *
+         * ```js
+         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+         *    // getRole...
+         *    // setRole...
+         *    createRole: BelongsToAssociationCreateMixin<RoleAttributes>;
+         * }
+         * ```
+         *
+         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+         * @see Instance
+         */
+        interface BelongsToAssociationCreateMixin<TAttributes> {
+          /**
+           * Create a new instance of the associated model and associate it with this.
+           * @param values The values used to create the association.
+           * @param options The options passed to `target.create` and `setAssociation`.
+           */
+          (values?: TAttributes, options?: BelongsToAssociationCreateMixinOptions): Promise<void>
         }
 
-        interface Instance<TInstance, TPojo> {
-            /**
-             * Returns true if this instance has not yet been persisted to the database.
-             */
-            isNewRecord: boolean;
+        // TODO: HasOne Associations
+        // TODO: HasMany Associations
+        // TODO: BelongsToMany Associations
+
+        /**
+         * Foreign Key Options
+         *
+         * @see AssociationOptions
+         */
+        interface AssociationForeignKeyOptions extends ColumnOptions {
 
             /**
-             * Returns the Model the instance was created from.
+             *  Attribute name for the relation
              */
-            Model: Model<TInstance, TPojo>;
+            name? : string;
 
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
-             * Otherwise, always returns false.
-             */
-            isDeleted: boolean;
-
-            /**
-             * Get the values of this Instance. Proxies to this.get.
-             */
-            values: TPojo;
-
-            /**
-             * A getter for this.changed(). Returns true if any keys have changed.
-             */
-            isDirty: boolean;
-
-            /**
-             *  Get the values of the primary keys of this instance.
-             */
-            primaryKeyValues: TPojo;
-
-            /**
-             * Get the value of the underlying data value.
-             *
-             * @param key   Field to retrieve.
-             */
-            getDataValue(key: string): any;
-
-            /**
-             * Update the underlying data value.
-             *
-             * @param key   Field to set.
-             * @param value Value to set.
-             */
-            setDataValue(key: string, value: any): void;
-
-            /**
-             * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
-             * invoking virtual getters.
-             */
-            get(key?: string): any;
-
-            /**
-             * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
-             * that nothing will be persisted before you actually call save).
-             */
-            set(key: string, value: any, options?: SetOptions): void;
-
-            /**
-             * If changed is called with a string it will return a boolean indicating whether the value of that key in
-             * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-             * return an array of keys that have changed.
-             */
-            changed(key: string): any;
-
-            /**
-               * If changed is called with a string it will return a boolean indicating whether the value of that key in
-               * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-               * return an array of keys that have changed.
-               */
-            changed(): Array<string>;
-
-            /**
-             * Returns the previous value for key from _previousDataValues.
-             */
-            previous(key: string): any;
-
-            /**
-             * Validate this instance, and if the validation passes, persist it to the database.
-             */
-            save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
-             * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
-             * With this method, all references to the Instance are updated with the new data and no new objects are created.
-             */
-            reload(options?: FindOptions): PromiseT<TInstance>;
-
-            /**
-             * Validate the attribute of this instance according to validation rules set in the model definition.
-             */
-            validate(options?: ValidateOptions): PromiseT<Error>;
-
-            /**
-             * This is the same as calling setAttributes, then calling save.
-             */
-            updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
-             * completely deleted, or have its deletedAt timestamp set to the current time.
-             *
-             * @param options   Allows caller to specify if delete should be forced.
-             */
-            destroy(options?: DestroyInstanceOptions): Promise;
-
-            /**
-             * Increment the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  incremented by the value given.
-             * @param options   Increment options.
-             */
-            increment(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Decrement the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  decremented by the value given.
-             * @param options   Decrement options.
-             */
-            decrement(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Check whether all values of this and other Instance are the same.
-             */
-            equal(other: TInstance): boolean;
-
-            /**
-             * Check if this is eqaul to one of others by calling equals.
-             *
-             * @param others    Other instances to compare to.
-             */
-            equalsOneOf(others: Array<TInstance>): boolean;
-
-            /**
-             * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
-             * gotten from the DB, and apply all custom getters.
-             */
-            toJSON(): TPojo;
         }
 
-        interface Transaction extends TransactionStatic {
-            /**
-             * Commit the transaction.
-             */
-            commit(): Transaction;
+        /**
+         * Options provided when associating models
+         *
+         * @see Association class
+         */
+        interface AssociationOptions {
 
             /**
-             * Rollback (abort) the transaction.
-             */
-            rollback(): Transaction;
-        }
-
-        interface TransactionStatic {
-            /**
-             * The possible isolation levels to use when starting a transaction
-             */
-            ISOLATION_LEVELS: TransactionIsolationLevels;
-
-            /**
-             * Possible options for row locking. Used in conjuction with find calls.
-             */
-            LOCK: TransactionLocks;
-        }
-
-        interface TransactionIsolationLevels {
-            READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
-            READ_COMMITTED: string;  // "READ COMMITTED"
-            REPEATABLE_READ: string; // "REPEATABLE READ"
-            SERIALIZABLE: string;    // "SERIALIZABLE"
-        }
-
-        interface TransactionLocks {
-            UPDATE: string;  // UPDATE
-            SHARE: string;   // SHARE
-        }
-
-        interface Hooks {
-
-            /**
-             * Add a named hook to the model.
+             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade.
+             * For example if `User.hasOne(Profile, {onDelete: 'cascade', hooks:true})`, the before-/afterDestroy hooks
+             * for profile will be called when a user is deleted. Otherwise the profile will be deleted without invoking
+             * any hooks.
              *
-             * @param hooktype
+             * Defaults to false
              */
-            addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
+            hooks?: boolean;
 
             /**
-             * Add a hook to the model.
+             * The alias of this model, in singular form. See also the `name` option passed to `sequelize.define`. If
+             * you create multiple associations between the same tables, you should provide an alias to be able to
+             * distinguish between them. If you provide an alias when creating the assocition, you should provide the
+             * same alias when eager loading and when getting assocated models. Defaults to the singularized name of
+             * target
+             */
+                as?: string | { singular: string, plural: string };
+
+            /**
+             * The name of the foreign key in the target table or an object representing the type definition for the
+             * foreign column (see `Sequelize.define` for syntax). When using an object, you can add a `name` property
+             * to set the name of the column. Defaults to the name of source + primary key of source
+             */
+            foreignKey?: string | AssociationForeignKeyOptions;
+
+            /**
+             * What happens when delete occurs.
              *
-             * @param hooktype
+             * Cascade if this is a n:m, and set null if it is a 1:m
+             *
+             * Defaults to 'SET NULL' or 'CASCADE'
              */
-            addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
+            onDelete?: string;
 
             /**
-             * A named hook that is run before validation.
+             * What happens when update occurs
+             *
+             * Defaults to 'CASCADE'
              */
-            beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
+            onUpdate?: string;
 
             /**
-             * A hook that is run before validation.
+             * Should on update and on delete constraints be enabled on the foreign key.
              */
-            beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
+            constraints?: boolean;
+            foreignKeyConstraint?: boolean;
 
-            /**
-             * A named hook that is run before validation.
-             */
-            afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before validation.
-             */
-            afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating a single instance.
-             */
-            afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating a single instance.
-             */
-            afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
         }
 
+        /**
+         * Options for Association Scope
+         *
+         * @see AssociationOptionsManyToMany
+         */
+        interface AssociationScope {
+
+            /**
+             * The name of the column that will be used for the associated scope and it's value
+             */
+            [scopeName: string] : any;
+
+        }
+
+        /**
+         * Options provided for many-to-many relationships
+         *
+         * @see AssociationOptionsHasMany
+         * @see AssociationOptionsBelongsToMany
+         */
+        interface AssociationOptionsManyToMany extends AssociationOptions {
+
+            /**
+             * A key/value set that will be used for association create and find defaults on the target.
+             * (sqlite not supported for N:M)
+             */
+            scope? : AssociationScope;
+
+        }
+
+        /**
+         * Options provided when associating models with hasOne relationship
+         *
+         * @see Association class hasOne method
+         */
+        interface AssociationOptionsHasOne extends AssociationOptions {
+
+            /**
+             * A string or a data type to represent the identifier in the table
+             */
+            keyType?: DataTypeAbstract;
+
+        }
+
+        /**
+         * Options provided when associating models with belongsTo relationship
+         *
+         * @see Association class belongsTo method
+         */
+        interface AssociationOptionsBelongsTo extends AssociationOptions {
+
+            /**
+             * The name of the field to use as the key for the association in the target table. Defaults to the primary
+             * key of the target table
+             */
+            targetKey? : string;
+
+            /**
+             * A string or a data type to represent the identifier in the table
+             */
+            keyType?: DataTypeAbstract;
+
+        }
+
+        /**
+         * Options provided when associating models with hasMany relationship
+         *
+         * @see Association class hasMany method
+         */
+        interface AssociationOptionsHasMany extends AssociationOptionsManyToMany {
+
+            /**
+             * A string or a data type to represent the identifier in the table
+             */
+            keyType?: DataTypeAbstract;
+
+        }
+
+        /**
+         * Options provided when associating models with belongsToMany relationship
+         *
+         * @see Association class belongsToMany method
+         */
+        interface AssociationOptionsBelongsToMany extends AssociationOptionsManyToMany {
+
+            /**
+             * The name of the table that is used to join source and target in n:m associations. Can also be a
+             * sequelize
+             * model if you want to define the junction table yourself and add extra attributes to it.
+             *
+             * In 3.4.1 version of Sequelize, hasMany's use of through gives an error, and on the other hand through
+             * option for belongsToMany has been made required.
+             *
+             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/has-many.js
+             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/belongs-to-many.js
+             */
+            through : Model<any, any> | string | ThroughOptions;
+
+            /**
+             * The name of the foreign key in the join table (representing the target model) or an object representing
+             * the type definition for the other column (see `Sequelize.define` for syntax). When using an object, you
+             * can add a `name` property to set the name of the colum. Defaults to the name of target + primary key of
+             * target
+             */
+            otherKey? : string | AssociationForeignKeyOptions;
+
+        }
+
+        /**
+         * Used for a association table in n:m associations.
+         *
+         * @see AssociationOptionsBelongsToMany
+         */
+        interface ThroughOptions {
+
+            /**
+             * The model used to join both sides of the N:M association.
+             */
+            model : Model<any, any>;
+
+            /**
+             * A key/value set that will be used for association create and find defaults on the through model.
+             * (Remember to add the attributes to the through model)
+             */
+            scope? : AssociationScope;
+
+            /**
+             * If true a unique key will be generated from the foreign keys used (might want to turn this off and create
+             * specific unique keys when using scopes)
+             *
+             * Defaults to true
+             */
+            unique? : boolean;
+
+        }
+
+        /**
+         * Creating assocations in sequelize is done by calling one of the belongsTo / hasOne / hasMany functions on a
+         * model (the source), and providing another model as the first argument to the function (the target).
+         *
+         * * hasOne - adds a foreign key to target
+         * * belongsTo - add a foreign key to source
+         * * hasMany - adds a foreign key to target, unless you also specify that target hasMany source, in which case
+         * a
+         * junction table is created with sourceId and targetId
+         *
+         * Creating an association will add a foreign key constraint to the attributes. All associations use `CASCADE`
+         * on update and `SET NULL` on delete, except for n:m, which also uses `CASCADE` on delete.
+         *
+         * When creating associations, you can provide an alias, via the `as` option. This is useful if the same model
+         * is associated twice, or you want your association to be called something other than the name of the target
+         * model.
+         *
+         * As an example, consider the case where users have many pictures, one of which is their profile picture. All
+         * pictures have a `userId`, but in addition the user model also has a `profilePictureId`, to be able to easily
+         * load the user's profile picture.
+         *
+         * ```js
+         * User.hasMany(Picture)
+         * User.belongsTo(Picture, { as: 'ProfilePicture', constraints: false })
+         *
+         * user.getPictures() // gets you all pictures
+         * user.getProfilePicture() // gets you only the profile picture
+         *
+         * User.findAll({
+         *   where: ...,
+         *   include: [
+         *     { model: Picture }, // load all pictures
+         *     { model: Picture, as: 'ProfilePicture' }, // load the profile picture. Notice that the spelling must be
+         * the exact same as the one in the association
+         *   ]
+         * })
+         * ```
+         * To get full control over the foreign key column added by sequelize, you can use the `foreignKey` option. It
+         * can either be a string, that specifies the name, or and object type definition,
+         * equivalent to those passed to `sequelize.define`.
+         *
+         * ```js
+         * User.hasMany(Picture, { foreignKey: 'uid' })
+         * ```
+         *
+         * The foreign key column in Picture will now be called `uid` instead of the default `userId`.
+         *
+         * ```js
+         * User.hasMany(Picture, {
+         *   foreignKey: {
+         *     name: 'uid',
+         *     allowNull: false
+         *   }
+         * })
+         * ```
+         *
+         * This specifies that the `uid` column can not be null. In most cases this will already be covered by the
+         * foreign key costraints, which sequelize creates automatically, but can be useful in case where the foreign
+         * keys are disabled, e.g. due to circular references (see `constraints: false` below).
+         *
+         * When fetching associated models, you can limit your query to only load some models. These queries are
+         * written
+         * in the same way as queries to `find`/`findAll`. To only get pictures in JPG, you can do:
+         *
+         * ```js
+         * user.getPictures({
+         *   where: {
+         *     format: 'jpg'
+         *   }
+         * })
+         * ```
+         *
+         * There are several ways to update and add new assoications. Continuing with our example of users and
+         * pictures:
+         * ```js
+         * user.addPicture(p) // Add a single picture
+         * user.setPictures([p1, p2]) // Associate user with ONLY these two picture, all other associations will be
+         * deleted user.addPictures([p1, p2]) // Associate user with these two pictures, but don't touch any current
+         * associations
+         * ```
+         *
+         * You don't have to pass in a complete object to the association functions, if your associated model has a
+         * single primary key:
+         *
+         * ```js
+         * user.addPicture(req.query.pid) // Here pid is just an integer, representing the primary key of the picture
+         * ```
+         *
+         * In the example above we have specified that a user belongs to his profile picture. Conceptually, this might
+         * not make sense, but since we want to add the foreign key to the user model this is the way to do it.
+         *
+         * Note how we also specified `constraints: false` for profile picture. This is because we add a foreign key
+         * from user to picture (profilePictureId), and from picture to user (userId). If we were to add foreign keys
+         * to both, it would create a cyclic dependency, and sequelize would not know which table to create first,
+         * since user depends on picture, and picture depends on user. These kinds of problems are detected by
+         * sequelize before the models are synced to the database, and you will get an error along the lines of `Error:
+         * Cyclic dependency found. 'users' is dependent of itself`. If you encounter this, you should either disable
+         * some constraints, or rethink your associations completely.
+         *
+         * @see Sequelize.Model
+         */
         interface Associations {
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
-             *
-             * @param target
-             * @param options
-             */
-            hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
 
             /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
+             * Creates an association between this (the source) and the provided target. The foreign key is added
+             * on the target.
              *
-             * @param target
-             * @param options
+             * Example: `User.hasOne(Profile)`. This will add userId to the profile table.
+             *
+             * @param target The model that will be associated with hasOne relationship
+             * @param options Options for the association
              */
-            belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+            hasOne( target : Model<any, any>, options? : AssociationOptionsHasOne ): void;
 
             /**
-             * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
+             * Creates an association between this (the source) and the provided target. The foreign key is added on the
+             * source.
              *
-             * @param target
-             * @param options
+             * Example: `Profile.belongsTo(User)`. This will add userId to the profile table.
+             *
+             * @param target The model that will be associated with hasOne relationship
+             * @param options Options for the association
              */
-            belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+            belongsTo( target : Model<any, any>, options? : AssociationOptionsBelongsTo ) : void;
 
             /**
              * Create an association that is either 1:m or n:m.
              *
-             * @param target
-             * @param options
+             * ```js
+             * // Create a 1:m association between user and project
+             * User.hasMany(Project)
+             * ```
+             * ```js
+             * // Create a n:m association between user and project
+             * User.hasMany(Project)
+             * Project.hasMany(User)
+             * ```
+             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+             * overridden by providing either a string or a Model as `through` in the options. If you use a through
+             * model with custom attributes, these attributes can be set when adding / setting new associations in two
+             * ways. Consider users and projects from before with a join table that stores whether the project has been
+             * started yet:
+             * ```js
+             * var UserProjects = sequelize.define('userprojects', {
+             *   started: Sequelize.BOOLEAN
+             * })
+             * User.hasMany(Project, { through: UserProjects })
+             * Project.hasMany(User, { through: UserProjects })
+             * ```
+             * ```js
+             * jan.addProject(homework, { started: false }) // The homework project is not started yet
+             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner have been
+             * started
+             * ```
+             *
+             * If you want to set several target instances, but with different attributes you have to set the
+             * attributes on the instance, using a property with the name of the through model:
+             *
+             * ```js
+             * p1.userprojects {
+             *   started: true
+             * }
+             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+             * ```
+             *
+             * Similarily, when fetching through a join table with custom attributes, these attributes will be
+             * available as an object with the name of the through model.
+             * ```js
+             * user.getProjects().then(function (projects) {
+             *   var p1 = projects[0]
+             *   p1.userprojects.started // Is this project started yet?
+             * })
+             * ```
+             *
+             * @param target The model that will be associated with hasOne relationship
+             * @param options Options for the association
              */
-            hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+            hasMany( target : Model<any, any>, options? : AssociationOptionsHasMany ) : void;
+
+            /**
+             * Create an N:M association with a join table
+             *
+             * ```js
+             * User.belongsToMany(Project)
+             * Project.belongsToMany(User)
+             * ```
+             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+             * overridden by providing either a string or a Model as `through` in the options.
+             *
+             * If you use a through model with custom attributes, these attributes can be set when adding / setting new
+             * associations in two ways. Consider users and projects from before with a join table that stores whether
+             * the project has been started yet:
+             * ```js
+             * var UserProjects = sequelize.define('userprojects', {
+             *   started: Sequelize.BOOLEAN
+             * })
+             * User.belongsToMany(Project, { through: UserProjects })
+             * Project.belongsToMany(User, { through: UserProjects })
+             * ```
+             * ```js
+             * jan.addProject(homework, { started: false }) // The homework project is not started yet
+             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner has been started
+             * ```
+             *
+             * If you want to set several target instances, but with different attributes you have to set the
+             * attributes on the instance, using a property with the name of the through model:
+             *
+             * ```js
+             * p1.userprojects {
+             *   started: true
+             * }
+             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+             * ```
+             *
+             * Similarily, when fetching through a join table with custom attributes, these attributes will be
+             * available as an object with the name of the through model.
+             * ```js
+             * user.getProjects().then(function (projects) {
+             *   var p1 = projects[0]
+             *   p1.userprojects.started // Is this project started yet?
+             * })
+             * ```
+             *
+             * @param target The model that will be associated with hasOne relationship
+             * @param options Options for the association
+             *
+             */
+            belongsToMany( target : Model<any, any>, options : AssociationOptionsBelongsToMany ) : void;
+
+        }
+
+        //
+        //  DataTypes
+        // ~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/data-types.js
+        //
+
+        /**
+         * Abstract DataType interface. Use this if you want to create an interface that has a value any of the
+         * DataTypes that Sequelize supports.
+         */
+        interface DataTypeAbstract {
+
+            /**
+             * Although this is not needed for the definitions itself, we want to make sure that DataTypeAbstract is not
+             * something than can be evaluated to an empty object.
+             */
+            dialectTypes : string;
+
+        }
+
+        interface DataTypeAbstractString<T> extends DataTypeAbstract {
+
+            /**
+             * A variable length string. Default length 255
+             */
+            ( options? : { length: number } ) : T;
+            ( length : number ) : T;
+
+            /**
+             * Property BINARY for the type
+             */
+            BINARY : T;
+
+        }
+
+        interface DataTypeString extends DataTypeAbstractString<DataTypeString> { }
+
+        interface DataTypeChar extends DataTypeAbstractString<DataTypeChar> { }
+
+        interface DataTypeText extends DataTypeAbstract {
+
+            /**
+             * Length of the text field.
+             *
+             * Available lengths: `tiny`, `medium`, `long`
+             */
+            ( options? : { length: string } ) : DataTypeText;
+            ( length : string ) : DataTypeText;
+
+        }
+
+        interface DataTypeAbstractNumber<T> extends DataTypeAbstract {
+            UNSIGNED : T;
+            ZEROFILL : T;
+        }
+
+        interface DataTypeNumber extends DataTypeAbstractNumber<DataTypeNumber> { }
+
+        interface DataTypeInteger extends DataTypeAbstractNumber<DataTypeInteger> {
+
+            /**
+             * Length of the number field.
+             */
+            ( options? : { length: number } ) : DataTypeInteger;
+            ( length : number ) : DataTypeInteger;
+
+        }
+
+        interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
+
+            /**
+             * Length of the number field.
+             */
+            ( options? : { length: number } ) : DataTypeBigInt;
+            ( length : number ) : DataTypeBigInt;
+
+        }
+
+        interface DataTypeFloat extends DataTypeAbstractNumber<DataTypeFloat> {
+
+            /**
+             * Length of the number field and decimals of the float
+             */
+            ( options? : { length: number, decimals?: number } ) : DataTypeFloat;
+            ( length : number, decimals? : number ) : DataTypeFloat;
+
+        }
+
+        interface DataTypeReal extends DataTypeAbstractNumber<DataTypeReal> {
+
+            /**
+             * Length of the number field and decimals of the real
+             */
+            ( options? : { length: number, decimals?: number } ) : DataTypeReal;
+            ( length : number, decimals? : number ) : DataTypeReal;
+
+        }
+
+        interface DataTypeDouble extends DataTypeAbstractNumber<DataTypeDouble> {
+
+            /**
+             * Length of the number field and decimals of the real
+             */
+            ( options? : { length: number, decimals?: number } ) : DataTypeDouble;
+            ( length : number, decimals? : number ) : DataTypeDouble;
+
+        }
+
+        interface DataTypeDecimal extends DataTypeAbstractNumber<DataTypeDecimal> {
+
+            /**
+             * Precision and scale for the decimal number
+             */
+            ( options? : { precision: number, scale?: number } ) : DataTypeDecimal;
+            ( precision : number, scale? : number ) : DataTypeDecimal;
+
+        }
+
+        interface DataTypeBoolean extends DataTypeAbstract { }
+
+        interface DataTypeTime extends DataTypeAbstract { }
+
+        interface DataTypeDate extends DataTypeAbstract { }
+
+        interface DataTypeDateOnly extends DataTypeAbstract { }
+
+        interface DataTypeHStore extends DataTypeAbstract { }
+
+        interface DataTypeJSONType extends DataTypeAbstract { }
+
+        interface DataTypeJSONB extends DataTypeAbstract { }
+
+        interface DataTypeNow extends DataTypeAbstract { }
+
+        interface DataTypeBlob extends DataTypeAbstract {
+
+            /**
+             * Length of the blob field.
+             *
+             * Available lengths: `tiny`, `medium`, `long`
+             */
+            ( options? : { length: string } ) : DataTypeBlob;
+            ( length : string ) : DataTypeBlob;
+
+        }
+
+        interface DataTypeRange extends DataTypeAbstract {
+
+            /**
+             * Range field for Postgre
+             *
+             * Accepts subtype any of the ranges
+             */
+            ( options? : { subtype: DataTypeAbstract } ) : DataTypeRange;
+            ( subtype : DataTypeAbstract ) : DataTypeRange;
+
+        }
+
+        interface DataTypeUUID extends DataTypeAbstract { }
+
+        interface DataTypeUUIDv1 extends DataTypeAbstract { }
+
+        interface DataTypeUUIDv4 extends DataTypeAbstract { }
+
+        interface DataTypeVirtual extends DataTypeAbstract { }
+
+        interface DataTypeEnum extends DataTypeAbstract {
+
+            /**
+             * Enum field
+             *
+             * Accepts values
+             */
+            ( options? : { values: string | string[] } ) : DataTypeEnum;
+            ( values : string | string[] ) : DataTypeEnum;
+            ( ...args : string[] ) : DataTypeEnum;
+
+        }
+
+        interface DataTypeArray extends DataTypeAbstract {
+
+            /**
+             * Array field for Postgre
+             *
+             * Accepts type any of the DataTypes
+             */
+            ( options : { type: DataTypeAbstract } ) : DataTypeArray;
+            ( type : DataTypeAbstract ) : DataTypeArray;
+
+        }
+
+        interface DataTypeGeometry extends DataTypeAbstract {
+
+            /**
+             * Geometry field for Postgres
+             */
+            ( type : string, srid? : number ) : DataTypeGeometry;
+
         }
 
         /**
-         * Extension of external project that doesn't have definitions.
+         * A convenience class holding commonly used data types. The datatypes are used when definining a new model
+         * using
+         * `Sequelize.define`, like this:
          *
-         * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+         * ```js
+         * sequelize.define('model', {
+     *   column: DataTypes.INTEGER
+     * })
+         * ```
+         * When defining a model you can just as easily pass a string as type, but often using the types defined here
+         * is
+         * beneficial. For example, using `DataTypes.BLOB`, mean that that column will be returned as an instance of
+         * `Buffer` when being fetched by sequelize.
+         *
+         * Some data types have special properties that can be accessed in order to change the data type.
+         * For example, to get an unsigned integer with zerofill you can do `DataTypes.INTEGER.UNSIGNED.ZEROFILL`.
+         * The order you access the properties in do not matter, so `DataTypes.INTEGER.ZEROFILL.UNSIGNED` is fine as
+         * well. The available properties are listed under each data type.
+         *
+         * To provide a length for the data type, you can invoke it like a function: `INTEGER(2)`
+         *
+         * Three of the values provided here (`NOW`, `UUIDV1` and `UUIDV4`) are special default values, that should not
+         * be used to define types. Instead they are used as shorthands for defining default values. For example, to
+         * get a uuid field with a default value generated following v1 of the UUID standard:
+         *
+         * ```js
+         * sequelize.define('model', {
+     *   uuid: {
+     *     type: DataTypes.UUID,
+     *     defaultValue: DataTypes.UUIDV1,
+     *     primaryKey: true
+     *   }
+     * })
+         * ```
          */
-        interface Validator {
+        interface DataTypes {
+            ABSTRACT : DataTypeAbstract;
+            STRING : DataTypeString;
+            CHAR : DataTypeChar;
+            TEXT : DataTypeText;
+            NUMBER : DataTypeNumber;
+            INTEGER : DataTypeInteger;
+            BIGINT : DataTypeBigInt;
+            FLOAT : DataTypeFloat;
+            TIME : DataTypeTime;
+            DATE : DataTypeDate;
+            DATEONLY: DataTypeDateOnly;
+            BOOLEAN: DataTypeBoolean;
+            NOW: DataTypeNow;
+            BLOB: DataTypeBlob;
+            DECIMAL: DataTypeDecimal;
+            NUMERIC: DataTypeDecimal;
+            UUID: DataTypeUUID;
+            UUIDV1: DataTypeUUIDv1;
+            UUIDV4: DataTypeUUIDv4;
+            HSTORE: DataTypeHStore;
+            JSON: DataTypeJSONType;
+            JSONB: DataTypeJSONB;
+            VIRTUAL: DataTypeVirtual;
+            ARRAY: DataTypeArray;
+            NONE: DataTypeVirtual;
+            ENUM: DataTypeEnum;
+            RANGE: DataTypeRange;
+            REAL: DataTypeReal;
+            DOUBLE: DataTypeDouble,
+            'DOUBLE PRECISION': DataTypeDouble,
+            GEOMETRY: DataTypeGeometry
+        }
+
+        //
+        //  Deferrable
+        // ~~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/deferrable.js
+        //
+
+        /**
+         * Abstract Deferrable interface. Use this if you want to create an interface that has a value any of the
+         * Deferrables that Sequelize supports.
+         */
+        interface DeferrableAbstract {
+
+            /**
+             * Although this is not needed for the definitions itself, we want to make sure that DeferrableAbstract is
+             * not something than can be evaluated to an empty object.
+             */
+            toString() : string;
+            toSql() : string;
+
+        }
+
+        interface DeferrableInitiallyDeferred extends DeferrableAbstract {
+
+            /**
+             * A property that will defer constraints checks to the end of transactions.
+             */
+            () : DeferrableInitiallyDeferred;
+
+        }
+
+        interface DeferrableInitiallyImmediate extends DeferrableAbstract {
+
+            /**
+             * A property that will trigger the constraint checks immediately
+             */
+            () : DeferrableInitiallyImmediate;
+
+        }
+
+        interface DeferrableNot extends DeferrableAbstract {
+
+            /**
+             * A property that will set the constraints to not deferred. This is the default in PostgreSQL and it make
+             * it impossible to dynamically defer the constraints within a transaction.
+             */
+            () : DeferrableNot;
+
+        }
+
+        interface DeferrableSetDeferred extends DeferrableAbstract {
+
+            /**
+             * A property that will trigger an additional query at the beginning of a
+             * transaction which sets the constraints to deferred.
+             *
+             * @param constraints An array of constraint names. Will defer all constraints by default.
+             */
+            ( constraints : Array<string> ) : DeferrableSetDeferred;
+
+        }
+
+        interface DeferrableSetImmediate extends DeferrableAbstract {
+
+            /**
+             * A property that will trigger an additional query at the beginning of a
+             * transaction which sets the constraints to immediately.
+             *
+             * @param constraints An array of constraint names. Will defer all constraints by default.
+             */
+            ( constraints : Array<string> ) : DeferrableSetImmediate;
 
         }
 
         /**
-         * Custom class defined, but no extra methods or functionality even.
+         * A collection of properties related to deferrable constraints. It can be used to
+         * make foreign key constraints deferrable and to set the constaints within a
+         * transaction. This is only supported in PostgreSQL.
+         *
+         * The foreign keys can be configured like this. It will create a foreign key
+         * that will check the constraints immediately when the data was inserted.
+         *
+         * ```js
+         * sequelize.define('Model', {
+         *   foreign_id: {
+         *     type: Sequelize.INTEGER,
+         *     references: {
+         *       model: OtherModel,
+         *       key: 'id',
+         *       deferrable: Sequelize.Deferrable.INITIALLY_IMMEDIATE
+         *     }
+         *   }
+         * });
+         * ```
+         *
+         * The constraints can be configured in a transaction like this. It will
+         * trigger a query once the transaction has been started and set the constraints
+         * to be checked at the very end of the transaction.
+         *
+         * ```js
+         * sequelize.transaction({
+     *   deferrable: Sequelize.Deferrable.SET_DEFERRED
+     * });
+         * ```
          */
-        interface ValidationError extends Error {
+        interface Deferrable {
+            INITIALLY_DEFERRED: DeferrableInitiallyDeferred;
+            INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
+            NOT: DeferrableNot;
+            SET_DEFERRED: DeferrableSetDeferred;
+            SET_IMMEDIATE: DeferrableSetImmediate
+        }
+
+        //
+        //  Errors
+        // ~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/errors.js
+        //
+
+        /**
+         * The Base Error all Sequelize Errors inherit from.
+         */
+        interface BaseError extends ErrorConstructor { }
+
+        interface ValidationError extends BaseError {
+
+            /**
+             * Validation Error. Thrown when the sequelize validation has failed. The error contains an `errors`
+             * property, which is an array with 1 or more ValidationErrorItems, one for each validation that failed.
+             *
+             * @param message Error message
+             * @param errors  Array of ValidationErrorItem objects describing the validation errors
+             */
+            new ( message : string, errors? : Array<ValidationErrorItem> ) : ValidationError;
+
+            /**
+             * Gets all validation error items for the path / field specified.
+             *
+             * @param path The path to be checked for error items
+             */
+            get( path : string ) : Array<ValidationErrorItem>;
 
         }
 
-        interface QueryChainer {
+        interface ValidationErrorItem extends BaseError {
+
             /**
-             * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
-             * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
-             * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
-             * cumbersome, but it is used when you want to run queries in serial.
+             * Validation Error Item
+             * Instances of this class are included in the `ValidationError.errors` property.
+             *
+             * @param message An error message
+             * @param type The type of the validation error
+             * @param path The field that triggered the validation error
+             * @param value The value that generated the error
+             */
+            new ( message : string, type : string, path : string, value : string ) : ValidationErrorItem;
+
+        }
+
+        interface DatabaseError extends BaseError {
+
+            /**
+             * A base class for all database related errors.
+             */
+            new ( parent : Error ) : DatabaseError;
+
+        }
+
+        interface TimeoutError extends DatabaseError {
+
+            /**
+             * Thrown when a database query times out because of a deadlock
+             */
+            new ( parent : Error ) : TimeoutError;
+
+        }
+
+        interface UniqueConstraintError extends DatabaseError {
+
+            /**
+             * Thrown when a unique constraint is violated in the database
+             */
+            new ( options : { parent? : Error, message? : string, errors? : Object } ) : UniqueConstraintError;
+
+        }
+
+        interface ForeignKeyConstraintError extends DatabaseError {
+
+            /**
+             * Thrown when a foreign key constraint is violated in the database
+             */
+            new ( options : { parent? : Error, message? : string, index? : string, fields? : Array<string>, table? : string } ) : ForeignKeyConstraintError;
+
+        }
+
+        interface ExclusionConstraintError extends DatabaseError {
+
+            /**
+             * Thrown when an exclusion constraint is violated in the database
+             */
+            new ( options : { parent? : Error, message? : string, constraint? : string, fields? : Array<string>, table? : string } ) : ExclusionConstraintError;
+
+        }
+
+        interface ConnectionError extends BaseError {
+
+            /**
+             * A base class for all connection related errors.
+             */
+            new ( parent : Error ) : ConnectionError;
+
+        }
+
+        interface ConnectionRefusedError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database is refused
+             */
+            new ( parent : Error ) : ConnectionRefusedError;
+
+        }
+
+        interface AccessDeniedError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database is refused due to insufficient privileges
+             */
+            new ( parent : Error ) : AccessDeniedError;
+
+        }
+
+        interface HostNotFoundError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database has a hostname that was not found
+             */
+            new ( parent : Error ) : HostNotFoundError;
+
+        }
+
+        interface HostNotReachableError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database has a hostname that was not reachable
+             */
+            new ( parent : Error ) : HostNotReachableError;
+
+        }
+
+        interface InvalidConnectionError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database has invalid values for any of the connection parameters
+             */
+            new ( parent : Error ) : InvalidConnectionError;
+
+        }
+
+        interface ConnectionTimedOutError extends ConnectionError {
+
+            /**
+             * Thrown when a connection to a database times out
+             */
+            new ( parent : Error ) : ConnectionTimedOutError;
+
+        }
+
+        /**
+         * Sequelize provides a host of custom error classes, to allow you to do easier debugging. All of these errors
+         * are exposed on the sequelize object and the sequelize constructor. All sequelize errors inherit from the
+         * base JS error object.
+         */
+        interface Errors {
+            Error : BaseError;
+            ValidationError : ValidationError;
+            ValidationErrorItem : ValidationErrorItem;
+            DatabaseError : DatabaseError;
+            TimeoutError : TimeoutError;
+            UniqueConstraintError : UniqueConstraintError;
+            ExclusionConstraintError : ExclusionConstraintError;
+            ForeignKeyConstraintError : ForeignKeyConstraintError;
+            ConnectionError : ConnectionError;
+            ConnectionRefusedError : ConnectionRefusedError;
+            AccessDeniedError : AccessDeniedError;
+            HostNotFoundError : HostNotFoundError;
+            HostNotReachableError : HostNotReachableError;
+            InvalidConnectionError : InvalidConnectionError;
+            ConnectionTimedOutError : ConnectionTimedOutError;
+        }
+
+        //
+        //  Hooks
+        // ~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/hooks.js
+        //
+
+        /**
+         * Options for Sequelize.define. We mostly duplicate the Hooks here, since there is no way to combine the two
+         * interfaces.
+         *
+         * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+         * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
+         * afterBulkUpdate.
+         */
+        interface HooksDefineOptions<TInstance> {
+
+            beforeValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            afterValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            beforeCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
+            afterCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
+            beforeDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            beforeDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            afterDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            afterDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            beforeUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            afterUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
+            beforeBulkCreate? : ( instances : Array<TInstance>, options : Object, fn? : Function ) => any;
+            afterBulkCreate? : ( instances : Array<TInstance>, options : Object, fn? : Function ) => any;
+            beforeBulkDestroy? : ( options : Object, fn? : Function ) => any;
+            beforeBulkDelete? : ( options : Object, fn? : Function ) => any;
+            afterBulkDestroy? : ( options : Object, fn? : Function ) => any;
+            afterBulkDelete? : ( options : Object, fn? : Function ) => any;
+            beforeBulkUpdate? : ( options : Object, fn? : Function ) => any;
+            afterBulkUpdate? : ( options : Object, fn? : Function ) => any;
+            beforeFind? : ( options : Object, fn? : Function ) => any;
+            beforeFindAfterExpandIncludeAll? : ( options : Object, fn? : Function ) => any;
+            beforeFindAfterOptions? : ( options : Object, fn? : Function ) => any;
+            afterFind? : ( instancesOrInstance : Array<TInstance> | TInstance, options : Object,
+                           fn? : Function ) => any;
+
+        }
+
+        /**
+         * Hooks are function that are called before and after  (bulk-) creation/updating/deletion and validation.
+         * Hooks can be added to you models in three ways:
+         *
+         * 1. By specifying them as options in `sequelize.define`
+         * 2. By calling `hook()` with a string and your hook handler function
+         * 3. By calling the function with the same name as the hook you want
+         *
+         * ```js
+         * // Method 1
+         * sequelize.define(name, { attributes }, {
+         *   hooks: {
+         *     beforeBulkCreate: function () {
+         *       // can be a single function
+         *     },
+         *     beforeValidate: [
+         *       function () {},
+         *       function() {} // Or an array of several
+         *     ]
+         *   }
+         * })
+         *
+         * // Method 2
+         * Model.hook('afterDestroy', function () {})
+         *
+         * // Method 3
+         * Model.afterBulkUpdate(function () {})
+         * ```
+         *
+         * @see Sequelize.define
+         */
+        interface Hooks<TInstance> {
+
+            /**
+             * Add a hook to the model
+             *
+             * @param hookType
+             * @param name Provide a name for the hook function. It can be used to remove the hook later or to order
+             *     hooks based on some sort of priority system in the future.
+             * @param fn The hook function
+             *
+             * @alias hook
+             */
+            addHook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
+            addHook( hookType : string, fn : Function ) : Hooks<TInstance>;
+            hook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
+            hook( hookType : string, fn : Function ) : Hooks<TInstance>;
+
+            /**
+             * Remove hook from the model
+             *
+             * @param hookType
+             * @param name
+             */
+            removeHook( hookType : string, name : string ) : Hooks<TInstance>;
+
+            /**
+             * Check whether the mode has any hooks of this type
+             *
+             * @param hookType
+             *
+             * @alias hasHooks
+             */
+            hasHook( hookType : string ) : boolean;
+            hasHooks( hookType : string ) : boolean;
+
+            /**
+             * A hook that is run before validation
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             */
+            beforeValidate( name : string,
+                            fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after validation
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             */
+            afterValidate( name : string,
+                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before creating a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with attributes, options
+             */
+            beforeCreate( name : string,
+                          fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after creating a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with attributes, options
+             */
+            afterCreate( name : string,
+                         fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before destroying a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             * @alias beforeDelete
+             */
+            beforeDestroy( name : string,
+                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeDelete( name : string,
+                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after destroying a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             * @alias afterDelete
+             */
+            afterDestroy( name : string,
+                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterDelete( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before updating a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             */
+            beforeUpdate( name : string,
+                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            beforeUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after updating a single instance
+             *
+             * @param name
+             * @param fn A callback function that is called with instance, options
+             */
+            afterUpdate( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+            afterUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before creating instances in bulk
+             *
+             * @param name
+             * @param fn A callback function that is called with instances, options
+             */
+            beforeBulkCreate( name : string,
+                              fn : ( instances : Array<TInstance>, options : Object, fn? : Function ) => void ): void;
+            beforeBulkCreate( fn : ( instances : Array<TInstance>, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after creating instances in bulk
+             *
+             * @param name
+             * @param fn A callback function that is called with instances, options
+             * @name afterBulkCreate
+             */
+            afterBulkCreate( name : string,
+                             fn : ( instances : Array<TInstance>, options : Object, fn? : Function ) => void ): void;
+            afterBulkCreate( fn : ( instances : Array<TInstance>, options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before destroying instances in bulk
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             *
+             * @alias beforeBulkDelete
+             */
+            beforeBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after destroying instances in bulk
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             *
+             * @alias afterBulkDelete
+             */
+            afterBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            afterBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
+            afterBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            afterBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after updating instances in bulk
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             */
+            beforeBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after updating instances in bulk
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             */
+            afterBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            afterBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before a find (select) query
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             */
+            beforeFind( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeFind( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before a find (select) query, after any { include: {all: ...} } options are expanded
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             */
+            beforeFindAfterExpandIncludeAll( name : string,
+                                             fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeFindAfterExpandIncludeAll( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before a find (select) query, after all option parsing is complete
+             *
+             * @param name
+             * @param fn   A callback function that is called with options
+             */
+            beforeFindAfterOptions( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
+            beforeFindAfterOptions( fn : ( options : Object, fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run after a find (select) query
+             *
+             * @param name
+             * @param fn   A callback function that is called with instance(s), options
+             */
+            afterFind( name : string,
+                       fn : ( instancesOrInstance : Array<TInstance> | TInstance, options : Object,
+                              fn? : Function ) => void ): void;
+            afterFind( fn : ( instancesOrInstance : Array<TInstance> | TInstance, options : Object,
+                              fn? : Function ) => void ): void;
+
+            /**
+             * A hook that is run before a define call
+             *
+             * @param name
+             * @param fn   A callback function that is called with attributes, options
+             */
+            beforeDefine( name : string, fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
+            beforeDefine( fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
+
+            /**
+             * A hook that is run after a define call
+             *
+             * @param name
+             * @param fn   A callback function that is called with factory
+             */
+            afterDefine( name : string, fn : ( model : Model<TInstance, any> ) => void ): void;
+            afterDefine( fn : ( model : Model<TInstance, any> ) => void ): void;
+
+            /**
+             * A hook that is run before Sequelize() call
+             *
+             * @param name
+             * @param fn   A callback function that is called with config, options
+             */
+            beforeInit( name : string, fn : ( config : Object, options : Object ) => void ): void;
+            beforeInit( fn : ( config : Object, options : Object ) => void ): void;
+
+            /**
+             * A hook that is run after Sequelize() call
+             *
+             * @param name
+             * @param fn   A callback function that is called with sequelize
+             */
+            afterInit( name : string, fn : ( sequelize : Sequelize ) => void ): void;
+            afterInit( fn : ( sequelize : Sequelize ) => void ): void;
+
+        }
+
+        //
+        //  Instance
+        // ~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/instance.js
+        //
+
+        /**
+         * Options used for Instance.increment method
+         */
+        interface InstanceIncrementDecrementOptions {
+
+            /**
+             * The number to increment by
+             *
+             * Defaults to 1
+             */
+            by? : number;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * A hash of attributes to describe your search. See above for examples.
+             */
+            where? : WhereOptions | Array<col | and | or | string>;
+
+        }
+
+        /**
+         * Options used for Instance.restore method
+         */
+        interface InstanceRestoreOptions {
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+        }
+
+        /**
+         * Options used for Instance.destroy method
+         */
+        interface InstanceDestroyOptions {
+
+            /**
+             * If set to true, paranoid models will actually be deleted
+             */
+            force? : boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run the query in
+             */
+            transaction? : Transaction;
+
+        }
+
+        /**
+         * Options used for Instance.update method
+         */
+        interface InstanceUpdateOptions extends InstanceSaveOptions, InstanceSetOptions {
+
+            /**
+             * A hash of attributes to describe your search. See above for examples.
+             */
+            where? : WhereOptions | Array<col | and | or | string>;
+
+        }
+
+        /**
+         * Options used for Instance.set method
+         */
+        interface InstanceSetOptions {
+
+            /**
+             * If set to true, field and virtual setters will be ignored
+             */
+            raw? : boolean;
+
+            /**
+             * Clear all previously set data values
+             */
+            reset? : boolean;
+
+        }
+
+        /**
+         * Options used for Instance.save method
+         */
+        interface InstanceSaveOptions {
+
+            /**
+             * An optional array of strings, representing database columns. If fields is provided, only those columns
+             * will be validated and saved.
+             */
+            fields? : Array<string>;
+
+            /**
+             * If true, the updatedAt timestamp will not be updated.
+             *
+             * Defaults to false
+             */
+            silent? : boolean;
+
+            /**
+             * If false, validations won't be run.
+             *
+             * Defaults to true
+             */
+            validate? : boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run the query in
+             */
+            transaction? : Transaction;
+
+        }
+
+        /**
+         * This class represents an single instance, a database row. You might see it referred to as both Instance and
+         * instance. You should not instantiate the Instance class directly, instead you access it using the finder and
+         * creation methods on the model.
+         *
+         * Instance instances operate with the concept of a `dataValues` property, which stores the actual values
+         * represented by the instance. By default, the values from dataValues can also be accessed directly from the
+         * Instance, that is:
+         * ```js
+         * instance.field
+         * // is the same as
+         * instance.get('field')
+         * // is the same as
+         * instance.getDataValue('field')
+         * ```
+         * However, if getters and/or setters are defined for `field` they will be invoked, instead of returning the
+         * value from `dataValues`. Accessing properties directly or using `get` is preferred for regular use,
+         * `getDataValue` should only be used for custom getters.
+         *
+         * @see Sequelize.define for more information about getters and setters
+         */
+        interface Instance<TInstance, TAttributes> {
+
+            /**
+             * Returns true if this instance has not yet been persisted to the database
+             */
+            isNewRecord : boolean;
+
+            /**
+             * Returns the Model the instance was created from.
+             *
+             * @see Model
+             */
+            Model : Model<TInstance, TAttributes>;
+
+            /**
+             * A reference to the sequelize instance
+             */
+            sequelize : Sequelize;
+
+            /**
+             * Get an object representing the query for this instance, use with `options.where`
+             */
+            where() : Object;
+
+            /**
+             * Get the value of the underlying data value
+             */
+            getDataValue( key : string ) : any;
+
+            /**
+             * Update the underlying data value
+             */
+            setDataValue( key : string, value : any ) : void;
+
+            /**
+             * If no key is given, returns all values of the instance, also invoking virtual getters.
+             *
+             * If key is given and a field or virtual getter is present for the key it will call that getter - else it
+             * will return the value for key.
+             *
+             * @param options.plain If set to true, included instances will be returned as plain objects
+             */
+            get( key : string, options? : { plain? : boolean, clone? : boolean } ) : any;
+            get( options? : { plain? : boolean, clone? : boolean } ) : TAttributes;
+
+            /**
+             * Set is used to update values on the instance (the sequelize representation of the instance that is,
+             * remember that nothing will be persisted before you actually call `save`). In its most basic form `set`
+             * will update a value stored in the underlying `dataValues` object. However, if a custom setter function
+             * is defined for the key, that function will be called instead. To bypass the setter, you can pass `raw:
+             * true` in the options object.
+             *
+             * If set is called with an object, it will loop over the object, and call set recursively for each key,
+             * value pair. If you set raw to true, the underlying dataValues will either be set directly to the object
+             * passed, or used to extend dataValues, if dataValues already contain values.
+             *
+             * When set is called, the previous value of the field is stored and sets a changed flag(see `changed`).
+             *
+             * Set can also be used to build instances for associations, if you have values for those.
+             * When using set with associations you need to make sure the property key matches the alias of the
+             * association while also making sure that the proper include options have been set (from .build() or
+             * .find())
+             *
+             * If called with a dot.seperated key on a JSON/JSONB attribute it will set the value nested and flag the
+             * entire object as changed.
+             *
+             * @param options.raw If set to true, field and virtual setters will be ignored
+             * @param options.reset Clear all previously set data values
+             */
+            set( key : string, value : any, options? : InstanceSetOptions ) : TInstance;
+            set( keys : Object, options? : InstanceSetOptions ) : TInstance;
+            setAttributes( key : string, value : any, options? : InstanceSetOptions ) : TInstance;
+            setAttributes( keys : Object, options? : InstanceSetOptions ) : TInstance;
+
+            /**
+             * If changed is called with a string it will return a boolean indicating whether the value of that key in
+             * `dataValues` is different from the value in `_previousDataValues`.
+             *
+             * If changed is called without an argument, it will return an array of keys that have changed.
+             *
+             * If changed is called without an argument and no keys have changed, it will return `false`.
+             */
+            changed( key : string ) : boolean;
+            changed() : boolean | Array<string>;
+
+            /**
+             * Returns the previous value for key from `_previousDataValues`.
+             */
+            previous( key : string ) : any;
+
+            /**
+             * Validate this instance, and if the validation passes, persist it to the database.
+             *
+             * On success, the callback will be called with this instance. On validation error, the callback will be
+             * called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
+             * fields for which validation failed, with the error message for that field.
+             */
+            save( options? : InstanceSaveOptions ) : Promise<TInstance>;
+
+            /**
+             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return
+             * the same object. This is different from doing a `find(Instance.id)`, because that would create and
+             * return a new instance. With this method, all references to the Instance are updated with the new data
+             * and no new objects are created.
+             */
+            reload( options? : FindOptions ) : Promise<TInstance>;
+
+            /**
+             * Validate the attribute of this instance according to validation rules set in the model definition.
+             *
+             * Emits null if and only if validation successful; otherwise an Error instance containing
+             * { field name : [error msgs] } entries.
+             *
+             * @param options.skip An array of strings. All properties that are in this array will not be validated
+             */
+            validate( options? : { skip?: Array<string> } ) : Promise<void>;
+
+            /**
+             * This is the same as calling `set` and then calling `save`.
+             */
+            update( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<TInstance>;
+            update( keys : Object, options? : InstanceUpdateOptions ) : Promise<TInstance>;
+            updateAttributes( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<TInstance>;
+            updateAttributes( keys : Object, options? : InstanceUpdateOptions ) : Promise<TInstance>;
+
+            /**
+             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
+             * either be completely deleted, or have its deletedAt timestamp set to the current time.
+             */
+            destroy( options? : InstanceDestroyOptions ) : Promise<void>;
+
+            /**
+             * Restore the row corresponding to this instance. Only available for paranoid models.
+             */
+            restore( options? : InstanceRestoreOptions ) : Promise<void>;
+
+            /**
+             * Increment the value of one or more columns. This is done in the database, which means it does not use
+             * the values currently stored on the Instance. The increment is done using a
+             * ```sql
+             * SET column = column + X
+             * ```
+             * query. To get the correct value after an increment into the Instance you should do a reload.
+             *
+             *```js
+             * instance.increment('number') // increment number by 1
+             * instance.increment(['number', 'count'], { by: 2 }) // increment number and count by 2
+             * instance.increment({ answer: 42, tries: 1}, { by: 2 }) // increment answer by 42, and tries by 1.
+             *                                                        // `by` is ignored, since each column has its own
+             *                                                        // value
+             * ```
+             *
+             * @param fields If a string is provided, that column is incremented by the value of `by` given in options.
+             *               If an array is provided, the same is true for each column.
+             *               If and object is provided, each column is incremented by the value given.
+             */
+            increment( fields : string | Array<string> | Object,
+                       options? : InstanceIncrementDecrementOptions ) : Promise<TInstance>;
+
+            /**
+             * Decrement the value of one or more columns. This is done in the database, which means it does not use
+             * the values currently stored on the Instance. The decrement is done using a
+             * ```sql
+             * SET column = column - X
+             * ```
+             * query. To get the correct value after an decrement into the Instance you should do a reload.
+             *
+             * ```js
+             * instance.decrement('number') // decrement number by 1
+             * instance.decrement(['number', 'count'], { by: 2 }) // decrement number and count by 2
+             * instance.decrement({ answer: 42, tries: 1}, { by: 2 }) // decrement answer by 42, and tries by 1.
+             *                                                        // `by` is ignored, since each column has its own
+             *                                                        // value
+             * ```
+             *
+             * @param fields If a string is provided, that column is decremented by the value of `by` given in options.
+             *               If an array is provided, the same is true for each column.
+             *               If and object is provided, each column is decremented by the value given
+             */
+            decrement( fields : string | Array<string> | Object,
+                       options? : InstanceIncrementDecrementOptions ) : Promise<TInstance>;
+
+            /**
+             * Check whether all values of this and `other` Instance are the same
+             */
+            equals( other : Instance<any, any> ) : boolean;
+
+            /**
+             * Check if this is eqaul to one of `others` by calling equals
+             */
+            equalsOneOf( others : Array<Instance<any, any>> ) : boolean;
+
+            /**
+             * Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
+             * values gotten from the DB, and apply all custom getters.
+             */
+            toJSON() : TAttributes;
+
+        }
+
+        //
+        //  Model
+        // ~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/model.js
+        //
+
+        /**
+         * Options to pass to Model on drop
+         */
+        interface DropOptions {
+
+            /**
+             * Also drop all objects depending on this table, such as views. Only works in postgres
+             */
+            cascade?: boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging?: boolean | Function;
+
+        }
+
+        /**
+         * Schema Options provided for applying a schema to a model
+         */
+        interface SchemaOptions {
+
+            /**
+             * The character(s) that separates the schema name from the table name
+             */
+            schemaDelimeter? : string,
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : Function | boolean
+
+        }
+
+        /**
+         * Scope Options for Model.scope
+         */
+        interface ScopeOptions {
+
+            /**
+             * The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of arguments.
+             * To apply simple scopes and scope functions with no arguments, pass them as strings. For scope function,
+             * pass an object, with a `method` property. The value can either be a string, if the method does not take
+             * any arguments, or an array, where the first element is the name of the method, and consecutive elements
+             * are arguments to that method. Pass null to remove all scopes, including the default.
+             */
+            method : string | Array<any>;
+
+        }
+
+        /**
+         * Where Complex nested query
+         */
+        interface WhereNested {
+            $and : Array<WhereOptions | WhereLogic>;
+            $or : Array<WhereOptions | WhereLogic>;
+        }
+
+        /**
+         * Nested where Postgre Statement
+         */
+        interface WherePGStatement {
+            $any : Array<string | number>;
+            $all : Array<string | number>;
+        }
+
+        /**
+         * Where Geometry Options
+         */
+        interface WhereGeometryOptions {
+            type: string;
+            coordinates: Array<Array<number> | number>;
+        }
+
+        /**
+         * Logic of where statement
+         */
+        interface WhereLogic {
+            $ne : string | number | WhereLogic;
+            $in : Array<string | number> | literal;
+            $not : boolean | string | number | WhereOptions;
+            $notIn : Array<string | number> | literal;
+            $gte : number | string | Date;
+            $gt : number | string | Date;
+            $lte : number | string | Date;
+            $lt : number | string | Date;
+            $like : string | WherePGStatement;
+            $iLike : string | WherePGStatement;
+            $ilike : string | WherePGStatement;
+            $notLike : string | WherePGStatement;
+            $notILike : string | WherePGStatement;
+            $between : [number, number];
+            ".." : [number, number];
+            $notBetween: [number, number];
+            "!.." : [number, number];
+            $overlap : [number, number];
+            "&&" : [number, number];
+            $contains: any;
+            "@>": any;
+            $contained: any;
+            "<@": any;
+        }
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         *
+         * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
+         * typesafety, but there is no way to pass the tests if we just remove it.
+         */
+        interface WhereOptions {
+            [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
+        }
+
+        /**
+         * Through options for Include Options
+         */
+        interface IncludeThroughOptions {
+
+            /**
+             * Filter on the join model for belongsToMany relations
+             */
+            where? : WhereOptions;
+
+            /**
+             * A list of attributes to select from the join model for belongsToMany relations
+             */
+            attributes? : Array<string>;
+
+        }
+
+        /**
+         * Association Object for Include Options
+         */
+        interface IncludeAssociation {
+            source: Model<any, any>;
+            target: Model<any, any>;
+            identifier: string;
+        }
+
+        /**
+         * Complex include options
+         */
+        interface IncludeOptions {
+
+            /**
+             * The model you want to eagerly load
+             */
+            model? : Model<any, any>;
+
+            /**
+             * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
+             * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
+             */
+                as? : string;
+
+            /**
+             * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
+             */
+            association? : IncludeAssociation;
+
+            /**
+             * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
+             * unless you explicitly set `required: false`
+             */
+            where? : WhereOptions;
+
+            /**
+             * A list of attributes to select from the child model
+             */
+            attributes? : Array<string>;
+
+            /**
+             * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
+             * matching children. True if `include.where` is set, false otherwise.
+             */
+            required? : boolean;
+
+            /**
+             * Through Options
+             */
+            through? : IncludeThroughOptions;
+
+            /**
+             * Load further nested related models
+             */
+            include? : Array<Model<any, any> | IncludeOptions>;
+
+        }
+
+        /**
+         * Options that are passed to any model creating a SELECT query
+         *
+         * A hash of options to describe the scope of the search
+         */
+        interface FindOptions {
+
+            /**
+             * A hash of attributes to describe your search. See above for examples.
+             */
+            where? : WhereOptions | Array<col | and | or | string>;
+
+            /**
+             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
+             * two elements - the first is the name of the attribute in the DB (or some kind of expression such as
+             * `Sequelize.literal`, `Sequelize.fn` and so on), and the second is the name you want the attribute to
+             * have in the returned instance
+             */
+            attributes? : Array<string | [string, string]>;
+
+            /**
+             * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
+             * be returned. Only applies if `options.paranoid` is true for the model.
+             */
+            paranoid?: boolean;
+
+            /**
+             * A list of associations to eagerly load using a left join. Supported is either
+             * `{ include: [ Model1, Model2, ...]}` or `{ include: [{ model: Model1, as: 'Alias' }]}`.
+             * If your association are set up with an `as` (eg. `X.hasMany(Y, { as: 'Z }`, you need to specify Z in
+             * the as attribute when eager loading Y).
+             */
+            include?: Array<Model<any, any> | IncludeOptions>;
+
+            /**
+             * Specifies an ordering. If a string is provided, it will be escaped. Using an array, you can provide
+             * several columns / functions to order by. Each element can be further wrapped in a two-element array. The
+             * first element is the column / function to order by, the second is the direction. For example:
+             * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
+             */
+            order?: string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}> | Array<string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}>>;
+
+            /**
+             * Limit the results
+             */
+            limit?: number;
+
+            /**
+             * Skip the results;
+             */
+            offset?: number;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * Lock the selected rows. Possible options are transaction.LOCK.UPDATE and transaction.LOCK.SHARE.
+             * Postgres also supports transaction.LOCK.KEY_SHARE, transaction.LOCK.NO_KEY_UPDATE and specific model
+             * locks with joins. See [transaction.LOCK for an example](transaction#lock)
+             */
+            lock? : string | { level: string, of: Model<any, any> };
+
+            /**
+             * Return raw result. See sequelize.query for more information.
+             */
+            raw? : boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * having ?!?
+             */
+            having? : WhereOptions;
+
+        }
+
+        /**
+         * Options for Model.count method
+         */
+        interface CountOptions {
+
+            /**
+             * A hash of search attributes.
+             */
+            where? : WhereOptions | Array<string>;
+
+            /**
+             * Include options. See `find` for details
+             */
+            include?: Array<Model<any, any> | IncludeOptions>;
+
+            /**
+             * Apply COUNT(DISTINCT(col))
+             */
+            distinct? : boolean;
+
+            /**
+             * Used in conjustion with `group`
+             */
+            attributes? : Array<string | [string, string]>;
+
+            /**
+             * For creating complex counts. Will return multiple rows as needed.
+             *
+             * TODO: Check?
+             */
+            group? : Object;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            transaction?: Transaction;
+        }
+
+        /**
+         * Options for Model.build method
+         */
+        interface BuildOptions {
+
+            /**
+             * If set to true, values will ignore field and virtual setters.
+             */
+            raw? : boolean;
+
+            /**
+             * Is this record new
+             */
+            isNewRecord? : boolean;
+
+            /**
+             * an array of include options - Used to build prefetched/included model instances. See `set`
+             *
+             * TODO: See set
+             */
+            include? :  Array<Model<any, any> | IncludeOptions>;
+
+        }
+
+        /**
+         * Options for Model.create method
+         */
+        interface CreateOptions extends BuildOptions {
+
+            /**
+             * If set, only columns matching those in fields will be saved
+             */
+            fields? : Array<string>;
+
+            /**
+             * On Duplicate
+             */
+            onDuplicate? : string;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            silent? : boolean;
+
+            returning? : boolean;
+        }
+
+        /**
+         * Options for Model.findOrInitialize method
+         */
+        interface FindOrInitializeOptions<TAttributes> {
+
+            /**
+             * A hash of search attributes.
+             */
+            where : string | WhereOptions;
+
+            /**
+             * Default values to use if building a new instance
+             */
+            defaults? : TAttributes;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+        }
+
+        /**
+         * Options for Model.upsert method
+         */
+        interface UpsertOptions {
+
+            /**
+             * Run validations before the row is inserted
+             */
+            validate? : boolean;
+
+            /**
+             * The fields to insert / update. Defaults to all fields
+             */
+            fields? : Array<string>;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+        }
+
+        /**
+         * Options for Model.bulkCreate method
+         */
+        interface BulkCreateOptions {
+
+            /**
+             * Fields to insert (defaults to all fields)
+             */
+            fields? : Array<string>;
+
+            /**
+             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+             * fails validation
+             */
+            validate? : boolean;
+
+            /**
+             * Run before / after bulk create hooks?
+             */
+            hooks? : boolean;
+
+            /**
+             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if
+             * options.hooks is true.
+             */
+            individualHooks? : boolean;
+
+            /**
+             * Ignore duplicate values for primary keys? (not supported by postgres)
+             *
+             * Defaults to false
+             */
+            ignoreDuplicates? : boolean;
+
+            /**
+             * Fields to update if row key already exists (on duplicate key update)? (only supported by mysql &
+             * mariadb). By default, all fields are updated.
+             */
+            updateOnDuplicate? : Array<string>;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+        }
+
+        /**
+         * The options passed to Model.destroy in addition to truncate
+         */
+        interface TruncateOptions {
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+            /**
+             * Only used in conjuction with TRUNCATE. Truncates  all tables that have foreign-key references to the
+             * named table, or to any tables added to the group due to CASCADE.
+             *
+             * Defaults to false;
+             */
+            cascade? : boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+        }
+
+        /**
+         * Options used for Model.destroy
+         */
+        interface DestroyOptions extends TruncateOptions {
+
+            /**
+             * Filter the destroy
+             */
+            where? : WhereOptions;
+
+            /**
+             * Run before / after bulk destroy hooks?
+             */
+            hooks? : boolean;
+
+            /**
+             * If set to true, destroy will SELECT all records matching the where parameter and will execute before /
+             * after destroy hooks on each row
+             */
+            individualHooks? : boolean;
+
+            /**
+             * How many rows to delete
+             */
+            limit? : number;
+
+            /**
+             * Delete instead of setting deletedAt to current timestamp (only applicable if `paranoid` is enabled)
+             */
+            force? : boolean;
+
+            /**
+             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is
+             * truncated the where and limit options are ignored
+             */
+            truncate? : boolean;
+
+        }
+
+        /**
+         * Options for Model.restore
+         */
+        interface RestoreOptions {
+
+            /**
+             * Filter the restore
+             */
+            where? : WhereOptions;
+
+            /**
+             * Run before / after bulk restore hooks?
+             */
+            hooks? : boolean;
+
+            /**
+             * If set to true, restore will find all records within the where parameter and will execute before / after
+             * bulkRestore hooks on each row
+             */
+            individualHooks? : boolean;
+
+            /**
+             * How many rows to undelete
+             */
+            limit? : number;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+        }
+
+        /**
+         * Options used for Model.update
+         */
+        interface UpdateOptions {
+
+            /**
+             * Options to describe the scope of the search.
+             */
+            where: WhereOptions;
+
+            /**
+             * Fields to update (defaults to all fields)
+             */
+            fields? : Array<string>;
+
+            /**
+             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+             * fails validation.
+             *
+             * Defaults to true
+             */
+            validate? : boolean;
+
+            /**
+             * Run before / after bulk update hooks?
+             *
+             * Defaults to true
+             */
+            hooks? : boolean;
+
+            /**
+             * Whether or not to update the side effects of any virtual setters.
+             *
+             * Defaults to true
+             */
+            sideEffects? : boolean;
+
+            /**
+             * Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs.
+             * A select is needed, because the row data needs to be passed to the hooks
+             *
+             * Defaults to false
+             */
+            individualHooks? : boolean;
+
+            /**
+             * Return the affected rows (only for postgres)
+             */
+            returning? : boolean;
+
+            /**
+             * How many rows to update (only for mysql and mariadb)
+             */
+            limit? : number;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+            /**
+             * Transaction to run query under
+             */
+            transaction? : Transaction;
+
+        }
+
+        /**
+         * Options used for Model.aggregate
+         */
+        interface AggregateOptions extends QueryOptions {
+
+            /**
+             * A hash of search attributes.
+             */
+            where?: WhereOptions;
+
+            /**
+             * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
+             * otherwise defaults to float.
+             */
+            dataType? : DataTypeAbstract | string;
+
+            /**
+             * Applies DISTINCT to the field being aggregated over
+             */
+            distinct? : boolean;
+
+        }
+
+        /**
+         * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
+         * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
+         * already created models can be loaded using `sequelize.import`
+         */
+        interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
+
+            /**
+             * The Instance class
+             */
+            Instance() : Instance<TInstance, TAttributes>;
+
+            /**
+             * Remove attribute from model definition
+             *
+             * @param attribute
+             */
+            removeAttribute( attribute : string ) : void;
+
+            /**
+             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
+             * model instance (this)
+             */
+            sync( options? : SyncOptions ) : Promise<Model<TInstance, TAttributes>>;
+
+            /**
+             * Drop the table represented by this Model
              *
-             * @param emitterOrKlass
-             * @param method
-             * @param params
              * @param options
              */
-            add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
+            drop( options? : DropOptions ) : Promise<void>;
 
             /**
-             * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
-             * began executing as soon as you invoked their methods.
-             */
-            run(): EventEmitter;
-
-            /**
-             * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
+             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table
+             * name
+             * - `"schema"."tableName"`, while the schema will be prepended to the table name for mysql and
+             * sqlite - `'schema.tablename'`.
              *
-             * @param options @see QueryChainerRunSeriallyOptions
+             * @param schema The name of the schema
+             * @param options
              */
-            runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
+            schema( schema : string, options? : SchemaOptions ) : Model<TInstance, TAttributes>;
+
+            /**
+             * Get the tablename of the model, taking schema into account. The method will return The name as a string
+             * if the model has no schema, or an object with `tableName`, `schema` and `delimiter` properties.
+             *
+             * @param options The hash of options from any query. You can use one model to access tables with matching
+             *     schemas by overriding `getTableName` and using custom key/values to alter the name of the table.
+             *     (eg.
+             *     subscribers_1, subscribers_2)
+             * @param options.logging=false A function that gets executed while running the query to log the sql.
+             */
+            getTableName( options? : { logging : Function } ) : string | Object;
+
+            /**
+             * Apply a scope created in `define` to the model. First let's look at how to create scopes:
+             * ```js
+             * var Model = sequelize.define('model', attributes, {
+             *   defaultScope: {
+             *     where: {
+             *       username: 'dan'
+             *     },
+             *     limit: 12
+             *   },
+             *   scopes: {
+             *     isALie: {
+             *       where: {
+             *         stuff: 'cake'
+             *       }
+             *     },
+             *     complexFunction: function(email, accessLevel) {
+             *       return {
+             *         where: {
+             *           email: {
+             *             $like: email
+             *           },
+             *           accesss_level {
+             *             $gte: accessLevel
+             *           }
+             *         }
+             *       }
+             *     }
+             *   }
+             * })
+             * ```
+             * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
+             * your query. Here's a couple of examples:
+             * ```js
+             * Model.findAll() // WHERE username = 'dan'
+             * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
+             * ```
+             *
+             * To invoke scope functions you can do:
+             * ```js
+             * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
+             * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
+             * ```
+             *
+             * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
+             *     model will clear the previous scope.
+             */
+            scope( options? : string | Array<string> | ScopeOptions | WhereOptions ) : Model<TInstance, TAttributes>;
+
+            /**
+             * Search for multiple instances.
+             *
+             * __Simple search using AND and =__
+             * ```js
+             * Model.findAll({
+             *   where: {
+             *     attr1: 42,
+             *     attr2: 'cake'
+             *   }
+             * })
+             * ```
+             * ```sql
+             * WHERE attr1 = 42 AND attr2 = 'cake'
+             *```
+             *
+             * __Using greater than, less than etc.__
+             * ```js
+             *
+             * Model.findAll({
+             *   where: {
+             *     attr1: {
+             *       gt: 50
+             *     },
+             *     attr2: {
+             *       lte: 45
+             *     },
+             *     attr3: {
+             *       in: [1,2,3]
+             *     },
+             *     attr4: {
+             *       ne: 5
+             *     }
+             *   }
+             * })
+             * ```
+             * ```sql
+             * WHERE attr1 > 50 AND attr2 <= 45 AND attr3 IN (1,2,3) AND attr4 != 5
+             * ```
+             * Possible options are: `$ne, $in, $not, $notIn, $gte, $gt, $lte, $lt, $like, $ilike/$iLike, $notLike,
+             * $notILike, '..'/$between, '!..'/$notBetween, '&&'/$overlap, '@>'/$contains, '<@'/$contained`
+             *
+             * __Queries using OR__
+             * ```js
+             * Model.findAll({
+             *   where: Sequelize.and(
+             *     { name: 'a project' },
+             *     Sequelize.or(
+             *       { id: [1,2,3] },
+             *       { id: { gt: 10 } }
+             *     )
+             *   )
+             * })
+             * ```
+             * ```sql
+             * WHERE name = 'a project' AND (id` IN (1,2,3) OR id > 10)
+             * ```
+             *
+             * The success listener is called with an array of instances if the query succeeds.
+             *
+             * @see    {Sequelize#query}
+             */
+            findAll( options? : FindOptions ) : Promise<Array<TInstance>>;
+            all( optionz? : FindOptions ) : Promise<Array<TInstance>>;
+
+            /**
+             * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
+             * always be called with a single instance.
+             */
+            findById( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
+            findByPrimary( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
+
+            /**
+             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
+             * instance.
+             */
+            findOne( options? : FindOptions ) : Promise<TInstance>;
+            find( optionz? : FindOptions ) : Promise<TInstance>;
+
+            /**
+             * Run an aggregation method on the specified field
+             *
+             * @param field The field to aggregate over. Can be a field name or *
+             * @param aggregateFunction The function to use for aggregation, e.g. sum, max etc.
+             * @param options Query options. See sequelize.query for full options
+             * @return Returns the aggregate result cast to `options.dataType`, unless `options.plain` is false, in
+             *     which case the complete data result is returned.
+             */
+            aggregate( field : string, aggregateFunction : Function, options? : AggregateOptions ) : Promise<Object>;
+
+            /**
+             * Count the number of records matching the provided where clause.
+             *
+             * If you provide an `include` option, the number of matching associations will be counted instead.
+             */
+            count( options? : CountOptions ) : Promise<number>;
+
+            /**
+             * Find all the rows matching your query, within a specified offset / limit, and get the total number of
+             * rows matching your query. This is very usefull for paging
+             *
+             * ```js
+             * Model.findAndCountAll({
+             *   where: ...,
+             *   limit: 12,
+             *   offset: 12
+             * }).then(function (result) {
+             *   ...
+             * })
+             * ```
+             * In the above example, `result.rows` will contain rows 13 through 24, while `result.count` will return
+             * the
+             * total number of rows that matched your query.
+             *
+             * When you add includes, only those which are required (either because they have a where clause, or
+             * because
+             * `required` is explicitly set to true on the include) will be added to the count part.
+             *
+             * Suppose you want to find all users who have a profile attached:
+             * ```js
+             * User.findAndCountAll({
+             *   include: [
+             *      { model: Profile, required: true}
+             *   ],
+             *   limit 3
+             * });
+             * ```
+             * Because the include for `Profile` has `required` set it will result in an inner join, and only the users
+             * who have a profile will be counted. If we remove `required` from the include, both users with and
+             * without
+             * profiles will be counted
+             */
+            findAndCount( options? : FindOptions ) : Promise<{ rows : Array<TInstance>, count : number }>;
+            findAndCountAll( options? : FindOptions ) : Promise<{ rows : Array<TInstance>, count : number }>;
+
+            /**
+             * Find the maximum value of field
+             */
+            max( field : string, options? : AggregateOptions ) : Promise<any>;
+
+            /**
+             * Find the minimum value of field
+             */
+            min( field : string, options? : AggregateOptions ) : Promise<any>;
+
+            /**
+             * Find the sum of field
+             */
+            sum( field : string, options? : AggregateOptions ) : Promise<number>;
+
+            /**
+             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+             */
+            build( record? : TAttributes, options? : BuildOptions ) : TInstance;
+
+            /**
+             * Undocumented bulkBuild
+             */
+            bulkBuild( records : Array<TAttributes>, options? : BuildOptions ) : Array<TInstance>;
+
+            /**
+             * Builds a new model instance and calls save on it.
+             */
+            create( values? : TAttributes, options? : CreateOptions ) : Promise<TInstance>;
+
+            /**
+             * Find a row that matches the query, or build (but don't save) the row if none is found.
+             * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
+             */
+            findOrInitialize( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
+            findOrBuild( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
+
+            /**
+             * Find a row that matches the query, or build and save the row if none is found
+             * The successful result of the promise will be (instance, created) - Make sure to use .spread()
+             *
+             * If no transaction is passed in the `options` object, a new transaction will be created internally, to
+             * prevent the race condition where a matching row is created by another connection after the find but
+             * before the insert call. However, it is not always possible to handle this case in SQLite, specifically
+             * if one transaction inserts and another tries to select before the first one has comitted. In this case,
+             * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
+             * will be created instead, and any unique constraint violation will be handled internally.
+             */
+            findOrCreate( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
+
+            /**
+             * Insert or update a single row. An update will be executed if a row which matches the supplied values on
+             * either the primary key or a unique key is found. Note that the unique index must be defined in your
+             * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
+             * because sequelize fails to identify the row that should be updated.
+             *
+             * **Implementation details:**
+             *
+             * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
+             * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
+             *   unique_constraint UPDATE
+             * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
+             * regardless
+             *   of whether the row already existed or not
+             *
+             * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
+             * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
+             * whether the row was inserted or not.
+             */
+            upsert( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
+            insertOrUpdate( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
+
+            /**
+             * Create and insert multiple instances in bulk.
+             *
+             * The success handler is passed an array of instances, but please notice that these may not completely
+             * represent the state of the rows in the DB. This is because MySQL and SQLite do not make it easy to
+             * obtain
+             * back automatically generated IDs and other default values in a way that can be mapped to multiple
+             * records. To obtain Instances for the newly created values, you will need to query for them again.
+             *
+             * @param records List of objects (key/value pairs) to create instances from
+             */
+            bulkCreate( records : Array<TAttributes>, options? : BulkCreateOptions ) : Promise<Array<TInstance>>;
+
+            /**
+             * Truncate all instances of the model. This is a convenient method for Model.destroy({ truncate: true }).
+             */
+            truncate( options? : TruncateOptions ) : Promise<void>;
+
+            /**
+             * Delete multiple instances, or set their deletedAt timestamp to the current time if `paranoid` is enabled.
+             *
+             * @return Promise<number> The number of destroyed rows
+             */
+            destroy( options? : DestroyOptions ) : Promise<number>;
+
+            /**
+             * Restore multiple instances if `paranoid` is enabled.
+             */
+            restore( options? : RestoreOptions ) : Promise<void>;
+
+            /**
+             * Update multiple instances that match the where options. The promise returns an array with one or two
+             * elements. The first element is always the number of affected rows, while the second element is the actual
+             * affected rows (only supported in postgres with `options.returning` true.)
+             */
+            update( values : TAttributes, options : UpdateOptions ) : Promise<[number, Array<TInstance>]>;
+
+            /**
+             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and
+             * their types.
+             */
+            describe() : Promise<Object>;
+
+            /**
+             * Unscope the model
+             */
+            unscoped() : Model<TInstance, TAttributes>;
+
         }
 
+        //
+        //  Query Interface
+        // ~~~~~~~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-interface.js
+        //
+
+        /**
+         * Most of the methods accept options and use only the logger property of the options. That's why the most used
+         * interface type for options in a method is separated here as another interface.
+         */
+        interface QueryInterfaceOptions {
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : boolean | Function;
+
+        }
+
+        /**
+         * The interface that Sequelize uses to talk to all databases.
+         *
+         * This interface is available through sequelize.QueryInterface. It should not be commonly used, but it's
+         * referenced anyway, so it can be used.
+         */
         interface QueryInterface {
 
             /**
              * Returns the dialect-specific sql generator.
+             *
+             * We don't have a definition for the QueryGenerator, because I doubt it is commonly in use separately.
              */
-            QueryGenerator: QueryGenerator;
+            QueryGenerator: any;
 
             /**
              * Queries the schema (table list).
              *
              * @param schema The schema to query. Applies only to Postgres.
              */
-            createSchema(schema?: string): EventEmitter;
+            createSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
 
             /**
              * Drops the specified schema (table).
              *
-             * @param schema The name of the table to drop.
+             * @param schema The schema to query. Applies only to Postgres.
              */
-            dropSchema(schema: string): EventEmitter;
+            dropSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
 
             /**
              * Drops all tables.
              */
-            dropAllSchemas(): EventEmitter;
+            dropAllSchemas( options? : QueryInterfaceOptions ): Promise<void>;
 
             /**
              * Queries all table names in the database.
              *
              * @param options
              */
-            showAllSchemas(options?: QueryOptions): EventEmitter;
+            showAllSchemas( options? : QueryOptions ): Promise<Object>;
+
+            /**
+             * Return database version
+             */
+            databaseVersion( options? : QueryInterfaceOptions ) : Promise<string>;
 
             /**
              * Creates a table with specified attributes.
+             *
              * @param tableName     Name of table to create
              * @param attributes    Hash of attributes, key is attribute name, value is data type
              * @param options       Query options.
-             *
-             * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
              */
-            createTable(tableName: string, attributes: any, options?: QueryOptions): any;
+            createTable( tableName : string | { schema? : string, tableName? : string }, attributes : DefineAttributes,
+                         options? : QueryOptions ): Promise<void>;
 
             /**
              * Drops the specified table.
@@ -1019,562 +2931,793 @@ declare module "sequelize"
              * @param tableName Table name.
              * @param options   Query options, particularly "force".
              */
-            dropTable(tableName: string, options?: QueryOptions): EventEmitter;
-            dropAllTables(options?: QueryOptions): EventEmitter;
-            dropAllEnums(options?: QueryOptions): EventEmitter;
-            renameTable(before: string, after: string): EventEmitter;
-            showAllTables(options?: QueryOptions): EventEmitter;
-            describeTable(tableName: string, options?: QueryOptions): EventEmitter;
-            addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
-            removeColumn(tableName: string, attributeName: string): EventEmitter;
-            changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
-            renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
-            addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
-            showIndex(tableName: string, options?: QueryOptions): EventEmitter;
-            getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
-            removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
-            removeIndex(tableName: string, indexName: string): EventEmitter;
-            insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
-            /**
-             * Inserts several records into the specified table.
-             * @param tableName     Table to insert into.
-             * @param records       Array of key/value pairs to insert as records.
-             * @param options       Query options
-             * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
-             */
-            bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
+            dropTable( tableName : string, options? : QueryOptions ): Promise<void>;
 
-            update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
-            delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
-            select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
-            increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
             /**
-             * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
+             * Drops all tables.
              *
-             * @param tableName
-             * @param triggerName
-             * @param timingType
-             * @param fireOnArray
-             * @param functionName
-             * @param functionParams
-             * @param optionsArray
+             * @param options
              */
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
+            dropAllTables( options? : QueryOptions ): Promise<void>;
+
+            /**
+             * Drops all defined enums
+             *
+             * @param options
+             */
+            dropAllEnums( options? : QueryOptions ): Promise<void>;
+
+            /**
+             * Renames a table
+             */
+            renameTable( before : string, after : string, options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Returns all tables
+             */
+            showAllTables( options? : QueryOptions ) : Promise<Array<string>>;
+
+            /**
+             * Describe a table
+             */
+            describeTable( tableName : string | { schema? : string, tableName? : string },
+                           options? : string | { schema? : string, schemaDelimeter? : string, logging? : boolean | Function } ) : Promise<Object>;
+
+            /**
+             * Adds a new column to a table
+             */
+            addColumn( table : string, key : string, attribute : DefineAttributeColumnOptions | DataTypeAbstract,
+                       options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Removes a column from a table
+             */
+            removeColumn( table : string, attribute : string, options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Changes a column
+             */
+            changeColumn( tableName : string | { schema? : string, tableName? : string }, attributeName : string,
+                          dataTypeOrOptions? : string | DataTypeAbstract | DefineAttributeColumnOptions,
+                          options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Renames a column
+             */
+            renameColumn( tableName : string | { schema? : string, tableName? : string }, attrNameBefore : string,
+                          attrNameAfter : string,
+                          options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Adds a new index to a table
+             */
+            addIndex( tableName : string | Object, attributes : Array<string>, options? : QueryOptions,
+                      rawTablename? : string ) : Promise<void>;
+
+            /**
+             * Shows the index of a table
+             */
+            showIndex( tableName : string | Object, options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Put a name to an index
+             */
+            nameIndexes( indexes : Array<string>, rawTablename : string ) : Promise<void>;
+
+            /**
+             * Returns all foreign key constraints of a table
+             */
+            getForeignKeysForTables( tableNames : string, options? : QueryInterfaceOptions ) : Promise<Object>;
+
+            /**
+             * Removes an index of a table
+             */
+            removeIndex( tableName : string, indexNameOrAttributes : Array<string> | string,
+                         options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Inserts a new record
+             */
+            insert( instance : Instance<any, any>, tableName : string, values : Object,
+                    options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Inserts or Updates a record in the database
+             */
+            upsert( tableName : string, values : Object, updateValues : Object, model : Model<any, any>,
+                    options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Inserts multiple records at once
+             */
+            bulkInsert( tableName : string, records : Array<Object>, options? : QueryOptions,
+                        attributes? : Array<string> | string ) : Promise<Object>;
+
+            /**
+             * Updates a row
+             */
+            update( instance : Instance<any, any>, tableName : string, values : Object, identifier : Object,
+                    options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Updates multiple rows at once
+             */
+            bulkUpdate( tableName : string, values : Object, identifier : Object, options? : QueryOptions,
+                        attributes? : Array<string> | string ) : Promise<Object>;
+
+            /**
+             * Deletes a row
+             */
+            "delete"( instance : Instance<any, any>, tableName : string, identifier : Object,
+                      options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Deletes multiple rows at once
+             */
+            bulkDelete( tableName : string, identifier : Object, options? : QueryOptions,
+                        model? : Model<any, any> ) : Promise<Object>;
+
+            /**
+             * Returns selected rows
+             */
+            select( model : Model<any, any>, tableName : string, options? : QueryOptions ) : Promise<Array<Object>>;
+
+            /**
+             * Increments a row value
+             */
+            increment( instance : Instance<any, any>, tableName : string, values : Object, identifier : Object,
+                       options? : QueryOptions ) : Promise<Object>;
+
+            /**
+             * Selects raw without parsing the string into an object
+             */
+            rawSelect( tableName : string, options : QueryOptions, attributeSelector : string | Array<string>,
+                       model? : Model<any, any> ) : Promise<Array<string>>;
+
+            /**
+             * Postgres only. Creates a trigger on specified table to call the specified function with supplied
+             * parameters.
+             */
+            createTrigger( tableName : string, triggerName : string, timingType : string, fireOnArray : Array<any>,
+                           functionName : string, functionParams : Array<any>, optionsArray : Array<string>,
+                           options? : QueryInterfaceOptions ): Promise<void>;
+
             /**
              * Postgres only. Drops the specified trigger.
-             *
-             * @param tableName
-             * @param triggerName
              */
-            dropTrigger(tableName: string, triggerName: string): EventEmitter;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
-            createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
-            dropFunction(functionName: string, params: Array<any>): EventEmitter;
-            renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
+            dropTrigger( tableName : string, triggerName : string, options? : QueryInterfaceOptions ): Promise<void>;
+
             /**
-             * Escape an identifier (e.g. a table or attribute name). If force is true,
-             * the identifier will be quoted even if the `quoteIdentifiers` option is
-             * false.
+             * Postgres only. Renames a trigger
              */
-            quoteIdentifier(identifier: string, force: boolean): EventEmitter;
-            quoteTable(tableName: string): EventEmitter;
-            quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
-            escape(value: string): EventEmitter;
-            setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
-            setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
-            startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+            renameTrigger( tableName : string, oldTriggerName : string, newTriggerName : string,
+                           options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Postgres only. Create a function
+             */
+            createFunction( functionName : string, params : Array<any>, returnType : string, language : string,
+                            body : string, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Postgres only. Drops a function
+             */
+            dropFunction( functionName : string, params : Array<any>,
+                          options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Postgres only. Rename a function
+             */
+            renameFunction( oldFunctionName : string, params : Array<any>, newFunctionName : string,
+                            options? : QueryInterfaceOptions ) : Promise<void>;
+
+            /**
+             * Escape an identifier (e.g. a table or attribute name). If force is true, the identifier will be quoted
+             * even if the `quoteIdentifiers` option is false.
+             */
+            quoteIdentifier( identifier : string, force : boolean ) : string;
+
+            /**
+             * Escape a table name
+             */
+            quoteTable( identifier : string ) : string;
+
+            /**
+             * Split an identifier into .-separated tokens and quote each part. If force is true, the identifier will be
+             * quoted even if the `quoteIdentifiers` option is false.
+             */
+            quoteIdentifiers( identifiers : string, force : boolean ) : string;
+
+            /**
+             * Escape a value (e.g. a string, number or date)
+             */
+            escape( value? : string | number | Date ) : string;
+
+            /**
+             * Set option for autocommit of a transaction
+             */
+            setAutocommit( transaction : Transaction, value : boolean, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Set the isolation level of a transaction
+             */
+            setIsolationLevel( transaction : Transaction, value : string, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Begin a new transaction
+             */
+            startTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Defer constraints
+             */
+            deferConstraints( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Commit an already started transaction
+             */
+            commitTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Rollback ( revert ) a transaction that has'nt been commited
+             */
+            rollbackTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
+
         }
 
-        interface QueryGenerator {
-            createSchema(schemaName: string): string;
-            dropSchema(schemaName: string): string;
-            showSchemasQuery(): string;
-            addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
-            createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
-            describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
-            dropTableQuery(tableName: string, options?: { cascade: string }): string;
-            renameTableQuery(before: string, after: string): string;
-            showTablesQuery(): string;
-            addColumnQuery(tableName: string, attributes: any): string;
-            removeColumnQuery(tableName: string, attributeName: string): string;
-            changeColumnQuery(tableName: string, attributes: any): string;
-            renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
-            insertQuery(table: string, valueHash: any, modelAttributes: any): string;
-            bulkInsertQuery(tableName: string, attrValueHashes: any): string;
-            updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
-            deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
-            deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
-            /**
-             * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
-             * 
-             * @param tableName
-             * @param attrValueHash
-             * @param where
-             * @param options
-             */
-            incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
-            addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
-            /**
-             * Return indices for a table. Not options may be passed but is not used, so can be anything.
-             * @param tableName
-             * @param options
-             */
-            showIndexQuery(tableName: string, options?: any): string; // options is actually not used
-            removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
-            removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
-            attributesToSQL(attributes: Array<any>): string;
-            findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
-            quoteTable(param: any, as: boolean): string;
-            quote(obj: any, parent: any, force: boolean): string;
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
-            dropTrigger(tableName: string, triggerName: string): string;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
-            createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
-            dropFunction(functionName: string, params: Array<TriggerParam>): string;
-            renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
-            quoteIdentifier(identifier: string, force?: boolean): string;
-            quoteIdentifiers(identifiers: string, force?: boolean): string;
-            /**
-             * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
-             *
-             * @param value
-             * @param field
-             */
-            escape(value: any, field: any): string;
-            getForeignKeysQuery(tableName: string, schemaName: string): string;
-            dropForeignKeyQuery(tableName: string, foreignKey: string): string;
-            selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            setAutocommitQuery(value: boolean): string;
-            setIsolationLevelQuery(value: string): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            startTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            commitTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            rollbackTransactionQuery(options?: any): string;
-            addLimitAndOffset(options: SelectOptions, query?: string): string;
-            getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
-            prependTableNameToHash(tableName: string, hash?: any): string;
-            findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
-            getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
-            isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
-            getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
-            getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
-            arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
-            hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
-            booleanValue(value: boolean): string;
-        }
-
-        interface Schema {
-            tableName: string;
-            table: string;
-            name: string;
-            schema: string;
-            delimiter: string;
-        }
+        //
+        //  Query Types
+        // ~~~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-types.js
+        //
 
         interface QueryTypes {
-            SELECT: string;
-            BULKUPDATE: string;
-            BULKDELETE: string;
+            SELECT: string // 'SELECT'
+            INSERT: string // 'INSERT'
+            UPDATE: string // 'UPDATE'
+            BULKUPDATE: string // 'BULKUPDATE'
+            BULKDELETE: string // 'BULKDELETE'
+            DELETE: string // 'DELETE'
+            UPSERT: string // 'UPSERT'
+            VERSION: string // 'VERSION'
+            SHOWTABLES: string // 'SHOWTABLES'
+            SHOWINDEXES: string // 'SHOWINDEXES'
+            DESCRIBE: string // 'DESCRIBE'
+            RAW: string // 'RAW'
+            FOREIGNKEYS: string // 'FOREIGNKEYS'
         }
 
-        interface ModelManager {
-            daos: Array<Model<any, any>>;
-            sequelize: Sequelize;
-            addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
-            removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
-            getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
-            all: Array<Model<any, any>>;
+        //
+        //  Sequelize
+        // ~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/sequelize.js
+        //
+
+        /**
+         * General column options
+         *
+         * @see Define
+         * @see AssociationForeignKeyOptions
+         */
+        interface ColumnOptions {
 
             /**
-             * Iterate over DAOs in an order suitable for e.g. creating tables. Will
-             * take foreign key constraints into account so that dependencies are visited
-             * before dependents.
-             */
-            forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
-        }
-
-        interface TransactionManager {
-            sequelize: Sequelize;
-            connectorManagers: any;
-            getConnectorManager(uuid?: string): ConnectorManager;
-            releaseConnectionManager(uuid?: string): void;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
-        }
-
-        interface ConnectorManager {
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            afterTransactionSetup(callback: () => void): void;
-            connect(): void;
-            disconnect(): void;
-            reconnect(): void;
-            cleanup(): void;
-        }
-
-        interface Migrator {
-            queryInterface: QueryInterface;
-            migrate(options?: MigratorOptions): EventEmitter;
-            getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
-            findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
-            exec(filename: string, options?: MigratorExecOptions): EventEmitter;
-            getLastMigrationFromDatabase(): EventEmitter;
-            getLastMigrationIdFromDatabase(): EventEmitter;
-            getFormattedDateString(s: string): string;
-            stringToDate(s: string): Date;
-            saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
-            deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
-            execute(options?: MigrationExecuteOptions): EventEmitter;
-            isBefore(date: Date, options?: MigrationCompareOptions): boolean;
-            isAfter(date: Date, options?: MigrationCompareOptions): boolean;
-
-        }
-
-        interface Migration extends QueryInterface {
-            migrator: Migrator;
-            path: string;
-            filename: string;
-            migrationId: number;
-            date: Date;
-            queryInterface: QueryInterface;
-            migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
-
-        }
-
-        interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
-
-        interface EventEmitterT<R> extends NodeJS.EventEmitter {
-            /**
-             * Create a new emitter instance.
-             *
-             * @param handler
-             */
-            new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
-
-            /**
-             * Run the function that was passed when the emitter was instantiated.
-             */
-            run(): EventEmitterT<R>;
-
-            /**
-             * Listen for success events.
-             *
-             * @param onSuccess
-             */
-            success(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             *
-             * @param onSuccess
-             */
-            ok(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError
-             */
-            error(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            fail(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            failure(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): EventEmitterT<R>;
-
-            /**
-             * Proxy every event of this event emitter to another one.
-             *
-             * @param emitter   The event emitter that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
-
-
-        }
-
-        interface Options {
-            /**
-             * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
-             * Default is mysql.
-             */
-            dialect?: string;
-
-            /**
-             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
-             * connecting to a pg database, you should specify 'pg.js' here
-             */
-            dialectModulePath?: string;
-
-            /**
-             * The host of the relational database. Default 'localhost'.
-             */
-            host?: string;
-
-            /**
-             * Integer    The port of the relational database.
-             */
-            port?: number;
-
-            /**
-             * The protocol of the relational database. Default 'tcp'.
-             */
-            protocol?: string;
-
-            /**
-             * Default options for model definitions. See sequelize.define for options.
-             */
-            define?: DefineOptions;
-
-            /**
-             * Default options for sequelize.query
-             */
-            query?: QueryOptions;
-
-            /**
-             * Default options for sequelize.sync
-             */
-            sync?: SyncOptions;
-
-            /**
-             * The timezone used when converting a date from the database into a javascript date. The timezone is also used to 
-             * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time 
-             * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
-             * Default '+00:00'.
-             */
-            timezone?: string;
-
-            /**
-             * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
-             *
-             * Set to "false" to disable logging.
-             */
-            logging?: any;
-
-            /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
-             * A flag that defines if null values should be passed to SQL queries or not.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
-             * queries will be executed immediately.
-             */
-            queue?: boolean;
-
-            /**
-             * The maximum number of queries that should be executed at once if queue is true.
-             */
-            maxConcurrentQueries?: number;
-
-            /**
-             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
-             */
-            native?: boolean;
-
-            /**
-             * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
-             * should be an object (a single server for handling writes), and read an array of object (several servers to
-             * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
-             */
-            replication?: ReplicationOptions;
-
-            /**
-             * Connection pool options.
-             *
-             */
-            pool?: PoolOptions;
-
-            /**
-             * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
-             * Default true.
-             */
-            quoteIdentifiers?: boolean;
-
-            /**
-             * Language. Default "en".
-             */
-            language?: string;
-        }
-
-        interface PoolOptions {
-            maxConnections?: number;
-
-            minConnections?: number;
-
-            /**
-             * The maximum time, in milliseconds, that a connection can be idle before being released.
-             */
-            maxIdleTime?: number;
-
-            /**
-             * A function that validates a connection. Called with client. The default function checks that client is an
-             * object, and that its state is not disconnected.
-             *
-             * Note, this is not documented, and after reading code I'm not sure what client's type is.
-             */
-            validateConnection?: (client?: any) => boolean;
-        }
-
-        interface AttributeOptions {
-            /**
-             * A string or a data type
-             */
-            type?: string;
-
-            /**
-             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
-             * is saved.
+             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an
+             * instance is saved.
              */
             allowNull?: boolean;
 
             /**
-             * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
+             *  If set, sequelize will map the attribute name to a different name in the database
+             */
+            field? : string;
+
+            /**
+             * A literal default value, a JavaScript function, or an SQL function (see `sequelize.fn`)
              */
             defaultValue?: any;
 
+        }
+
+        /**
+         * References options for the column's attributes
+         *
+         * @see AttributeColumnOptions
+         */
+        interface DefineAttributeColumnReferencesOptions {
+
+            /**
+             * If this column references another table, provide it here as a Model, or a string
+             */
+            model?: string | Model<any, any>;
+
+            /**
+             * The column of the foreign table that this column references
+             */
+            key? : string;
+
+            /**
+             * When to check for the foreign key constraing
+             *
+             * PostgreSQL only
+             */
+            deferrable? : Deferrable;
+
+        }
+
+        /**
+         * Column options for the model schema attributes
+         *
+         * @see Attributes
+         */
+        interface DefineAttributeColumnOptions extends ColumnOptions {
+
+            /**
+             * A string or a data type
+             */
+            type: string | DataTypeAbstract;
+
             /**
              * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
-             * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
+             * composite unique index. If multiple columns have the same string, they will be part of the same unique
+             * index
              */
-            unique?: any;
+            unique?: boolean | string | { name: string, msg: string };
 
+            /**
+             * Primary key flag
+             */
             primaryKey?: boolean;
 
             /**
-             * If set, sequelize will map the attribute name to a different name in the database.
+             * Is this field an auto increment field
              */
-            field?: string;
-
             autoIncrement?: boolean;
 
+            /**
+             * Comment for the database
+             */
             comment?: string;
 
             /**
-             * If this column references another table, provide it here as a Model, or a string.
+             * An object with reference configurations
              */
-            references?: any;
-
-            /**
-             * The column of the foreign table that this column references. Default 'id'.
-             */
-            referencesKey?: string;
+            references? : DefineAttributeColumnReferencesOptions;
 
             /**
              * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
+             * NO ACTION
              */
-            onUpdate?: string;
+            onUpdate? : string;
 
             /**
              * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
+             * NO ACTION
              */
-            onDelete?: string;
+            onDelete? : string;
 
             /**
-             * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
+             * Provide a custom getter for this column. Use `this.getDataValue(String)` to manipulate the underlying
+             * values.
              */
-            get?: () => any;
+            get? : () => any;
 
             /**
-             * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
+             * Provide a custom setter for this column. Use `this.setDataValue(String, Value)` to manipulate the
+             * underlying values.
              */
-            set?: (value?: any) => void;
+            set? : ( val : any ) => void;
 
             /**
-             * An object of validations to execute for this column every time the model is saved. Can be either the name of a
-             * validation provided by validator.js, a validation function provided by extending validator.js (see the
-             * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
-             * with the value of the field, and can possibly take a second callback argument, to signal that they are
-             * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
-             * the callback should be called with the error text.
+             * An object of validations to execute for this column every time the model is saved. Can be either the
+             * name of a validation provided by validator.js, a validation function provided by extending validator.js
+             * (see the
+             * `DAOValidator` property for more details), or a custom validation function. Custom validation functions
+             * are called with the value of the field, and can possibly take a second callback argument, to signal that
+             * they are asynchronous. If the validator is sync, it should throw in the case of a failed validation, it
+             * it is async, the callback should be called with the error text.
              */
-            validate?: any;
+            validate? : DefineValidateOptions;
+
+            /**
+             * Usage in object notation
+             *
+             * ```js
+             * sequelize.define('model', {
+             *     states: {
+             *       type:   Sequelize.ENUM,
+             *       values: ['active', 'pending', 'deleted']
+             *     }
+             *   })
+             * ```
+             */
+            values? : Array<string>;
+
         }
 
-        interface ForeignKeyAttributeOptions extends AttributeOptions {
+        /**
+         * Interface for Attributes provided for a column
+         *
+         * @see Sequelize.define
+         */
+        interface DefineAttributes {
+
             /**
-             * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
+             * The description of a database column
              */
-            fieldName: string;
+            [name : string] : string | DataTypeAbstract | DefineAttributeColumnOptions;
+
         }
 
-        interface DefineOptions {
+        /**
+         * Interface for query options
+         *
+         * @see Options
+         */
+        interface QueryOptions {
+
+            /**
+             * If true, sequelize will not try to format the results of the query, or build an instance of a model from
+             * the result
+             */
+            raw?: boolean;
+
+            /**
+             * The transaction that the query should be executed under
+             */
+            transaction?: Transaction;
+
+            /**
+             * The type of query you are executing. The query type affects how results are formatted before they are
+             * passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
+             */
+            type?: string;
+
+            /**
+             * If true, transforms objects with `.` separated property names into nested objects using
+             * [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes
+             * { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`,
+             * unless otherwise specified
+             *
+             * Defaults to false
+             */
+            nest?: boolean;
+
+            /**
+             * Sets the query type to `SELECT` and return a single row
+             */
+            plain?: boolean;
+
+            /**
+             * Either an object of named parameter replacements in the format `:param` or an array of unnamed
+             * replacements to replace `?` in your SQL.
+             */
+            replacements? : Object | Array<string>;
+
+            /**
+             * Force the query to use the write pool, regardless of the query type.
+             *
+             * Defaults to false
+             */
+            useMaster? : boolean;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging? : Function
+
+            /**
+             * A sequelize instance used to build the return instance
+             */
+            instance? : Instance<any, any>;
+
+            /**
+             * A sequelize model used to build the returned model instances (used to be called callee)
+             */
+            model? : Model<any, any>;
+
+            // TODO: force, cascade
+
+        }
+
+        /**
+         * Model validations, allow you to specify format/content/inheritance validations for each attribute of the
+         * model.
+         *
+         * Validations are automatically run on create, update and save. You can also call validate() to manually
+         * validate an instance.
+         *
+         * The validations are implemented by validator.js.
+         */
+        interface DefineValidateOptions {
+
+            /**
+             * is: ["^[a-z]+$",'i'] // will only allow letters
+             * is: /^[a-z]+$/i      // same as the previous example using real RegExp
+             */
+            is?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
+
+            /**
+             * not: ["[a-z]",'i']  // will not allow letters
+             */
+            not?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
+
+            /**
+             * checks for email format (foo@bar.com)
+             */
+            isEmail?: boolean | { msg: string };
+
+            /**
+             * checks for url format (http://foo.com)
+             */
+            isUrl?: boolean | { msg: string };
+
+            /**
+             * checks for IPv4 (129.89.23.1) or IPv6 format
+             */
+            isIP?: boolean | { msg: string };
+
+            /**
+             * checks for IPv4 (129.89.23.1)
+             */
+            isIPv4?: boolean | { msg: string };
+
+            /**
+             * checks for IPv6 format
+             */
+            isIPv6?: boolean | { msg: string };
+
+            /**
+             * will only allow letters
+             */
+            isAlpha?: boolean | { msg: string };
+
+            /**
+             * will only allow alphanumeric characters, so "_abc" will fail
+             */
+            isAlphanumeric?: boolean | { msg: string };
+
+            /**
+             * will only allow numbers
+             */
+            isNumeric?: boolean | { msg: string };
+
+            /**
+             * checks for valid integers
+             */
+            isInt?: boolean | { msg: string };
+
+            /**
+             * checks for valid floating point numbers
+             */
+            isFloat?: boolean | { msg: string };
+
+            /**
+             * checks for any numbers
+             */
+            isDecimal?: boolean | { msg: string };
+
+            /**
+             * checks for lowercase
+             */
+            isLowercase?: boolean | { msg: string };
+
+            /**
+             * checks for uppercase
+             */
+            isUppercase?: boolean | { msg: string };
+
+            /**
+             * won't allow null
+             */
+            notNull?: boolean | { msg: string };
+
+            /**
+             * only allows null
+             */
+            isNull?: boolean | { msg: string };
+
+            /**
+             * don't allow empty strings
+             */
+            notEmpty?: boolean | { msg: string };
+
+            /**
+             * only allow a specific value
+             */
+            equals? : string | { msg: string };
+
+            /**
+             * force specific substrings
+             */
+            contains? : string | { msg: string };
+
+            /**
+             * check the value is not one of these
+             */
+            notIn? : Array<Array<string>> | { msg: string, args: Array<Array<string>> };
+
+            /**
+             * check the value is one of these
+             */
+            isIn? : Array<Array<string>> | { msg: string, args: Array<Array<string>> };
+
+            /**
+             * don't allow specific substrings
+             */
+            notContains? : Array<string> | string | { msg: string, args: Array<string> | string };
+
+            /**
+             * only allow values with length between 2 and 10
+             */
+            len?: [number, number] | { msg: string, args: [number, number] };
+
+            /**
+             * only allow uuids
+             */
+            isUUID?: number | { msg: string, args: number };
+
+            /**
+             * only allow date strings
+             */
+            isDate?: boolean | { msg: string, args: boolean };
+
+            /**
+             * only allow date strings after a specific date
+             */
+            isAfter?: string | { msg: string, args: string };
+
+            /**
+             * only allow date strings before a specific date
+             */
+            isBefore?: string | { msg: string, args: string };
+
+            /**
+             * only allow values
+             */
+            max?: number | { msg: string, args: number };
+
+            /**
+             * only allow values >= 23
+             */
+            min?: number | { msg: string, args: number };
+
+            /**
+             * only allow arrays
+             */
+            isArray?: boolean | { msg: string, args: boolean };
+
+            /**
+             * check for valid credit card numbers
+             */
+            isCreditCard?: boolean | { msg: string, args: boolean };
+
+            /**
+             * custom validations are also possible
+             *
+             * Implementation notes :
+             *
+             * We can't enforce any other method to be a function, so :
+             *
+             * ```typescript
+             * [name: string] : ( value : any ) => boolean;
+             * ```
+             *
+             * doesn't work in combination with the properties above
+             *
+             * @see https://github.com/Microsoft/TypeScript/issues/1889
+             */
+            [name: string] : any;
+
+        }
+
+        /**
+         * Interface for indexes property in DefineOptions
+         *
+         * @see DefineOptions
+         */
+        interface DefineIndexesOptions {
+
+            /**
+             * The name of the index. Defaults to model name + _ + fields concatenated
+             */
+            name? : string,
+
+            /**
+             * Index type. Only used by mysql. One of `UNIQUE`, `FULLTEXT` and `SPATIAL`
+             */
+            index? : string,
+
+            /**
+             * The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and
+             * postgres, and postgres additionally supports GIST and GIN.
+             */
+            method? : string,
+
+            /**
+             * Should the index by unique? Can also be triggered by setting type to `UNIQUE`
+             *
+             * Defaults to false
+             */
+            unique? : boolean,
+
+            /**
+             * PostgreSQL will build the index without taking any write locks. Postgres only
+             *
+             * Defaults to false
+             */
+            concurrently? : boolean,
+
+            /**
+             * An array of the fields to index. Each field can either be a string containing the name of the field,
+             * a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute`
+             * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
+             * should be sorted in), `collate` (the collation (sort order) for the column)
+             */
+            fields? : Array<string|{ attribute: string, length: number, order: string, collate: string }>
+
+        }
+
+        /**
+         * Interface for name property in DefineOptions
+         *
+         * @see DefineOptions
+         */
+        interface DefineNameOptions {
+
+            /**
+             * Singular model name
+             */
+            singular? : string,
+
+            /**
+             * Plural model name
+             */
+            plural? : string,
+
+        }
+
+        /**
+         * Interface for getterMethods in DefineOptions
+         *
+         * @see DefineOptions
+         */
+        interface DefineGetterMethodsOptions {
+            [name: string] : () => any;
+        }
+
+        /**
+         * Interface for setterMethods in DefineOptions
+         *
+         * @see DefineOptions
+         */
+        interface DefineSetterMethodsOptions {
+            [name: string] : ( val : any ) => void;
+        }
+
+        /**
+         * Interface for Define Scope Options
+         *
+         * @see DefineOptions
+         */
+        interface DefineScopeOptions {
+
+            /**
+             * Name of the scope and it's query
+             */
+            [scopeName: string] : FindOptions | Function;
+
+        }
+
+        /**
+         * Options for model definition
+         *
+         * @see Sequelize.define
+         */
+        interface DefineOptions<TInstance> {
+
             /**
              * Define the default search scope to use for this model. Scopes have the same form as the options passed to
              * find / findAll.
@@ -1582,10 +3725,10 @@ declare module "sequelize"
             defaultScope?: FindOptions;
 
             /**
-             * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
-             * scopes are defined, and what you can do with them
+             * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
+             * how scopes are defined, and what you can do with them
              */
-            scopes?: any;
+            scopes?: DefineScopeOptions;
 
             /**
              * Don't persits null values. This means that all columns with null values will not be saved.
@@ -1614,1236 +3757,1232 @@ declare module "sequelize"
             underscoredAll?: boolean;
 
             /**
-             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
-             * dao name will be pluralized. Default false.
+             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name.
+             * Otherwise, the dao name will be pluralized. Default false.
              */
             freezeTableName?: boolean;
 
             /**
-             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
+             * An object with two attributes, `singular` and `plural`, which are used when this model is associated to
+             * others.
              */
-            createdAt?: any;
+            name?: DefineNameOptions;
 
             /**
-             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
+             * Indexes for the provided database table
              */
-            updatedAt?: any;
+            indexes? : Array<DefineIndexesOptions>;
 
             /**
-             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
+             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps
+             * must be true. Not affected by underscored setting.
              */
-            deletedAt?: any;
+            createdAt? : string | boolean;
 
             /**
-             * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
+             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps
+             * must be true. Not affected by underscored setting.
              */
-            tableName?: string;
+            deletedAt? : string | boolean;
 
             /**
-             * Provide getter functions that work like those defined per column. If you provide a getter method with the same
-             * name as a column, it will be used to access the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual getter, that can fetch multiple other values.
+             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps
+             * must be true. Not affected by underscored setting.
              */
-            getterMethods?: any;
+            updatedAt? : string | boolean;
 
             /**
-             * Provide setter functions that work like those defined per column. If you provide a setter method with the same
-             * name as a column, it will be used to update the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
-             * persisted
+             * Defaults to pluralized model name, unless freezeTableName is true, in which case it uses model name
+             * verbatim
              */
-            setterMethods?: any;
+            tableName? : string;
 
             /**
-             * Provide functions that are added to each instance (DAO).
+             * Provide getter functions that work like those defined per column. If you provide a getter method with
+             * the
+             * same name as a column, it will be used to access the value of that column. If you provide a name that
+             * does not match a column, this function will act as a virtual getter, that can fetch multiple other
+             * values
              */
-            instanceMethods?: any;
+            getterMethods? : DefineGetterMethodsOptions;
 
             /**
-             * Provide functions that are added to the model (Model).
+             * Provide setter functions that work like those defined per column. If you provide a setter method with
+             * the
+             * same name as a column, it will be used to update the value of that column. If you provide a name that
+             * does not match a column, this function will act as a virtual setter, that can act on and set other
+             * values, but will not be persisted
              */
-            classMethods?: any;
+            setterMethods? : DefineSetterMethodsOptions;
 
             /**
-             * Default 'public'.
+             * Provide functions that are added to each instance (DAO). If you override methods provided by sequelize,
+             * you can access the original method using `this.constructor.super_.prototype`, e.g.
+             * `this.constructor.super_.prototype.toJSON.apply(this, arguments)`
              */
-            schema?: string;
-            schemaDelimiter?: string;
-            engine?: string;
-            charset?: string;
-            comment?: string;
-            collate?: string;
-            whereCollection?: any;
-            language?: string;
+            instanceMethods? : Object;
 
             /**
-             * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
-             * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-             * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
-             * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
-             * either be a function, or an array of functions.
+             * Provide functions that are added to the model (Model). If you override methods provided by sequelize,
+             * you can access the original method using `this.constructor.prototype`, e.g.
+             * `this.constructor.prototype.find.apply(this, arguments)`
              */
-            hooks?: Hooks;
+            classMethods? : Object;
+
+            schema? : string;
 
             /**
-             * An object of model wide validations. Validations have access to all model values via this. If the validator
-             * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
-             * error.
+             * You can also change the database engine, e.g. to MyISAM. InnoDB is the default.
              */
-            validate?: any;
+            engine? : string;
+
+            charset? : string;
 
             /**
-             * 
+             * Finaly you can specify a comment for the table in MySQL and PG
              */
-            indexes?: Array<DefineIndexOptions>;
-        }
+            comment? : string;
 
-        interface DefineIndexOptions {
-            /**
-             * The name of the index. Defaults to model name + _ + fields concatenated.
-             */
-            name?: string;
-
-            /**
-             * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
-             */
-            type: string;
-
-            /**
-             * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres, 
-             * and postgres additionally supports GIST and GIN.
-             */
-            method: string;
-
-            /**
-             * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE", 
-             * then true).
-             */
-            unique?: boolean;
-
-            /**
-             * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
-             */
-            concurrently?: boolean;
+            collate? : string;
 
             /**
-             * An array of the fields to index. Each field can either be a string containing the name of the field, or an object 
-             * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the 
-             * direction the column should be sorted in), collate (the collation (sort order) for the column)
+             * Set the initial AUTO_INCREMENT value for the table in MySQL.
              */
-            fields: Array<any>;
-        }
+            initialAutoIncrement? : string;
 
-        interface QueryOptions {
             /**
-             * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
-             * result.
+             * An object of hook function that are called before and after certain lifecycle events.
+             * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
+             * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
+             * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
+             * functions and their signatures. Each property can either be a function, or an array of functions.
              */
-            raw?: boolean;
+            hooks? : HooksDefineOptions<TInstance>;
 
             /**
-             * The transaction that the query should be executed under.
+             * An object of model wide validations. Validations have access to all model values via `this`. If the
+             * validator function takes an argument, it is asumed to be async, and is called with a callback that
+             * accepts an optional error.
              */
-            transaction?: Transaction;
+            validate? : DefineValidateOptions;
 
-            /**
-             * The type of query you are executing. The query type affects how results are formatted before they are passed
-             * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
-             * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
-             * are SELECT, BULKUPDATE and BULKDELETE.
-             *
-             * Default is SELECT.
-             */
-            type?: string;
-
-            /**
-             * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
-             * transaction.LOCK.SHARE. See transaction.LOCK for an example.
-             */
-            lock?: string;
-
-            /**
-             * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
-             * type of that field, otherwise defaults to float.
-             */
-            dataType?: any;
-
-            /**
-             * A function that logs sql queries, or false for no logging.
-             */
-            logging?: any;
-
-            /**
-             * If plain is true, then sequelize will only return the first record of the result set. In case of false it will 
-             * all records.
-             */
-            plain?: boolean;
         }
 
+        /**
+         * Sync Options
+         *
+         * @see Sequelize.sync
+         */
         interface SyncOptions {
+
             /**
-             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
-             * Default false.
+             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
              */
             force?: boolean;
 
             /**
-             * A function that logs sql queries, or false for no logging.
+             * Match a regex against the database name before syncing, a safety check for cases where force: true is
+             * used in tests but not live code
              */
-            logging?: any;
+            match?: RegExp;
 
             /**
-             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
-             * Default 'public'.
+             * A function that logs sql queries, or false for no logging
+             */
+            logging?: Function | boolean;
+
+            /**
+             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define
              */
             schema?: string;
+
         }
 
+        interface SetOptions { }
+
+        /**
+         * Connection Pool options
+         *
+         * @see Options
+         */
+        interface PoolOptions {
+
+            /**
+             * Maximum connections of the pool
+             */
+            maxConnections?: number;
+
+            /**
+             * Minimum connections of the pool
+             */
+            minConnections?: number;
+
+            /**
+             * The maximum time, in milliseconds, that a connection can be idle before being released.
+             */
+            maxIdleTime?: number;
+
+            /**
+             * A function that validates a connection. Called with client. The default function checks that client is an
+             * object, and that its state is not disconnected.
+             */
+            validateConnection?: ( client? : any ) => boolean;
+
+        }
+
+        /**
+         * Interface for replication Options in the sequelize constructor
+         *
+         * @see Options
+         */
         interface ReplicationOptions {
-            read?: Array<Server>;
-            write?: Server;
+
+            read?: {
+                host?: string,
+                port?: string | number,
+                username?: string,
+                password?: string,
+                database?: string
+            }
+
+            write?: {
+                host?: string,
+                port?: string | number,
+                username?: string,
+                password?: string,
+                database?: string
+            }
+
         }
 
-        interface Server {
-            host?: string;
-            port?: number;
-            database?: string;
-            username?: string;
-            password?: string;
-        }
+        /**
+         * Options for the constructor of Sequelize main class
+         */
+        interface Options {
 
-        interface DropOptions {
             /**
-             * Also drop all objects depending on this table, such as views. Only works in postgres.
+             * The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql.
              *
-             * Default false.
+             * Defaults to 'mysql'
              */
-            cascade?: boolean;
-        }
-
-        interface SchemaOptions {
-            /**
-             * The character(s) that separates the schema name from the table name. Default '.'.
-             */
-            schemaDelimiter?: string;
-        }
-
-        interface FindOptions {
-            /**
-             * A hash of attributes to describe your search.
-             */
-            where?: any;
+            dialect?: string;
 
             /**
-             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two 
-             * elements - the first is the name of the attribute in the DB (or some kind of expression such as 
-             * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the 
-             * returned instance
+             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of
+             * pg when connecting to a pg database, you should specify 'pg.js' here
              */
-            attributes?: Array<any>;
+            dialectModulePath?: string;
 
             /**
-             * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
-             * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
-             * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
-             * specify attributes to specify what columns to load, where to limit the relations, and include to load further
-             * nested relations
+             * An object of additional options, which are passed directly to the connection library
              */
-            include?: any;
-
-            /**
-             * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
-             * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
-             * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
-             * this way the column will be escaped, but the direction will not.
-             */
-            order?: any;
-
-            limit?: number;
-
-            offset?: number;
-        }
-
-        interface BuildOptions {
-            /**
-             * If set to true, values will ignore field and virtual setters. Default false.
-             */
-            raw?: boolean;
-
-            /**
-             * Default true.
-             */
-            isNewRecord?: boolean;
-
-            /**
-             * Default true.
-             */
-            isDirty?: boolean;
-
-            /**
-             * an array of include options - Used to build prefetched/included model instances. See set.
-             */
-            include?: Array<any>;
-        }
-
-        interface CopyOptions extends BuildOptions {
-            /**
-             * If set, only columns matching those in fields will be saved.
-             */
-            fields?: Array<string>;
+            dialectOptions? : Object;
 
             /**
+             * Only used by sqlite.
              *
+             * Defaults to ':memory:'
              */
-            transaction?: Transaction;
-        }
+            storage? : string;
 
-        interface FindOrCreateOptions extends FindOptions, QueryOptions {
+            /**
+             * The host of the relational database.
+             *
+             * Defaults to 'localhost'
+             */
+            host? : string;
+
+            /**
+             * The port of the relational database.
+             */
+            port? : number;
+
+            /**
+             * The protocol of the relational database.
+             *
+             * Defaults to 'tcp'
+             */
+            protocol? : string;
+
+            /**
+             * Default options for model definitions. See sequelize.define for options
+             */
+            define? : DefineOptions<any>;
+
+            /**
+             * Default options for sequelize.query
+             */
+            query? : QueryOptions;
+
+            /**
+             * Default options for sequelize.set
+             */
+            set? : SetOptions;
+
+            /**
+             * Default options for sequelize.sync
+             */
+            sync? : SyncOptions;
+
+            /**
+             * The timezone used when converting a date from the database into a JavaScript date. The timezone is also
+             * used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP
+             * and other time related functions have in the right timezone. For best cross platform performance use the
+             * format
+             * +/-HH:MM. Will also accept string versions of timezones used by moment.js (e.g. 'America/Los_Angeles');
+             * this is useful to capture daylight savings time changes.
+             *
+             * Defaults to '+00:00'
+             */
+            timezone? : string;
+
+            /**
+             * A function that gets executed everytime Sequelize would log something.
+             *
+             * Defaults to console.log
+             */
+            logging? : boolean | Function;
+
+            /**
+             * A flag that defines if null values should be passed to SQL queries or not.
+             *
+             * Defaults to false
+             */
+            omitNull? : boolean;
+
+            /**
+             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+             *
+             * Defaults to false
+             */
+            native? : boolean;
+
+            /**
+             * Use read / write replication. To enable replication, pass an object, with two properties, read and write.
+             * Write should be an object (a single server for handling writes), and read an array of object (several
+             * servers to handle reads). Each read/write server can have the following properties: `host`, `port`,
+             * `username`, `password`, `database`
+             *
+             * Defaults to false
+             */
+            replication? : ReplicationOptions;
+
+            /**
+             * Connection pool options
+             */
+            pool? : PoolOptions;
+
+            /**
+             * Set to `false` to make table names and attributes case-insensitive on Postgres and skip double quoting of
+             * them.
+             *
+             * Defaults to true
+             */
+            quoteIdentifiers? : boolean;
+
+            /**
+             * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
+             * options.
+             *
+             * Defaults to 'REPEATABLE_READ'
+             */
+            isolationLevel? : string;
 
         }
 
-        interface BulkCreateOptions {
-            /**
-             * Fields to insert (defaults to all fields).
-             */
-            fields?: Array<string>;
+        /**
+         * Sequelize methods that are available both for the static and the instance class of Sequelize
+         */
+        interface SequelizeStaticAndInstance extends Errors {
 
             /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default false.
+             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you
+             * might want to use `Sequelize.Utils._`, which is a reference to the lodash library, if you don't already
+             * have it imported in your project.
              */
-            validate?: boolean;
+            Utils: Utils;
 
             /**
-             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
+             * A modified version of bluebird promises, that allows listening for sql events
              */
-            hooks?: boolean;
+            Promise: typeof Promise;
 
             /**
-             * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
+             * Available query types for use with `sequelize.query`
              */
-            ignoreDuplicates?: boolean;
+            QueryTypes: QueryTypes;
+
+            /**
+             * Exposes the validator.js object, so you can extend it with custom validation functions.
+             * The validator is exposed both on the instance, and on the constructor.
+             */
+            Validator: Validator;
+
+            /**
+             * A Model represents a table in the database. Sometimes you might also see it referred to as model, or
+             * simply as factory. This class should not be instantiated directly, it is created using sequelize.define,
+             * and already created models can be loaded using sequelize.import
+             */
+            Model: Model<any, any>;
+
+            /**
+             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a
+             * transaction
+             */
+            Transaction : TransactionStatic;
+
+            /**
+             * A reference to the deferrable collection. Use this to access the different deferrable options.
+             */
+            Deferrable : Deferrable;
+
+            /**
+             * A reference to the sequelize instance class.
+             */
+            Instance : Instance<any, any>;
+
+            /**
+             * Creates a object representing a database function. This can be used in search queries, both in where and
+             * order parts, and as default values in column definitions. If you want to refer to columns in your
+             * function, you should use `sequelize.col`, so that the columns are properly interpreted as columns and
+             * not a strings.
+             *
+             * Convert a user's username to upper case
+             * ```js
+             * instance.updateAttributes({
+             *   username: self.sequelize.fn('upper', self.sequelize.col('username'))
+             * })
+             * ```
+             * @param fn The function you want to call
+             * @param args All further arguments will be passed as arguments to the function
+             */
+            fn( fn : string, ...args : any[] ) : fn;
+
+            /**
+             * Creates a object representing a column in the DB. This is often useful in conjunction with
+             * `sequelize.fn`, since raw string arguments to fn will be escaped.
+             *
+             * @param col The name of the column
+             */
+            col( col : string ) : col;
+
+            /**
+             * Creates a object representing a call to the cast function.
+             *
+             * @param val The value to cast
+             * @param type The type to cast it to
+             */
+            cast( val : any, type : string ) : cast;
+
+            /**
+             * Creates a object representing a literal, i.e. something that will not be escaped.
+             *
+             * @param val
+             */
+            literal( val : any ) : literal;
+            asIs( val : any ) : literal;
+
+            /**
+             * An AND query
+             *
+             * @param args Each argument will be joined by AND
+             */
+            and( ...args : Array<string | Object> ) : and;
+
+            /**
+             * An OR query
+             *
+             * @param args Each argument will be joined by OR
+             */
+            or( ...args : Array<string|Object> ) : or;
+
+            /**
+             * Creates an object representing nested where conditions for postgres's json data-type.
+             *
+             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+             *     notation or a string using postgres json syntax.
+             * @param value An optional value to compare against. Produces a string of the form "<json path> =
+             *     '<value>'".
+             */
+            json( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
+
+            /**
+             * A way of specifying attr = condition.
+             *
+             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+             * or
+             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+             *
+             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+             * string to be escaped, use `sequelize.literal`.
+             *
+             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+             *     POJO syntax
+             * @param comparator Comparator
+             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+             *     etc.)
+             */
+            where( attr : Object, comparator : string, logic : string | Object ) : where;
+            where( attr : Object, logic : string | Object ) : where;
+            condition( attr : Object, logic : string | Object ) : where;
+
         }
 
-        interface DestroyOptions {
-            /**
-             * If set to true, destroy will find all records within the where parameter and will execute before-/ after
-             * bulkDestroy hooks on each row.
-             */
-            hooks?: boolean;
+        /**
+         * Sequelize methods available only for the static class ( basically this is the constructor and some extends )
+         */
+        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
 
             /**
-             * How many rows to delete
+             * Instantiate sequelize with name of database, username and password
+             *
+             * #### Example usage
+             *
+             * ```javascript
+             * // without password and options
+             * var sequelize = new Sequelize('database', 'username')
+             *
+             * // without options
+             * var sequelize = new Sequelize('database', 'username', 'password')
+             *
+             * // without password / with blank password
+             * var sequelize = new Sequelize('database', 'username', null, {})
+             *
+             * // with password and options
+             * var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+             *
+             * // with uri (see below)
+             * var sequelize = new Sequelize('mysql://localhost:3306/database', {})
+             * ```
+             *
+             * @param database The name of the database
+             * @param username The username which is used to authenticate against the
+             *     database.
+             * @param password The password which is used to authenticate against the
+             *     database.
+             * @param options An object with options.
              */
-            limit?: number;
+            new ( database : string, username : string, password : string, options? : Options ) : Sequelize;
+            new ( database : string, username : string, options? : Options ) : Sequelize;
 
             /**
-             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
-             * where and limit options are ignored.
+             * Instantiate sequelize with an URI
+             * @name Sequelize
+             * @constructor
+             *
+             * @param uri A full database URI
+             * @param options See above for possible options
              */
-            truncate?: boolean;
+            new ( uri : string, options? : Options ) : Sequelize;
+
         }
 
-        interface DestroyInstanceOptions {
+        interface QueryOptionsTransactionRequired { }
+
+        /**
+         * This is the main class, the entry point to sequelize. To use it, you just need to
+         * import sequelize:
+         *
+         * ```js
+         * var Sequelize = require('sequelize');
+         * ```
+         *
+         * In addition to sequelize, the connection library for the dialect you want to use
+         * should also be installed in your project. You don't need to import it however, as
+         * sequelize will take care of that.
+         */
+        interface Sequelize extends SequelizeStaticAndInstance, Hooks<any> {
+
             /**
-             * If set to true, paranoid models will actually be deleted.
+             * A reference to Sequelize constructor from sequelize. Useful for accessing DataTypes, Errors etc.
              */
-            force: boolean;
+            Sequelize: SequelizeStatic;
+
+            /**
+             * Returns the specified dialect.
+             */
+            getDialect() : string;
+
+            /**
+             * Returns an instance of QueryInterface.
+             */
+            getQueryInterface(): QueryInterface;
+
+            /**
+             * Define a new model, representing a table in the DB.
+             *
+             * The table columns are define by the hash that is given as the second argument. Each attribute of the
+             * hash
+             * represents a column. A short table definition might look like this:
+             *
+             * ```js
+             * sequelize.define('modelName', {
+             *     columnA: {
+             *         type: Sequelize.BOOLEAN,
+             *         validate: {
+             *           is: ["[a-z]",'i'],        // will only allow letters
+             *           max: 23,                  // only allow values <= 23
+             *           isIn: {
+             *             args: [['en', 'zh']],
+             *             msg: "Must be English or Chinese"
+             *           }
+             *         },
+             *         field: 'column_a'
+             *         // Other attributes here
+             *     },
+             *     columnB: Sequelize.STRING,
+             *     columnC: 'MY VERY OWN COLUMN TYPE'
+             * })
+             *
+             * sequelize.models.modelName // The model will now be available in models under the name given to define
+             * ```
+             *
+             * As shown above, column definitions can be either strings, a reference to one of the datatypes that are
+             * predefined on the Sequelize constructor, or an object that allows you to specify both the type of the
+             * column, and other attributes such as default values, foreign key constraints and custom setters and
+             * getters.
+             *
+             * For a list of possible data types, see
+             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#data-types
+             *
+             * For more about getters and setters, see
+             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#getters-setters
+             *
+             * For more about instance and class methods, see
+             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#expansion-of-models
+             *
+             * For more about validation, see
+             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#validations
+             *
+             * @param modelName  The name of the model. The model will be stored in `sequelize.models` under this name
+             * @param attributes An object, where each attribute is a column of the table. Each column can be either a
+             *                   DataType, a string or a type-description object, with the properties described below:
+             * @param options    These options are merged with the default define options provided to the Sequelize
+             *                   constructor
+             */
+            define<TInstance, TAttributes>( modelName : string, attributes : DefineAttributes,
+                                            options? : DefineOptions<TInstance> ) : Model<TInstance, TAttributes>;
+
+            /**
+             * Fetch a Model which is already defined
+             *
+             * @param modelName The name of a model defined with Sequelize.define
+             */
+            model<TInstance, TAttributes>( modelName : string ) : Model<TInstance, TAttributes>;
+
+            /**
+             * Checks whether a model with the given name is defined
+             *
+             * @param modelName The name of a model defined with Sequelize.define
+             */
+            isDefined( modelName : string ) : boolean;
+
+            /**
+             * Imports a model defined in another file
+             *
+             * Imported models are cached, so multiple calls to import with the same path will not load the file
+             * multiple times
+             *
+             * See https://github.com/sequelize/sequelize/blob/master/examples/using-multiple-model-files/Task.js for a
+             * short example of how to define your models in separate files so that they can be imported by
+             * sequelize.import
+             *
+             * @param path The path to the file that holds the model you want to import. If the part is relative, it
+             *     will be resolved relatively to the calling file
+             */
+            import<TInstance, TAttributes>( path : string ) : Model<TInstance, TAttributes>;
+
+            /**
+             * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
+             *
+             * By default, the function will return two arguments: an array of results, and a metadata object,
+             * containing number of affected rows etc. Use `.spread` to access the results.
+             *
+             * If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you
+             * can pass in a query type to make sequelize format the results:
+             *
+             * ```js
+             * sequelize.query('SELECT...').spread(function (results, metadata) {
+             *   // Raw query - use spread
+             * });
+             *
+             * sequelize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
+             *   // SELECT query - use then
+             * })
+             * ```
+             *
+             * @param sql
+             * @param options Query options
+             */
+            query( sql : string | { query: string, values: Array<any> }, options? : QueryOptions ) : Promise<any>;
+
+            /**
+             * Execute a query which would set an environment or user variable. The variables are set per connection,
+             * so this function needs a transaction.
+             *
+             * Only works for MySQL.
+             *
+             * @param variables Object with multiple variables.
+             * @param options Query options.
+             */
+            set( variables : Object, options : QueryOptionsTransactionRequired ) : Promise<any>;
+
+            /**
+             * Escape value.
+             *
+             * @param value Value that needs to be escaped
+             */
+            escape( value : string ) : string;
+
+            /**
+             * Create a new database schema.
+             *
+             * Note,that this is a schema in the
+             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+             * not a database table. In mysql and sqlite, this command will do nothing.
+             *
+             * @param schema Name of the schema
+             * @param options Options supplied
+             * @param options.logging A function that logs sql queries, or false for no logging
+             */
+            createSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
+
+            /**
+             * Show all defined schemas
+             *
+             * Note,that this is a schema in the
+             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+             * not a database table. In mysql and sqlite, this will show all tables.
+             *
+             * @param options Options supplied
+             * @param options.logging A function that logs sql queries, or false for no logging
+             */
+            showAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
+
+            /**
+             * Drop a single schema
+             *
+             * Note,that this is a schema in the
+             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+             * not a database table. In mysql and sqlite, this drop a table matching the schema name
+             *
+             * @param schema Name of the schema
+             * @param options Options supplied
+             * @param options.logging A function that logs sql queries, or false for no logging
+             */
+            dropSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
+
+            /**
+             * Drop all schemas
+             *
+             * Note,that this is a schema in the
+             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+             * not a database table. In mysql and sqlite, this is the equivalent of drop all tables.
+             *
+             * @param options Options supplied
+             * @param options.logging A function that logs sql queries, or false for no logging
+             */
+            dropAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
+
+            /**
+             * Sync all defined models to the DB.
+             *
+             * @param options Sync Options
+             */
+            sync( options? : SyncOptions ) : Promise<any>;
+
+            /**
+             * Truncate all tables defined through the sequelize models. This is done
+             * by calling Model.truncate() on each model.
+             *
+             * @param {object} [options] The options passed to Model.destroy in addition to truncate
+             * @param {Boolean|function} [options.transaction]
+             * @param {Boolean|function} [options.logging] A function that logs sql queries, or false for no logging
+             */
+            truncate( options? : DestroyOptions ) : Promise<any>;
+
+            /**
+             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model
+             * @see {Model#drop} for options
+             *
+             * @param options The options passed to each call to Model.drop
+             */
+            drop( options? : DropOptions ) : Promise<any>;
+
+            /**
+             * Test the connection by trying to authenticate
+             *
+             * @param options Query Options for authentication
+             */
+            authenticate( options? : QueryOptions ) : Promise<void>;
+            validate( options? : QueryOptions ) : Promise<void>;
+
+            /**
+             * Start a transaction. When using transactions, you should pass the transaction in the options argument
+             * in order for the query to happen under that transaction
+             *
+             * ```js
+             * sequelize.transaction().then(function (t) {
+             *   return User.find(..., { transaction: t}).then(function (user) {
+             *     return user.updateAttributes(..., { transaction: t});
+             *   })
+             *   .then(t.commit.bind(t))
+             *   .catch(t.rollback.bind(t));
+             * })
+             * ```
+             *
+             * A syntax for automatically committing or rolling back based on the promise chain resolution is also
+             * supported:
+             *
+             * ```js
+             * sequelize.transaction(function (t) { // Note that we use a callback rather than a promise.then()
+             *   return User.find(..., { transaction: t}).then(function (user) {
+             *     return user.updateAttributes(..., { transaction: t});
+             *   });
+             * }).then(function () {
+             *   // Commited
+             * }).catch(function (err) {
+             *   // Rolled back
+             *   console.error(err);
+             * });
+             * ```
+             *
+             * If you have [CLS](https://github.com/othiym23/node-continuation-local-storage) enabled, the transaction
+             * will automatically be passed to any query that runs witin the callback. To enable CLS, add it do your
+             * project, create a namespace and set it on the sequelize constructor:
+             *
+             * ```js
+             * var cls = require('continuation-local-storage'),
+             *     ns = cls.createNamespace('....');
+             * var Sequelize = require('sequelize');
+             * Sequelize.cls = ns;
+             * ```
+             * Note, that CLS is enabled for all sequelize instances, and all instances will share the same namespace
+             *
+             * @param options Transaction Options
+             * @param autoCallback Callback for the transaction
+             */
+            transaction( options : TransactionOptions,
+                         autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
+            transaction( autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
+            transaction() : Promise<Transaction>;
+
+            /**
+             * Close all connections used by this sequelize instance, and free all references so the instance can be
+             * garbage collected.
+             *
+             * Normally this is done on process exit, so you only need to call this method if you are creating multiple
+             * instances, and want to garbage collect some of them.
+             */
+            close() : void;
+
+            /**
+             * Returns the database version
+             */
+            databaseVersion() : Promise<string>;
+
         }
 
-        interface InsertOptions {
-            limit?: number;
-            returning?: string;
-            allowNull?: string;
+        //
+        //  Validator
+        // ~~~~~~~~~~~
+
+        /**
+         * Validator Interface
+         */
+        interface Validator extends IValidatorStatic {
+
+            notEmpty( str : string ) : boolean;
+            len( str : string, min : number, max : number ) : boolean;
+            isUrl( str : string ) : boolean;
+            isIPv6( str : string ) : boolean
+            isIPv4( str : string ) : boolean
+            notIn( str : string, values : Array<string> ) : boolean;
+            regex( str : string, pattern : string, modifiers : string ) : boolean;
+            notRegex( str : string, pattern : string, modifiers : string ) : boolean;
+            isDecimal( str : string ) : boolean;
+            min( str : string, val : number ) : boolean;
+            max( str : string, val : number ) : boolean;
+            not( str : string, pattern : string, modifiers : string ) : boolean;
+            contains( str : string, element : Array<string> ) : boolean;
+            notContains( str : string, element : Array<string> ) : boolean;
+            is( str : string, pattern : string, modifiers : string ) : boolean;
+
         }
 
-        interface UpdateOptions {
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default true.
-             */
-            validate?: boolean;
+        //
+        //  Transaction
+        // ~~~~~~~~~~~~~
+        //
+        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/transaction.js
+        //
+
+        /**
+         * The transaction object is used to identify a running transaction. It is created by calling
+         * `Sequelize.transaction()`.
+         *
+         * To run a query under a transaction, you should pass the transaction in the options object.
+         */
+        interface Transaction {
 
             /**
-             * Run before / after bulkUpdate hooks? Default false.
+             * Possible options for row locking. Used in conjuction with `find` calls:
+             *
+             * @see TransactionStatic
              */
-            hooks?: boolean;
+            LOCK : TransactionLock;
 
             /**
-             * How many rows to update (only for mysql and mariadb).
+             * Commit the transaction
              */
-            limit?: number;
+            commit() : Transaction;
+
+            /**
+             * Rollback (abort) the transaction
+             */
+            rollback() : Transaction;
+
         }
 
-        interface SetOptions {
-            /**
-             * If set to true, field and virtual setters will be ignored. Default false.
-             */
-            raw?: boolean;
+        /**
+         * The transaction static object
+         *
+         * @see Transaction
+         */
+        interface TransactionStatic {
 
             /**
-             * Clear all previously set data values. Default false.
+             * Isolations levels can be set per-transaction by passing `options.isolationLevel` to
+             * `sequelize.transaction`. Default to `REPEATABLE_READ` but you can override the default isolation level
+             * by passing
+             * `options.isolationLevel` in `new Sequelize`.
+             *
+             * The possible isolations levels to use when starting a transaction:
+             *
+             * ```js
+             * {
+             *   READ_UNCOMMITTED: "READ UNCOMMITTED",
+             *   READ_COMMITTED: "READ COMMITTED",
+             *   REPEATABLE_READ: "REPEATABLE READ",
+             *   SERIALIZABLE: "SERIALIZABLE"
+             * }
+             * ```
+             *
+             * Pass in the desired level as the first argument:
+             *
+             * ```js
+             * return sequelize.transaction({
+             *   isolationLevel: Sequelize.Transaction.SERIALIZABLE
+             * }, function (t) {
+             *
+             *  // your transactions
+             *
+             * }).then(function(result) {
+             *   // transaction has been committed. Do something after the commit if required.
+             * }).catch(function(err) {
+             *   // do something with the err.
+             * });
+             * ```
+             *
+             * @see ISOLATION_LEVELS
              */
-            reset?: boolean;
+            ISOLATION_LEVELS : TransactionIsolationLevels;
+
+            /**
+             * Possible options for row locking. Used in conjuction with `find` calls:
+             *
+             * ```js
+             * t1 // is a transaction
+             * t1.LOCK.UPDATE,
+             * t1.LOCK.SHARE,
+             * t1.LOCK.KEY_SHARE, // Postgres 9.3+ only
+             * t1.LOCK.NO_KEY_UPDATE // Postgres 9.3+ only
+             * ```
+             *
+             * Usage:
+             * ```js
+             * t1 // is a transaction
+             * Model.findAll({
+             *   where: ...,
+             *   transaction: t1,
+             *   lock: t1.LOCK...
+             * });
+             * ```
+             *
+             * Postgres also supports specific locks while eager loading by using OF:
+             * ```js
+             * UserModel.findAll({
+             *   where: ...,
+             *   include: [TaskModel, ...],
+             *   transaction: t1,
+             *   lock: {
+             *     level: t1.LOCK...,
+             *     of: UserModel
+             *   }
+             * });
+             * ```
+             * UserModel will be locked but TaskModel won't!
+             */
+            LOCK : TransactionLock;
 
-            include?: any;
         }
 
-        interface SaveOptions {
-            /**
-             * An alternative way of setting which fields should be persisted.
-             */
-            fields?: any;
-
-            /**
-             * If true, the updatedAt timestamp will not be updated. Default false.
-             */
-            silent?: boolean;
-
-            transaction?: Transaction;
+        /**
+         * Isolations levels can be set per-transaction by passing `options.isolationLevel` to `sequelize.transaction`.
+         * Default to `REPEATABLE_READ` but you can override the default isolation level by passing
+         * `options.isolationLevel` in `new Sequelize`.
+         */
+        interface TransactionIsolationLevels {
+            READ_UNCOMMITTED: string; // 'READ UNCOMMITTED'
+            READ_COMMITTED: string; // 'READ COMMITTED'
+            REPEATABLE_READ: string; // 'REPEATABLE READ'
+            SERIALIZABLE: string; // 'SERIALIZABLE'
         }
 
-        interface ValidateOptions {
-            /**
-             * An array of strings. All properties that are in this array will not be validated.
-             */
-            skip: Array<string>;
-        }
-
-        interface IncrementOptions {
-            /**
-             * The number to increment by. Default 1.
-             */
-            by?: number;
-
-            transaction?: Transaction;
-        }
-
-        interface IndexOptions {
-            indicesType?: string;
-            indexType?: string;
-            indexName?: string;
-            parser?: any;
-        }
-
-        interface ProxyOptions {
-            /**
-             * An array of the events to proxy. Defaults to sql, error and success.
-             */
-            events: Array<string>;
-        }
-
-        interface AssociationOptions {
-            /**
-             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
-             * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
-             * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
-             * Default false.
-             */
-            hooks?: boolean;
-
-            /**
-             * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
-             * if you want to define the junction table yourself and add extra attributes to it.
-             */
-            through?: any;
-
-            /**
-             * The alias of this model. If you create multiple associations between the same tables, you should provide an
-             * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
-             * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
-             * version of target.name
-             */
-            as?: string;
-
-            /**
-             * The foreignKey can be either a string name of the foreign key in the target table,
-             * or can be an object defining the foreign key and its options. Note foreignKey is not fully
-             * typed since TypeScript does not support union types--it can be either a string or an
-             * options object. String name defaults to the name of source + primary key of source.
-             * 
-             * @see ForeignKeyAttributeOptions.
-             */
-            foreignKey?: any;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default SET NULL.
-             */
-            onDelete?: string;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default CASCADE.
-             */
-            onUpdate?: string;
-
-            /**
-             * Should on update and on delete constraints be enabled on the foreign key.
-             */
-            constraints?: boolean;
-        }
-
-        interface TriggerOptions {
-            insert?: Array<string>;
-            update?: Array<string>;
-            delete?: Array<string>;
-            truncate?: Array<string>;
-        }
-
-        interface TriggerParam {
-            type: string;
-            direction?: string;
-            name?: string;
-        }
-
-        interface SelectOptions {
-            limit?: number;
-            offset?: number;
-            attributes?: Array<any>;
-            hasIncludeWhere?: boolean;
-            hasIncludeRequired?: boolean;
-            hasMultiAssociation?: boolean;
-            tableAs?: string;
-            table?: string;
-            include?: Array<any>;
-            includeIgnoreAttributes?: boolean;
-            where?: any;
-            /**
-             * String field name or array of strings of field names.
-             */
-            group?: any;
-            having?: any;
-            order?: any;
-            lock?: string;
-        }
-
-        interface HashToWhereConditionsOption {
-            include?: boolean;
-            keysEscaped?: boolean;
-        }
-
-        interface ModelMangerGetDaoOptions {
-            attribute: string;
-        }
-
-        interface ModelManagerForEachDaoOptions {
-            /**
-             * Default true.
-             */
-            reverse: boolean;
-        }
-
-        interface MigratorOptions {
-            /**
-             * A flag that defines if the migrator should get instantiated or not..
-             */
-            force: boolean;
-        }
-
-        interface FindAndCountResult<T> {
-            /**
-             * The matching model instances.
-             */
-            rows?: Array<T>;
-
-            /**
-             * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
-             */
-            count?: number;
-        }
-
-        interface Col {
-            /**
-             * Column name.
-             */
-            col: string;
-        }
-
-        interface Cast {
-            /**
-             * The value to cast.
-             */
-            val: any;
-
-            /**
-             * The type to cast it to.
-             */
-            type: string;
-        }
-
-        interface Literal {
-            val: any;
-        }
-
-        interface And {
-            /**
-             * Each argument (string or object) will be joined by AND.
-             */
-            args: Array<any>;
-        }
-
-        interface Or {
-            /**
-             * Each argument (string or object) will be joined by OR.
-             */
-            args: Array<any>;
-        }
-
-        interface Where {
-            /**
-             * The attribute.
-             */
-            attribute: string;
-
-            /**
-             * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
-             */
-            logic: any;
+        /**
+         * Possible options for row locking. Used in conjuction with `find` calls:
+         */
+        interface TransactionLock {
+            UPDATE: string; // 'UPDATE'
+            SHARE: string; // 'SHARE'
+            KEY_SHARE: string; // 'KEY SHARE'
+            NO_KEY_UPDATE: string; // 'NO KEY UPDATE'
         }
 
+        /**
+         * Options provided when the transaction is created
+         *
+         * @see sequelize.transaction()
+         */
         interface TransactionOptions {
-            /**
-             *
-             */
+
             autocommit?: boolean;
 
             /**
-             * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
+             *  See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
              */
             isolationLevel?: string;
+
+            /**
+             * A function that gets executed while running the query to log the sql.
+             */
+            logging?: Function;
+
         }
 
-        interface QueryChainerRunSeriallyOptions {
-            /**
-             * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
-             */
-            skipOnError: boolean;
+        //
+        //  Utils
+        // ~~~~~~~
+
+        interface fn {
+            clone : fnStatic;
         }
 
-        interface CreateTableQueryOptions {
-            comment?: string;
-            uniqueKeys?: Array<any>;
-            charset?: string;
+        interface fnStatic {
+            /**
+             * @param fn The function you want to call
+             * @param args All further arguments will be passed as arguments to the function
+             */
+            new ( fn : string, ...args : Array<any> ) : fn;
         }
 
-        interface MigratorExecOptions {
-            before?: (migrator: Migrator) => void;
-            after?: (migrator: Migrator) => void;
-            success?: (migrator: Migrator) => void;
+        interface col {
+            col: string;
         }
 
-        interface MigrationExecuteOptions {
-            method: string;
+        interface colStatic {
+            /**
+             * Creates a object representing a column in the DB. This is often useful in conjunction with
+             * `sequelize.fn`, since raw string arguments to fn will be escaped.
+             * @see {Sequelize#fn}
+             *
+             * @param col The name of the column
+             */
+            new ( col : string ) : col;
         }
 
-        interface MigrationCompareOptions {
-            /**
-             * Default false.
-             */
-            withoutEquals: boolean;
+        interface cast {
+            val: any;
+            type: string;
         }
 
-        interface Promise {
+        interface castStatic {
             /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+             * Creates a object representing a call to the cast function.
              *
-             * @param evt Event
-             * @param fct Handler
+             * @param val The value to cast
+             * @param type The type to cast it to
              */
-            on(evt: string, fct: () => void): void;
-
-            /**
-             * Emit an event from the emitter.
-             *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
-             */
-            emit(type: string, ...value: Array<any>): void;
-
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: () => void): Promise;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: () => void): Promise;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            error(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            fail(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            failure(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): Promise;
-
-            /**
-             * Proxy every event of this promise to another one.
-             *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(promise: Promise, options?: ProxyOptions): Promise;
-
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter, 
-             * as opposed to then which will only recieve the first argument.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => void): Promise;
+            new ( val : any, type : string ) : cast;
         }
 
-        interface PromiseT<T> extends Promise {
+        interface literal {
+            val: any;
+        }
+
+        interface literalStatic {
             /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+             * Creates a object representing a literal, i.e. something that will not be escaped.
              *
-             * @param evt Event
-             * @param fct Handler
+             * @param val
              */
-            on(evt: string, fct: (t: T) => void): void;
+            new ( val : any ) : literal;
+        }
 
+        interface and {
+            args: Array<any>;
+        }
+
+        interface andStatic {
             /**
-             * Emit an event from the emitter.
+             * An AND query
              *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
+             * @param args Each argument will be joined by AND
              */
-            emit(type: string, ...value: Array<T>): void;
+            new ( ...args : Array<string | Object> ) : and;
+        }
 
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: (t: T) => void): PromiseT<T>;
+        interface or {
+            args: Array<any>;
+        }
 
+        interface orStatic {
             /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: (t: T) => void): PromiseT<T>;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
+             * An OR query
+             * @see {Model#find}
              *
-             * @param onSQL
+             * @param args Each argument will be joined by OR
              */
-            sql(onSQL: (sql: string) => void): PromiseT<T>;
+            new ( ...args : Array<String|Object> ) : or;
+        }
 
+        interface json {
+            conditions?: Object;
+            path? : string;
+            value? : string | number | boolean;
+        }
+
+        interface jsonStatic {
             /**
-             * Proxy every event of this promise to another one.
+             * Creates an object representing nested where conditions for postgres's json data-type.
+             * @see {Model#find}
              *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+             * @method json
+             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+             *     notation or a string using postgres json syntax.
+             * @param value An optional value to compare against. Produces a string of the form "<json path> =
+             *     '<value>'".
              */
-            proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
+            new ( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
+        }
 
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
+        interface where {
+            attribute : Object;
+            comparator? : string;
+            logic : string | Object;
+        }
 
+        interface whereStatic {
             /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
+             * A way of specifying attr = condition.
+             *
+             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+             * or
+             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+             *
+             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+             * string to be escaped, use `sequelize.literal`.
+             *
+             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+             *     POJO syntax
+             * @param comparator Comparator
+             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+             *     etc.)
              */
-            then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
+            new ( attr : Object, comparator : string, logic : string | Object ) : where;
+            new ( attr : Object, logic : string | Object ) : where;
+        }
 
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+        interface SequelizeLoDash extends _.LoDashStatic {
 
+            camelizeIf( str : string, condition : boolean ): string;
+            underscoredIf( str : string, condition : boolean ): string;
             /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
+             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered
+             * falsey.
+             *
+             * @param arr Array to compact.
              */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
+            compactLite<T>( arr : Array<T> ): Array<T>;
+            matchesDots( dots : string | Array<string>, value : Object ) : ( item : Object ) => boolean;
 
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             * 
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success). 
-             *                          Note that this function will always only be called with one argument, as per 
-             *                          the promises/A spec. For functions that emit multiple arguments 
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => void): Promise;
         }
 
         interface Utils {
-            _: Lodash;
 
-            /**
-             * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
-             * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
-             * @param dialect   SQL Dialect.
-             */
-            format(arr: Array<any>, dialect?: string): string;
-
-            /**
-             * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
-             *
-             * @param sql           String to format.
-             * @param parameters    Key/value hash with values to replace in string.
-             * @param dialect       SQL Dialect
-             */
-            formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
-
-            injectScope(scope: string, merge: boolean): any;
-
-            smartWhere(whereArg: any, dialect: string): any;
-
-            compileSmartWhere(obj: any, dialect: string): Array<any>;
-
-            getWhereLogic(logic: string, val?: any): string;
-
-            isHash(obj: any): boolean;
-
-            hasChanged(attrValue: any, value: any): boolean;
-
-            argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
-
-            /**
-             * Consistently combines two table names such that the alphabetically first name always comes first when combined.
-             *
-             * @param table1
-             * @param table2
-             */
-            combineTableNames(table1: string, table2: string): string;
-
-            singularize(s: string, language?: string): string;
-
-            pluralize(s: string, language: string): string;
+            _ : SequelizeLoDash;
 
             /**
              * Same concept as _.merge, but don't overwrite properties that have already been assigned
              */
-            mergeDefaults: typeof _.merge;
+            mergeDefaults : typeof _.merge;
 
-            lowercaseFirst(str: string): string;
+            lowercaseFirst( str : string ): string;
+            uppercaseFirst( str : string ): string;
+            spliceStr( str : string, index : number, count : number, add : string ): string;
+            camelize( str : string ): string;
+            format( arr : Array<any>, dialect? : string ): string;
+            formatNamedParameters( sql : string, parameters : any, dialect? : string ): string;
+            cloneDeep<T extends Object>( obj : T, fn? : ( value : T ) => any ) : T;
+            mapOptionFieldNames<T extends Object>( options : T, Model : Model<any, any> ) : T;
+            mapValueFieldNames( dataValues : Object, fields : Array<string>, Model : Model<any, any> ) : Object;
+            argsArePrimaryKeys( args : Array<any>, primaryKeys : Object ) : boolean;
+            canTreatArrayAsAnd( arr : Array<any> ) : boolean;
+            combineTableNames( tableName1 : string, tableName2 : string ): string;
+            singularize( s : string ): string;
+            pluralize( s : string ): string;
+            removeCommentsFromFunctionString( s : string ): string;
+            toDefaultValue( value : DataTypeAbstract ): any;
+            toDefaultValue( value : () => DataTypeAbstract ): any;
 
-            uppercaseFirst(str: string): string;
+            /**
+             * Determine if the default value provided exists and can be described
+             * in a db schema using the DEFAULT directive.
+             */
+            defaultValueSchemable( value : any ) : boolean;
 
-            spliceStr(str: string, index: number, count: number, add: string): string;
-
-            camelize(str: string): string;
-
-            removeCommentsFromFunctionString(s: string): string;
-
-            toDefaultValue(value: any): any;
-
-            defaultValueSchemable(value: any): boolean;
-            setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
-            removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
-            firstValueOfHash(obj: any): any;
-            inherit(subClass: any, superClass: any): any;
+            removeNullValuesFromHash( hash : Object, omitNull? : boolean, options? : Object ): any;
+            inherit( subClass : Object, superClass : Object ): Object;
             stack(): string;
-            now(dialect: string): Date;
+            sliceArgs( args : Array<any>, begin? : number ) : Array<any>;
+            now( dialect : string ): Date;
+            tick( f : Function ): void;
+            addTicks( s : string, tickChar? : string ): string;
+            removeTicks( s : string, tickChar? : string ): string;
 
-            /**
-             * Runs provided function on next tick, depending on environment.
-             *
-             * @param f
-             */
-            tick(f: Function): void;
+            fn: fnStatic;
+            col: colStatic;
+            cast: castStatic;
+            literal: literalStatic;
+            and: andStatic;
+            or: orStatic;
+            json: jsonStatic;
+            where: whereStatic;
 
-            /**
-             * Surrounds a string with tick marks while removing all existing tick marks from the string.
-             * @param s         String to tick
-             * @param tickChar  Tick mark. Default `
-             */
-            addTicks(s: string, tickChar?: string): string;
-
-            removeTicks(s: string, tickChar?: string): string;
-
-            generateUUID(): string;
-
-            validateParameter(value: any, expectation: any): boolean;
-
-            CustomEventEmitter: EventEmitter;
-            Promise: Promise;
-            QueryChainer: QueryChainer;
-            Lingo: any; // external project, no definitions yet}
-        }
-
-        interface Lodash extends _.LoDashStatic {
-            camelizeIf(str: string, condition: boolean): string;
-            camelizeIf(str: string, condition: any): string;
-            underscoredIf(str: string, condition: boolean): string;
-            underscoredIf(str: string, condition: any): string;
-            /**
-             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
-             *
-             * @param arr Array to compact.
-             */
-            compactLite<T>(arr: Array<T>): Array<T>;
-        }
-
-        interface MetaPojo {
-            from: string;
-            to: string;
-        }
-        interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
+            validateParameter( value : Object, expectation : Object, options? : Object ) : boolean;
+            formatReferences( obj : Object ) : Object;
+            Promise : typeof Promise;
 
         }
 
-        interface DataTypeStringBase {
-            BINARY: DataTypeString;
-            (length:number, binary?:boolean):DataTypeString;
-            (options:{length?:number; binary?:boolean;}):DataTypeString;
-        }
-
-        interface DataTypeNumberOptions {
-            length?:number;
-            zerofill?:boolean;
-            decimals?:number;
-            precision?:number;
-            scale?:number;
-            unsigned?:boolean;
-        }
-
-        interface DataTypeNumberBase {
-            UNSIGNED: DataTypeNumberBase;
-            ZEROFILL: DataTypeNumberBase;
-            (options: DataTypeNumberOptions): DataTypeNumberBase;
-        }
-
-        interface DataTypeString extends DataTypeStringBase {
-        }
-        interface DataTypeChar extends DataTypeStringBase {
-        }
-
-        interface DataTypeText {
-            (length:string): DataTypeText;
-            (options:{length:string}): DataTypeText;
-        }
-
-        interface DataTypeInteger extends DataTypeNumberBase {
-            (length:number):DataTypeInteger;
-            (options:DataTypeNumberOptions):DataTypeInteger;
-        }
-
-        interface DataTypeBigInt extends DataTypeNumberBase {
-            (length:number):DataTypeBigInt;
-            (options:DataTypeNumberOptions):DataTypeBigInt;
-        }
-
-        interface DataTypeFloat extends DataTypeNumberBase {
-            (length:number, decimals?:number):DataTypeFloat;
-            (options:DataTypeNumberOptions):DataTypeFloat;
-        }
-
-        interface DataTypeReal extends DataTypeNumberBase {
-            (length:number, decimals?:number):DataTypeReal;
-            (options:DataTypeNumberOptions):DataTypeReal;
-        }
-
-        interface DataTypeDouble extends DataTypeNumberBase {
-            (length:number, decimals?:number):DataTypeDouble;
-            (options:DataTypeNumberOptions):DataTypeDouble;
-        }
-
-        interface DataTypeBlob {
-            (length:string):DataTypeBlob;
-            (options:{length:string}):DataTypeBlob;
-        }
-
-        interface DataTypeDecimal extends DataTypeNumberBase {
-            (precision:number, scale:number):DataTypeDecimal;
-            (options:DataTypeNumberOptions):DataTypeDecimal;
-        }
-
-        interface DataTypeRange {
-            (subtype?:any):DataTypeRange;
-            (options:{subtype:any}):DataTypeRange;
-        }
-
-        interface DataTypeVirtual {
-        }
-
-        interface DataTypeEnum {
-            (...values: Array<string>): DataTypeEnum;
-        }
-        interface DataTypeArray {
-            (type?:any):DataTypeArray;
-            (options:{type:any}):DataTypeArray;
-            is(obj:any, type:any):boolean;
-        }
-
-        interface DataTypeHstore {
-        }
-
-        interface DataTypes {
-            ABSTRACT: string;
-            STRING: DataTypeString;
-            CHAR: DataTypeChar;
-            TEXT: DataTypeText;
-            NUMBER: DataTypeNumberBase;
-            INTEGER: DataTypeInteger;
-            BIGINT: DataTypeBigInt;
-            FLOAT: DataTypeFloat;
-            TIME:string;
-            DATE: string;
-            DATEONLY:string;
-            BOOLEAN: string;
-            NOW: string;
-            BLOB: DataTypeBlob;
-            DECIMAL: DataTypeDecimal;
-            NUMERIC: DataTypeDecimal;
-            UUID: string;
-            UUIDV1: string;
-            UUIDV4: string;
-            HSTORE: DataTypeHstore;
-            JSON: string;
-            JSONB: string;
-            VIRTUAL: DataTypeVirtual;
-            ARRAY: DataTypeArray;
-            NONE: DataTypeVirtual;
-            ENUM: DataTypeEnum;
-            RANGE:DataTypeRange;
-            REAL: DataTypeReal;
-            DOUBLE: DataTypeDouble;
-            "DOUBLE PRECISION": DataTypeDouble;
-        }
     }
 
-    var sequelize: sequelize.SequelizeStatic;
+    var sequelize : sequelize.SequelizeStatic;
 
     export = sequelize;
+
 }
diff --git a/serve-favicon/serve-favicon.d.ts b/serve-favicon/serve-favicon.d.ts
index bb19c2f69..19bbb261e 100644
--- a/serve-favicon/serve-favicon.d.ts
+++ b/serve-favicon/serve-favicon.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for serve-favicon 2.1.6
+// Type definitions for serve-favicon 2.2.0
 // Project: https://github.com/expressjs/serve-favicon
 // Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -24,6 +24,8 @@ declare module "serve-favicon" {
         */
         maxAge?: number;
     }): express.RequestHandler;
+    
+    namespace serveFavicon{}
 
     export = serveFavicon;
 }
\ No newline at end of file
diff --git a/sharepoint/SharePoint.d.ts b/sharepoint/SharePoint.d.ts
index 2981718eb..57613b0ee 100644
--- a/sharepoint/SharePoint.d.ts
+++ b/sharepoint/SharePoint.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SharePoint 2010 and 2013
+// Type definitions for SharePoint 2010 and 2013
 // Project: http://sptypescript.codeplex.com
 // Definitions by: Stanislav Vyshchepan <http://blog.gandjustas.ru>, Andrey Markeev <http://markeev.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -72,7 +72,7 @@ declare module SP {
         static isUndefined(obj: any): boolean;
         static replaceOrAddQueryString(url: string, key: string, value: string): string;
         static removeHtml(str: string): string;
-        static removeStyleChildren(element: HTMLElement): any;
+        static removeStyleChildren(element: HTMLElement): void;
         static removeHtmlAndTrimStringWithEllipsis(str: string, maxLength: number): string;
         static setTextAreaElementValue(textAreaElement: HTMLTextAreaElement, newValue: string): void;
         static truncateToInt(n: number): number;
@@ -116,12 +116,12 @@ declare module SP {
             export function refreshView(viewId: string): void;
         }
         export module Selection {
-            export function selectListItem(iid: string, bSelect: boolean): any;
+            export function selectListItem(iid: string, bSelect: boolean): void;
             export function getSelectedItems(): { id: number; fsObjType: FileSystemObjectType; }[];
             export function getSelectedList(): string;
             export function getSelectedView(): string;
             export function navigateUp(viewId: string): void;
-            export function deselectAllListItems(iid: string): any;
+            export function deselectAllListItems(iid: string): void;
         }
         export module Overrides {
             export function overrideDeleteConfirmation(listId: string, overrideText: string): void;
@@ -321,7 +321,7 @@ interface ContextInfo extends SPClientTemplates.RenderContext {
 }
 
 declare function GetCurrentCtx(): ContextInfo;
-declare function SetFullScreenMode(fullscreen: boolean): any;
+declare function SetFullScreenMode(fullscreen: boolean): void;
 declare module SP {
     export enum RequestExecutorErrors {
         requestAbortedOrTimedout,
@@ -348,7 +348,7 @@ declare module SP {
         method?: string;
         headers?: { [key: string]: string; };
         /** Can be string or bytearray depending on binaryStringRequestBody field */
-        body?: string|Uint8Array;
+        body?: string | Uint8Array;
         binaryStringRequestBody?: boolean;
 
         /** Currently need fix to get ginary response. Details: http://techmikael.blogspot.ru/2013/07/how-to-copy-files-between-sites-using.html */
@@ -367,7 +367,7 @@ declare module SP {
         headers?: { [key: string]: string; };
         contentType?: string;
         /** Can be string or bytearray depending on request.binaryStringResponseBody field */
-        body?: string|Uint8Array;
+        body?: string | Uint8Array;
         state?: any;
     }
 
@@ -651,7 +651,7 @@ declare class CalloutActionMenuEntry {
 
 declare class CalloutActionMenu {
     constructor(actionsId: any);
-    addAction(action: CalloutAction): any;
+    addAction(action: CalloutAction): void;
     getActions(): CalloutAction[];
     render(): void;
     refreshActions(): void;
@@ -664,9 +664,9 @@ declare class CalloutAction {
     getText(): string;
     getToolTop(): string;
     getDisabledToolTip(): string;
-    getOnClickCallback(): (event: any, action: CalloutAction) => any;
-    getIsDisabledCallback(): (action: CalloutAction) => boolean;
-    getIsVisibleCallback(): (action: CalloutAction) => boolean;
+    getOnClickCallback(event: any, action: CalloutAction): any;
+    getIsDisabledCallback(action: CalloutAction): boolean;
+    getIsVisibleCallback(action: CalloutAction): boolean;
     getIsMenu(): boolean;
     getMenuEntries(): CalloutActionMenuEntry[];
     render(): void;
@@ -680,7 +680,7 @@ declare class Callout {
     set(options: CalloutOptions): any;
     /** Adds event handler to the callout.
         @param eventName one of the following: "opened", "opening", "closing", "closed" */
-    addEventCallback(eventName: string, callback: (callout: Callout) => void): any;
+    addEventCallback(eventName: string, callback: (callout: Callout) => void): void;
     /** Returns the launch point element of the callout. */
     getLaunchPoint(): HTMLElement;
     /** Returns the ID of the callout. */
@@ -714,13 +714,13 @@ declare class Callout {
     /** Returns the callout actions menu */
     getActionMenu(): CalloutActionMenu;
     /** Adds a link to the actions panel in the bottom part of the callout window */
-    addAction(action: CalloutAction): any;
+    addAction(action: CalloutAction): void;
     /** Re-renders the actions menu. Call after the actions menu is changed. */
     refreshActions(): void;
     /** Display the callout. Animation can be used only for IE9+ */
-    open(useAnimation?: boolean): any;
+    open(useAnimation: boolean): void;
     /** Hide the callout. Animation can be used only for IE9+ */
-    close(useAnimation?: boolean): any;
+    close(useAnimation: boolean): void;
     /** Display if hidden, hide if shown. */
     toggle(): void;
     /** Do not call this directly. Instead, use CalloutManager.remove */
@@ -774,7 +774,7 @@ declare class CalloutManager {
     /** Checks if callout with specified ID already exists. If it doesn't, creates it, otherwise returns the existing one. */
     static createNewIfNecessary(options: CalloutOptions): Callout;
     /** Detaches callout from the launch point and destroys it. */
-    static remove(callout: Callout): any;
+    static remove(callout: Callout): void;
     /** Searches for a callout associated with the specified launch point. Throws error if not found. */
     static getFromLaunchPoint(launchPoint: HTMLElement): Callout;
     /** Searches for a callout associated with the specified launch point. Returns null if not found. */
@@ -785,7 +785,7 @@ declare class CalloutManager {
     /** Finds the closest launch point based on the specified descendant element, and returns callout associated with the launch point. */
     static getFromCalloutDescendant(descendant: HTMLElement): Callout;
     /** Perform some action for each callout on the page. */
-    static forEach(callback: (callout: Callout) => void): any;
+    static forEach(callback: (callout: Callout) => void): void;
     /** Closes all callouts on the page */
     static closeAll(): boolean;
     /** Returns true if at least one of the defined on page callouts is opened. */
@@ -1346,15 +1346,15 @@ declare module SPClientTemplates {
         View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
         Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template 
         /** Defines templates for rendering groups (aggregations). */
-        Group?: GroupCallback| string;
+        Group?: GroupCallback | string;
         /** Defines templates for list items rendering. */
-        Item?: ItemCallback| string;
+        Item?: ItemCallback | string;
         /** Defines template for rendering list view header.
             Can be either string or SingleTemplateCallback */
-        Header?: SingleTemplateCallback| string;
+        Header?: SingleTemplateCallback | string;
         /** Defines template for rendering list view footer.
             Can be either string or SingleTemplateCallback */
-        Footer?: SingleTemplateCallback| string;
+        Footer?: SingleTemplateCallback | string;
         /** Defines templates for fields rendering. The field is specified by it's internal name. */
         Fields?: FieldTemplates;
     }
@@ -1367,15 +1367,15 @@ declare module SPClientTemplates {
         View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
         Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template 
         /** Defines templates for rendering groups (aggregations). */
-        Group?: GroupCallback| string;
+        Group?: GroupCallback | string;
         /** Defines templates for list items rendering. */
-        Item?: ItemCallback| string;
+        Item?: ItemCallback | string;
         /** Defines template for rendering list view header.
             Can be either string or SingleTemplateCallback */
-        Header?: SingleTemplateCallback| string;
+        Header?: SingleTemplateCallback | string;
         /** Defines template for rendering list view footer.
             Can be either string or SingleTemplateCallback */
-        Footer?: SingleTemplateCallback| string;
+        Footer?: SingleTemplateCallback | string;
         /** Defines templates for fields rendering. The field is specified by it's internal name. */
         Fields?: FieldTemplateMap;
     }
@@ -1397,7 +1397,7 @@ declare module SPClientTemplates {
         ListTemplateType?: number;
         /** Base view ID (SPView.BaseViewID) for which the template should be applied.
             If not defined, the templates will be applied to all views. */
-        BaseViewID?: number|string;
+        BaseViewID?: number | string;
     }
     export class TemplateManager {
         static RegisterTemplateOverrides(renderCtx: TemplateOverridesOptions): void;
@@ -1481,7 +1481,7 @@ declare module SPClientTemplates {
         registerGetValueCallback(fieldname: string, callback: () => any): void;
         updateControlValue(fieldname: string, value: any): void;
         registerClientValidator(fieldname: string, validator: SPClientForms.ClientValidation.ValidatorSet): void;
-        registerHasValueChangedCallback(fieldname: string, callback: (eventArg?: any) => void): any;
+        registerHasValueChangedCallback(fieldname: string, callback: (eventArg?: any) => void): void;
     }
 
 }
@@ -1499,7 +1499,7 @@ declare module SPClientForms {
         }
 
         export class ValidatorSet {
-            public RegisterValidator(validator: IValidator): any;
+            public RegisterValidator(validator: IValidator): void;
         }
 
         export interface IValidator {
@@ -1509,6 +1509,43 @@ declare module SPClientForms {
         export class RequiredValidator implements IValidator {
             Validate(value: any): ValidationResult;
         }
+
+        export class RequiredFileValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class RequiredRichTextValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class MaxLengthUrlValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+
+    }
+
+    export enum FormManagerEvents {
+        Event_OnControlValueChanged,//: 1,
+        Event_OnControlInitializedCallback,//: 2,
+        Event_OnControlFocusSetCallback,//: 3,
+        Event_GetControlValueCallback,//: 4,
+        Event_OnControlValidationError,//: 5,
+        Event_RegisterControlValidator,//: 6,
+        Event_GetHasValueChangedCallback//: 7
+    }
+
+    export class ClientForm {
+        constructor(qualifier: string);
+        RenderClientForm(): void;
+        SubmitClientForm(): boolean;
+        NotifyControlEvent(eventName: FormManagerEvents, fldName: string, eventArg: any): void;
+    }
+
+    export class ClientFormManager {
+        static GetClientForm(qualifier: string): ClientForm;
+        static RegisterClientForm(qualifier: string): void;
+        static SubmitClientForm(qualifier: string): boolean;
     }
 }
 
@@ -1521,6 +1558,31 @@ declare class SPMgr {
 
 declare var spMgr: SPMgr;
 
+declare function SPField_FormDisplay_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPField_FormDisplay_DefaultNoEncode(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPField_FormDisplay_Empty(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldText_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNumber_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldBoolean_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNote_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNote_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldFile_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldFile_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Dropdown_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Radio_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldMultiChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldDateTime_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldDateTime_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUrl_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUrl_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUserMulti_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPClientPeoplePickerCSRTemplate(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookup_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookup_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookupMulti_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldAttachments_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+
 declare module SPAnimation {
     export enum Attribute {
         PositionX,
@@ -1563,7 +1625,7 @@ declare module SPAnimation {
 
 
     export class State {
-        SetAttribute(attributeId: Attribute, value: number): any;
+        SetAttribute(attributeId: Attribute, value: number): void;
         GetAttribute(attributeId: Attribute): number;
         GetDataIndex(attributeId: Attribute): number
     }
@@ -4817,6 +4879,9 @@ declare module SP {
         loadAndInstallApp(appPackageStream: SP.Base64EncodedByteArray): SP.AppInstance;
         ensureUser(logonName: string): SP.User;
         applyTheme(colorPaletteUrl: string, fontSchemeUrl: string, backgroundImageUrl: string, shareGenerated: boolean): void;
+
+        /** Available after March 2015 CU for SharePoint 2013*/
+        getList(url: string): List;
     }
     export class WebCollection extends SP.ClientObjectCollection<Web> {
         itemAt(index: number): SP.Web;
@@ -5105,7 +5170,7 @@ declare module Microsoft.SharePoint.Client.Search {
             set_maxSnippetLength: (value: number) => void;
 
             get_personalizationData: () => QueryPersonalizationData;
-            set_personalizationData: (QueryPersonalizationData: any) => void;
+            set_personalizationData: (value: QueryPersonalizationData) => void;
 
             get_processBestBets: () => boolean;
             set_processBestBets: (value: boolean) => void;
@@ -5149,7 +5214,7 @@ declare module Microsoft.SharePoint.Client.Search {
             set_startRow: (value: number) => void;
 
             get_summaryLength: () => number;
-            set_summaryLength: (number: any) => void;
+            set_summaryLength: (value: number) => void;
 
             get_timeout: () => number;
             set_timeout: (value: number) => void;
@@ -5167,11 +5232,11 @@ declare module Microsoft.SharePoint.Client.Search {
 
 
             getQuerySuggestionsWithResults: (iNumberOfQuerySuggestions: number,
-            iNumberOfResultSuggestions: number,
-            fPreQuerySuggestions: boolean,
-            fHitHighlighting: boolean,
-            fCapitalizeFirstLetters: boolean,
-            fPrefixMatchAllTerms: boolean) => QuerySuggestionResults;
+                iNumberOfResultSuggestions: number,
+                fPreQuerySuggestions: boolean,
+                fHitHighlighting: boolean,
+                fCapitalizeFirstLetters: boolean,
+                fPrefixMatchAllTerms: boolean) => QuerySuggestionResults;
 
 
         }
@@ -5217,15 +5282,15 @@ declare module Microsoft.SharePoint.Client.Search {
             executeQuery: (query: Query) => SP.JsonObjectResult;
             executeQueries: (queryIds: string[], queries: Query[], handleExceptions: boolean) => SP.JsonObjectResult;
             recordPageClick: (
-            pageInfo: string,
-            clickType: string,
-            blockType: number,
-            clickedResultId: string,
-            subResultIndex: number,
-            immediacySourceId: string,
-            immediacyQueryString: string,
-            immediacyTitle: string,
-            immediacyUrl: string) => void;
+                pageInfo: string,
+                clickType: string,
+                blockType: number,
+                clickedResultId: string,
+                subResultIndex: number,
+                immediacySourceId: string,
+                immediacyQueryString: string,
+                immediacyTitle: string,
+                immediacyUrl: string) => void;
             exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
         }
 
@@ -5531,14 +5596,14 @@ declare module Microsoft.SharePoint.Client.Search {
         export class DocumentCrawlLog extends SP.ClientObject {
             constructor(context: SP.ClientContext, site: SP.Site);
             getCrawledUrls: (getCountOnly: boolean,
-            maxRows: { High: number; Low: number; },
-            queryString: string,
-            isLike: boolean,
-            contentSourceID: number,
-            errorLevel: number,
-            errorID: number,
-            startDateTime: Date,
-            endDateTime: Date) => SP.JsonObjectResult;
+                maxRows: { High: number; Low: number; },
+                queryString: string,
+                isLike: boolean,
+                contentSourceID: number,
+                errorLevel: number,
+                errorID: number,
+                startDateTime: Date,
+                endDateTime: Date) => SP.JsonObjectResult;
         }
 
         export class SearchObjectOwner extends SP.ClientObject {
@@ -7159,7 +7224,7 @@ declare module SP {
             /** Y coordinate of the dialog box. */
             y?: number;
             /** The dialog will be maximized when shown. */
-            showMaximized?: number;
+            showMaximized?: boolean;
             /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
             url?: string;
             /** specifies if close button should be shown on the dialog */
@@ -7191,7 +7256,7 @@ declare module SP {
             /** Y coordinate of the dialog box. */
             y: number;
             /** The dialog will be maximized when shown. */
-            showMaximized: number;
+            showMaximized: boolean;
             /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
             url: string;
             /** specifies if close button should be shown on the dialog */
@@ -7336,8 +7401,8 @@ declare module SP {
         }
 
         export module Workplace {
-            export function add_resized(handler: Function): any;
-            export function remove_resized(handler: Function): any;
+            export function add_resized(handler: Function): void;
+            export function remove_resized(handler: Function): void;
         }
 
         export module UIUtility {
@@ -7562,7 +7627,7 @@ declare module SP {
                 Pictures in bmp, jpg and png formats and up to 5,000,000 bytes are supported.
                 A user can upload a picture only to the user's own profile.
                 @param data Binary content of an image file */
-            setMyProfilePicture(data: any): void;
+            setMyProfilePicture(data: SP.Base64EncodedByteArray): void;
         }
 
         /** Specifies the capabilities of a personal site. */
@@ -7803,17 +7868,17 @@ declare module SP {
             /** Specifies the item of this item */
             set_title(value: string): string;
             /** Specifies the GUID for this item in the Content database. */
-            get_uniqueId(): any;
+            get_uniqueId(): SP.Guid;
             /** Specifies the GUID for this item in the Content database. */
-            set_uniqueId(value: any): any;
+            set_uniqueId(value: SP.Guid): SP.Guid;
             /** Specifies the URL of this item. */
             get_url(): string;
             /** Specifies the URL of this item. */
             set_url(value: string): string;
             /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
-            get_webId(): string;
+            get_webId(): SP.Guid;
             /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
-            set_webId(value: any): any;
+            set_webId(value: SP.Guid): any;
         }
 
         export enum FollowedItemType {
@@ -8060,7 +8125,7 @@ declare module SP {
 
     export module DateTimeUtil {
         export class SimpleDate {
-            construction(year: number, month: number, day: number, era: number): any;
+            constructor(year: number, month: number, day: number, era: number);
             get_year(): number;
             set_year(value: number): void;
             get_month(): number;
@@ -8233,10 +8298,10 @@ declare module SP.WorkflowServices {
     export class InteropService extends SP.ClientObject {
         constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
         static getCurrent(context: SP.ClientRuntimeContext): InteropService;
-        enableEvents(listId: any, itemGuid: any): void;
-        disableEvents(listId: any, itemGuid: any): void;
-        startWorkflow(associationName: any, correlationId: any, listId: any, itemGuid: any, workflowParameters: any): SP.GuidResult;
-        cancelWorkflow(instanceId: any): void;
+        enableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
+        disableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
+        startWorkflow(associationName: string, correlationId: SP.Guid, listId: SP.Guid, itemGuid: SP.Guid, workflowParameters: any): SP.GuidResult;
+        cancelWorkflow(instanceId: SP.Guid): void;
     }
 
     /** Represents a workflow definition and associated properties. */
@@ -8312,7 +8377,6 @@ declare module SP.WorkflowServices {
 
     /** Manages workflow definitions and workflow activity authoring. */
     export class WorkflowDeploymentService extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
         /** Returns an XML representation of a list of valid Workflow Manager Client 1.0 actions for the specified web (WorkflowInfo element). */
         getDesignerActions(web: SP.Web): SP.StringResult;
         /** Returns an XML representation of a collection of XAML class signatures for workflow definitions.
@@ -8336,7 +8400,7 @@ declare module SP.WorkflowServices {
         getDefinition(definitionId: string): WorkflowDefinition;
         /** Saves the collateral file of a workflow definition.
             @param workflowDefinitionId The guid identifier of the workflow definition.*/
-        saveCollateral(workflowDefinitionId: string, leafFileName: string, fileContent: any): void;
+        saveCollateral(workflowDefinitionId: string, leafFileName: string, fileContent: Base64EncodedByteArray): void;
         /** Deletes the URL of a workflow definition's collateral file.
             @param workflowDefinitionId The guid identifier of the workflow definition.  */
         deleteCollateral(workflowDefinitionId: string, leafFileName: string): void;
@@ -8353,7 +8417,7 @@ declare module SP.WorkflowServices {
             @param packageDefaultFilename The default filename to choose for the new package.
             @param packageTitle The title of the package.
             @param packageDescription The description of the package. */
-        packageDefinition(definitionId: any, packageDefaultFilename: any, packageTitle: any, packageDescription: any): SP.StringResult;
+        packageDefinition(definitionId: SP.Guid, packageDefaultFilename: string, packageTitle: string, packageDescription: string): SP.StringResult;
     }
 
     /** Represents an instance of a workflow association that performs on a list item the process that is defined in a workflow template */
@@ -8451,9 +8515,9 @@ declare module SP.WorkflowServices {
     /** Base class representing subscriptions for the external workflow host. */
     export class WorkflowSubscription extends SP.ClientObject {
         /** Gets the unique ID of the workflow definition to activate. */
-        get_definitionId(): any;
+        get_definitionId(): SP.Guid;
         /** Sets the unique ID of the workflow definition to activate. */
-        set_definitionId(value: any): any;
+        set_definitionId(value: SP.Guid): SP.Guid;
         /** Gets a boolean value that specifies if the workflow subscription is enabled.
             When disabled, new instances of the subscription cannot be started, but existing instances will continue to run.  */
         get_enabled(): boolean;
@@ -8479,9 +8543,9 @@ declare module SP.WorkflowServices {
         /** Boolean value that specifies whether multiple workflow instances can be started manually on the same list item at the same time. This property can be used for list workflows only.  */
         set_manualStartBypassesActivationLimit(value: boolean): boolean;
         /** Gets the name of the workflow subscription for the specified event source.  */
-        get_name(): any;
+        get_name(): string;
         /** Sets the name of the workflow subscription for the specified event source.  */
-        set_name(value: any): any;
+        set_name(value: string): string;
         /** Gets the properties and values to pass to the workflow definition when the subscription is matched. */
         get_propertyDefinitions(): any;
         /** Gets the name of the workflow status field on the specified list.  */
@@ -8520,8 +8584,8 @@ declare module SP.WorkflowServices {
             @param listId GUID of the list containing the event receiver to be unregistered.
             @eventName eventName The name of the event to be removed. */
         unregisterInterestInList(listId: string, eventName: string): void;
-        getSubscription(subscriptionId: any): WorkflowSubscription;
-        deleteSubscription(subscriptionId: any): WorkflowSubscription;
+        getSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
+        deleteSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
         /** Retrieves workflow subscriptions that contains all of the workflow subscriptions on the Web  */
         enumerateSubscriptions(): WorkflowSubscriptionCollection;
         /** Retrieves workflow subscriptions based on workflow definition */
@@ -8764,7 +8828,7 @@ declare module SP {
 
                 public get_view(): NavigationTermSetView;
 
-                public createTerm(termName: string, linkType: NavigationLinkType, termId: Guid): any;
+                public createTerm(termName: string, linkType: NavigationLinkType, termId: Guid): Taxonomy.Term;
 
                 public getTaxonomyTermStore(): Taxonomy.TermStore;
 
@@ -8821,7 +8885,7 @@ declare module SP {
 
                 public getResolvedAssociatedFolderUrl(): StringResult;
 
-                public getWebRelativeFriendlyUrl(): any; StringResult: any;
+                public getWebRelativeFriendlyUrl(): StringResult;
 
                 public getAllParentTerms(): NavigationTermCollection;
 
@@ -8898,11 +8962,11 @@ declare module SP {
             export class TaxonomyNavigation {
                 static getWebNavigationSettings(context: ClientContext, web: Web): WebNavigationSettings;
                 static getTermSetForWeb(context: ClientContext, web: Web, siteMapProviderName: string, includeInheritedSettings: boolean): NavigationTermSet;
-                static setCrawlAsFriendlyUrlPage(context: ClientContext, navigationTerm: any, crawlAsFriendlyUrlPage: any): BooleanResult;
+                static setCrawlAsFriendlyUrlPage(context: ClientContext, navigationTerm: Taxonomy.Term, crawlAsFriendlyUrlPage: boolean): BooleanResult;
                 static getNavigationLcidForWeb(context: ClientContext, web: Web): IntResult;
                 static flushSiteFromCache(context: ClientContext, site: Site): void;
                 static flushWebFromCache(context: ClientContext, web: Web): void;
-                static flushTermSetFromCache(context: ClientContext, webForPermissions: any, termStoreId: Guid, termSetId: Guid): void;
+                static flushTermSetFromCache(context: ClientContext, webForPermissions: Web, termStoreId: Guid, termSetId: Guid): void;
             }
 
             export class WebNavigationSettings extends ClientObject {
@@ -8946,7 +9010,6 @@ declare module SP {
         }
 
         export class SPContainerId extends ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
             static createFromList(context: ClientRuntimeContext, list: List): SPContainerId;
             static createFromWeb(context: ClientRuntimeContext, web: Web): SPContainerId;
             static createFromSite(context: ClientRuntimeContext, site: Site): SPContainerId;
@@ -8980,7 +9043,6 @@ declare module SP {
         }
 
         export class SPPolicyAssociation extends ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
 
             get_allowOverride(): boolean;
             set_allowOverride(value: boolean): boolean;
@@ -9026,7 +9088,6 @@ declare module SP {
         }
 
         export class SPPolicyBinding extends ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
 
             get_identity(): any;
             set_identity(value: any): any;
@@ -9072,7 +9133,6 @@ declare module SP {
         }
 
         export class SPPolicyDefinition extends ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
 
             get_comment(): string;
             set_comment(value: string): string;
@@ -9080,8 +9140,8 @@ declare module SP {
             get_createdBy(): any;
             set_createdBy(value: any): any;
 
-            get_defaultPolicyRuleConfigId: any;
-            set_defaultPolicyRuleConfigId: any;
+            get_defaultPolicyRuleConfigId(): any;
+            set_defaultPolicyRuleConfigId(value: any): any;
 
             get_description(): string;
             set_description(value: string): string;
@@ -9120,7 +9180,6 @@ declare module SP {
         }
 
         export class SPPolicyRule extends ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
 
             get_comment(): string;
             set_comment(value: string): string;
@@ -9176,7 +9235,7 @@ declare module SP {
 
             deletePolicyRule(policyRuleId: any): void;
 
-            notifyUnifiedPolicySync(notificationId: any, syncSvcUrl: string, changeInfos: any, syncNow: boolean, fullSyncForTenant: any): void;
+            notifyUnifiedPolicySync(notificationId: any, syncSvcUrl: string, changeInfos: any, syncNow: boolean, fullSyncForTenant: boolean): void;
 
             updatePolicyDefinition(policyDefinition: SPPolicyDefinition): void;
 
@@ -9394,7 +9453,7 @@ declare class SPClientPeoplePicker {
 
     public SetInitialValue(entities: ISPClientPeoplePickerEntity[], initialErrorMsg?: string): void
     public AddUserKeys(userKeys: string, bSearch: boolean): void;
-    public BatchAddUserKeysOperation(allKeys: string[], numProcessed: number): any;
+    public BatchAddUserKeysOperation(allKeys: string[], numProcessed: number): void;
     public ResolveAllUsers(fnContinuation: () => void): void;
     public ExecutePickerQuery(queryIds: string, onSuccess: (queryId: string, result: SP.StringResult) => void, onFailure: (queryId: string, result: SP.StringResult) => void, fnContinuation: () => void): void;
     public AddUnresolvedUserFromEditor(bRunQuery?: boolean): void;
@@ -9437,7 +9496,7 @@ declare class SPClientPeoplePicker {
     public AddLoadingSuggestionMenuOption(): void;
     public ShowingLocalSuggestions(): boolean;
     public ShouldUsePPMRU(): boolean;
-    public AddResolvedUserToLocalCache(resolvedEntity: ISPClientPeoplePickerEntity, resolveText: string): any;
+    public AddResolvedUserToLocalCache(resolvedEntity: ISPClientPeoplePickerEntity, resolveText: string): void;
 }
 
 interface ISPClientPeoplePickerSchema {
@@ -9532,7 +9591,7 @@ declare class SPClientPeoplePickerProcessedUser {
     ErrorDescription: string;// '',
     ResolveText: string;// '',
     public UpdateResolvedUser(newUserInfo: ISPClientPeoplePickerEntity, strNewElementId: string): void;
-    public UpdateSuggestions(entity: ISPClientPeoplePickerEntity): any;
+    public UpdateSuggestions(entity: ISPClientPeoplePickerEntity): void;
     public BuildUserHTML(): string;
     public UpdateUserMaxWidth(): void;
     public ResolvedAsUnverifiedEmail(): string;
@@ -9551,16 +9610,17 @@ declare module Microsoft {
             export module ReputationModel {
                 export class Reputation {
                     constructor();
-                    static setLike(context: SP.ClientContext, listId: string, itemId: number, like: boolean): any;
-                    static setRating(context: SP.ClientContext, listId: string, itemId: number, rating: number): any;
+                    static setLike(context: SP.ClientContext, listId: string, itemId: number, like: boolean): void;
+                    static setRating(context: SP.ClientContext, listId: string, itemId: number, rating: number): void;
                 }
             }
         }
     }
 }
+
 /** Available only in SharePoint Online*/
 declare module Define {
-    export function loadScript(url: string, successCallback: () => void, errCallback: () => void): any;
+    export function loadScript(url: string, successCallback: () => void, errCallback: () => void): void;
     /** Loads script from _layouts/15/[req].js */
     export function require(req: string, callback: Function): void;
     /** Loads script from _layouts/15/[req].js */
@@ -9570,7 +9630,7 @@ declare module Define {
 
 /** Available only in SharePoint Online*/
 declare module Verify {
-    export function ArgumentType(arg: string, expected: any): any;
+    export function ArgumentType(arg: string, expected: any): void;
 }
 
 
@@ -9582,7 +9642,7 @@ declare module BrowserStorage {
     /** Available only in SharePoint Online*/
     interface CachedStorage {
         getItem(key: string): string;
-        setItem(key: string, value: string): any;
+        setItem(key: string, value: string): void;
         removeItem(key: string): void;
         clead(): void;
         length: number;
@@ -9621,7 +9681,7 @@ declare module DOM {
     export function GetEventSrcElement(evt: Event): HTMLElement;
     export function GetInnerText(el: HTMLElement): string;
     export function PreventDefaultNavigation(evt: Event): void;
-    export function SetEvent(eventName: string, eventFunc: Function, el: HTMLElement): any;
+    export function SetEvent(eventName: string, eventFunc: Function, el: HTMLElement): void;
 }
 
 /** Available only in SharePoint Online*/
@@ -9645,8 +9705,8 @@ declare module IE8Support {
 
 /** Available only in SharePoint Online*/
 declare module StringUtil {
-    export function BuildParam(stPattern: string, ...params: any[]): any;
-    export function ApplyStringTemplate(str: string, ...params: any[]): any;
+    export function BuildParam(stPattern: string, ...params: any[]): string;
+    export function ApplyStringTemplate(str: string, ...params: any[]): string;
 }
 
 /** Available only in SharePoint Online*/
@@ -9867,10 +9927,20 @@ declare module SP {
             HideInitialLoadingBanner(): void;
             ShowInitialGridErrorMsg(errorMsg: string): void;
             ShowGridErrorMsg(errorMsg: string): void;
-            LaunchPrintView(additionalScriptFiles: any, beforeInitFnName: any, beforeInitFnArgsObj: any, title: any, bEnableGantt: any, optGanttDelegateNames: any, optInitTableViewParamsFnName: any, optInitTableViewParamsFnArgsObj: any, optInitGanttStylesFnName: any, optInitGanttStylesFnArgsObj: any): void;
+            LaunchPrintView(
+                additionalScriptFiles: any,
+                beforeInitFnName: any,
+                beforeInitFnArgsObj: any,
+                title: string,
+                bEnableGantt: boolean,
+                optGanttDelegateNames?: any,
+                optInitTableViewParamsFnName?: any,
+                optInitTableViewParamsFnArgsObj?: any,
+                optInitGanttStylesFnName?: any,
+                optInitGanttStylesFnArgsObj?: any): void;
             GetAllDataJson(fnOnFinished: any, optFnGetCellStyleID?: any): void;
             SetTableView(tableViewParams: any): void;
-            SetRowView(rowViewParams: any): void;
+            SetRowView(rowViewParam: any): void;
 
             /** Enable grid after Disable. */
             Enable(): void;
@@ -9885,7 +9955,7 @@ declare module SP {
             /** Switches the currently selected cell into edit mode: displays edit control and sets focus into it.
                 Returns true if success. */
             TryBeginEdit(): boolean;
-            FinalizeEditing(fnContinue: any, fnError: any): void;
+            FinalizeEditing(fnContinue: Function, fnError: Function): void;
             /** Get diff tracker object that tracks changes to the grid data. */
             GetDiffTracker(): SP.JsGrid.Internal.DiffTracker;
             /** Moves focus to the JsGrid control */
@@ -9943,7 +10013,7 @@ declare module SP {
             MoveRecordsUpByOne(recordKeys: any): any;
             MoveRecordsDownByOne(recordKeys: any): any;
             GetReorderRange(recordKeys: any): any;
-            GetNodeExpandCollapseState(recordKey: any): any;
+            GetNodeExpandCollapseState(recordKey: number): any;
             ToggleExpandCollapse(recordKey: number): void;
 
             /** Attach event handler to a particular event type */
@@ -10002,7 +10072,7 @@ declare module SP {
             HideColumn(columnKey: string): void;
             /** Update column descriptions */
             UpdateColumns(columnInfoCollection: ColumnInfoCollection): void;
-            GetColumns(optPaneId?: any): ColumnInfo[];
+            GetColumns(optPaneId?: string): ColumnInfo[];
             /** Get ColumnInfo object by fieldKey
                 @fieldKey when working with SharePoint data sources, fieldKey corresponds to field internal name */
             GetColumnByFieldKey(fieldKey: string, optPaneId?: any): ColumnInfo;
@@ -10060,12 +10130,12 @@ declare module SP {
             /** Moves cursor to entry record (the row that is used to add new records) */
             JumpToEntryRecord(): void;
 
-            SelectRowRange(rowIdx1: any, rowIdx2: any, bAppend: any, optPaneId?: any): void;
-            SelectColumnRange(colIdx1: any, colIdx2: any, bAppend: any, optPaneId?: any): void;
-            SelectCellRange(rowIdx1: any, rowIdx2: any, colIdx1: any, colIdx2: any, bAppend: any, optPaneId: any): void;
-            SelectRowRangeByKey(rowKey1: any, rowKey2: any, bAppend: any, optPaneId?: any): void;
-            SelectColumnRangeByKey(colKey1: any, colKey2: any, bAppend: any, optPaneId?: any): void;
-            SelectCellRangeByKey(recordKey1: string, recordKey2: string, colKey1: any, colKey2: any, bAppend: any, optPaneId?: any): void;
+            SelectRowRange(rowIdx1: number, rowIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectColumnRange(colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectCellRange(rowIdx1: number, rowIdx2: number, colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectRowRangeByKey(rowKey1: any, rowKey2: any, bAppend: boolean, optPaneId?: string): void;
+            SelectColumnRangeByKey(colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
+            SelectCellRangeByKey(recordKey1: string, recordKey2: string, colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
 
             ChangeKeys(oldKey: any, newKey: any): void;
             GetSelectedRowRanges(optPaneId?: any): any;
@@ -10261,14 +10331,14 @@ declare module SP {
                 validationState: SP.JsGrid.ValidationState;
             }
             export class RecordInserted implements IEventArgs {
-                constructor(recordKey: any, recordIdx: any, afterRecordKey: any, changeKey: any);
+                constructor(recordKey: number, recordIdx: number, afterRecordKey: number, changeKey: JsGrid.IChangeKey);
                 recordKey: number;
                 recordIdx: number;
                 afterRecordKey: number;
                 changeKey: JsGrid.IChangeKey;
             }
             export class RecordDeleted implements IEventArgs {
-                constructor(recordKey: any, recordIdx: any, changeKey: any);
+                constructor(recordKey: number, recordIdx: number, changeKey: JsGrid.IChangeKey);
                 recordKey: number;
                 recordIdx: number;
                 changeKey: JsGrid.IChangeKey;
@@ -10279,7 +10349,7 @@ declare module SP {
                 bChecked: boolean;
             }
             export class OnCellErrorStateChanged implements IEventArgs {
-                constructor(recordKey: any, fieldKey: any, bAddingError: any, bCellCurrentlyHasError: any, bCellHadError: any, errorId: any);
+                constructor(recordKey: number, fieldKey: string, bAddingError: boolean, bCellCurrentlyHasError: boolean, bCellHadError: boolean, errorId: number);
                 recordKey: number;
                 fieldKey: string;
                 bAddingError: boolean;
@@ -10288,7 +10358,7 @@ declare module SP {
                 errorId: number;
             }
             export class OnRowErrorStateChanged implements IEventArgs {
-                constructor(recordKey: any, bAddingError: any, bErrorCurrentlyInRow: any, bRowHadError: any, errorId: any, message: any);
+                constructor(recordKey: number, bAddingError: boolean, bErrorCurrentlyInRow: boolean, bRowHadError: boolean, errorId: number, message: string);
                 recordKey: number;
                 bAddingError: boolean;
                 bErrorCurrentlyInRow: boolean;
@@ -10412,8 +10482,8 @@ declare module SP {
             UpdateSplitterStyleFromCss(styleObject: IStyleType.Splitter, splitterStyleNameCollection: any): void;
             UpdateHeaderStyleFromCss(styleObject: IStyleType.Header, headerStyleNameCol: any): void;
             UpdateGridPaneStyleFromCss(styleObject: IStyleType.GridPane, gridStyleNameCollection: any): void;
-            UpdateDefaultCellStyleFromCss(styleObject: IStyleType.Cell, cssClass: any): void;
-            UpdateGroupStylesFromCss(styleObject: any, prefix: any): void;
+            UpdateDefaultCellStyleFromCss(styleObject: IStyleType.Cell, cssClass: string): void;
+            UpdateGroupStylesFromCss(styleObject: IStyleType.Cell, prefix: string): void;
         }
 
         export interface IStyleType { }
@@ -10530,15 +10600,15 @@ declare module SP {
 
             static SetRTL: { (rtlObject: any): void; };
             static MakeJsGridStyleManager: { (): IStyleManager };
-            static CreateStyleFromCss: { (styleType: IStyleType, cssStyleName: string, optExistingStyle: any, optClassId: any): any; };
+            static CreateStyleFromCss: { (styleType: IStyleType, cssStyleName: string, optExistingStyle?: any, optClassId?: any): any; };
             static CreateStyle: { (styleType: IStyleType, styleProps: any): any; };
             static MergeCellStyles: { (majorStyle: any, minorStyle: any): any; };
-            static ApplyCellStyle: { (td: any, style: any): void; };
-            static ApplyRowHeaderStyle: { (domObj: any, style: any, fnGetHeaderSibling: any): void; };
-            static ApplyCornerHeaderBorderStyle: { (domObj: any, colStyle: any, rowStyle: any): void; };
-            static ApplyHeaderInnerBorderStyle: { (domObj: any, bIsRowHeader: any, headerObject: any): void };
-            static ApplyColumnContextMenuStyle: { (domObj: any, style: any): void };
-            static ApplySplitterStyle: { (domObj: any, style: any): void };
+            static ApplyCellStyle: { (td: HTMLTableCellElement, style: any): void; };
+            static ApplyRowHeaderStyle: { (domObj: HTMLElement, style: any, fnGetHeaderSibling: Function): void; };
+            static ApplyCornerHeaderBorderStyle: { (domObj: HTMLElement, colStyle: any, rowStyle: any): void; };
+            static ApplyHeaderInnerBorderStyle: { (domObj: HTMLElement, bIsRowHeader: any, headerObject: any): void };
+            static ApplyColumnContextMenuStyle: { (domObj: HTMLElement, style: any): void };
+            static ApplySplitterStyle: { (domObj: HTMLElement, style: any): void };
             static MakeBorderString: { (width: number, style: string, color: string): string };
             static GetCellStyleDefaultBackgroundColor: { (): string };
 
@@ -10649,7 +10719,7 @@ declare module SP {
             constructor(gridFieldMap: any, keyColumnName: string, fnGetPropType: any);
             gridFieldMap: any;
             /** Create a new record */
-            MakeRecord(dataPropMap: any, localizedPropMap: any, bKeepRawData: any): IRecord;
+            MakeRecord(dataPropMap: any, localizedPropMap: any, bKeepRawData: boolean): IRecord;
         }
 
         export interface IPropertyBase {
@@ -10800,11 +10870,11 @@ declare module SP {
 
 
             export class Utils {
-                static RegisterDisplayControl(name: string, singleton: any, requiredFunctionNames: string[]): any;
-                static RegisterEditControl(name: string, factory: (gridContext: IEditControlGridContext, gridTextInputElement: HTMLElement) => IEditControl, requiredFunctionNames: string[]): any;
-                static RegisterWidgetControl(name: string, factory: { (ddContext: any): IPropertyType; }, requiredFunctionNames: string[]): any;
+                static RegisterDisplayControl(name: string, singleton: any, requiredFunctionNames: string[]): void;
+                static RegisterEditControl(name: string, factory: (gridContext: IEditControlGridContext, gridTextInputElement: HTMLElement) => IEditControl, requiredFunctionNames: string[]): void;
+                static RegisterWidgetControl(name: string, factory: { (ddContext: any): IPropertyType; }, requiredFunctionNames: string[]): void;
 
-                static UpdateDisplayControlForPropType(propTypeName: string, displayControlType: string): any;
+                static UpdateDisplayControlForPropType(propTypeName: string, displayControlType: string): void;
             }
         }
 
@@ -10819,7 +10889,7 @@ declare module SP {
 
         export module Internal {
             export class DiffTracker {
-                constructor(objBag: any, fnGetChange: any);
+                constructor(objBag: any, fnGetChange: Function);
                 ExternalAPI: {
                     AnyChanges(): boolean;
                     ChangeKeySliceInfo(): any;
@@ -10827,7 +10897,7 @@ declare module SP {
                     EventSliceInfo(): any;
                     GetChanges(optStartEvent: any, optEndEvent: any, optRecordKeys: any, bFirstStartEvent: boolean, bStartInclusive: boolean, bEndInclusive: boolean, bIncludeInvalidPropUpdates: boolean, bLastEndEvent: boolean): any;
                     GetChangesAsJson(changeQuery: any, optfnPreProcessUpdateForSerialize?: any): string;
-                    GetUniquePropertyChanges(changeQuery: any, optfnFilter: any): any;
+                    GetUniquePropertyChanges(changeQuery: any, optfnFilter?: any): any;
                     RegisterEvent(changeKey: IChangeKey, eventObject: any): void;
                     UnregisterEvent(changeKey: IChangeKey, eventObject: any): void;
                 };
@@ -10874,20 +10944,20 @@ declare module SP {
         export interface IEditControl {
             SupportedWriteMode?: SP.JsGrid.EditActorWriteType;
             SupportedReadMode?: SP.JsGrid.EditActorReadType;
-            GetCellContext? (): IEditControlCellContext;
-            GetOriginalValue? (): IValue;
-            SetValue? (value: IValue): void;
+            GetCellContext?(): IEditControlCellContext;
+            GetOriginalValue?(): IValue;
+            SetValue?(value: IValue): void;
             Dispose(): void;
-            GetInputElement? (): HTMLElement;
-            Focus? (eventInfo: Sys.UI.DomEvent): void;
+            GetInputElement?(): HTMLElement;
+            Focus?(eventInfo: Sys.UI.DomEvent): void;
             BindToCell(cellContext: IEditControlCellContext): void;
             OnBeginEdit(eventInfo: Sys.UI.DomEvent): void;
             Unbind(): void;
             OnEndEdit(): void;
-            OnCellMove? (): void;
-            OnValueChanged? (newValue: IValue): void;
-            IsCurrentlyUsingGridTextInputElement? (): boolean;
-            SetSize? (width: number, height: number): void;
+            OnCellMove?(): void;
+            OnValueChanged?(newValue: IValue): void;
+            IsCurrentlyUsingGridTextInputElement?(): boolean;
+            SetSize?(width: number, height: number): void;
         }
 
     }
diff --git a/sharepoint/SharePoint.d.ts.tscparams b/sharepoint/SharePoint.d.ts.tscparams
index d3f5a12fa..ac975cac6 100644
--- a/sharepoint/SharePoint.d.ts.tscparams
+++ b/sharepoint/SharePoint.d.ts.tscparams
@@ -1 +1 @@
-
+--noImplicitAny 
\ No newline at end of file
diff --git a/should-promised/should-promised-tests.ts b/should-promised/should-promised-tests.ts
index 03167e663..50ea0b59a 100644
--- a/should-promised/should-promised-tests.ts
+++ b/should-promised/should-promised-tests.ts
@@ -7,9 +7,9 @@ var promise: Promise<number> = new Promise<number>(function (resolve, reject) {}
 promise.should.be.Promise;
 (10).should.not.be.a.Promise;
 
-promise.should.be.fulfilled;
+promise.should.be.fulfilled();
 
-promise.should.be.rejected;
+promise.should.be.rejected();
 
 promise.should.be.rejectedWith(Error);
 promise.should.be.rejectedWith('boom');
diff --git a/should-promised/should-promised.d.ts b/should-promised/should-promised.d.ts
index c6c95ba98..f7e2a97f5 100644
--- a/should-promised/should-promised.d.ts
+++ b/should-promised/should-promised.d.ts
@@ -5,8 +5,8 @@
 
 interface ShouldAssertion {
     Promise: ShouldAssertion;
-    fulfilled: ShouldAssertion;
-    rejected: ShouldAssertion;
+    fulfilled(): ShouldAssertion;
+    rejected(): ShouldAssertion;
     rejectedWith(message: (string | Function | RegExp), properties?: Object): ShouldAssertion;
     rejectedWith(message: Object): ShouldAssertion;
     finally: ShouldAssertion;
diff --git a/should/should.d.ts b/should/should.d.ts
index a787b622c..ba32f571b 100644
--- a/should/should.d.ts
+++ b/should/should.d.ts
@@ -49,6 +49,10 @@ interface ShouldAssertion {
   matchEach(other: (val: any) => any, description?: string): ShouldAssertion;
   matchEach(regexp: RegExp, description?: string): ShouldAssertion;
   matchEach(other: any, description?: string): ShouldAssertion;
+  matchAny(other: {}, description?: string): ShouldAssertion;
+  matchAny(other: (val: any) => any, description?: string): ShouldAssertion;
+  matchAny(regexp: RegExp, description?: string): ShouldAssertion;
+  matchAny(other: any, description?: string): ShouldAssertion;
   length(n: number, description?: string): ShouldAssertion;
   property(name: string, description?: string): ShouldAssertion;
   property(name: string, val: any, description?: string): ShouldAssertion;
diff --git a/simplebar/simplebar-tests.ts b/simplebar/simplebar-tests.ts
new file mode 100644
index 000000000..033b16c74
--- /dev/null
+++ b/simplebar/simplebar-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="simplebar.d.ts"/>
+/// <reference path="../jquery/jquery.d.ts"/>
+
+var simplebar = $.fn.simplebar.noConflict();
+$.fn.simplebar = simplebar;
diff --git a/simplebar/simplebar.d.ts b/simplebar/simplebar.d.ts
new file mode 100644
index 000000000..d9ef0a45d
--- /dev/null
+++ b/simplebar/simplebar.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for simplebar.js 1.1.7
+// Project: https://github.com/Grsmto/simplebar
+// Definitions by: Gregor Woiwode <https://github.com/gregonnet>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface SimplebarOptions {
+    autoHide?: boolean;
+    wrapContent?: boolean;
+}
+
+interface JQuery {
+    /**
+    * Enables simplebar on calling element.
+    */
+    simplebar: {
+        /**
+        * Define if scrollbar should be faded out automatically
+        *
+        * @param indicator if scrollbar should be faded out automatically.
+        */
+        (options?: SimplebarOptions): JQuery;
+    };
+}
+
+interface JQueryStatic {
+    /**
+    * Enables simplebar on calling element.
+    */
+    simplebar: {
+        /**
+        * Define if scrollbar should be faded out automatically
+        *
+        * @param indicator if scrollbar should be faded out automatically.
+        */
+        (options?: SimplebarOptions): JQuery;
+    };
+}
diff --git a/sinon-chrome/sinon-chrome.d.ts b/sinon-chrome/sinon-chrome.d.ts
index eddb32be4..f5aa2344f 100644
--- a/sinon-chrome/sinon-chrome.d.ts
+++ b/sinon-chrome/sinon-chrome.d.ts
@@ -411,6 +411,7 @@ declare module SinonChrome.runtime {
 
     export var id: string;
     export var getURL: Sinon.SinonSpy;
+    export var lastError: { message?: string };
 }
 
 declare module SinonChrome.sessions {
diff --git a/sinon/sinon-tests.ts b/sinon/sinon-tests.ts
index ca916788d..3e6f72086 100644
--- a/sinon/sinon-tests.ts
+++ b/sinon/sinon-tests.ts
@@ -109,3 +109,9 @@ testSix();
 testSeven();
 testEight();
 testNine();
+
+var clock: Sinon.SinonFakeTimers = sinon.useFakeTimers();
+clock.setSystemTime(1000);
+clock.setSystemTime(new Date());
+
+
diff --git a/sinon/sinon.d.ts b/sinon/sinon.d.ts
index 6440dda90..fec30d70d 100644
--- a/sinon/sinon.d.ts
+++ b/sinon/sinon.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sinon 1.8.1
+// Type definitions for Sinon 1.16.0
 // Project: http://sinonjs.org/
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -181,7 +181,20 @@ declare module Sinon {
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
         restore(): void;
-    }
+
+		/**
+		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+		 * without affecting timers, intervals or immediates.
+		 * @param now The new 'now' in unix milliseconds
+		 */
+		setSystemTime(now: number): void;
+		/**
+		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+		 * without affecting timers, intervals or immediates.
+		 * @param now The new 'now' as a JavaScript Date
+		 */
+		setSystemTime(date: Date): void;
+	}
 
     interface SinonFakeTimersStatic {
         (): SinonFakeTimers;
@@ -251,6 +264,7 @@ declare module Sinon {
         fakeHTTPMethods: boolean;
         getHTTPMethod: (request: SinonFakeXMLHttpRequest) => string;
         requests: SinonFakeXMLHttpRequest[];
+        respondImmediately: boolean;
 
         // Methods
         respondWith(body: string): void;
diff --git a/sipml/sipml.d.ts b/sipml/sipml.d.ts
index 84a694454..0e3df6873 100644
--- a/sipml/sipml.d.ts
+++ b/sipml/sipml.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: A. Groenenboom <https://github.com/chookies>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module SIPml {
+declare namespace SIPml {
   class Event {
     public description: string;
     public type: string;
@@ -14,12 +14,12 @@ declare module SIPml {
     public getSipResponseCode(): number;
   }
 
-  class EventTarget {
-    public addEventListener(type: any, listener: Function): void;
-    public removeEventListener(type: any): void;
+  class EventTarget<EventSubscriptionType extends string, EventType extends Event> {
+    public addEventListener(type: EventSubscriptionType, listener: (e: EventType) => void): void;
+    public removeEventListener(type: EventSubscriptionType): void;
   }
 
-  class Session extends EventTarget {
+  class Session extends EventTarget<Session.EventSubscriptionType, Session.Event> {
     public accept(configuration?: Session.Configuration): number;
     public getId(): number;
     public getRemoteFriendlyName(): string;
@@ -28,20 +28,51 @@ declare module SIPml {
     public setConfiguration(configuration?: Session.Configuration): void;
   }
 
-  export module Session {
+  export namespace Session {
+     /**
+      * Should be
+      *
+      * "*" |
+      * "connecting" |
+      * "connected" |
+      * "terminating" |
+      * "terminated" |
+      * "i_ao_request" |
+      * "media_added" |
+      * "media_removed" |
+      * "i_request" |
+      * "o_request" |
+      * "cancelled_request" |
+      * "sent_request" |
+      * "transport_error" |
+      * "global_error" |
+      * "message_error" |
+      * "webrtc_error" |
+      */
+    type EventSubscriptionType = string;
+
     interface Configuration {
       audio_remote?: HTMLElement;
-      bandwidth?: Object;
+      bandwidth?: { audio: number; video: number; };
+      events_listener?: {
+        events: EventSubscriptionType | EventSubscriptionType[];
+        listener: (e: Session.Event) => void
+      };
       expires?: number;
       from?: string;
       sip_caps?: Object[];
       sip_headers?: Object[];
       video_local?: HTMLElement;
       video_remote?: HTMLElement;
-      video_size?: Object;
+      video_size?: {
+        minWidth?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        maxHeight?: number;
+      };
     }
 
-    class Call extends Session {
+    class Call extends Session implements EventTarget<Call.EventSubscriptionType, Session.Event> {
       public acceptTransfer(configuration?: Session.Configuration): number;
       public call(to: string, configuration?: Session.Configuration): number;
       public dtmf(): number;
@@ -52,6 +83,42 @@ declare module SIPml {
       public resume(): number;
       public transfer(): number;
     }
+    
+    namespace Call {
+        /**
+         * Should be 
+         *
+         * Session.EventSubscriptionType |
+         * "m_early_media" |
+         * "m_local_hold_ok" |
+         * "m_local_hold_nok" |
+         * "m_local_resume_ok" |
+         * "m_local_resume_nok" |
+         * "m_remote_hold" |
+         * "m_remote_resume" |
+         * "m_stream_video_local_added" |
+         * "m_stream_video_local_removed" |
+         * "m_stream_video_remote_added" |
+         * "m_stream_video_remote_removed" |
+         * "m_stream_audio_local_added" |
+         * "m_stream_audio_local_removed" |
+         * "m_stream_audio_remote_added" |
+         * "m_stream_audio_remote_removed" |
+         * "i_ect_new_call" |
+         * "o_ect_trying" |
+         * "o_ect_accepted" |
+         * "o_ect_completed" |
+         * "i_ect_completed" |
+         * "o_ect_failed" |
+         * "i_ect_failed" |
+         * "o_ect_notify" |
+         * "i_ect_notify" |
+         * "i_ect_requested " |
+         * "m_bfcp_info" |
+         * "i_info" |
+         */
+        type EventSubscriptionType = Session.EventSubscriptionType;
+    }
 
     class Event extends SIPml.Event {
       public session: Session;
@@ -74,13 +141,22 @@ declare module SIPml {
       public unregister(configuration?: Session.Configuration): void;
     }
 
-    class Subscribe extends Session {
+    class Subscribe extends Session implements EventTarget<Subscribe.EventSubscriptionType, Session.Event> {
       public subscribe(to: string, configuration?: Session.Configuration): number;
       public unsubscribe(configuration?: Session.Configuration): number;
     }
+    
+    namespace Subscribe {
+        /**
+         * Should be
+         *
+         * Session.EventSubscriptionType | "i_notify"
+         */
+        type EventSubscriptionType = Session.EventSubscriptionType;
+    }
   }
 
-  class Stack extends EventTarget {
+  class Stack extends EventTarget<Stack.EventSubscriptionType, Stack.Event> {
     public constructor(configuration?: Stack.Configuration);
     public setConfiguration(configuration: Stack.Configuration): number;
     public newSession(type: string, configuration?: Session.Configuration): any;
@@ -88,15 +164,36 @@ declare module SIPml {
     public stop(timeout?: number): number;
   }
 
-  export module Stack {
+  export namespace Stack {
+    /**
+     * Should be
+     *
+     * "*" |
+     * "starting" |
+     * "started" |
+     * "stopping" |
+     * "stopped" |
+     * "failed_to_start" |
+     * "failed_to_stop" |
+     * "i_new_call" |
+     * "i_new_message" |
+     * "m_permission_requested" |
+     * "m_permission_accepted" |
+     * "m_permission_refused";
+     */
+    type EventSubscriptionType = string;
+
     interface Configuration {
-      bandwidth?: Object;
+      bandwidth?: { audio: number; video: number; };
       display_name?: string;
       enable_click2call?: boolean;
       enable_early_ims?: boolean;
       enable_media_stream_cache?: boolean;
       enable_rtcweb_breaker?: boolean;
-      events_listener?: Object;
+      events_listener?: {
+        events: EventSubscriptionType | EventSubscriptionType[];
+        listener: (e: Stack.Event) => void
+      };
       ice_servers?: Object[];
       impi?: string;
       impu?: string;
@@ -104,7 +201,12 @@ declare module SIPml {
       password?: string;
       realm?: string;
       sip_headers?: Object[];
-      video_size?: Object;
+      video_size?: {
+        minWidth?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        maxHeight?: number;
+      };
       websocket_proxy_url?: string;
     }
 
diff --git a/ski/ski-tests.ts b/ski/ski-tests.ts
new file mode 100644
index 000000000..73b8b4392
--- /dev/null
+++ b/ski/ski-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="./ski.d.ts" />
+
+import { S, K, I } from 'ski';
+
+var foo: string = S(a => b => a + b, a => a.split('').reverse().join(''), 'bar'); // barrab
+
+var foo: string = K('bar')(); // bar
+
+var foo: string = I('bar'); // bar
diff --git a/ski/ski.d.ts b/ski/ski.d.ts
new file mode 100644
index 000000000..dba4b9840
--- /dev/null
+++ b/ski/ski.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ski 1.1.0
+// Project: https://github.com/jden/ski
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "ski" {
+	export function S<T, S, U>(x: (z: U) => (y: S) => T, y: (z: U) => S, z: U): T;
+	export function K<T, S>(x: T): (y?: S) => T
+	export function I<T>(x: T): T;
+}
diff --git a/skyway/skyway-tests.ts b/skyway/skyway-tests.ts
index a7eced27d..0a2a49d59 100644
--- a/skyway/skyway-tests.ts
+++ b/skyway/skyway-tests.ts
@@ -4,8 +4,6 @@
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
     debug: 3,
-    logFunction: ()=>{
-    }
 });
 
 peerByOption.listAllPeers(function(items){
@@ -21,8 +19,6 @@ var peerByIdAndOption: PeerJs.Peer = new Peer(
     {
         key: 'peerKey',
         debug: 3,
-        logFunction: ()=>{
-        }
     });
 
 var id = peerByOption.id;
diff --git a/skyway/skyway.d.ts b/skyway/skyway.d.ts
index 681d358b8..8c5c85d1c 100644
--- a/skyway/skyway.d.ts
+++ b/skyway/skyway.d.ts
@@ -77,7 +77,7 @@ declare module PeerJs{
          * @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;
+        connect(id: string, options?: PeerJs.PeerConnectOption): 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).
diff --git a/slickgrid/SlickGrid.d.ts b/slickgrid/SlickGrid.d.ts
index 54686df9f..e012194c4 100644
--- a/slickgrid/SlickGrid.d.ts
+++ b/slickgrid/SlickGrid.d.ts
@@ -217,7 +217,7 @@ declare module Slick {
 	* @extends Slick.NonDataItem
 	* @constructor
 	*/
-	export class Group<T, R> extends NonDataRow {
+	export class Group<T extends SlickData> extends NonDataRow {
 
 		constructor();
 
@@ -240,7 +240,7 @@ declare module Slick {
 		* @property value
 		* @type {Object}
 		*/
-		public value: T;
+		public value: any;
 
 		/***
 		* Formatted display value of the group.
@@ -261,21 +261,21 @@ declare module Slick {
 		* @property totals
 		* @type {GroupTotals}
 		*/
-		public totals: GroupTotals<T, R>;
+		public totals: GroupTotals<T>;
 
 		/**
 		* Rows that are part of the group.
 		* @property rows
 		* @type {Array}
 		*/
-		public rows: R[];
+		public rows: T[];
 
 		/**
 		* Sub-groups that are part of the group.
 		* @property groups
 		* @type {Array}
 		*/
-		public groups: Group<T, R>[];
+		public groups: Group<T>[];
 
 		/**
 		* A unique key used to identify the group.  This key can be used in calls to DataView
@@ -292,7 +292,7 @@ declare module Slick {
 		* @param group {Group} Group instance to compare to.
 		* todo: this is on the prototype (NonDataRow()) instance, not Group, maybe doesn't matter?
 		*/
-		public equals(group: Group<T, R>): boolean;
+		public equals(group: Group<T>): boolean;
 	}
 
 	/***
@@ -304,7 +304,7 @@ declare module Slick {
 	* @extends Slick.NonDataItem
 	* @constructor
 	*/
-	export class GroupTotals<T, R> extends NonDataRow {
+	export class GroupTotals<T> extends NonDataRow {
 
 		constructor();
 
@@ -313,7 +313,7 @@ declare module Slick {
 		* @param group
 		* @type {Group}
 		*/
-		public group: Group<T, R>;
+		public group: Group<T>;
 
 	}
 
@@ -507,11 +507,11 @@ declare module Slick {
 		getEditor<T>(column: Column<T>): Editors.Editor<T>;
 	}
 
-	export interface FormatterFactory<T extends Slick.SlickData> {
+	export interface FormatterFactory<T extends SlickData> {
 		getFormatter(column: Column<T>): Formatter<any>;
 	}
 
-	export interface GridOptions<T extends Slick.SlickData> {
+	export interface GridOptions<T extends SlickData> {
 
 		/**
 		* Makes cell editors load asynchronously after a small delay. This greatly increases keyboard navigation speed.
@@ -690,14 +690,86 @@ declare module Slick {
 	}
 
 	export interface DataProvider<T extends SlickData> {
-		getItem(index: number): T;
+		/**
+		 * Returns the number of data items in the set.
+		 */
 		getLength(): number;
+
+		/**
+		 * Returns the item at a given index.
+		 * @param index
+		 */
+		getItem(index: number): T;
+
+		/**
+		 * Returns the metadata for the item at a given index (optional).
+		 * @param index
+		 */
+		getItemMetadata?(index: number): RowMetadata<T>;
 	}
 
 	export interface SlickData {
 		// todo ? might be able to leave as empty
 	}
 
+	export interface RowMetadata<T> {
+		/**
+		 * One or more (space-separated) CSS classes to be added to the entire row.
+		 */
+		cssClasses?: string;
+
+		/**
+		 * Whether or not any cells in the row can be set as "active".
+		 */
+		focusable?: boolean;
+
+		/**
+		 * Whether or not a row or any cells in it can be selected.
+		 */
+		selectable?: boolean;
+
+		/**
+		 * Metadata related to individual columns
+		 */
+		columns?: {
+			/**
+			 * Metadata indexed by column id
+			 */
+			[index: string]: ColumnMetadata<T>;
+			/**
+			 * Metadata indexed by column index
+			 */
+			[index: number]: ColumnMetadata<T>;
+		}
+	}
+
+	export interface ColumnMetadata<T extends SlickData> {
+		/**
+		 * Whether or not a cell can be set as "active".
+		 */
+		focusable?: boolean;
+
+		/**
+		 * Whether or not a cell can be selected.
+		 */
+		selectable?: boolean;
+
+		/**
+		 * A custom cell formatter.
+		 */
+		formatter?: Formatter<T>;
+
+		/**
+		 * A custom cell editor.
+		 */
+		editor?: Slick.Editors.Editor<T>;
+
+		/**
+		 * Number of columns this cell will span. Can also contain "*" to indicate that the cell should span the rest of the row.
+		 */
+		colspan?: number|string;
+	}
+
 	/**
 	* Selecting cells in SlickGrid is handled by a selection model.
 	* Selection models are controllers responsible for handling user interactions and notifying subscribers of the changes in the selection. Selection is represented as an array of Slick.Range objects.
@@ -729,23 +801,8 @@ declare module Slick {
 		* @param options Additional options.  See Grid Options for a list of options that can be included.
 		**/
 		constructor(
-			container: string,
-			data: T[],
-			columns: Column<T>[],
-			options: GridOptions<T>);
-		constructor(
-			container: HTMLElement,
-			data: T[],
-			columns: Column<T>[],
-			options: GridOptions<T>);
-		constructor(
-			container: string,
-			data: DataProvider<T>,
-			columns: Column<T>[],
-			options: GridOptions<T>);
-		constructor(
-			container: HTMLElement,
-			data: DataProvider<T>,
+			container: string|HTMLElement|JQuery,
+			data: T[]|DataProvider<T>,
 			columns: Column<T>[],
 			options: GridOptions<T>);
 
@@ -878,7 +935,7 @@ declare module Slick {
 		* todo: no docs or comments available
 		* @return
 		**/
-		public getSortColumns(): Column<T>[];
+		public getSortColumns(): { columnId: string; sortAsc: boolean }[];
 
 		/**
 		* Updates an existing column definition and a corresponding header DOM element with the new title and tooltip.
@@ -1121,39 +1178,39 @@ declare module Slick {
 
 		// #region Events
 
-		public onScroll: Slick.Event<OnScrollEventData>;
-		public onSort: Slick.Event<OnSortEventData<T>>;
-		public onHeaderMouseEnter: Slick.Event<OnHeaderMouseEventData<T>>;
-		public onHeaderMouseLeave: Slick.Event<OnHeaderMouseEventData<T>>;
-		public onHeaderContextMenu: Slick.Event<OnHeaderContextMenuEventData<T>>;
-		public onHeaderClick: Slick.Event<OnHeaderClickEventData<T>>;
-		public onHeaderCellRendered: Slick.Event<OnHeaderCellRenderedEventData<T>>;
-		public onBeforeHeaderCellDestroy: Slick.Event<OnBeforeHeaderCellDestroyEventData<T>>;
-		public onHeaderRowCellRendered: Slick.Event<OnHeaderRowCellRenderedEventData<T>>;
-		public onBeforeHeaderRowCellDestroy: Slick.Event<OnBeforeHeaderRowCellDestroyEventData<T>>;
-		public onMouseEnter: Slick.Event<OnMouseEnterEventData>;
-		public onMouseLeave: Slick.Event<OnMouseLeaveEventData>;
-		public onClick: Slick.Event<OnClickEventData>;
-		public onDblClick: Slick.Event<OnDblClickEventData>;
-		public onContextMenu: Slick.Event<OnContextMenuEventData>;
-		public onKeyDown: Slick.Event<OnKeyDownEventData>;
-		public onAddNewRow: Slick.Event<OnAddNewRowEventData<T>>;
-		public onValidationError: Slick.Event<OnValidationErrorEventData<T>>;
-		public onColumnsReordered: Slick.Event<OnColumnsReorderedEventData>;
-		public onColumnsResized: Slick.Event<OnColumnsResizedEventData>;
-		public onCellChange: Slick.Event<OnCellChangeEventData<T>>;
-		public onBeforeEditCell: Slick.Event<OnBeforeEditCellEventData<T>>;
-		public onBeforeCellEditorDestroy: Slick.Event<OnBeforeCellEditorDestroyEventData<T>>;
-		public onBeforeDestroy: Slick.Event<OnBeforeDestroyEventData>;
-		public onActiveCellChanged: Slick.Event<OnActiveCellChangedEventData>;
-		public onActiveCellPositionChanged: Slick.Event<OnActiveCellPositionChangedEventData>;
-		public onDragInit: Slick.Event<OnDragInitEventData>;
-		public onDragStart: Slick.Event<OnDragStartEventData>;
-		public onDrag: Slick.Event<OnDragEventData>;
-		public onDragEnd: Slick.Event<OnDragEndEventData>;
-		public onSelectedRowsChanged: Slick.Event<OnSelectedRowsChangedEventData>;
-		public onCellCssStylesChanged: Slick.Event<OnCellCssStylesChangedEventData>;
-		public onViewportChanged: Slick.Event<OnViewportChangedEventData>;
+		public onScroll: Slick.Event<OnScrollEventArgs<T>>;
+		public onSort: Slick.Event<OnSortEventArgs<T>>;
+		public onHeaderMouseEnter: Slick.Event<OnHeaderMouseEventArgs<T>>;
+		public onHeaderMouseLeave: Slick.Event<OnHeaderMouseEventArgs<T>>;
+		public onHeaderContextMenu: Slick.Event<OnHeaderContextMenuEventArgs<T>>;
+		public onHeaderClick: Slick.Event<OnHeaderClickEventArgs<T>>;
+		public onHeaderCellRendered: Slick.Event<OnHeaderCellRenderedEventArgs<T>>;
+		public onBeforeHeaderCellDestroy: Slick.Event<OnBeforeHeaderCellDestroyEventArgs<T>>;
+		public onHeaderRowCellRendered: Slick.Event<OnHeaderRowCellRenderedEventArgs<T>>;
+		public onBeforeHeaderRowCellDestroy: Slick.Event<OnBeforeHeaderRowCellDestroyEventArgs<T>>;
+		public onMouseEnter: Slick.Event<OnMouseEnterEventArgs<T>>;
+		public onMouseLeave: Slick.Event<OnMouseLeaveEventArgs<T>>;
+		public onClick: Slick.Event<OnClickEventArgs<T>>;
+		public onDblClick: Slick.Event<OnDblClickEventArgs<T>>;
+		public onContextMenu: Slick.Event<OnContextMenuEventArgs<T>>;
+		public onKeyDown: Slick.Event<OnKeyDownEventArgs<T>>;
+		public onAddNewRow: Slick.Event<OnAddNewRowEventArgs<T>>;
+		public onValidationError: Slick.Event<OnValidationErrorEventArgs<T>>;
+		public onColumnsReordered: Slick.Event<OnColumnsReorderedEventArgs<T>>;
+		public onColumnsResized: Slick.Event<OnColumnsResizedEventArgs<T>>;
+		public onCellChange: Slick.Event<OnCellChangeEventArgs<T>>;
+		public onBeforeEditCell: Slick.Event<OnBeforeEditCellEventArgs<T>>;
+		public onBeforeCellEditorDestroy: Slick.Event<OnBeforeCellEditorDestroyEventArgs<T>>;
+		public onBeforeDestroy: Slick.Event<OnBeforeDestroyEventArgs<T>>;
+		public onActiveCellChanged: Slick.Event<OnActiveCellChangedEventArgs<T>>;
+		public onActiveCellPositionChanged: Slick.Event<OnActiveCellPositionChangedEventArgs<T>>;
+		public onDragInit: Slick.Event<OnDragInitEventArgs<T>>;
+		public onDragStart: Slick.Event<OnDragStartEventArgs<T>>;
+		public onDrag: Slick.Event<OnDragEventArgs<T>>;
+		public onDragEnd: Slick.Event<OnDragEndEventArgs<T>>;
+		public onSelectedRowsChanged: Slick.Event<OnSelectedRowsChangedEventArgs<T>>;
+		public onCellCssStylesChanged: Slick.Event<OnCellCssStylesChangedEventArgs<T>>;
+		public onViewportChanged: Slick.Event<OnViewportChangedEventArgs<T>>;
 		// #endregion Events
 
 		// #region Plugins
@@ -1169,6 +1226,7 @@ declare module Slick {
 		public invalidate(): void;
 		public invalidateRow(row: number): void;
 		public invalidateRows(rows: number[]): void;
+		public invalidateAllRows(): void;
 		public updateCell(row: number, cell: number): void;
 		public updateRow(row: number): void;
 		public getViewport(viewportTop?: number, viewportLeft?: number): Viewport;
@@ -1191,74 +1249,78 @@ declare module Slick {
 		// #endregion Editors
 	}
 
-	export interface OnCellCssStylesChangedEventData {
+	export interface GridEventArgs<T extends SlickData> {
+		grid: Grid<T>;
+	}
+
+	export interface OnCellCssStylesChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		key: string;
 		hash: CellCssStylesHash;
 	}
 
-	export interface OnSelectedRowsChangedEventData {
+	export interface OnSelectedRowsChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		rows: number[];
 	}
 
-	export interface OnDragEndEventData {
+	export interface OnDragEndEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		// todo: need to understand $canvas drag event parameter's 'dd' object
 		// the documentation is not enlightening
 	}
 
-	export interface OnDragEventData {
+	export interface OnDragEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		// todo: need to understand $canvas drag event parameter's 'dd' object
 		// the documentation is not enlightening
 	}
 
-	export interface OnDragStartEventData {
+	export interface OnDragStartEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		// todo: need to understand $canvas drag event parameter's 'dd' object
 		// the documentation is not enlightening
 	}
 
-	export interface OnDragInitEventData {
+	export interface OnDragInitEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		// todo: need to understand $canvas drag event parameter's 'dd' object
 		// the documentation is not enlightening
 	}
 
-	export interface OnActiveCellPositionChangedEventData {
+	export interface OnActiveCellPositionChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnActiveCellChangedEventData {
+	export interface OnActiveCellChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 	}
 
-	export interface OnBeforeDestroyEventData {
+	export interface OnBeforeDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnBeforeCellEditorDestroyEventData<T extends Slick.SlickData> {
+	export interface OnBeforeCellEditorDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		editor: Editors.Editor<T>;
 	}
 
-	export interface OnBeforeEditCellEventData<T extends SlickData> {
+	export interface OnBeforeEditCellEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 		item: T;
 		column: Column<T>;
 	}
 
-	export interface OnCellChangeEventData<T extends SlickData> {
+	export interface OnCellChangeEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 		item: T;
 	}
 
-	export interface OnColumnsResizedEventData {
+	export interface OnColumnsResizedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnColumnsReorderedEventData {
+	export interface OnColumnsReorderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnValidationErrorEventData<T extends SlickData> {
+	export interface OnValidationErrorEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		editor: Editors.Editor<T>;
 		cellNode: HTMLElement;
 		validationResults: ValidateResults;
@@ -1267,92 +1329,91 @@ declare module Slick {
 		column: Column<T>;
 	}
 
-	export interface OnAddNewRowEventData<T extends SlickData> {
+	export interface OnAddNewRowEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		item: T;
 		column: Column<T>;
 	}
 
-	export interface OnKeyDownEventData {
+	export interface OnKeyDownEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 	}
 
-	export interface OnContextMenuEventData {
+	export interface OnContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnDblClickEventData {
+	export interface OnDblClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 	}
 
-	export interface OnClickEventData {
+	export interface OnClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		row: number;
 		cell: number;
 	}
 
-	export interface OnMouseLeaveEventData {
+	export interface OnMouseLeaveEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnMouseEnterEventData {
+	export interface OnMouseEnterEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
-	export interface OnBeforeHeaderRowCellDestroyEventData<T extends SlickData> {
+	export interface OnBeforeHeaderRowCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		node: HTMLElement; // todo: might be JQuery instance
 		column: Column<T>;
 	}
 
-	export interface OnHeaderRowCellRenderedEventData<T extends SlickData> {
+	export interface OnHeaderRowCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		node: HTMLElement; // todo: might be JQuery instance
 		column: Column<T>;
 	}
 
-	export interface OnBeforeHeaderCellDestroyEventData<T extends SlickData> {
+	export interface OnBeforeHeaderCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		node: HTMLElement; // todo: might be JQuery instance
 		column: Column<T>;
 	}
 
-	export interface OnHeaderCellRenderedEventData<T extends SlickData> {
+	export interface OnHeaderCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		node: HTMLElement;	// todo: might be JQuery instance
 		column: Column<T>;
 	}
 
-	export interface OnHeaderClickEventData<T extends SlickData> {
+	export interface OnHeaderClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		column: Column<T>;
 	}
 
-	export interface OnHeaderContextMenuEventData<T extends SlickData> {
+	export interface OnHeaderContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		column: Column<T>;
 	}
 
-	export interface OnHeaderMouseEventData<T extends SlickData> {
+	export interface OnHeaderMouseEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		column: Column<T>;
 	}
 
-	// todo: merge with existing column definition
-	export interface Column<T extends SlickData> {
-		sortCol?: Column<T>;
-		sortAsc?: boolean;
-	}
-
-	export interface OnSortEventData<T extends SlickData> {
+	export interface OnSortEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		multiColumnSort: boolean;
-		sortCol?: Column<T>;
-		sortCols: Column<T>[];
-		sortAsc?: boolean;
+		sortCol?: SortColumn<T>;
+		sortCols?: SortColumn<T>[];
+		sortAsc: boolean;
 	}
 
-	export interface OnScrollEventData {
+	export interface OnScrollEventArgs<T extends SlickData> extends GridEventArgs<T> {
 		scrollLeft: number;
 		scrollTop: number;
 	}
 
-	export interface OnViewportChangedEventData {
+	export interface OnViewportChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
 
 	}
 
+	export interface SortColumn<T extends SlickData> {
+		sortCol: Column<T>;
+		sortAsc: boolean;
+	}
+
 	export interface Cell {
 		row: number;
 		cell: number;
@@ -1463,7 +1524,7 @@ declare module Slick {
 		}
 	}
 
-	export interface Formatter<T extends Slick.SlickData> {
+	export interface Formatter<T extends SlickData> {
         (row: number, cell: number, value: any, columnDef: Column<T>, dataContext: SlickData): string;
 	}
 
@@ -1500,8 +1561,7 @@ declare module Slick {
 			public fastSort(field: string, ascending: boolean): void;
 			public fastSort(field: Function, ascending: boolean): void;		// todo: typeof(field), should be the same callback as Array.sort
 			public reSort(): void;
-			public setGrouping(groupingInfos: GroupingOptions<T>[]): void;
-			public setGrouping(groupingInfo: GroupingOptions<T>): void;
+			public setGrouping(groupingInfos: GroupingOptions<T> | GroupingOptions<T>[]): void;
 			public getGrouping(): GroupingOptions<T>[];
 
 			/**
@@ -1539,11 +1599,11 @@ declare module Slick {
 			*     the 'high' setGrouping.
 			*/
 			public expandGroup(...varArgs: string[]): void;
-			public getGroups(): Group<T, any>[];
+			public getGroups(): Group<T>[];
 			public getIdxById(id: string): number;
-			public getRowById(): T;
+			public getRowById(id: string): number;
 			public getItemById(id: any): T;
-			public getItemByIdx(): T;
+			public getItemByIdx(idx: number): T;
 			public mapRowsToIds(rowArray: T[]): string[];
 			public setRefreshHints(hints: RefreshHints): void;
 			public setFilterArgs(args: any): void;
@@ -1557,7 +1617,7 @@ declare module Slick {
 
 			public getLength(): number;
 			public getItem(index: number): T;
-			public getItemMetadata(index?: number): void;
+			public getItemMetadata(index: number): RowMetadata<T>;
 
 			public onRowCountChanged: Slick.Event<OnRowCountChangedEventData>;
 			public onRowsChanged: Slick.Event<OnRowsChangedEventData>;
@@ -1565,16 +1625,16 @@ declare module Slick {
 		}
 
 		export interface GroupingOptions<T> {
-			getter: Function;	// todo
-			formatter: Formatter<T>;
-			comparer: (a:any, b:any) => any;	// todo
-			predefinedValues: any[];	// todo
-			aggregators: Aggregators.Aggregator<T>[];
-			aggregateEmpty: boolean;
-			aggregateCollapsed: boolean;
-			aggregateChildGroups: boolean;
-			collapsed: boolean;
-			displayTotalsRow: boolean;
+			getter?: ((item?: T) => any) | string;
+			formatter?: (item?: T) => string;
+			comparer?: (a: Group<T>, b: Group<T>) => number;
+			predefinedValues?: any[];	// todo
+			aggregators?: Aggregators.Aggregator<T>[];
+			aggregateEmpty?: boolean;
+			aggregateCollapsed?: boolean;
+			aggregateChildGroups?: boolean;
+			collapsed?: boolean;
+			displayTotalsRow?: boolean;
 		}
 
 		export interface PagingOptions {
@@ -1607,7 +1667,7 @@ declare module Slick {
 				public field: string;
 				public init(): void;
 				public accumulate(item: T): void;
-				public storeResult(groupTotals: GroupTotals<T, any>): void;	// todo "R"
+				public storeResult(groupTotals: GroupTotals<T>): void;
 			}
 
 			export class Avg<T> extends Aggregator<T> {
@@ -1644,29 +1704,8 @@ declare module Slick {
 		export class GroupItemMetadataProvider<T extends Slick.SlickData> {
 			public init(): void;
 			public destroy(): void;
-			public getGroupRowMetadata(): GroupRowMetadata<T>;
-			public getTotalsRowMetadata(): TotalsRowMetadata<T>;
-		}
-
-		export interface GroupRowMetadata<T extends Slick.SlickData> {
-			selectable: boolean;
-			focusable: boolean;
-			cssClasses: string;
-			columns: {
-				0: {
-					colspan: string;
-					formatter: Formatter<T>;
-					editor: Slick.Editors.Editor<T>;
-				}
-			};
-		}
-
-		export interface TotalsRowMetadata<T extends Slick.SlickData> {
-			selectable: boolean;
-			focusable: boolean;
-			cssClasses: string;
-			formatter: Formatter<T>;
-			editor: Slick.Editors.Editor<T>;
+			public getGroupRowMetadata(item?: Group<T>): RowMetadata<T>;
+			public getTotalsRowMetadata(item?: GroupTotals<T>): RowMetadata<T>;
 		}
 
 		export interface GroupItemMetadataProviderOptions {
@@ -1707,7 +1746,7 @@ declare module Slick {
 
 	export class Plugin<T extends Slick.SlickData> {
 
-		constructor(options: PluginOptions);
+		constructor(options?: PluginOptions);
 		public init(grid: Grid<T>): void;
 		public destroy(): void;
 	}
diff --git a/slickgrid/slick.headerbuttons.d.ts b/slickgrid/slick.headerbuttons.d.ts
index 613203f43..df7e6bb25 100644
--- a/slickgrid/slick.headerbuttons.d.ts
+++ b/slickgrid/slick.headerbuttons.d.ts
@@ -24,7 +24,7 @@ declare module Slick {
         tooltip?: string;
     }
 
-    export interface OnCommandEventData<T extends SlickData> {
+    export interface OnCommandEventArgs<T extends SlickData> {
         grid: Grid<T>;
         column: Column<T>;
         command: string;
@@ -35,7 +35,7 @@ declare module Slick {
 
         export class HeaderButtons<T extends SlickData> extends Plugin<T> {
             constructor();
-            public onCommand: Event<OnCommandEventData<T>>;
+            public onCommand: Event<OnCommandEventArgs<T>>;
         }
     }
 }
diff --git a/snapsvg/snapsvg.d.ts b/snapsvg/snapsvg.d.ts
index 56d6b27b4..aff964a6d 100644
--- a/snapsvg/snapsvg.d.ts
+++ b/snapsvg/snapsvg.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Snap-SVG 0.3
+// Type definitions for Snap-SVG 0.4.1
 // Project: https://github.com/adobe-webplatform/Snap.svg
-// Definitions by: Lars Klein <https://github.com/lhk>
+// Definitions by: Lars Klein <https://github.com/lhk>, Mattanja Kern <https://github.com/mattanja>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare function mina(a:number, A:number, b:number, B:number, get:Function, set:Function, easing?:(num:number)=>number):mina.AnimationDescriptor;
@@ -13,7 +13,8 @@ declare module mina {
         status: Function;
         stop: Function;
     }
-    export interface AnimationDescriptor{
+
+    export interface AnimationDescriptor {
 		id: string;
         start: number;
         end: number;
@@ -53,13 +54,12 @@ declare function Snap(query:string):Snap.Paper;
 declare function Snap(DOM:SVGElement):Snap.Paper;
 
 declare module Snap {
-
 	export var filter:Filter;
 	export var path:Path;
-	
+
 	export function Matrix(a:number,b:number,c:number,d:number,e:number,f:number):Matrix;
 	export function Matrix(svgMatrix:SVGMatrix):Matrix;
-	
+
 	export function ajax(url:string,postData:string,callback:Function,scope?:Object):XMLHttpRequest;
 	export function ajax(url:string,postData:Object,callback:Function,scope?:Object):XMLHttpRequest;
 	export function ajax(url:string,callback:Function,scope?:Object):XMLHttpRequest;
@@ -72,10 +72,10 @@ declare module Snap {
 	export function select(query:string):Snap.Element;
 	export function selectAll(query:string):any;
 	export function snapTo(values:Array<number>,value:number,tolerance?:number):number;
-	
+
 	export function animate(from:number|number[],to:number|number[],updater:(n:number)=>void,duration:number,easing?:(num:number)=>number,callback?:()=>void):mina.MinaAnimation;
 	export function animation(attr:Object,duration:number,easing?:(num:number)=>number,callback?:()=>void):Snap.Animation;
-	
+
 	export function color(clr:string):RGBHSB;
 	export function getRGB(color:string):RGB;
 	export function hsb(h:number,s:number,b:number):HSB;
@@ -89,27 +89,39 @@ declare module Snap {
 	export function angle(x1:number,y1:number,x2:number,y2:number,x3?:number,y3?:number):number;
 	export function rad(deg:number):number;
 	export function deg(rad:number):number;
-	
+	export function sin(angle: number): number;
+	export function cos(angle: number): number;
+	export function tan(angle: number): number;
+	export function asin(angle: number): number;
+	export function acos(angle: number): number;
+	export function atan(angle: number): number;
+	export function atan2(angle: number): number;
+
+	export function len(x1: number, y1: number, x2: number, y2: number): number;
+	export function len2(x1: number, y1: number, x2: number, y2: number): number;
+
 	export function parse(svg:string):Fragment;
 	export function parsePathString(pathString:string):Array<any>;
 	export function parsePathString(pathString:Array<string>):Array<any>;
 	export function parseTransformString(TString:string):Array<any>;
 	export function parseTransformString(TString:Array<string>):Array<any>;
-	
-	export interface RGB{
+
+	export function closest(x: number, y: number, X: number, Y: number): boolean;
+
+	export interface RGB {
 		r:number;
 		g:number;
 		b:number;
 		hex:string;
 	}
-	
-	export interface HSB{
+
+	export interface HSB {
 		h:number;
 		s:number;
 		b:number;
 	}
-	
-	export interface RGBHSB{
+
+	export interface RGBHSB {
 		r:number;
 		g:number;
 		b:number;
@@ -120,14 +132,14 @@ declare module Snap {
 		v:number;
 		l:number;
 	}
-	
-	export interface HSL{
+
+	export interface HSL {
 		h:number;
 		s:number;
 		l:number;
 	}
-	
-	export interface BBox{
+
+	export interface BBox {
 		cx:number;
 		cy:number;
 		h:number;
@@ -144,7 +156,7 @@ declare module Snap {
 		y2:number;
 		y:number;
 	}
-	
+
 	export interface TransformationDescriptor {
         string: string;
         globalMatrix: Snap.Matrix;
@@ -154,7 +166,8 @@ declare module Snap {
         local: string;
         toString(): string;
     }
-	export interface Animation{
+
+	export interface Animation {
 		attr:{[attr:string]:string|number|boolean|any};
 		duration:number;
 		easing?:(num:number)=>number;
@@ -165,16 +178,19 @@ declare module Snap {
 		add(el:Snap.Element):Snap.Element;
 		addClass(value:string):Snap.Element;
 		after(el:Snap.Element):Snap.Element;
-		animate(attrs:{[attr:string]:string|number|boolean|any},duration:number,easing?:(num: number)=> number,callback?:()=>void):Snap.Element;
+		align(el: Snap.Element, way: string):Snap.Element;
 		animate(animation:any):Snap.Element;
+		animate(attrs:{[attr:string]:string|number|boolean|any},duration:number,easing?:(num: number)=> number,callback?:()=>void):Snap.Element;
 		append(el:Snap.Element):Snap.Element;
 		appendTo(el:Snap.Element):Snap.Element;
 		asPX(attr:string,value?:string):number;            //TODO: check what is really returned
-		attr(params:{[attr:string]:string|number|boolean|any}):Snap.Element;
 		attr(param:string):string;
+		attr(params:{[attr:string]:string|number|boolean|any}):Snap.Element;
 		before(el:Snap.Element):Snap.Element;
+		children(): Snap.Element[];
 		clone():Snap.Element;
 		data(key:string,value?:any):any;
+		getAlign(el: Snap.Element, way: string): string;
 		getBBox():BBox;
 		getPointAtLength(length:number):{x:number, y:number, alpha:number};
 		getSubpath(from:number,to:number):string;
@@ -195,20 +211,20 @@ declare module Snap {
 		removeClass(value:string):Snap.Element;
 		removeData(key?:string):Snap.Element;
 		select(query:string):Snap.Element;
-        selectAll(query: string): Snap.Set;
-        selectAll(): Snap.Set;
 		stop():Snap.Element;
 		toDefs():Snap.Element;
+		toJSON(): any;
+		toggleClass(value:string,flag:boolean):Snap.Element;
 		toPattern(x:number,y:number,width:number,height:number):Object;
 		toPattern(x:string,y:string,width:string,height:string):Object;
 		toString():string;
-		toggleClass(value:string,flag:boolean):Snap.Element;
-		transform(tstr:string):Snap.Element;
 		transform(): TransformationDescriptor;
+		transform(tstr:string):Snap.Element;
 		type:string;
 		use():Object;
-		
-		
+        selectAll(): Snap.Set;
+        selectAll(query: string): Snap.Set;
+
         click(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         dblclick(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         mousedown(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
@@ -220,7 +236,7 @@ declare module Snap {
         touchmove(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         touchend(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         touchcancel(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
-        
+
         unclick(handler?: (event: MouseEvent) => void): Snap.Element;
         undblclick(handler: (event: MouseEvent) => void): Snap.Element;
         unmousedown(handler: (event: MouseEvent) => void): Snap.Element;
@@ -236,9 +252,9 @@ declare module Snap {
         hover(hoverInHandler: (event: MouseEvent) => void, hoverOutHandler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         hover(hoverInHandler: (event: MouseEvent) => void, hoverOutHandler: (event: MouseEvent) => void, inThisArg?: any, outThisArg?: any): Snap.Element;
         unhover(hoverInHandler: (event: MouseEvent) => void, hoverOutHandler: (event: MouseEvent) => void): Snap.Element;
-		
+
 		drag():Snap.Element;
-        drag(onMove:  (dx: number, dy: number, event: MouseEvent) => void,
+        drag(onMove:  (dx: number, dy: number, x: number, y: number, event: MouseEvent) => void,
              onStart: (x: number, y: number, event: MouseEvent) => void,
              onEnd:   (event: MouseEvent) => void,
              moveThisArg?: any,
@@ -249,15 +265,14 @@ declare module Snap {
                onStart: (x: number, y: number, event: MouseEvent) => void,
                onEnd:   (event: MouseEvent) => void): Snap.Element;
 	}
-	
+
 	export interface Fragment {
 		//TODO: The documentation says that selectAll returns a set, but the getting started guide
 		// uses .attr on the returned object. That's not supported by a set
 		select(query:string):Snap.Element;
 		selectAll(query ?:string):Snap.Set;
 	}
-	
-	
+
 	export interface Matrix {
 		add(a:number,b:number,c:number,d:number,e:number,f:number):Matrix;
 		add(matrix:Matrix):Matrix;
@@ -267,13 +282,13 @@ declare module Snap {
 		rotate(a:number,x?:number,y?:number):Matrix;
 		scale(x:number,y?:number,cx?:number,cy?:number):Matrix;
 		split():ExplicitTransform;
-		toTransformString():string;	
+		toTransformString():string;
 		translate(x:number,y:number):Matrix;
 		x(x:number,y:number):number;
 		y(x:number,y:number):number;
-	
+
 	}
-	
+
 	interface ExplicitTransform {
         dx: number;
         dy: number;
@@ -283,32 +298,32 @@ declare module Snap {
         rotate: number;
         isSimple: boolean;
     }
-	
-	interface Paper extends Snap.Element {
 
-	clear():void;
-	el(name:string, attr:Object):Snap.Element;
-	filter(filstr:string):Snap.Element;
-	gradient(gradient:string):any;
-	g(varargs?:any):any;
-	group(...els:any[]):any;
-	mask(varargs:any):Object;
-	ptrn(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
-	svg(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
-	toString():string;
-	use(id?:string):Object;
-	use(id?:Snap.Element):Object;
-	
-	circle(x:number,y:number,r:number):Snap.Element;
-	ellipse(x:number,y:number,rx:number,ry:number):Snap.Element;
-	image(src:string,x:number,y:number,width:number,height:number):Snap.Element;
-	line(x1:number,y1:number,x2:number,y2:number):Snap.Element;
-	path(pathString?:string):Snap.Element;
-	polygon(varargs:any[]):Snap.Element;
-	polyline(varargs:any[]):Snap.Element;
-	rect(x:number,y:number,width:number,height:number,rx?:number,ry?:number):Snap.Element;
-	text(x:number,y:number,text:string|number):Snap.Element;
-	text(x:number,y:number,text:Array<string|number>):Snap.Element;
+	interface Paper extends Snap.Element {
+		clear():void;
+		el(name:string, attr:Object):Snap.Element;
+		filter(filstr:string):Snap.Element;
+		gradient(gradient:string):any;
+		g(varargs?:any):any;
+		group(...els:any[]):any;
+		mask(varargs:any):Object;
+		ptrn(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
+		svg(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
+		toDataUrl(): string;
+		toString():string;
+		use(id?:string):Object;
+		use(id?:Snap.Element):Object;
+
+		circle(x:number,y:number,r:number):Snap.Element;
+		ellipse(x:number,y:number,rx:number,ry:number):Snap.Element;
+		image(src:string,x:number,y:number,width:number,height:number):Snap.Element;
+		line(x1:number,y1:number,x2:number,y2:number):Snap.Element;
+		path(pathString?:string):Snap.Element;
+		polygon(varargs:any[]):Snap.Element;
+		polyline(varargs:any[]):Snap.Element;
+		rect(x:number,y:number,width:number,height:number,rx?:number,ry?:number):Snap.Element;
+		text(x:number,y:number,text:string|number):Snap.Element;
+		text(x:number,y:number,text:Array<string|number>):Snap.Element;
 	}
 
 	export interface Set {
@@ -327,7 +342,7 @@ declare module Snap {
 		push(els:Snap.Element[]):Snap.Element;
 		splice(index:number,count:number,insertion?:Object[]):Snap.Element[];
 	}
-	
+
 	interface Filter {
 		blur(x:number,y?:number):string;
 		brightness(amount:number):string;
@@ -339,9 +354,9 @@ declare module Snap {
 		sepia(amount:number):string;
 		shadow(dx: number, dy: number, blur: number, color: string, opacity: number): string;
         shadow(dx: number, dy: number, color: string, opacity: number): string;
-        shadow(dx: number, dy: number, opacity: number): string;	
+        shadow(dx: number, dy: number, opacity: number): string;
 	}
-	
+
 	interface Path {
 		bezierBBox(...args:number[]):BBox;
 		bezierBBox(bez:Array<number>):BBox;
@@ -363,7 +378,7 @@ declare module Snap {
 		toCubic(pathString:Array<string>):Array<any>;
 		toRelative(path:string):Array<any>;
 	}
-	
+
 	interface IntersectionDot{
 		x:number,
 		y:number,
diff --git a/socket.io-client/legacy/socket.io-client-0.9-commonjs-tests.ts b/socket.io-client/legacy/socket.io-client-0.9-commonjs-tests.ts
deleted file mode 100644
index beb8f0fad..000000000
--- a/socket.io-client/legacy/socket.io-client-0.9-commonjs-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import io = require('socket.io-client-0.9');
-
-var socket = io.connect('http://localhost:80');
-
-socket.on('connect', function () {
-    console.log('Connected!');
-    socket.emit('event', 'some test data', function () {
-        console.log('Sent some data.');
-    });
-});
diff --git a/socket.io-client/legacy/socket.io-client-0.9-tests.ts b/socket.io-client/legacy/socket.io-client-0.9-tests.ts
deleted file mode 100644
index 717830628..000000000
--- a/socket.io-client/legacy/socket.io-client-0.9-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/// <reference path="socket.io-client-0.9.d.ts"/>
-
-var socket = io.connect('http://localhost:80');
-
-socket.on('connect', function () {
-    console.log('Connected!');
-    socket.emit('event', 'some test data', function () {
-        console.log('Sent some data.');
-    });
-});
diff --git a/socket.io-client/legacy/socket.io-client-0.9.d.ts b/socket.io-client/legacy/socket.io-client-0.9.d.ts
deleted file mode 100644
index 0b3626e42..000000000
--- a/socket.io-client/legacy/socket.io-client-0.9.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for socket.io nodejs client
-// Project: http://socket.io/
-// Definitions by: Maido Kaara <https://github.com/v3rm0n>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "socket.io-client-0.9" {
-  export = io;
-}
-
-declare var io: SocketIOStatic;
-
-interface SocketIOStatic {
-    connect(host: string, details?: any): SocketIOClient.Socket;
-}
-
-declare module SocketIOClient {
-    interface EventEmitter {
-        emit(name: string, ...data: any[]): any;
-        on(ns: string, fn: Function): EventEmitter;
-        addListener(ns: string, fn: Function): EventEmitter;
-        removeListener(ns: string, fn: Function): EventEmitter;
-        removeAllListeners(ns: string): EventEmitter;
-        once(ns: string, fn: Function): EventEmitter;
-        listeners(ns: string): Function[];
-    }
-
-    interface SocketNamespace extends EventEmitter {
-        of(name: string): SocketNamespace;
-        send(data: any, fn: Function): SocketNamespace;
-        emit(name: string): SocketNamespace;
-    }
-
-    interface Socket extends EventEmitter {
-        of(name: string): SocketNamespace;
-        connect(fn: Function): Socket;
-        packet(data: any): Socket;
-        flushBuffer(): void;
-        disconnect(): Socket;
-    }
-}
diff --git a/socket.io-client/legacy/socket.io-client-1.2.0-tests.ts b/socket.io-client/legacy/socket.io-client-1.2.0-tests.ts
deleted file mode 100644
index 3ad8db95f..000000000
--- a/socket.io-client/legacy/socket.io-client-1.2.0-tests.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/// <reference path="socket.io-client-1.2.0.d.ts"/>
-
-function testUsingWithNodeHTTPServer() {
-    var socket = io('http://localhost');
-    socket.on('news', function (data: any) {
-        console.log(data);
-        socket.emit('my other event', { my: 'data' });
-    });
-}
-
-function testUsingWithExpress() {
-    var socket = io.connect('http://localhost');
-    socket.on('news', function (data: any) {
-        console.log(data);
-        socket.emit('my other event', { my: 'data' });
-    });
-}
-
-function testUsingWithTheExpressFramework() {
-    var socket = io.connect('http://localhost');
-    socket.on('news', function (data: any) {
-        console.log(data);
-        socket.emit('my other event', { my: 'data' });
-    });
-}
-
-function testRestrictingYourselfToANamespace() {
-    var chat = io.connect('http://localhost/chat')
-        , news = io.connect('http://localhost/news');
-
-    chat.on('connect', function () {
-        chat.emit('hi!');
-    });
-
-    news.on('news', function () {
-        news.emit('woot');
-    });
-}
-
-function testSendingAndGettingData() {
-    var socket = io();
-    socket.on('connect', function () {
-        socket.emit('ferret', 'tobi', function (data: any) {
-            console.log(data);
-        });
-    });
-}
-
-function testUsingItJustAsACrossBrowserWebSocket() {
-    var socket = io('http://localhost/');
-    socket.on('connect', function () {
-        socket.emit('hi');
-
-        socket.on('message', function (msg: any) {
-        });
-    });
-}
diff --git a/socket.io-client/legacy/socket.io-client-1.2.0.d.ts b/socket.io-client/legacy/socket.io-client-1.2.0.d.ts
deleted file mode 100644
index c5d783764..000000000
--- a/socket.io-client/legacy/socket.io-client-1.2.0.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for socket.io-client 1.2.0
-// Project: http://socket.io/
-// Definitions by: PROGRE <https://github.com/progre/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare var io: SocketIOClientStatic;
-
-declare module 'socket.io-client' {
-    export = io;
-}
-
-interface SocketIOClientStatic {
-    (host: string, details?: any): SocketIOClient.Socket;
-    (details?: any): SocketIOClient.Socket;
-    connect(host: string, details?: any): SocketIOClient.Socket;
-    connect(details?: any): SocketIOClient.Socket;
-    protocol: number;
-    Socket: { new (...args: any[]): SocketIOClient.Socket };
-    Manager: SocketIOClient.ManagerStatic;
-}
-
-declare module SocketIOClient {
-    interface Socket {
-        on(event: string, fn: Function): Socket;
-        once(event: string, fn: Function): Socket;
-        off(event?: string, fn?: Function): Socket;
-        emit(event: string, ...args: any[]): Socket;
-        listeners(event: string): Function[];
-        hasListeners(event: string): boolean;
-        connected: boolean;
-    }
-
-    interface ManagerStatic {
-        (url: string, opts: any): SocketIOClient.Manager;
-        new (url: string, opts: any): SocketIOClient.Manager;
-    }
-
-    interface Manager {
-        reconnection(v: boolean): Manager;
-        reconnectionAttempts(v: boolean): Manager;
-        reconnectionDelay(v: boolean): Manager;
-        reconnectionDelayMax(v: boolean): Manager;
-        timeout(v: boolean): Manager;
-    }
-}
diff --git a/socket.io.users/socket.io.users-tests.ts b/socket.io.users/socket.io.users-tests.ts
new file mode 100644
index 000000000..54a047262
--- /dev/null
+++ b/socket.io.users/socket.io.users-tests.ts
@@ -0,0 +1,58 @@
+/// <reference path="../socket.io/socket.io.d.ts"/>
+/// <reference path="socket.io.users.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../express/express.d.ts" />
+var express = require('express');
+var app = express();
+var httpServer = require('http').createServer(app);
+var io = require('socket.io')(httpServer);
+import ioUsers = require("socket.io.users");
+
+
+
+ioUsers.Session(app, {
+  "secret": "socket.io.users secret test",
+  "resave": true,
+  "saveUninitialized": true
+});
+
+io.use(ioUsers.Middleware());
+
+var users = ioUsers.Users.of("/");
+
+
+var userDisconnected = (user: ioUsers.User) => {
+  console.log(user.get("username") + " has disconnected from all web browser windows or/and tabs");
+}
+
+var setUsername = (user: ioUsers.User, data: any) => {
+  console.log(user.ip + ' is for first time visiting our site. He/she wants ' + data.username + ' for username');
+  user.set("username", data.username);
+}
+
+var joinRoom = (user: ioUsers.User, roomToJoin: string) => {
+  console.log(user.get("username") + ' joined to ' + roomToJoin);
+}
+
+var leaveRoom = (user: ioUsers.User, roomToJoin: string) => {
+  console.log(user.get("username") + ' joined to ' + roomToJoin);
+}
+
+var sendMessage = (user: ioUsers.User, data: any) => {
+  console.log(user.get("username") + 'send ' + data.content + ' to room: ' + data.room);
+}
+
+users.on('disconnected', userDisconnected);
+users.on('set username', setUsername);
+users.on('join room', joinRoom); //notify other = user joined room or (GLOBAL) room created.
+users.on('leave room', leaveRoom); //notify other = user left room or (GLOBAL) room removed.
+users.on("send message", sendMessage); //notify other = receive message.
+
+httpServer.on('uncaughtException', function(err: any) {
+  console.log(err);
+})
+
+var httpPort = 80;
+httpServer.listen(httpPort, function() {
+  console.log("Server is running on " + httpPort);
+});
diff --git a/socket.io.users/socket.io.users.d.ts b/socket.io.users/socket.io.users.d.ts
new file mode 100644
index 000000000..f7ee9b2d8
--- /dev/null
+++ b/socket.io.users/socket.io.users.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for socket.io.users
+// Project: https://github.com/nodets/socket.io.users
+// Definitions by: Makis Maropoulos <https://github.com/kataras>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../express-session/express-session.d.ts" />
+/// <reference path="../socket.io/socket.io.d.ts" />
+
+declare module "socket.io.users" {
+	import { EventEmitter } from 'events';
+	import { Application } from "express";
+	import { SessionOptions } from "express-session";
+
+	var CONNECTION_EVENTS: string[];
+	var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
+	var Session: (app: Application, options?: SessionOptions) => void;
+
+	type SocketUserList = {
+		[namespace: string]: Users;
+	};
+
+	class Namespaces {
+		private static socketUsersList: any;
+		static attach(namespace: string, socketUsersObj: Users): void;
+		static get(namespace: string): Users;
+	}
+
+	class User {
+		id: string | number;
+		socket: SocketIO.Socket;
+		sockets: SocketIO.Socket[];
+		rooms: string[];
+		ip: string;
+		remoteAddresses: string[];
+		store: any;
+		attach(socket: SocketIO.Socket): void;
+		detachSocket(socket: SocketIO.Socket): void;
+		detach(): void;
+		join(room: string): boolean;
+		leave(room: string): void;
+		leaveAll(): void;
+		/** same as in, checks if this user is inside a room */
+		belong(room: string): boolean;
+		/** same as belong, checks if this user is inside a room  */
+		in(room: string): boolean;
+		set(key: string, value: any, callback?: () => void): void;
+		get: (key: string) => any;
+		toString(): string;
+		emit(...args: any[]): void;
+		to(room: string): SocketIO.Socket;
+	}
+
+
+	class Users extends EventEmitter {
+		namespace: string;
+		users: User[];
+		constructor(namespace?: string);
+		static of(namespace?: string): Users;
+		takeId: (request: any) => string | number;
+		create(socket: SocketIO.Socket): User;
+		getById(id: string | number): User;
+		get(socket: SocketIO.Socket): User;
+		list(): User[];
+		size(): number;
+		push(_user: User): void;
+		add(socket: SocketIO.Socket): User;
+		indexOf(user: User): number;
+		remove(user: User): void;
+		room(room: string): User[];
+		in(room: string): User[];
+		from(room: string): User[];
+		update(user: User): void;
+		emitAll(...args: any[]): void;
+		registerSocketEvents(currentUser: User): void;
+	}
+
+}
diff --git a/socket.io/legacy/socket.io-0.9-tests.ts b/socket.io/legacy/socket.io-0.9-tests.ts
deleted file mode 100644
index 0d7e12bb6..000000000
--- a/socket.io/legacy/socket.io-0.9-tests.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import io = require('socket.io-0.9');
-
-var socketManager = io.listen(80);
-
-socketManager.sockets.on('connection', socket => {
-	socket.emit('news', { hello: 'world' });
-	socket.on('my other event', data => {
-		console.log(data);
-	});
-});
-
-// Storing data Associated to a client. 
-// Server side sample 
-io.listen(80).sockets.on('connection', function (socket) {
-    socket.on('set nickname', function (name) {
-        socket.set('nickname', name, function () { socket.emit('ready'); });
-    });
-
-    socket.on('msg', function () {
-        socket.get('nickname', function (err, name) {
-            console.log('Chat message by ', name);
-        });
-    });
-});
\ No newline at end of file
diff --git a/socket.io/legacy/socket.io-0.9.d.ts b/socket.io/legacy/socket.io-0.9.d.ts
deleted file mode 100644
index 5ead4abde..000000000
--- a/socket.io/legacy/socket.io-0.9.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for socket.io
-// Project: http://socket.io/
-// Definitions by: William Orr <https://github.com/worr>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-
-///<reference path='../../node/node.d.ts' />
-
-declare module "socket.io-0.9" {
-	import http = require('http');
-
-	export function listen(server: http.Server, options: any, fn: Function): SocketManager;
-	export function listen(server: http.Server, fn?: Function): SocketManager;
-	export function listen(port: Number): SocketManager;
-
-
-  interface Socket {
-    id: string;
-    json:any;
-    log: any;
-    volatile: any;
-    broadcast: any;
-    handshake: any;
-    in(room: string): Socket;
-    to(room: string): Socket;
-    join(name: string, fn: Function): Socket;
-    leave(name: string, fn: Function): Socket;
-    set(key: string, value: any, fn: Function): Socket;
-    get(key: string, fn: Function): Socket;
-    has(key: string, fn: Function): Socket;
-    del(key: string, fn: Function): Socket;
-    disconnect(): Socket;
-    send(data: any, fn: Function): Socket;
-    emit(ev: any, ...data:any[]): Socket;
-    on(ns: string, fn: Function): Socket;
-  }
-
-  interface SocketNamespace {
-    clients(room: string): Socket[];
-    log: any;
-    store: any;
-    json: any;
-    volatile: any;
-    in(room: string): SocketNamespace;
-    on(evt: string, fn: (socket: Socket) => void): SocketNamespace;
-    to(room: string): SocketNamespace;
-    except(id: any): SocketNamespace;
-    send(data: any): any;
-    emit(ev: any, ...data:any[]): Socket;
-    socket(sid: any, readable: boolean): Socket;
-    authorization(fn: Function): SocketNamespace;
-  }
-
-  interface SocketManager {
-    get(key: any): any;
-    set(key: any, value: any): SocketManager;
-    enable(key: any): SocketManager;
-    disable(key: any): SocketManager;
-    enabled(key: any): boolean;
-    disabled(key: any): boolean;
-    configure(env: string, fn: Function): SocketManager;
-    configure(fn: Function): SocketManager;
-    of(nsp: string): SocketNamespace;
-    on(ns: string, fn: Function): SocketManager;
-    sockets: SocketNamespace;
-  }
-
-
-}
-
diff --git a/socket.io/legacy/socket.io-1.2.0-tests.ts b/socket.io/legacy/socket.io-1.2.0-tests.ts
deleted file mode 100644
index c2664f9cd..000000000
--- a/socket.io/legacy/socket.io-1.2.0-tests.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-/// <reference path="socket.io-1.2.0.d.ts"/>
-
-import socketIO = require('socket.io-1.2.0');
-
-function testUsingWithNodeHTTPServer() {
-    var app = require('http').createServer(handler);
-    var io = socketIO(app);
-    var fs = require('fs');
-
-    app.listen(80);
-
-    function handler(req: any, res: any) {
-        fs.readFile(__dirname + '/index.html',
-            function (err: any, data: any) {
-                if (err) {
-                    res.writeHead(500);
-                    return res.end('Error loading index.html');
-                }
-
-                res.writeHead(200);
-                res.end(data);
-            });
-    }
-
-    io.on('connection', function (socket) {
-        socket.emit('news', { hello: 'world' });
-        socket.on('my other event', function (data: any) {
-            console.log(data);
-        });
-    });
-}
-
-function testUsingWithExpress() {
-    var app = require('express')();
-    var server = require('http').Server(app);
-    var io = socketIO(server);
-
-    server.listen(80);
-
-    app.get('/', function (req: any, res: any) {
-        res.sendfile(__dirname + '/index.html');
-    });
-
-    io.on('connection', function (socket) {
-        socket.emit('news', { hello: 'world' });
-        socket.on('my other event', function (data: any) {
-            console.log(data);
-        });
-    });
-}
-
-function testUsingWithTheExpressFramework() {
-    var app = require('express').createServer();
-    var io = socketIO(app);
-
-    app.listen(80);
-
-    app.get('/', function (req: any, res: any) {
-        res.sendfile(__dirname + '/index.html');
-    });
-
-    io.on('connection', function (socket) {
-        socket.emit('news', { hello: 'world' });
-        socket.on('my other event', function (data: any) {
-            console.log(data);
-        });
-    });
-}
-
-function testSendingAndReceivingEvents() {
-    var io = socketIO(80);
-
-    io.on('connection', function (socket) {
-        io.emit('this', { will: 'be received by everyone' });
-
-        socket.on('private message', function (from: any, msg: any) {
-            console.log('I received a private message by ', from, ' saying ', msg);
-        });
-
-        socket.on('disconnect', function () {
-            io.sockets.emit('user disconnected');
-        });
-    });
-}
-
-function testRestrictingYourselfToANamespace() {
-    var io = socketIO.listen(80);
-    var chat = io
-        .of('/chat')
-        .on('connection', function (socket) {
-            socket.emit('a message', {
-                that: 'only'
-                , '/chat': 'will get'
-            });
-            chat.emit('a message', {
-                everyone: 'in'
-                , '/chat': 'will get'
-            });
-        });
-
-    var news = io
-        .of('/news')
-        .on('connection', function (socket) {
-            socket.emit('item', { news: 'item' });
-        });
-}
-
-function testSendingVolatileMessages() {
-    var io = socketIO.listen(80);
-
-    io.sockets.on('connection', function (socket) {
-        var tweets = setInterval(function () {
-            socket.volatile.emit('bieber tweet', {});
-        }, 100);
-
-        socket.on('disconnect', function () {
-            clearInterval(tweets);
-        });
-    });
-}
-
-function testSendingAndGettingData() {
-    var io = socketIO.listen(80);
-
-    io.sockets.on('connection', function (socket) {
-        socket.on('ferret', function (name: any, fn: any) {
-            fn('woot');
-        });
-    });
-}
-
-function testBroadcastingMessages() {
-    var io = socketIO.listen(80);
-
-    io.sockets.on('connection', function (socket) {
-        socket.broadcast.emit('user connected');
-    });
-}
-
-function testUsingItJustAsACrossBrowserWebSocket() {
-    var io = socketIO.listen(80);
-
-    io.sockets.on('connection', function (socket) {
-        socket.on('message', function () { });
-        socket.on('disconnect', function () { });
-    });
-}
diff --git a/socket.io/legacy/socket.io-1.2.0.d.ts b/socket.io/legacy/socket.io-1.2.0.d.ts
deleted file mode 100644
index 01b5e0836..000000000
--- a/socket.io/legacy/socket.io-1.2.0.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for socket.io 1.2.0
-// Project: http://socket.io/
-// Definitions by: PROGRE <https://github.com/progre/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///<reference path='../../node/node.d.ts' />
-
-declare module 'socket.io-1.2.0' {
-    var server: SocketIOStatic;
-
-    export = server;
-}
-
-interface SocketIOStatic {
-    (): SocketIO.Server;
-    (srv: any, opts?: any): SocketIO.Server;
-    (port: number, opts?: any): SocketIO.Server;
-    (opts: any): SocketIO.Server;
-
-    listen: SocketIOStatic;
-}
-
-declare module SocketIO {
-    interface Server {
-        serveClient(v: boolean): Server;
-        path(v: string): Server;
-        adapter(v: any): Server;
-        origins(v: string): Server;
-        sockets: Namespace;
-        attach(srv: any, opts?: any): Server;
-        attach(port: number, opts?: any): Server;
-        listen(srv: any, opts?: any): Server;
-        listen(port: number, opts?: any): Server;
-        bind(srv: any): Server;
-        onconnection(socket: any): Server;
-        of(nsp: string): Namespace;
-        emit(name: string, ...args: any[]): Socket;
-        use(fn: Function): Namespace;
-
-        on(event: 'connection', listener: (socket: Socket) => void): Namespace;
-        on(event: 'connect', listener: (socket: Socket) => void): Namespace;
-        on(event: string, listener: Function): Namespace;
-    }
-
-    interface Namespace extends NodeJS.EventEmitter {
-        name: string;
-        connected: { [id: string]: Socket };
-        use(fn: Function): Namespace;
-        in(room: string): Namespace;
-
-        on(event: 'connection', listener: (socket: Socket) => void): Namespace;
-        on(event: 'connect', listener: (socket: Socket) => void): Namespace;
-        on(event: string, listener: Function): Namespace;
-    }
-
-    interface Socket {
-        rooms: string[];
-        client: Client;
-        conn: any;
-        request: any;
-        id: string;
-        handshake: {
-            headers: any;
-            time: string;
-            address: any;
-            xdomain: boolean;
-            secure: boolean;
-            issued: number;
-            url: string;
-            query: any;
-        };
-
-        emit(name: string, ...args: any[]): Socket;
-        join(name: string, fn?: Function): Socket;
-        leave(name: string, fn?: Function): Socket;
-        to(room: string): Socket;
-        in(room: string): Socket;
-        send(...args: any[]): Socket;
-        write(...args: any[]): Socket;
-
-        on(event: string, listener: Function): Socket;
-        once(event: string, listener: Function): Socket;
-        removeListener(event: string, listener: Function): Socket;
-        removeAllListeners(event: string): Socket;
-        broadcast: Socket;
-        volatile: Socket;
-        connected: boolean;
-        disconnect(close?: boolean): Socket;
-    }
-
-    interface Client {
-        conn: any;
-        request: any;
-        id: string;
-    }
-}
diff --git a/socket.io/socket.io.d.ts b/socket.io/socket.io.d.ts
index a5b13044f..a34a78b8c 100644
--- a/socket.io/socket.io.d.ts
+++ b/socket.io/socket.io.d.ts
@@ -687,7 +687,7 @@ declare module SocketIO {
 		 * Removes all event listeners on this object
 		 * @return This Socket
 		 */
-		removeAllListeners(): Socket;
+		removeAllListeners( event?: string ): Socket;
 		
 		/**
 		 * Sets the maximum number of listeners this instance can have
diff --git a/sockjs-client/sockjs-client-tests.ts b/sockjs-client/sockjs-client-tests.ts
new file mode 100644
index 000000000..53199ad0d
--- /dev/null
+++ b/sockjs-client/sockjs-client-tests.ts
@@ -0,0 +1,48 @@
+/// <reference path="./sockjs-client.d.ts" />
+
+import * as SockJS from 'sockjs-client';
+import BaseEvent = __SockJSClient.BaseEvent;
+import SockJSClass = __SockJSClient.SockJSClass;
+
+let sockJs: SockJSClass;
+
+sockJs = new SockJS('url');
+sockJs = SockJS('url');
+sockJs = SockJS('url', null, {
+  server: '1233445',
+  sessionId: 23,
+  transports: 'websocket'
+});
+sockJs = SockJS('url', null, {
+  sessionId: () => 'SID',
+  transports: ['websocket', 'eventsource']
+});
+
+let listener = (e: BaseEvent) => e;
+let listenerObj = {
+  handleEvent: (e: BaseEvent) => e
+};
+
+sockJs.addEventListener('onopen', listener);
+sockJs.addEventListener('onclose', listener, true);
+sockJs.addEventListener('onopen', listenerObj);
+sockJs.addEventListener('onclose', listenerObj, true);
+
+sockJs.removeEventListener('onopen', listener);
+sockJs.removeEventListener('onclose', listener, true);
+sockJs.removeEventListener('onopen', listenerObj);
+sockJs.removeEventListener('onclose', listenerObj, true);
+
+sockJs.onopen = e => console.log(e);
+sockJs.onmessage = e => console.log(e.data);
+sockJs.onclose = e => console.log(e.code, e.reason, e.wasClean);
+
+let testStates = SockJS.CONNECTING !== -1 && SockJS.OPEN !== -1 &&
+                  SockJS.CLOSING !== -1 && SockJS.CLOSED !== -1;
+
+sockJs.send('send');
+sockJs.send({x: 1});
+
+sockJs.close(100, 'reason');
+sockJs.close(200);
+sockJs.close();
diff --git a/sockjs-client/sockjs-client.d.ts b/sockjs-client/sockjs-client.d.ts
new file mode 100644
index 000000000..322f82139
--- /dev/null
+++ b/sockjs-client/sockjs-client.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for sockjs-client 1.0.3
+// Project: https://github.com/sockjs/sockjs-client
+// Definitions by: Emil Ivanov <https://github.com/vladev>, Alexander Rusakov <https://github.com/arusakov/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare namespace __SockJSClient {
+  interface BaseEvent {
+    type: string;
+  }
+
+  interface OpenEvent extends BaseEvent {}
+
+  interface CloseEvent extends BaseEvent {
+    code: number;
+    reason: string;
+    wasClean: boolean;
+  }
+
+  interface MessageEvent extends BaseEvent {
+    data: string;
+  }
+
+  interface SessionGenerator {
+    (): string;
+  }
+
+  interface Options {
+    server?: string;
+    sessionId?: number | SessionGenerator;
+    transports?: string | string[]
+  }
+
+  enum State {
+    CONNECTING = 0, OPEN, CLOSING, CLOSED
+  }
+
+  interface SockJSClass extends EventTarget {
+    readyState: State;
+    protocol: string;
+    url: string;
+    onopen: (e: OpenEvent) => any;
+    onclose: (e: CloseEvent) => any;
+    onmessage: (e: MessageEvent) => any;
+    send(data: any): void;
+    close(code?: number, reason?: string): void;
+  }
+}
+
+declare module 'sockjs-client' {
+  import SockJSClass = __SockJSClient.SockJSClass;
+  import Options = __SockJSClient.Options;
+  import State = __SockJSClient.State;
+
+  var SockJS: {
+    new(url: string, _reserved?: any, options?: Options): SockJSClass;
+    (url: string, _reserved?: any, options?: Options): SockJSClass;
+    prototype: SockJSClass;
+    CONNECTING: State;
+    OPEN: State;
+    CLOSING: State;
+    CLOSED: State;
+  };
+
+  export = SockJS;
+}
diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts
index 90e50200d..445006cab 100644
--- a/soundjs/soundjs.d.ts
+++ b/soundjs/soundjs.d.ts
@@ -14,7 +14,6 @@
 
 /// <reference path="../createjs-lib/createjs-lib.d.ts" />
 /// <reference path="../preloadjs/preloadjs.d.ts" />
-/// <reference path="../webaudioapi/waa.d.ts" />
 
 declare module createjs {
 
@@ -143,7 +142,21 @@ declare module createjs {
     export class HTMLAudioTagPool
         {
 
-        }
+        }
+
+    export class PlayPropsConfig
+	{
+	delay:number;
+	duration:number;
+	interrupt:string;
+	loop:number;
+	offset:number;
+	pan:number;
+	startTime:number;
+	volume:number;
+	static create( value:PlayPropsConfig|any ): PlayPropsConfig;
+	set ( props:any ): PlayPropsConfig;
+	}
     
     export class Sound extends EventDispatcher
         {
@@ -161,8 +174,10 @@ declare module createjs {
         static PLAY_INITED: string;
         static PLAY_INTERRUPTED: string;
         static PLAY_SUCCEEDED: string;
-        static SUPPORTED_EXTENSIONS: string[];
-        
+        static SUPPORTED_EXTENSIONS: string[];
+	static muted: boolean;
+	static volume: number;
+        static capabilities: any;
         
         // methods
         static createInstance(src: string): AbstractSoundInstance;
diff --git a/source-map/source-map-tests.ts b/source-map/source-map-tests.ts
index f7ad78e85..ac621fe43 100644
--- a/source-map/source-map-tests.ts
+++ b/source-map/source-map-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./source-map.d.ts" />
+
 import SourceMap = require('source-map');
 
 function testSourceMapConsumer() {
@@ -9,7 +11,7 @@ function testSourceMapConsumer() {
             version: 'foo',
             sources: ['foo', 'bar'],
             names: ['foo', 'bar'],
-            sourcesContent: 'foo',
+            sourcesContent: ['foo'],
             mappings: 'foo'
         });
 
@@ -162,4 +164,4 @@ function testSourceNode() {
         result = node.toStringWithSourceMap();
         result = node.toStringWithSourceMap(sos);
     }
-}
\ No newline at end of file
+}
diff --git a/source-map/source-map.d.ts b/source-map/source-map.d.ts
index a1d8e208b..3ddd49b53 100644
--- a/source-map/source-map.d.ts
+++ b/source-map/source-map.d.ts
@@ -13,7 +13,7 @@ declare module SourceMap {
         version: string;
         sources: Array<string>;
         names: Array<string>;
-        sourcesContent?: string;
+        sourcesContent?: string[];
         mappings: string;
     }
 
diff --git a/ssh2/ssh2-tests.ts b/ssh2/ssh2-tests.ts
new file mode 100644
index 000000000..1c59b1305
--- /dev/null
+++ b/ssh2/ssh2-tests.ts
@@ -0,0 +1,428 @@
+/// <reference path="ssh2.d.ts" />
+
+import * as ssh2 from 'ssh2';
+
+declare var inspect: any;
+
+//
+// # Client Examples
+//
+
+// Authenticate using keys and execute uptime on a server:
+
+var Client = require('ssh2').Client;
+
+var conn = new Client();
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.exec('uptime', (err: Error, stream: ssh2.Channel) => {
+        if (err) throw err;
+        stream
+            .on('close', (code: any, signal: any) => {
+                console.log('Stream :: close :: code: ' + code + ', signal: ' + signal);
+                conn.end();
+            }).on('data', (data: any) => {
+                console.log('STDOUT: ' + data);
+            }).stderr.on('data', (data: any) => {
+                console.log('STDERR: ' + data);
+            });
+    });
+}).connect({
+    host: '192.168.100.100',
+    port: 22,
+    username: 'frylock',
+    privateKey: require('fs').readFileSync('/here/is/my/key')
+});
+
+// Authenticate using keys and start an interactive shell session:
+
+var Client = require('ssh2').Client;
+
+var conn = new Client();
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.shell( (err: Error, stream: ssh2.Channel) => {
+        if (err) throw err;
+        stream.on('close', () => {
+            console.log('Stream :: close');
+            conn.end();
+        }).on('data', (data: any) => {
+            console.log('STDOUT: ' + data);
+        }).stderr.on('data', (data: any) => {
+                console.log('STDERR: ' + data);
+            });
+        stream.end('ls -l\nexit\n');
+    });
+}).connect({
+    host: '192.168.100.100',
+    port: 22,
+    username: 'frylock',
+    privateKey: require('fs').readFileSync('/here/is/my/key')
+});
+
+// Authenticate using password and send an HTTP request to port 80 on the server:
+
+var Client = require('ssh2').Client;
+
+var conn = new Client();
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.forwardOut('192.168.100.102', 8000, '127.0.0.1', 80, (err: Error, stream: ssh2.Channel) => {
+        if (err) throw err;
+        stream.on('close', () => {
+            console.log('TCP :: CLOSED');
+            conn.end();
+        }).on('data', (data: any) => {
+            console.log('TCP :: DATA: ' + data);
+        }).end([
+            'HEAD / HTTP/1.1',
+            'User-Agent: curl/7.27.0',
+            'Host: 127.0.0.1',
+            'Accept: */*',
+            'Connection: close',
+            '',
+            ''
+        ].join('\r\n'));
+    });
+}).connect({
+    host: '192.168.100.100',
+    port: 22,
+    username: 'frylock',
+    password: 'nodejsrules'
+});
+
+// Authenticate using password and forward remote connections on port 8000 to us:
+
+var Client = require('ssh2').Client;
+
+var conn = new Client();
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.forwardIn('127.0.0.1', 8000, (err: Error) => {
+        if (err) throw err;
+        console.log('Listening for connections on server on port 8000!');
+    });
+}).on('tcp connection', (info: any, accept: Function, reject: Function) => {
+    console.log('TCP :: INCOMING CONNECTION:');
+    console.dir(info);
+    accept().on('close', () => {
+        console.log('TCP :: CLOSED');
+    }).on('data', (data: any) => {
+        console.log('TCP :: DATA: ' + data);
+    }).end([
+        'HTTP/1.1 404 Not Found',
+        'Date: Thu, 15 Nov 2012 02:07:58 GMT',
+        'Server: ForwardedConnection',
+        'Content-Length: 0',
+        'Connection: close',
+        '',
+        ''
+    ].join('\r\n'));
+}).connect({
+    host: '192.168.100.100',
+    port: 22,
+    username: 'frylock',
+    password: 'nodejsrules'
+});
+
+// Authenticate using password and get a directory listing via SFTP:
+
+var Client = require('ssh2').Client;
+
+var conn = new Client();
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.sftp( (err: Error, sftp: any) => {
+        if (err) throw err;
+        sftp.readdir('foo', (err: Error, list: any) => {
+            if (err) throw err;
+            console.dir(list);
+            conn.end();
+        });
+    });
+}).connect({
+    host: '192.168.100.100',
+    port: 22,
+    username: 'frylock',
+    password: 'nodejsrules'
+});
+
+// Connection hopping:
+
+var Client = require('ssh2').Client;
+
+var conn1 = new Client(),
+    conn2 = new Client();
+
+conn1.on('ready', () => {
+    console.log('FIRST :: connection ready');
+    conn1.exec('nc 192.168.1.2 22', (err: Error, stream: ssh2.Channel) => {
+        if (err) {
+            console.log('FIRST :: exec error: ' + err);
+            return conn1.end();
+        }
+        conn2.connect({
+            sock: stream,
+            username: 'user2',
+            password: 'password2',
+        });
+    });
+}).connect({
+    host: '192.168.1.1',
+    username: 'user1',
+    password: 'password1',
+});
+
+conn2.on('ready', () => {
+    console.log('SECOND :: connection ready');
+    conn2.exec('uptime', (err: Error, stream: ssh2.Channel) => {
+        if (err) {
+            console.log('SECOND :: exec error: ' + err);
+            return conn1.end();
+        }
+        stream.on('end', () => {
+            conn1.end(); // close parent (and this) connection
+        }).on('data', (data: any) => {
+            console.log(data.toString());
+        });
+    });
+});
+
+// Forward X11 connections (xeyes):
+
+var net = require('net'),
+    Client = require('ssh2').Client;
+
+var conn = new Client();
+
+conn.on('x11', (info: any, accept: any, reject: any) => {
+    var xserversock = new net.Socket();
+    xserversock.on('connect', () => {
+        var xclientsock = accept();
+        xclientsock.pipe(xserversock).pipe(xclientsock);
+    });
+    // connects to localhost:0.0
+    xserversock.connect(6000, 'localhost');
+});
+
+conn.on('ready', () => {
+    conn.exec('xeyes', { x11: true }, (err: Error, stream: ssh2.Channel) => {
+        if (err) throw err;
+        var code = 0;
+        stream.on('end', () => {
+            if (code !== 0)
+                console.log('Do you have X11 forwarding enabled on your SSH server?');
+            conn.end();
+        }).on('exit', (exitcode: number) => {
+            code = exitcode;
+        });
+    });
+}).connect({
+    host: '192.168.1.1',
+    username: 'foo',
+    password: 'bar'
+});
+
+// Dynamic (1:1) port forwarding using a SOCKSv5 proxy (using socksv5):
+
+var socks = require('socksv5'),
+    Client = require('ssh2').Client;
+
+var ssh_config = {
+    host: '192.168.100.1',
+    port: 22,
+    username: 'nodejs',
+    password: 'rules'
+};
+
+socks.createServer( (info: any, accept: any, deny: any) => {
+    // NOTE: you could just use one ssh2 client connection for all forwards, but
+    // you could run into server-imposed limits if you have too many forwards open
+    // at any given time
+    var conn = new Client();
+    conn.on('ready', () => {
+        conn.forwardOut(info.srcAddr,
+            info.srcPort,
+            info.dstAddr,
+            info.dstPort,
+             (err: Error, stream: ssh2.Channel) => {
+                if (err) {
+                    conn.end();
+                    return deny();
+                }
+
+                var clientSocket: any;
+                if (clientSocket = accept(true)) {
+                    stream.pipe(clientSocket).pipe(stream).on('close', () => {
+                        conn.end();
+                    });
+                } else
+                    conn.end();
+            });
+    }).on('error', (err: Error) => {
+        deny();
+    }).connect(ssh_config);
+}).listen(1080, 'localhost', () => {
+    console.log('SOCKSv5 proxy server started on port 1080');
+}).useAuth(socks.auth.None());
+
+// Invoke an arbitrary subsystem (netconf in this example):
+
+var Client = require('ssh2').Client,
+    xmlhello = '<?xml version="1.0" encoding="UTF-8"?>'+
+        '<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">'+
+        '    <capabilities>'+
+        '        <capability>urn:ietf:params:netconf:base:1.0</capability>'+
+        '    </capabilities>'+
+        '</hello>]]>]]>';
+
+var conn = new Client();
+
+conn.on('ready', () => {
+    console.log('Client :: ready');
+    conn.subsys('netconf', (err: Error, stream: ssh2.Channel) => {
+        if (err) throw err;
+        stream.on('data', (data: any) => {
+            console.log(data);
+        }).write(xmlhello);
+    });
+}).connect({
+    host: '1.2.3.4',
+    port: 22,
+    username: 'blargh',
+    password: 'honk'
+});
+
+//
+// # Server Examples
+//
+
+// Only allow password and public key authentication and command execution:
+
+var fs = require('fs'),
+    crypto = require('crypto');
+var buffersEqual = require('buffer-equal-constant-time'),
+    //ssh2 = require('ssh2'),
+    utils = ssh2.utils;
+
+var pubKey = utils.genPublicKey(utils.parseKey(fs.readFileSync('user.pub')));
+
+new ssh2.Server({
+    privateKey: fs.readFileSync('host.key')
+}, (client: any) => {
+    console.log('Client connected!');
+
+    client.on('authentication', (ctx: any) => {
+        if (ctx.method === 'password'
+            && ctx.username === 'foo'
+            && ctx.password === 'bar')
+            ctx.accept();
+        else if (ctx.method === 'publickey'
+            && ctx.key.algo === pubKey.fulltype
+            && buffersEqual(ctx.key.data, pubKey.public)) {
+            if (ctx.signature) {
+                var verifier = crypto.createVerify(ctx.sigAlgo);
+                verifier.update(ctx.blob);
+                if (verifier.verify(pubKey.publicOrig, ctx.signature, 'binary'))
+                    ctx.accept();
+                else
+                    ctx.reject();
+            } else {
+                // if no signature present, that means the client is just checking
+                // the validity of the given public key
+                ctx.accept();
+            }
+        } else
+            ctx.reject();
+    }).on('ready', () => {
+        console.log('Client authenticated!');
+
+        client.on('session', (accept: any, reject: any) => {
+            var session = accept();
+            session.once('exec', (accept: any, reject: any, info: any) => {
+                console.log('Client wants to execute: ' + inspect(info.command));
+                var stream = accept();
+                stream.stderr.write('Oh no, the dreaded errors!\n');
+                stream.write('Just kidding about the errors!\n');
+                stream.exit(0);
+                stream.end();
+            });
+        });
+    }).on('end', () => {
+        console.log('Client disconnected');
+    });
+}).listen(0, '127.0.0.1', () => {
+        console.log('Listening on port ' + this.address().port);
+    });
+
+// SFTP only server:
+
+var fs = require('fs');
+//var ssh2 = require('ssh2');
+var OPEN_MODE = ssh2.SFTP_OPEN_MODE,
+    STATUS_CODE = ssh2.SFTP_STATUS_CODE;
+
+new ssh2.Server({
+    privateKey: fs.readFileSync('host.key')
+}, (client: any) => {
+    console.log('Client connected!');
+
+    client.on('authentication', (ctx: any) => {
+        if (ctx.method === 'password'
+            && ctx.username === 'foo'
+            && ctx.password === 'bar')
+            ctx.accept();
+        else
+            ctx.reject();
+    }).on('ready', () => {
+        console.log('Client authenticated!');
+
+        client.on('session', (accept: any, reject: any) => {
+            var session = accept();
+            session.on('sftp', (accept: any, reject: any) => {
+                console.log('Client SFTP session');
+                var openFiles: any = {};
+                var handleCount = 0;
+                // `sftpStream` is an `SFTPStream` instance in server mode
+                // see: https://github.com/mscdex/ssh2-streams/blob/master/SFTPStream.md
+                var sftpStream = accept();
+                sftpStream.on('OPEN', (reqid: any, filename: any, flags: any, attrs: any) => {
+                    // only allow opening /tmp/foo.txt for writing
+                    if (filename !== '/tmp/foo.txt' || !(flags & OPEN_MODE.WRITE))
+                        return sftpStream.status(reqid, STATUS_CODE.FAILURE);
+                    // create a fake handle to return to the client, this could easily
+                    // be a real file descriptor number for example if actually opening
+                    // the file on the disk
+                    var handle = new Buffer(4);
+                    openFiles[handleCount] = true;
+                    handle.writeUInt32BE(handleCount++, 0, true);
+                    sftpStream.handle(reqid, handle);
+                    console.log('Opening file for write')
+                }).on('WRITE', (reqid: any, handle: any, offset: any, data: any) => {
+                    if (handle.length !== 4 || !openFiles[handle.readUInt32BE(0, true)])
+                        return sftpStream.status(reqid, STATUS_CODE.FAILURE);
+                    // fake the write
+                    sftpStream.status(reqid, STATUS_CODE.OK);
+                    var inspected = require('util').inspect(data);
+                    console.log('Write to file at offset %d: %s', offset, inspected);
+                }).on('CLOSE', (reqid: any, handle: any) => {
+                    var fnum: any;
+                    if (handle.length !== 4 || !openFiles[(fnum = handle.readUInt32BE(0, true))])
+                        return sftpStream.status(reqid, STATUS_CODE.FAILURE);
+                    delete openFiles[fnum];
+                    sftpStream.status(reqid, STATUS_CODE.OK);
+                    console.log('Closing file');
+                });
+            });
+        });
+    }).on('end', () => {
+        console.log('Client disconnected');
+    });
+}).listen(0, '127.0.0.1', () => {
+        console.log('Listening on port ' + this.address().port);
+    });
+
+
+
+
+
diff --git a/ssh2/ssh2.d.ts b/ssh2/ssh2.d.ts
new file mode 100644
index 000000000..870104617
--- /dev/null
+++ b/ssh2/ssh2.d.ts
@@ -0,0 +1,346 @@
+// Type definitions for ssh2
+// Project: https://github.com/mscdex/ssh2
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "ssh2" {
+    import stream = require('stream');
+
+    namespace ssh2 {
+        interface Client {
+            Server: ServerStatic;
+            new(): Client;
+            /**
+             * SFTPStream.STATUS_CODE from ssh2-streams.
+             */
+            SFTP_STATUS_CODE: Sftp.StatusCode;
+            /**
+             * SFTPStream.OPEN_MODE from ssh2-streams.
+             */
+            SFTP_OPEN_MODE: Sftp.OpenMode;
+            //TODO: Type ssh2-streams
+            /**
+             * utility methods from ssh2-streams.
+             */
+            utils: Utils;
+
+            connect(config: ConnectConfig): void;
+            end(): void;
+            destroy(): void;
+            exec(command: string, options: ExecOption, callback: ChannelCallback): boolean;
+            exec(command: string, callback: ChannelCallback): boolean;
+            shell(window: boolean|PseudoTtySettings, options: boolean|number|X11Settings, callback: ChannelCallback): boolean;
+            shell(window: boolean|PseudoTtySettings, callback: ChannelCallback): boolean;
+            shell(callback: ChannelCallback): boolean;
+            subsys(subsystem: string, callback: ChannelCallback): boolean;
+            sftp(callback: SftpCallback): boolean;
+            forwardIn(bindAddr: string, bindPort: number, callback?: ForwardInCallback): boolean;
+            unforwardIn(bindAddr: string, bindPort: number, callback?: ErrorCallback): boolean;
+            forwardOut(srcIP: string, srcPort: number, dstIP: string, dstPort: number, callback: ChannelCallback): boolean;
+            openssh_noMoreSessions(callback?: ErrorCallback): boolean;
+            openssh_forwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+            openssh_unforwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+            openssh_forwardOutStreamLocal(socketPath: string, callback?: ChannelCallback): boolean;
+        }
+
+        interface ConnectConfig {
+            /**
+             * @description Hostname or IP address of the server.
+             * @default 'localhost'
+             */
+            host?: string;
+            /**
+             * @description Port number of the server.
+             * @default 22
+             */
+            port?: number;
+            /**
+             * @description Only connect via resolved IPv4 address for `host`.
+             * @default false
+             */
+            forceIPv4?: boolean;
+            /**
+             * @description Only connect via resolved IPv6 address for `host`.
+             * @default false
+             */
+            forceIPv6?: boolean;
+            /**
+             * @description 'md5' or 'sha1'. The host's key is hashed using this method and passed to the **hostVerifier** function.
+             * @default (none)
+             */
+            hostHash?: string;
+            /**
+             * @description Function that is passed a string hex hash of the host's key for verification purposes.
+             * Return `true` to continue with the handshake or `false` to reject and disconnect.
+             */
+            hostVerifier?: (keyHash: string) => boolean;
+            /**
+             * @description Username for authentication.
+             */
+            username?: string;
+            /**
+             * @description Password for password-based user authentication.
+             */
+            password?: string;
+            /**
+             * @description Path to ssh-agent's UNIX socket for ssh-agent-based user authentication.
+             * Windows users: set to 'pageant' for authenticating with Pageant or (actual) path to a cygwin "UNIX socket."
+             */
+            agent?: string;
+            /**
+             * @description Buffer or string that contains a private key for either key-based or hostbased user authentication (OpenSSH format).
+             */
+            privateKey?: Buffer|string;
+            /**
+             * @description For an encrypted private key, this is the passphrase used to decrypt it.
+             */
+            passphrase?: string;
+            /**
+             * @description Along with **localUsername** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+             */
+            localHostname?: string;
+            /**
+             * @description Along with **localHostname** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+             */
+            localUsername?: string;
+            /**
+             * @description Try keyboard-interactive user authentication if primary user authentication method fails.
+             * If you set this to `true`, you need to handle the `keyboard-interactive` event.
+             */
+            tryKeyboard: boolean;
+            /**
+             * @description How often (in milliseconds) to send SSH-level keepalive packets to the server
+             * (in a similar way as OpenSSH's ServerAliveInterval config option). Set to 0 to disable.
+             * @default 0
+             */
+            keepaliveInterval?: number;
+            /**
+             * @description How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server
+             * before disconnection (similar to OpenSSH's ServerAliveCountMax config option).
+             * @default 3
+             */
+            keepaliveCountMax?: number;
+            /**
+             * @description How long (in milliseconds) to wait for the SSH handshake to complete.
+             * @default 20000
+             */
+            readyTimeout?: number;
+            /**
+             * @description Performs a strict server vendor check before sending vendor-specific requests,
+             * etc. (e.g. check for OpenSSH server when using `openssh_noMoreSessions()`)
+             * @default true
+             */
+            strictVendor?: boolean;
+            /**
+             * A ReadableStream to use for communicating with the server instead of creating and using a new TCP connection (useful for connection hopping).
+             */
+            sock?: NodeJS.ReadableStream;
+            /**
+             * @description Set to `true` to use OpenSSH agent forwarding (`auth-agent@openssh.com`) for the life of the connection. `agent` must also be set to use this feature.
+             * @default false
+             */
+            agentForward?: boolean;
+            /**
+             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+             */
+            debug: (information: string) => any;
+        }
+
+        interface ExecOption {
+            /**
+             * @description An environment to use for the execution of the command.
+             */
+            env?: any;
+            /**
+             * @description Set to true to allocate a pseudo-tty with defaults, or an object containing specific pseudo-tty settings
+             * (see 'Pseudo-TTY settings'). Setting up a pseudo-tty can be useful when working with remote processes
+             * that expect input from an actual terminal (e.g. sudo's password prompt).
+             */
+            pty?: boolean|PseudoTtySettings;
+            /**
+             * @description Set to true to use defaults below, set to a number to specify a specific screen number,
+             * or an object.
+             */
+            x11?: boolean|number|X11Settings;
+        }
+
+        interface X11Settings {
+            /**
+             * Allow just a single connection?
+             * @default false
+             */
+            single?: boolean;
+            /**
+             * Screen number to use
+             * @default 0
+             */
+            screen?: number;
+        }
+
+        interface PseudoTtySettings {
+            /**
+             * @description * Number of rows
+             * @default 24
+             */
+            rows?: number;
+            /**
+             * @description * Number of columns
+             * @default 80
+             */
+            cols?: number;
+            /**
+             * @description * Height in pixels
+             * @default 480
+             */
+            height?: number;
+            /**
+             * @description * Width in pixels
+             * @default 640
+             */
+            width?: number;
+            /**
+             * @description The value to use for $TERM
+             * @default 'vt100'
+             */
+            term?: string;
+        }
+
+        interface ForwardInCallback {
+            (err?: Error, bindPort?: number): void;
+        }
+
+        interface ChannelCallback {
+            (err?: Error, channel?: Channel): void;
+        }
+
+        interface SftpCallback {
+            (err?: Error, sftp?: Sftp.Wrapper): void;
+        }
+
+        interface ErrorCallback {
+            (err?: Error): void;
+        }
+
+        interface Channel extends stream.Duplex {
+            new(info?: any, client?: any, options?: any): Channel;
+            eof(): boolean;
+            close(): boolean;
+            destroy(): void;
+            setWindow(rows: number, cols: number, height: number, width: number): boolean;
+            signal(signalName: string): boolean;
+            exit(name: string, coreDumped: boolean, msg: string): boolean;
+            exit(status: number): boolean;
+            stderr?: ServerStderr;
+
+            // EventEmitter overrides
+            addListener(event: string, listener: Function): Channel;
+            on(event: string, listener: Function): Channel;
+            once(event: string, listener: Function): Channel;
+            removeListener(event: string, listener: Function): Channel;
+            removeAllListeners(event?: string): Channel;
+        }
+
+        interface ServerStderr extends NodeJS.WritableStream {
+            new(channel: Channel): ServerStderr;
+        }
+
+        interface ServerStatic {
+            new(config: ServerConfig, listener?: any): Server;
+            createServer(config: ServerConfig, listener?: any): Server;
+            KEEPALIVE_INTERVAL: number;
+            KEEPALIVE_CLIENT_INTERVAL: number;
+            KEEPALIVE_CLIENT_COUNT_MAX: number;
+        }
+
+        interface Server extends NodeJS.EventEmitter {
+            listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
+            listen(port: number, hostname?: string, callback?: Function): Server;
+            listen(path: string, callback?: Function): Server;
+            listen(handle: any, listeningListener?: Function): Server;
+            address(): { port: number; family: string; address: string; };
+            getConnections(callback: any): any; //TODO: No type
+            close(callback?: Function): Server;
+            ref(): void;
+            unref(): void;
+        }
+
+        interface ServerConfig {
+            /**
+             * @description Buffer or string that contains the host private key (OpenSSH format).
+             */
+            privateKey: Buffer|string;
+            /**
+             * @description For an encrypted host private key, this is the passphrase used to decrypt it.
+             */
+            passphrase?: string;
+            /**
+             * @description A message that is sent to clients immediately upon connection, before handshaking begins.
+             */
+            banner?: string;
+            /**
+             * @description A custom server software name/version identifier.
+             * @default 'ssh2js' + moduleVersion + 'srv'
+             */
+            indent?: string;
+            /**
+             * @description This is the highWaterMark to use for the parser stream.
+             * @default 32 * 1024
+             */
+            highWaterMark?: number;
+            /**
+             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+             */
+            debug?: (information: string) => any;
+        }
+
+        // utility methods from ssh2-streams.
+        interface Utils {
+            iv_inc: Function;
+            isStreamCipher: Function;
+            isGCM: Function;
+            readInt: Function;
+            readString: Function;
+            parseKey: Function;
+            genPublicKey: Function;
+            convertPPKPrivate: Function;
+            verifyPPKMAC: Function;
+            decryptKey: Function;
+        }
+
+        namespace Sftp {
+            // SFTPStream.STATUS_CODE from ssh2-streams.
+            interface StatusCode {
+                OK: number;
+                EOF: number;
+                NO_SUCH_FILE: number;
+                PERMISSION_DENIED: number;
+                FAILURE: number;
+                BAD_MESSAGE: number;
+                NO_CONNECTION: number;
+                CONNECTION_LOST: number;
+                OP_UNSUPPORTED: number;
+            }
+
+            // SFTPStream.OPEN_MODE from ssh2-streams.
+            interface OpenMode {
+                READ: number;
+                WRITE: number;
+                APPEND: number;
+                CREAT: number;
+                TRUNC: number;
+                EXCL: number;
+            }
+
+            interface Wrapper extends NodeJS.EventEmitter {
+                //TODO: extends `ssh2-streams.SFTPStream`
+            }
+        }
+    }
+
+    var ssh2: ssh2.Client;
+
+    export = ssh2;
+}
+
diff --git a/stack-trace/stack-trace-tests.ts b/stack-trace/stack-trace-tests.ts
index a0b2f8d55..c18f63751 100644
--- a/stack-trace/stack-trace-tests.ts
+++ b/stack-trace/stack-trace-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./stack-trace.d.ts" />
+
 import stackTrace = require('stack-trace');
 
 var currentStackTrace = stackTrace.get();
diff --git a/stampit/stampit-1.2.0.d.ts b/stampit/stampit-1.2.0.d.ts
deleted file mode 100644
index 8d46e7477..000000000
--- a/stampit/stampit-1.2.0.d.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-// Type definitions for stampit
-// Project: https://github.com/ericelliott/stampit
-// Definitions by: Vasyl Boroviak <https://github.com/koresar>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare var stampit: stampit.Stampit;
-
-declare module stampit {
-    interface Stampit {
-        /**
-         * Return a factory (akaStamp) function that will produce new objects using the
-         * prototypes that are passed in or composed.
-         * @param methods A map of method names and bodies for delegation.
-         * @param state A map of property names and values to clone for each new object.
-         * @param enclose A closure (function) used to create private data and privileged methods.
-         * */
-        (methods?:{}, state?:{}, enclose?:{(...encloseArgs:any[]): void}[]):stampit.Stamp;
-
-        /**
-         * Take two or more Stamps and combine them to produce a new Stamp.
-         * Combining overrides properties with last-in priority.
-         * @param stamps Stamps produced by stampit.
-         * @return A new Stamp made of all the given.
-         */
-        compose(...stamps:Stamp[]): Stamp;
-
-        /**
-         * Take a destination object followed by one or more source objects,
-         * and copy the source object properties to the destination object,
-         * with last in priority overrides.
-         * @param destination An object to copy properties to.
-         * @param source Objects to copy properties from.
-         * @return The destination object.
-         */
-        mixIn(destination:any, ...source:any[]): any;
-
-        /**
-         * Alias for mixIn.
-         * Take a destination object followed by one or more source objects,
-         * and copy the source object properties to the destination object,
-         * with last in priority overrides.
-         * @param destination An object to copy properties to.
-         * @param source Objects to copy properties from.
-         * @return The destination object.
-         */
-        extend(destination:any, ...source:any[]): any;
-
-        /**
-         * Check if an object is a Stamp.
-         * @param obj An object to check.
-         * @return true if the object is a Stamp; otherwise - false.
-         */
-        isStamp(obj:any): boolean;
-
-        /**
-         * Take an old-fashioned JS constructor and return a Stamp
-         * that you can freely compose with other Stamps.
-         * @param Constructor Old-fashioned constructor function.
-         * @return A new Stamp based on the given constructor.
-         */
-        convertConstructor(Constructor:any): Stamp;
-    }
-
-    /**
-     * A factory function that will produce new objects using the
-     * prototypes that are passed in or composed.
-     */
-    export interface Stamp {
-        /**
-         * Just like calling stamp() invokes the stamp and returns a new object instance.
-         * @param state Properties you wish to set on the new objects.
-         * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-         * WARNING Avoid using two different .enclose() functions that expect different arguments.
-         * .enclose() functions that take arguments should not be considered safe to compose
-         * with other .enclose() functions that also take arguments. Taking arguments with
-         * an .enclose() function is an anti-pattern that should be avoided, when possible.
-         * @return A new object composed of the Stamps and prototypes provided.
-         */
-        (state?:{}, ...encloseArgs:any[]): any;
-
-        /**
-         * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
-         * @param state Properties you wish to set on the new objects.
-         * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-         * WARNING Avoid using two different .enclose() functions that expect different arguments.
-         * .enclose() functions that take arguments should not be considered safe to compose
-         * with other .enclose() functions that also take arguments. Taking arguments with
-         * an .enclose() function is an anti-pattern that should be avoided, when possible.
-         * @return A new object composed of the Stamps and prototypes provided.
-         */
-        create(state?:{}, ...encloseArgs:any[]): any;
-
-        /**
-         * An object map containing the fixed prototypes.
-         */
-        fixed: Fixed;
-
-        /**
-         * Add methods to the methods prototype. Chainable.
-         * @param methods Object(s) containing map of method names and bodies for delegation.
-         * @return Self.
-         */
-        methods(...methods:{}[]): Stamp;
-
-        /**
-         * Take n objects and add them to the state prototype. Changes `this` object. Chainable.
-         * @param states Object(s) containing map of property names and values to clone for each new object.
-         * @return Self.
-         */
-        state(...states:{}[]): Stamp;
-
-        /**
-         * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
-         * Functions passed into .enclose() are called any time an object is instantiated.
-         * That happens when the stamp function is invoked, or when the .create() method is called.
-         * Changes `this` object. Chainable.
-         * @param functions Closures (functions) used to create private data and privileged methods.
-         * @return Self.
-         */
-        enclose(...functions:{(...encloseArgs:any[]): void}[]): Stamp;
-
-        /**
-         * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
-         * Functions passed into .enclose() are called any time an object is instantiated.
-         * That happens when the stamp function is invoked, or when the .create() method is called.
-         * Changes `this` object. Chainable.
-         * @param methods Function properties of these objects will be treated as closure functions.
-         * @return Self.
-         */
-        enclose(...methods:{}[]): Stamp;
-
-        /**
-         * Take one or more Stamps and
-         * combine them with `this` to produce and return a new Stamp.
-         * Combining overrides properties with last-in priority.
-         * NOT chainable.
-         * @param stamps Stampit factories, aka Stamps.
-         * @return A new Stamp composed from arguments and `this`.
-         */
-        compose(...stamps:Stamp[]): Stamp;
-    }
-
-    /**
-     * An object map containing the fixed prototypes.
-     */
-    interface Fixed {
-        methods: {};
-        state: {};
-        enclose: {(...encloseArgs:any[]): void}[];
-    }
-}
-
-declare module "stampit" {
-    export = stampit;
-}
\ No newline at end of file
diff --git a/stampit/stampit-tests-1.2.0.ts b/stampit/stampit-tests-1.2.0.ts
deleted file mode 100644
index ce404651a..000000000
--- a/stampit/stampit-tests-1.2.0.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-/// <reference path="stampit-1.2.0.d.ts" />
-
-var a = stampit().enclose(() => {
-    var a = 'a';
-    this.getA = () => {
-        return a;
-    };
-});
-a(); // Object -- so far so good.
-a().getA(); // "a"
-
-
-var b = stampit().enclose(function () {
-    var a = 'b';
-    this.getB = function () {
-        return a;
-    };
-});
-
-
-var c = stampit.compose(a, b);
-var foo = c(); // we won't throw this one away...
-foo.getA(); // "a"
-foo.getB(); // "b"
-
-
-// Some more privileged methods, with some private data.
-// Use stampit.mixIn() to make this feel declarative:
-var availability = stampit().enclose(function () {
-    var isOpen = false; // private
-
-    return stampit.mixIn(this, {
-        open: function open() {
-            isOpen = true;
-            return this;
-        },
-        close: function close() {
-            isOpen = false;
-            return this;
-        },
-        isOpen: function isOpenMethod() {
-            return isOpen;
-        }
-    });
-});
-// Hre's a mixin with public methods, and some state:
-var membership = stampit({
-        members: {},
-        add: function (member: any) {
-            this.members[member.name] = member;
-            return this;
-        },
-        getMember: function (name: any) {
-            return this.members[name];
-        }
-    },
-    {
-        members: {}
-    });
-// Let's set some defaults:
-var defaults = stampit().state({
-    name: 'The Saloon',
-    specials: 'Whisky, Gin, Tequila'
-});
-
-// Classical inheritance has nothing on this. No parent/child coupling. No deep inheritance hierarchies.
-// Just good, clean code reusability.
-var bar = stampit.compose(defaults, availability, membership);
-// Note that you can override state on instantiation:
-var myBar = bar({name: 'Moe\'s'});
-// Silly, but proves that everything is as it should be.
-myBar.add({name: 'Homer' }).open().getMember('Homer');
-
-
-
-var myStamp = stampit().methods({
-    foo: function () {
-        return 'foo';
-    },
-    methodOverride: function () {
-        return false;
-    }
-}).methods({
-    bar: function () {
-        return 'bar'
-    },
-    methodOverride: function () {
-        return true;
-    }
-});
-
-myStamp.state({
-    foo: {bar: 'bar'},
-    stateOverride: false
-}).state({
-    bar: 'bar',
-    stateOverride: true
-});
-
-myStamp.enclose(function () {
-    var secret = 'foo';
-
-    this.getSecret = function () {
-        return secret;
-    };
-}).enclose(function () {
-    this.a = true;
-}).enclose({
-    bar: function bar() {
-        this.b = true;
-    }
-}, {
-    baz: function baz() {
-        this.c = true;
-    }
-});
-
-var obj = myStamp.create();
-obj.getSecret && obj.a && obj.b && obj.c; // true
-
-var newStamp = stampit(null, { defaultNum: 1 }).compose(myStamp);
-
-
-
-var obj1 = stampit().methods({
-    a: function () { return 'a'; }
-}, {
-    b: function () { return 'b'; }
-}).create();
-
-var obj2 = stampit().state({
-    a: 'a'
-}, {
-    b: 'b'
-}).create();
-
-var obj = defaults.compose(newStamp, membership, availability).create();
-
-
-
-// The old constructor / class thing...
-var Constructor = function Constructor() {
-    this.thing = 'initialized';
-};
-Constructor.prototype.foo = function foo() { return 'foo'; };
-
-// The conversion
-var oldskool = stampit.convertConstructor(Constructor);
-
-// A new stamp to compose with...
-var newskool = stampit().methods({
-    bar: function bar() { return 'bar'; }
-    // your methods here...
-}).enclose(function () {
-    this.baz = 'baz';
-});
-
-// Now you can compose those old constructors just like you could
-// with any other stamp...
-var myThing = stampit.compose(oldskool, newskool);
-
-var t = myThing();
-
-t.thing; // 'initialized',
-
-t.foo(); // 'foo',
-
-t.bar(); // 'bar'
diff --git a/stampit/stampit-tests.ts b/stampit/stampit-tests.ts
index f813482d8..07d3fe858 100644
--- a/stampit/stampit-tests.ts
+++ b/stampit/stampit-tests.ts
@@ -1,5 +1,6 @@
 /// <reference path="stampit.d.ts" />
-import stampit = require('./stampit.d');
+
+import stampit = require('stampit');
 
 var a = stampit().init((options) => {
     var a = options.args[0];
diff --git a/stampit/stampit.d.ts b/stampit/stampit.d.ts
index e56035c4f..5b03237f2 100644
--- a/stampit/stampit.d.ts
+++ b/stampit/stampit.d.ts
@@ -294,4 +294,6 @@ declare module stampit {
     export function convertConstructor(Constructor:any): Stamp;
 }
 
-export = stampit;
+declare module "stampit" {
+    export = stampit;
+}
diff --git a/stamplay-js-sdk/stamplay-js-sdk-tests.ts b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
new file mode 100644
index 000000000..bfc229d49
--- /dev/null
+++ b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
@@ -0,0 +1,36 @@
+/// <reference path="stamplay-js-sdk.d.ts" />
+
+var userFn = Stamplay.User();
+var user = new userFn.Model;
+var colTags = Stamplay.Cobject('tag');
+var tags = new colTags.Collection();
+
+// Signing up
+var registrationData = {
+   email : 'user@provider.com',
+   password: 'mySecret'
+ };
+
+user.signup(registrationData).then(function(){
+       user.set('phoneNumber', '020 123 4567' );
+       return user.save();
+     }).then(function(){
+       var number = user.get('phoneNumber');
+       console.log(number); // number value is 020 123 4567
+     });
+
+
+// Action
+var colFoo = Stamplay.Cobject('foo');
+var fooMod = new colFoo.Model();
+fooMod.fetch(5).then(
+  function(){
+    return fooMod.upVote()
+  }
+).then(
+  function(){
+    //success callback
+  }, function( err : any ){
+    //error callback
+  }
+)
diff --git a/stamplay-js-sdk/stamplay-js-sdk.d.ts b/stamplay-js-sdk/stamplay-js-sdk.d.ts
new file mode 100644
index 000000000..154dc414e
--- /dev/null
+++ b/stamplay-js-sdk/stamplay-js-sdk.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for stamplay-js-sdk 1.2.9
+// Project: https://github.com/Stamplay/stamplay-js-sdk
+// Definitions by: Riderman de Sousa Barbosa <https://github.com/ridermansb/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="..\promises-a-plus\promises-a-plus.d.ts"/>
+
+declare module Stamplay {
+
+  export interface IStamplayModel {
+    signup({}) : PromisesAPlus.Thenable<any>
+    new() : IStamplayModel
+    get(property : string) : any
+    set(property : string, value: any) : void
+    unset(property : string) : void
+    fetch(id : any) : PromisesAPlus.Thenable<any>
+    destroy() : PromisesAPlus.Thenable<any>
+    save({}?) : PromisesAPlus.Thenable<any>
+    upVote() : PromisesAPlus.Thenable<any>
+  }
+
+  export interface IStamplayObject  {
+      Model : IStamplayModel
+      Collection : any
+
+  }
+
+  export interface StamplayStatic {
+      User() : IStamplayObject
+      Cobject(object : string) : IStamplayObject
+  }
+}
+
+declare var Stamplay: Stamplay.StamplayStatic;
+
+declare module "Stamplay" {
+    export = Stamplay;
+}
diff --git a/static-eval/static-eval-tests.ts b/static-eval/static-eval-tests.ts
new file mode 100644
index 000000000..fe42c3d4d
--- /dev/null
+++ b/static-eval/static-eval-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="../esprima/esprima.d.ts" />
+/// <reference path="static-eval.d.ts" />
+
+import evaluate = require('static-eval');
+import esprima = require('esprima');
+var parse = esprima.parse;
+
+
+var src = '[1,2,3+4*10+n,foo(3+5),obj[""+"x"].y]';
+
+var ast = (<ESTree.ExpressionStatement>(parse(src).body[0])).expression;
+
+console.log(evaluate(ast, {
+    n: 6,
+    foo: function (x: number) { return x * 100 },
+    obj: { x: { y: 555 } }
+}));
\ No newline at end of file
diff --git a/static-eval/static-eval.d.ts b/static-eval/static-eval.d.ts
new file mode 100644
index 000000000..e44294c27
--- /dev/null
+++ b/static-eval/static-eval.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for static-eval v0.2.4
+// Project: https://github.com/substack/static-eval
+// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+ 
+/// <reference path="../esprima/esprima.d.ts" />
+
+declare module 'static-eval' {
+    /**
+    * Evaluates the given ESTree.Expression, with the given named variables in place.
+    * @param ast [ESTree.Expression] An esprima expression derived from parse.body[].expression
+    * @param vars Named variables, objects or functions which may be referenced in the expression.
+    */
+    function evaluate(ast : ESTree.Expression, vars: { [name: string]: any }): any;
+    export =evaluate;
+}
diff --git a/string/string-tests.ts b/string/string-tests.ts
new file mode 100644
index 000000000..22fca046d
--- /dev/null
+++ b/string/string-tests.ts
@@ -0,0 +1,286 @@
+/// <reference path="string.d.ts" />
+
+import S = require('string');
+
+S('hello').s //"hello"
+S(['a,b']).s //"a,b"
+S({hi: 'jp'}).s //"[object Object]""
+
+S('<a>foo</a>').between('<a>', '</a>').s // => 'foo'
+S('<a>foo</a></a>').between('<a>', '</a>').s // => 'foo'
+S('<a><a>foo</a></a>').between('<a>', '</a>').s // => '<a>foo'
+S('<a>foo').between('<a>', '</a>').s // => ''
+S('Some strings } are very {weird}, dont you think?').between('{', '}').s // => 'weird'
+S('This is a test string').between('test').s // => ' string'
+S('This is a test string').between('', 'test').s // => 'This is a '
+
+S('data_rate').camelize().s; //'dataRate'
+S('background-color').camelize().s; //'backgroundColor'
+S('-moz-something').camelize().s; //'MozSomething'
+S('_car_speed_').camelize().s; //'CarSpeed'
+S('yes_we_can').camelize().s; //'yesWeCan'
+
+S('jon').capitalize().s; //'Jon'
+S('JP').capitalize().s; //'Jp'
+
+S('foobar').chompLeft('foo').s; //'bar'
+S('foobar').chompLeft('bar').s; //'foobar'
+
+S('foobar').chompRight('bar').s; //'foo'
+S('foobar').chompRight('foo').s; //'foobar'
+
+var str = S('  String   \t libraries are   \n\n\t fun\n!  ').collapseWhitespace().s; //'String libraries are fun !'
+
+S('JavaScript is one of the best languages!').contains('one'); //true
+
+S('JP likes to program. JP does not play in the NBA.').count("JP")// 2
+S('Does not exist.').count("Flying Spaghetti Monster") //0
+S('Does not exist.').count("Bigfoot") //0
+S('JavaScript is fun, therefore Node.js is fun').count("fun") //2
+S('funfunfun').count("fun") //3
+
+S('dataRate').dasherize().s; //'data-rate'
+S('CarSpeed').dasherize().s; //'-car-speed'
+S('yesWeCan').dasherize().s; //'yes-we-can'
+S('backgroundColor').dasherize().s; //'background-color'
+
+S('Ken Thompson &amp; Dennis Ritchie').decodeHTMLEntities().s; //'Ken Thompson & Dennis Ritchie'
+S('3 &lt; 4').decodeHTMLEntities().s; //'3 < 4'
+
+S("hello jon").endsWith('jon'); //true
+
+S('<div>hi</div>').escapeHTML().s; //&lt;div&gt;hi&lt;/div&gt;
+
+S('subdir').ensureLeft('/').s; //'/subdir'
+S('/subdir').ensureLeft('/').s; //'/subdir'
+
+S('dir').ensureRight('/').s; //'dir/'
+S('dir/').ensureRight('/').s; //'dir/'
+
+S('the_humanize_string_method').humanize().s  //'The humanize string method'
+S('ThehumanizeStringMethod').humanize().s //'Thehumanize string method'
+S('the humanize string method').humanize().s  //'The humanize string method'
+S('the humanize_id string method_id').humanize().s //'The humanize id string method'
+S('the  humanize string method  ').humanize().s //'The humanize string method'
+S('   capitalize dash-CamelCase_underscore trim  ').humanize().s //'Capitalize dash camel case underscore trim'
+
+S('JavaScript is one of the best languages!').include('one'); //true
+
+S("afaf").isAlpha(); //true
+S('fdafaf3').isAlpha(); //false
+S('dfdf--dfd').isAlpha(); //false
+
+S("afaf35353afaf").isAlphaNumeric(); //true
+S("FFFF99fff").isAlphaNumeric(); //true
+S("99").isAlphaNumeric(); //true
+S("afff").isAlphaNumeric(); //true
+S("Infinity").isAlphaNumeric(); //true
+S("-Infinity").isAlphaNumeric(); //false
+S("-33").isAlphaNumeric(); //false
+S("aaff..").isAlphaNumeric(); //false
+
+S(' ').isEmpty(); //true
+S('\t\t\t    ').isEmpty(); //true
+S('\n\n ').isEmpty(); //true
+S('helo').isEmpty(); //false
+S(null).isEmpty(); //true
+S(undefined).isEmpty(); //true
+
+S('a').isLower(); //true
+S('z').isLower(); //true
+S('B').isLower(); //false
+S('hijp').isLower(); //true
+S('hi jp').isLower(); //false
+S('HelLO').isLower(); //false
+
+S("3").isNumeric(); //true
+S("34.22").isNumeric(); //false
+S("-22.33").isNumeric(); //false
+S("NaN").isNumeric(); //false
+S("Infinity").isNumeric(); //false
+S("-Infinity").isNumeric(); //false
+S("JP").isNumeric(); //false
+S("-5").isNumeric(); //false
+S("000992424242").isNumeric(); //true
+
+S('a').isUpper() //false
+S('z').isUpper()  //false
+S('B').isUpper() //true
+S('HIJP').isUpper() //true
+S('HI JP').isUpper() //false
+S('HelLO').isUpper() //true
+S('crème brûlée').latinise().s // 'creme brulee'
+
+S('My name is JP').left(2).s; //'My'
+S('Hi').left(0).s; //''
+S('My name is JP').left(-2).s; //'JP', same as right(2)
+
+var stuff = "My name is JP\nJavaScript is my fav language\r\nWhat is your fav language?"
+var lines = S(stuff).lines()
+console.dir(lines) 
+/*
+[ 'My name is JP',
+  'JavaScript is my fav language',
+  'What is your fav language?' ]
+*/
+
+S('hello').pad(5).s //'hello'
+S('hello').pad(10).s //'   hello  '
+S('hey').pad(7).s //'  hey  '
+S('hey').pad(5).s //' hey '
+S('hey').pad(4).s //' hey'
+S('hey').pad(7, '-').s//'--hey--'
+
+S('hello').padLeft(5).s //'hello'
+S('hello').padLeft(10).s //'     hello'
+S('hello').padLeft(7).s //'  hello'
+S('hello').padLeft(6).s //' hello'
+S('hello').padLeft(10, '.').s //'.....hello'
+
+S('hello').padRight(5).s //'hello'
+S('hello').padRight(10).s //'hello     '
+S('hello').padRight(7).s //'hello  '
+S('hello').padRight(6).s //'hello '
+S('hello').padRight(10, '.').s //'hello.....'
+
+S("'a','b','c'").parseCSV(',', "'") //['a', 'b', 'c'])
+S('"a","b","c"').parseCSV() // ['a', 'b', 'c'])
+S('a,b,c').parseCSV(',', null)  //['a', 'b', 'c'])
+S("'a,','b','c'").parseCSV(',', "'") //['a,', 'b', 'c'])
+S('"a","b",4,"c"').parseCSV(',', null) //['"a"', '"b"', '4', '"c"'])
+S('"a","b","4","c"').parseCSV() //['a', 'b', '4', 'c'])
+S('"a","b",       "4","c"').parseCSV() //['a', 'b', '4', 'c'])
+S('"a","b",       4,"c"').parseCSV(",", null) //[ '"a"', '"b"', '       4', '"c"' ])
+S('"a","b\\"","d","c"').parseCSV() //['a', 'b"', 'd', 'c'])
+S('"a","b\\"","d","c"').parseCSV() //['a', 'b"', 'd', 'c'])
+S('"a\na","b","c"\n"a", """b\nb", "a"').parseCSV(',', '"', '"', '\n'); // [ [ 'a\na', 'b', 'c' ], [ 'a', '"b\nb', 'a' ] ]
+
+S(' ').repeat(5).s; //'     '
+S('*').repeat(3).s; //'***'
+
+S(' does IT work? ').replaceAll(' ', '_').s; //'_does_IT_work?_'
+S('Yes it does!').replaceAll(' ', '').s; //'Yesitdoes!'
+
+S(' 1 2 3--__--4 5 6-7__8__9--0').strip(' ', '_', '-').s; //'1234567890'
+S('can words also be stripped out?').strip('words', 'also', 'be').s; //'can    stripped out?'
+
+S('I AM CRAZY').right(2).s; //'ZY'
+S('Does it work?  ').right(4).s; //'k?  '
+S('Hi').right(0).s; //''
+S('My name is JP').right(-2).s; //'My', same as left(2)
+
+S('my name is JP.').capitalize().s; //My name is JP.
+var a = "Hello " + S('joe!'); //a = "Hello joe!"
+S("Hello").toString() === S("Hello").s; //true
+
+var myString = S('War');
+myString.setValue('Peace').s; // 'Peace'
+
+S('Global Thermonuclear Warfare').slugify().s // 'global-thermonuclear-warfare'
+S('Crème brûlée').slugify().s // 'creme-brulee'
+
+S("JP is a software engineer").startsWith("JP"); //true
+S('wants to change the world').startsWith("politicians"); //false
+
+S('My, st[ring] *full* of %punct)').stripPunctuation().s; //My string full of punct
+
+S('<p>just <b>some</b> text</p>').stripTags().s //'just some text'
+S('<p>just <b>some</b> text</p>').stripTags('p').s //'just <b>some</b> text'
+
+var str = "Hello {{name}}! How are you doing during the year of {{date-year}}?"
+var values = {name: 'JP', 'date-year': 2013}
+console.log(S(str).template(values).s) //'Hello JP! How are you doing during the year of 2013?'
+
+str = "Hello #{name}! How are you doing during the year of #{date-year}?"
+console.log(S(str).template(values, '#{', '}').s) //'Hello JP! How are you doing during the year of 2013?'
+
+S.TMPL_OPEN = '{'
+S.TMPL_CLOSE = '}'
+str = "Hello {name}! How are you doing during the year of {date-year}?"
+console.log(S(str).template(values).s) //'Hello JP! How are you doing during the year of 2013?'
+
+S(' ').times(5).s //'     '
+S('*').times(3).s //'***'
+
+S('true').toBoolean() //true
+S('false').toBoolean() //false
+S('hello').toBoolean() //false
+S(true).toBoolean() //true
+S('on').toBoolean() //true
+S('yes').toBoolean() //true
+S('TRUE').toBoolean() //true
+S('TrUe').toBoolean() //true
+S('YES').toBoolean() //true
+S('ON').toBoolean() //true
+S('').toBoolean() //false
+S(undefined).toBoolean() //false
+S('undefined').toBoolean() //false
+S(null).toBoolean() //false
+S(false).toBoolean() //false
+S({}).toBoolean() //false
+S(1).toBoolean() //true
+S(-1).toBoolean() //false
+S(0).toBoolean() //false
+
+S(['a', 'b', 'c']).toCSV().s //'"a","b","c"'
+S(['a', 'b', 'c']).toCSV(':').s //'"a":"b":"c"'
+S(['a', 'b', 'c']).toCSV(':', null).s //'a:b:c')
+S(['a', 'b', 'c']).toCSV('*', "'").s //"'a'*'b'*'c'"
+S(['a"', 'b', 4, 'c']).toCSV({delimiter: ',', qualifier: '"', escape: '\\',  encloseNumbers: false}).s //'"a\\"","b",4,"c"'
+S({firstName: 'JP', lastName: 'Richardson'}).toCSV({keys: true}).s //'"firstName","lastName"'
+S({firstName: 'JP', lastName: 'Richardson'}).toCSV().s //'"JP","Richardson"'
+
+S('5').toFloat() // 5
+S('5.3').toFloat()  //5.3
+S(5.3).toFloat()  //5.3
+S('-10').toFloat()  //-10
+S('55.3 adfafaf').toFloat() // 55.3
+S('afff 44').toFloat()  //NaN
+S(3.45522222333232).toFloat(2) // 3.46
+
+S('5').toInt(); //5
+S('5.3').toInt(); //5;
+S(5.3).toInt(); //5;
+S('-10').toInt(); //-10
+S('55 adfafaf').toInt(); //55
+S('afff 44').toInt(); //NaN
+S('0xff').toInt() //255
+
+S('my name is JP.').capitalize().toString(); //My name is JP.
+var a = "Hello " + S('joe!'); //a = "Hello joe!"
+S("Hello").toString() === S("Hello").s; //true
+
+S('hello ').trim().s; //'hello'
+S(' hello ').trim().s; //'hello'
+S('\nhello').trim().s; //'hello'
+S('\nhello\r\n').trim().s; //'hello'
+S('\thello\t').trim().s; //'hello'
+
+S('  How are you?').trimLeft().s; //'How are you?';
+
+S('How are you?   ').trimRight().s; //'How are you?';
+
+S('this is some long text').truncate(3).s //'...'
+S('this is some long text').truncate(7).s //'this is...'
+S('this is some long text').truncate(11).s //'this is...'
+S('this is some long text').truncate(12).s //'this is some...'
+S('this is some long text').truncate(11).s //'this is...'
+S('this is some long text').truncate(14, ' read more').s //'this is some read more'
+
+S('dataRate').underscore().s; //'data_rate'
+S('CarSpeed').underscore().s; //'_car_speed'
+S('yesWeCan').underscore().s; //'yes_we_can'
+
+S('&lt;div&gt;hi&lt;/div&gt;').unescapeHTML().s; //<div>hi</div>
+
+S('Venkat').wrapHTML().s //<span>Venkat</span>
+S('Venkat').wrapHTML('div').s //<div>Venkat</div>
+S('Venkat').wrapHTML('div', {
+    "class": "left bullet"
+}).s //<div class="left bullet">Venkat</div>
+S('Venkat').wrapHTML('div', {
+    "id": "content",
+    "class": "left bullet"
+}).s // <div id="content" class="left bullet">Venkat</div>
+
+S.VERSION; //1.0.0
\ No newline at end of file
diff --git a/string/string.d.ts b/string/string.d.ts
new file mode 100644
index 000000000..d99a78111
--- /dev/null
+++ b/string/string.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for string.js
+// Project: http://stringjs.com
+// Definitions by: Bas Pennings <https://github.com/basp/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface StringJS {
+	length: number;
+	
+	s: string;
+	
+	between(left: string, right?: string): StringJS;
+	
+	camelize(): StringJS;
+	
+	capitalize(): StringJS;
+	
+	chompLeft(prefix: string): StringJS;
+	
+	chompRight(suffix: string): StringJS;
+	
+	collapseWhitespace(): StringJS;
+	
+	contains(ss: string): boolean;
+	
+	count(substring: string): number;
+	
+	dasherize(): StringJS;
+	
+	decodeHTMLEntities(): StringJS;
+	
+	endsWith(ss: string): boolean;
+	
+	escapeHTML(): StringJS;
+	
+	ensureLeft(prefix: string): StringJS;
+	
+	ensureRight(suffix: string): StringJS;
+	
+	humanize(): StringJS;
+	
+	include(ss: string): boolean;
+	
+	isAlpha(): boolean;
+	
+	isAlphaNumeric(): boolean;
+	
+	isEmpty(): boolean;
+	
+	isLower(): boolean;
+	
+	isNumeric(): boolean;
+	
+	isUpper(): boolean;
+	
+	latinise(): StringJS;
+	
+	left(n: number): StringJS;
+	
+	lines(): string[];
+	
+	pad(len: number, char?: string|number): StringJS;
+	
+	padLeft(len: number, char?: string|number): StringJS;
+	
+	padRight(len: number, char?: string|number): StringJS;
+	
+	parseCSV(delimiter?: string, qualifier?: string, escape?: string, lineDelimiter?: string): string[];
+	
+	repeat(n: number): StringJS;
+	
+	replaceAll(ss: string, newStr: string): StringJS;
+	
+	strip(...strings: string[]): StringJS;
+	
+	right(n: number): StringJS;
+	
+	setValue(string: any): StringJS;
+	
+	slugify(): StringJS;
+	
+	startsWith(prefix: string): boolean;
+	
+	stripPunctuation(): StringJS;
+	
+	stripTags(...tags: string[]): StringJS;
+	
+	template(values: Object, open?: string, close?: string): StringJS;
+	
+	times(n: number): StringJS;
+	
+	toBoolean(): boolean;
+	
+	toCSV(delimiter?: string, qualifier?: string): StringJS;
+	toCSV(options: {
+		delimiter?: string,
+		qualifier?: string,
+		escape?: string,
+		encloseNumbers?: boolean,
+		keys?: boolean
+	}): StringJS;
+	
+	toFloat(precision?: number): number;
+	
+	toInt(): number;
+	
+	toInteger(): number;
+	
+	toString(): string;
+	
+	trim(): StringJS;
+	
+	trimLeft(): StringJS;
+	
+	trimRight(): StringJS;
+	
+	truncate(length: number, chars?: string): StringJS;
+	
+	underscore(): StringJS;
+	
+	unescapeHTML(): StringJS;
+	
+	wrapHTML(element?: string, attributes?: Object): StringJS;
+}
+
+declare module "string" {
+	var S: {
+		(o: any): StringJS;
+		VERSION: string;
+		TMPL_OPEN: string;
+		TMPL_CLOSE: string;
+	}
+	
+	export = S;
+}
\ No newline at end of file
diff --git a/string_score/string_score-tests.ts b/string_score/string_score-tests.ts
new file mode 100644
index 000000000..8a7399603
--- /dev/null
+++ b/string_score/string_score-tests.ts
@@ -0,0 +1,8 @@
+/// <reference path="string_score.d.ts" />
+
+import string_score = require('string_score');
+
+var a = 'abc';
+var b = 'xyz';
+
+console.log(a.score(b).toString());
diff --git a/string_score/string_score.d.ts b/string_score/string_score.d.ts
new file mode 100644
index 000000000..6b3944c4e
--- /dev/null
+++ b/string_score/string_score.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for string_score 0.1.22
+// Project: https://github.com/joshaven/string_score
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "string_score"
+{
+    // nothing here as it's only extending the build in String class
+}
+
+interface String {
+    score: (word: string, fuzzy?: number) => number;
+}
diff --git a/stripe-checkout/stripe-checkout.d.ts b/stripe-checkout/stripe-checkout.d.ts
index f648a1bb3..8be22cab1 100644
--- a/stripe-checkout/stripe-checkout.d.ts
+++ b/stripe-checkout/stripe-checkout.d.ts
@@ -15,12 +15,13 @@ interface StripeCheckoutHandler {
 }
 
 interface StripeCheckoutOptions {
-    key: string;
-    token: (token: StripeTokenResponse) => void;
+    key?: string;
+    token?: (token: StripeTokenResponse) => void;
     image?: string;
     name?: string;
     description?: string;
     amount?: number;
+    locale?: string;
     currency?: string;
     panelLabel?: string;
     zipCode?: boolean;
@@ -32,4 +33,4 @@ interface StripeCheckoutOptions {
     closed?: () => void;
 }
 
-declare var StripeCheckout: StripeCheckoutStatic;
\ No newline at end of file
+declare var StripeCheckout: StripeCheckoutStatic;
diff --git a/stripe/stripe-node.d.ts b/stripe/stripe-node.d.ts
index cb5932086..d41fdc13e 100644
--- a/stripe/stripe-node.d.ts
+++ b/stripe/stripe-node.d.ts
@@ -2802,7 +2802,7 @@ declare module StripeNode {
      * A set of key/value pairs that you can attach to a reversal. It can be useful for storing 
      * additional information about the reversal in a structured format.
      */
-    interface IMetadata extends Object { }
+    interface IMetadata { }
 
     interface IShippingInformation {
         /**
diff --git a/stripe/stripe.d.ts b/stripe/stripe.d.ts
index ca589e133..96d8758bc 100644
--- a/stripe/stripe.d.ts
+++ b/stripe/stripe.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for stripe
 // Project: https://stripe.com/
-// Definitions by: Eric J. Smith <https://github.com/ejsmith/>
+// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 interface StripeStatic {
@@ -11,6 +11,7 @@ interface StripeStatic {
     cardType(cardNumber: string): string;
     getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
     card: StripeCardData;
+	createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
 }
 
 interface StripeTokenData {
@@ -57,8 +58,9 @@ interface StripeCardData {
     address_state?: string;
     address_zip?: string;
     address_country?: string;
-
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
 }
 
 declare var Stripe: StripeStatic;
+declare module "Stripe" {
+	export = StripeStatic;
+}
diff --git a/strophe/strophe.d.ts b/strophe/strophe.d.ts
index b8fc33989..c3125d36e 100644
--- a/strophe/strophe.d.ts
+++ b/strophe/strophe.d.ts
@@ -2,30 +2,1094 @@
 // Project: http://strophe.im/strophejs/
 // Definitions by: David Deutsch <https://github.com/DavidKDeutsch/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+declare module wrapper {
+    /** Function: $build
+     *  Create a Strophe.Builder.
+     *  This is an alias for 'new Strophe.Builder(name, attrs)'.
+     *
+     *  Parameters:
+     *    (String) name - The root element name.
+     *    (Object) attrs - The attributes for the root element in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+    function $build(name: string, attrs?: any): Strophe.Builder; 
+
+    /** Function: $msg
+     *  Create a Strophe.Builder with a <message/> element as the root.
+     *
+     *  Parmaeters:
+     *    (Object) attrs - The <message/> element attributes in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+    function $msg(attrs?: any): Strophe.Builder;
+
+    /** Function: $iq
+     *  Create a Strophe.Builder with an <iq/> element as the root.
+     *
+     *  Parameters:
+     *    (Object) attrs - The <iq/> element attributes in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+    function $iq(attrs?: any): Strophe.Builder;
+
+    /** Function: $pres
+     *  Create a Strophe.Builder with a <presence/> element as the root.
+     *
+     *  Parameters:
+     *    (Object) attrs - The <presence/> element attributes in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+    function $pres(attrs?: any): Strophe.Builder;
+
+    module Strophe {
+        /** Constant: VERSION
+         *  The version of the Strophe library. Unreleased builds will have
+         *  a version of head-HASH where HASH is a partial revision.
+         */
+        var VERSION: string;
+
+        /** Constants: XMPP Namespace Constants
+         *  Common namespace constants from the XMPP RFCs and XEPs.
+         *
+         *  NS.HTTPBIND - HTTP BIND namespace from XEP 124.
+         *  NS.BOSH - BOSH namespace from XEP 206.
+         *  NS.CLIENT - Main XMPP client namespace.
+         *  NS.AUTH - Legacy authentication namespace.
+         *  NS.ROSTER - Roster operations namespace.
+         *  NS.PROFILE - Profile namespace.
+         *  NS.DISCO_INFO - Service discovery info namespace from XEP 30.
+         *  NS.DISCO_ITEMS - Service discovery items namespace from XEP 30.
+         *  NS.MUC - Multi-User Chat namespace from XEP 45.
+         *  NS.SASL - XMPP SASL namespace from RFC 3920.
+         *  NS.STREAM - XMPP Streams namespace from RFC 3920.
+         *  NS.BIND - XMPP Binding namespace from RFC 3920.
+         *  NS.SESSION - XMPP Session namespace from RFC 3920.
+         *  NS.XHTML_IM - XHTML-IM namespace from XEP 71.
+         *  NS.XHTML - XHTML body namespace from XEP 71.
+         */
+        var NS: {
+            HTTPBIND: string;
+            BOSH: string;
+            CLIENT: string;
+            AUTH: string;
+            ROSTER: string;
+            PROFILE: string;
+            DISCO_INFO: string;
+            DISCO_ITEMS: string;
+            MUC: string;
+            SASL: string;
+            STREAM: string;
+            FRAMING: string;
+            BIND: string;
+            SESSION: string;
+            VERSION: string;
+            STANZAS: string;
+            XHTML_IM: string;
+            XHTML: string;
+        }
+
+        /** Constants: Connection Status Constants
+         *  Connection status constants for use by the connection handler
+         *  callback.
+         *
+         *  Status.ERROR - An error has occurred
+         *  Status.CONNECTING - The connection is currently being made
+         *  Status.CONNFAIL - The connection attempt failed
+         *  Status.AUTHENTICATING - The connection is authenticating
+         *  Status.AUTHFAIL - The authentication attempt failed
+         *  Status.CONNECTED - The connection has succeeded
+         *  Status.DISCONNECTED - The connection has been terminated
+         *  Status.DISCONNECTING - The connection is currently being terminated
+         *  Status.ATTACHED - The connection has been attached
+         */
+        enum Status {
+            ERROR,
+            CONNECTING,
+            CONNFAIL,
+            AUTHENTICATING,
+            AUTHFAIL,
+            CONNECTED,
+            DISCONNECTED,
+            DISCONNECTING,
+            ATTACHED,
+            REDIRECT
+        }
+
+        /** Constants: Log Level Constants
+         *  Logging level indicators.
+         *
+         *  LogLevel.DEBUG - Debug output
+         *  LogLevel.INFO - Informational output
+         *  LogLevel.WARN - Warnings
+         *  LogLevel.ERROR - Errors
+         *  LogLevel.FATAL - Fatal errors
+         */
+        enum LogLevel {
+            DEBUG,
+            INFO,
+            WARN,
+            ERROR,
+            FATAL
+        }
+
+        /** Function: addNamespace
+         *  This function is used to extend the current namespaces in
+         *  Strophe.NS.  It takes a key and a value with the key being the
+         *  name of the new namespace, with its actual value.
+         *  For example:
+         *  Strophe.addNamespace('PUBSUB', "http://jabber.org/protocol/pubsub");
+         *
+         *  Parameters:
+         *    (String) name - The name under which the namespace will be
+         *      referenced under Strophe.NS
+         *    (String) value - The actual namespace.
+         */
+        function addNamespace(name: string, value: string): void; 
+
+        /** Function: forEachChild
+         *  Map a function over some or all child elements of a given element.
+         *
+         *  This is a small convenience function for mapping a function over
+         *  some or all of the children of an element.  If elemName is null, all
+         *  children will be passed to the function, otherwise only children
+         *  whose tag names match elemName will be passed.
+         *
+         *  Parameters:
+         *    (XMLElement) elem - The element to operate on.
+         *    (String) elemName - The child element tag name filter.
+         *    (Function) func - The function to apply to each child.  This
+         *      function should take a single argument, a DOM element.
+         */
+        function forEachChild(elem: Element, elemName: string, func: (child: Element) => any): void; 
+
+        /** Function: isTagEqual
+         *  Compare an element's tag name with a string.
+         *
+         *  This function is case sensitive.
+         *
+         *  Parameters:
+         *    (XMLElement) el - A DOM element.
+         *    (String) name - The element name.
+         *
+         *  Returns:
+         *    true if the element's tag name matches _el_, and false
+         *    otherwise.
+         */
+        function isTagEqual(el: Element, name: string): boolean;
+
+        /** Function: xmlGenerator
+         *  Get the DOM document to generate elements.
+         *
+         *  Returns:
+         *    The currently used DOM document.
+         */
+        function xmlGenerator(): Document;
+
+        /** Function: xmlElement
+         *  Create an XML DOM element.
+         *
+         *  This function creates an XML DOM element correctly across all
+         *  implementations. Note that these are not HTML DOM elements, which
+         *  aren't appropriate for XMPP stanzas.
+         *
+         *  Parameters:
+         *    (String) name - The name for the element.
+         *    (Array|Object) attrs - An optional array or object containing
+         *      key/value pairs to use as element attributes. The object should
+         *      be in the format {'key': 'value'} or {key: 'value'}. The array
+         *      should have the format [['key1', 'value1'], ['key2', 'value2']].
+         *    (String) text - The text child data for the element.
+         *
+         *  Returns:
+         *    A new XML DOM element.
+         */
+        function xmlElement(name: string, attrs?: any, text?: string): Element;
+        function xmlElement(name: string, text?: string, attrs?: any): Element; 
+
+        /*  Function: xmlescape
+         *  Excapes invalid xml characters.
+         *
+         *  Parameters:
+         *     (String) text - text to escape.
+         *
+         *  Returns:
+         *      Escaped text.
+         */
+        function xmlescape(text: string): string;
+
+        /*  Function: xmlunescape
+        *  Unexcapes invalid xml characters.
+        *
+        *  Parameters:
+        *     (String) text - text to unescape.
+        *
+        *  Returns:
+        *      Unescaped text.
+        */
+        function xmlunescape(text: string): string;
+
+        /** Function: xmlTextNode
+         *  Creates an XML DOM text node.
+         *
+         *  Provides a cross implementation version of document.createTextNode.
+         *
+         *  Parameters:
+         *    (String) text - The content of the text node.
+         *
+         *  Returns:
+         *    A new XML DOM text node.
+         */
+        function xmlTextNode(text: string): Text;
+
+        /** Function: xmlHtmlNode
+         *  Creates an XML DOM html node.
+         *
+         *  Parameters:
+         *    (String) html - The content of the html node.
+         *
+         *  Returns:
+         *    A new XML DOM text node.
+         */
+        function xmlHtmlNode(html: string): Document; 
+
+        /** Function: getText
+             *  Get the concatenation of all text children of an element.
+             *
+             *  Parameters:
+             *    (XMLElement) elem - A DOM element.
+             *
+             *  Returns:
+             *    A String with the concatenated text of all text element children.
+             */
+        function getText(elem: Element): string;
+
+        /** Function: copyElement
+         *  Copy an XML DOM element.
+         *
+         *  This function copies a DOM element and all its descendants and returns
+         *  the new copy.
+         *
+         *  Parameters:
+         *    (XMLElement) elem - A DOM element.
+         *
+         *  Returns:
+         *    A new, copied DOM element tree.
+         */
+        function copyElement(elem: Element): Element; 
+
+        /** Function: createHtml
+         *  Copy an HTML DOM element into an XML DOM.
+         *
+         *  This function copies a DOM element and all its descendants and returns
+         *  the new copy.
+         *
+         *  Parameters:
+         *    (Element) elem - A DOM element.
+         *
+         *  Returns:
+         *    A new, copied DOM element tree.
+         */
+        function createHtml(elem: Element): Element; 
+
+        /** Function: escapeNode
+         *  Escape the node part (also called local part) of a JID.
+         *
+         *  Parameters:
+         *    (String) node - A node (or local part).
+         *
+         *  Returns:
+         *    An escaped node (or local part).
+         */
+        function escapeNode(node: string): string;
+
+        /** Function: unescapeNode
+         *  Unescape a node part (also called local part) of a JID.
+         *
+         *  Parameters:
+         *    (String) node - A node (or local part).
+         *
+         *  Returns:
+         *    An unescaped node (or local part).
+         */
+        function unescapeNode(node: string): string;
+
+        /** Function: getNodeFromJid
+         *  Get the node portion of a JID String.
+         *
+         *  Parameters:
+         *    (String) jid - A JID.
+         *
+         *  Returns:
+         *    A String containing the node.
+         */
+        function getNodeFromJid(jid: string): string;
+
+        /** Function: getDomainFromJid
+         *  Get the domain portion of a JID String.
+         *
+         *  Parameters:
+         *    (String) jid - A JID.
+         *
+         *  Returns:
+         *    A String containing the domain.
+         */
+        function getDomainFromJid(jid: string): string;
+
+        /** Function: getResourceFromJid
+         *  Get the resource portion of a JID String.
+         *
+         *  Parameters:
+         *    (String) jid - A JID.
+         *
+         *  Returns:
+         *    A String containing the resource.
+         */
+        function getResourceFromJid(jid: string): string;
+
+        /** Function: getBareJidFromJid
+         *  Get the bare JID from a JID String.
+         *
+         *  Parameters:
+         *    (String) jid - A JID.
+         *
+         *  Returns:
+         *    A String containing the bare JID.
+         */
+        function getBareJidFromJid(jid: string): string;
+
+        /** Function: log
+         *  User overrideable logging function.
+         *
+         *  This function is called whenever the Strophe library calls any
+         *  of the logging functions.  The default implementation of this
+         *  function does nothing.  If client code wishes to handle the logging
+         *  messages, it should override this with
+         *  > Strophe.log = function (level, msg) {
+         *  >   (user code here)
+         *  > };
+         *
+         *  Please note that data sent and received over the wire is logged
+         *  via Strophe.Connection.rawInput() and Strophe.Connection.rawOutput().
+         *
+         *  The different levels and their meanings are
+         *
+         *    DEBUG - Messages useful for debugging purposes.
+         *    INFO - Informational messages.  This is mostly information like
+         *      'disconnect was called' or 'SASL auth succeeded'.
+         *    WARN - Warnings about potential problems.  This is mostly used
+         *      to report transient connection errors like request timeouts.
+         *    ERROR - Some error occurred.
+         *    FATAL - A non-recoverable fatal error occurred.
+         *
+         *  Parameters:
+         *    (Integer) level - The log level of the log message.  This will
+         *      be one of the values in Strophe.LogLevel.
+         *    (String) msg - The log message.
+         */
+        function log(level: LogLevel, msg: string): void;
+
+        /** Functions: debug, info, warn, error
+         *  Log a message at the appropriate Strophe.LogLevel 
+         *
+         *  Parameters:
+         *    (String) msg - The log message.
+         */
+        function debug(msg: string): void;
+        function info(msg: string): void;
+        function warn(msg: string): void;
+        function error(msg: string): void;
+        function fatal(msg: string): void; 
+
+        /** Function: serialize
+         *  Render a DOM element and all descendants to a String.
+         *
+         *  Parameters:
+         *    (XMLElement) elem - A DOM element.
+         *
+         *  Returns:
+         *    The serialized element tree as a String.
+         */
+        function serialize(elem: Element | Builder): string;
+
+        /** Function: addConnectionPlugin
+         *  Extends the Strophe.Connection object with the given plugin.
+         *
+         *  Parameters:
+         *    (String) name - The name of the extension.
+         *    (Object) ptype - The plugin's prototype.
+         */
+        function addConnectionPlugin(name: string, ptype: any): void;
+
+        var Builder: {
+            /** Constructor: Strophe.Builder
+             *  Create a Strophe.Builder object.
+             *
+             *  The attributes should be passed in object notation.  For example
+             *  > var b = new Builder('message', {to: 'you', from: 'me'});
+             *  or
+             *  > var b = new Builder('messsage', {'xml:lang': 'en'});
+             *
+             *  Parameters:
+             *    (String) name - The name of the root element.
+             *    (Object) attrs - The attributes for the root element in object notation.
+             *
+             *  Returns:
+             *    A new Strophe.Builder.
+             */
+            new (name: string, attrs?: any): Builder;
+            prototype: any;
+        }
+    
+
+        /** Class: Strophe.Builder
+         *  XML DOM builder.
+         *
+         *  This object provides an interface similar to JQuery but for building
+         *  DOM element easily and rapidly.  All the functions except for toString()
+         *  and tree() return the object, so calls can be chained.  Here's an
+         *  example using the $iq() builder helper.
+         *  > $iq({to: 'you', from: 'me', type: 'get', id: '1'})
+         *  >     .c('query', {xmlns: 'strophe:example'})
+         *  >     .c('example')
+         *  >     .toString()
+         *  The above generates this XML fragment
+         *  > <iq to='you' from='me' type='get' id='1'>
+         *  >   <query xmlns='strophe:example'>
+         *  >     <example/>
+         *  >   </query>
+         *  > </iq>
+         *  The corresponding DOM manipulations to get a similar fragment would be
+         *  a lot more tedious and probably involve several helper variables.
+         *
+         *  Since adding children makes new operations operate on the child, up()
+         *  is provided to traverse up the tree.  To add two children, do
+         *  > builder.c('child1', ...).up().c('child2', ...)
+         *  The next operation on the Builder will be relative to the second child.
+         */
+        interface Builder {
+            /** Function: tree
+            *  Return the DOM tree.
+            *
+            *  This function returns the current DOM tree as an element object.  This
+            *  is suitable for passing to functions like Strophe.Connection.send().
+            *
+            *  Returns:
+            *    The DOM tree as a element object.
+            */
+            tree(): Element;
+
+            /** Function: toString
+             *  Serialize the DOM tree to a String.
+             *
+             *  This function returns a string serialization of the current DOM
+             *  tree.  It is often used internally to pass data to a
+             *  Strophe.Request object.
+             *
+             *  Returns:
+             *    The serialized DOM tree in a String.
+             */
+            toString(): string;
+
+            /** Function: up
+             *  Make the current parent element the new current element.
+             *
+             *  This function is often used after c() to traverse back up the tree.
+             *  For example, to add two children to the same element
+             *  > builder.c('child1', {}).up().c('child2', {});
+             *
+             *  Returns:
+             *    The Stophe.Builder object.
+             */
+            up(): Builder;
+
+            /** Function: attrs
+             *  Add or modify attributes of the current element.
+             *
+             *  The attributes should be passed in object notation.  This function
+             *  does not move the current element pointer.
+             *
+             *  Parameters:
+             *    (Object) moreattrs - The attributes to add/modify in object notation.
+             *
+             *  Returns:
+             *    The Strophe.Builder object.
+             */
+            attrs(moreattrs: any): Builder;
+
+            /** Function: c
+             *  Add a child to the current element and make it the new current
+             *  element.
+             *
+             *  This function moves the current element pointer to the child,
+             *  unless text is provided.  If you need to add another child, it
+             *  is necessary to use up() to go back to the parent in the tree.
+             *
+             *  Parameters:
+             *    (String) name - The name of the child.
+             *    (Object) attrs - The attributes of the child in object notation.
+             *    (String) text - The text to add to the child.
+             *
+             *  Returns:
+             *    The Strophe.Builder object.
+             */
+            c(name: string, attrs?: any, text?: string): Builder;
+
+            /** Function: cnode
+             *  Add a child to the current element and make it the new current
+             *  element.
+             *
+             *  This function is the same as c() except that instead of using a
+             *  name and an attributes object to create the child it uses an
+             *  existing DOM element object.
+             *
+             *  Parameters:
+             *    (XMLElement) elem - A DOM element.
+             *
+             *  Returns:
+             *    The Strophe.Builder object.
+             */
+            cnode(elem: Node): Builder;
+
+            /** Function: t
+             *  Add a child text element.
+             *
+             *  This *does not* make the child the new current element since there
+             *  are no children of text elements.
+             *
+             *  Parameters:
+             *    (String) text - The text data to append to the current element.
+             *
+             *  Returns:
+             *    The Strophe.Builder object.
+             */
+            t(text: string): Builder;
+
+            /** Function: h
+             *  Replace current element contents with the HTML passed in.
+             *
+             *  This *does not* make the child the new current element
+             *
+             *  Parameters:
+             *    (String) html - The html to insert as contents of current element.
+             *
+             *  Returns:
+             *    The Strophe.Builder object.
+             */
+            h(html: string): Builder;
+        }
+
+        interface ConnectionOptions {
+            protocol?: string;
+            sync?: boolean;
+        }
+        var Connection: {
+            /** Constructor: Strophe.Connection
+             *  Create and initialize a Strophe.Connection object.
+             *
+             *  The transport-protocol for this connection will be chosen automatically
+             *  based on the given service parameter. URLs starting with "ws://" or
+             *  "wss://" will use WebSockets, URLs starting with "http://", "https://"
+             *  or without a protocol will use BOSH.
+             *
+             *  To make Strophe connect to the current host you can leave out the protocol
+             *  and host part and just pass the path, e.g.
+             *
+             *  > var conn = new Strophe.Connection("/http-bind/");
+             *
+             *  WebSocket options:
+             *
+             *  If you want to connect to the current host with a WebSocket connection you
+             *  can tell Strophe to use WebSockets through a "protocol" attribute in the
+             *  optional options parameter. Valid values are "ws" for WebSocket and "wss"
+             *  for Secure WebSocket.
+             *  So to connect to "wss://CURRENT_HOSTNAME/xmpp-websocket" you would call
+             *
+             *  > var conn = new Strophe.Connection("/xmpp-websocket/", {protocol: "wss"});
+             *
+             *  Note that relative URLs _NOT_ starting with a "/" will also include the path
+             *  of the current site.
+             *
+             *  Also because downgrading security is not permitted by browsers, when using
+             *  relative URLs both BOSH and WebSocket connections will use their secure
+             *  variants if the current connection to the site is also secure (https).
+             *
+             *  BOSH options:
+             *
+             *  by adding "sync" to the options, you can control if requests will
+             *  be made synchronously or not. The default behaviour is asynchronous.
+             *  If you want to make requests synchronous, make "sync" evaluate to true:
+             *  > var conn = new Strophe.Connection("/http-bind/", {sync: true});
+             *  You can also toggle this on an already established connection:
+             *  > conn.options.sync = true;
+             *
+             *
+             *  Parameters:
+             *    (String) service - The BOSH or WebSocket service URL.
+             *    (Object) options - A hash of configuration options
+             *
+             *  Returns:
+             *    A new Strophe.Connection object.
+             */
+            new (service: string, options?: ConnectionOptions): Connection;
+            prototype: any;
+        }
+
+        /** Class: Strophe.Connection
+         *  XMPP Connection manager.
+         *
+         *  This class is the main part of Strophe.  It manages a BOSH connection
+         *  to an XMPP server and dispatches events to the user callbacks as
+         *  data arrives.  It supports SASL PLAIN, SASL DIGEST-MD5, SASL SCRAM-SHA1
+         *  and legacy authentication.
+         *
+         *  After creating a Strophe.Connection object, the user will typically
+         *  call connect() with a user supplied callback to handle connection level
+         *  events like authentication failure, disconnection, or connection
+         *  complete.
+         *
+         *  The user will also have several event handlers defined by using
+         *  addHandler() and addTimedHandler().  These will allow the user code to
+         *  respond to interesting stanzas or do something periodically with the
+         *  connection.  These handlers will be active once authentication is
+         *  finished.
+         *
+         *  To send data to the connection, use send().
+         */
+        interface Connection {
+
+            jid: string;
+            authzid: string;
+            pass: string;
+            authcid: string;
+            domain: string;
+            servtype: string;
+            maxRetries: number;
+            //todo: what other members are meant to be public?
+
+            /** Function: reset
+            *  Reset the connection.
+            *
+            *  This function should be called after a connection is disconnected
+            *  before that connection is reused.
+            */
+            reset(): void;
+
+            /** Function: pause
+             *  Pause the request manager.
+             *
+             *  This will prevent Strophe from sending any more requests to the
+             *  server.  This is very useful for temporarily pausing
+             *  BOSH-Connections while a lot of send() calls are happening quickly.
+             *  This causes Strophe to send the data in a single request, saving
+             *  many request trips.
+             */
+            pause(): void;
+
+            /** Function: resume
+             *  Resume the request manager.
+             *
+             *  This resumes after pause() has been called.
+             */
+            resume(): void;
+
+            /** Function: getUniqueId
+             *  Generate a unique ID for use in <iq/> elements.
+             *
+             *  All <iq/> stanzas are required to have unique id attributes.  This
+             *  function makes creating these easy.  Each connection instance has
+             *  a counter which starts from zero, and the value of this counter
+             *  plus a colon followed by the suffix becomes the unique id. If no
+             *  suffix is supplied, the counter is used as the unique id.
+             *
+             *  Suffixes are used to make debugging easier when reading the stream
+             *  data, and their use is recommended.  The counter resets to 0 for
+             *  every new connection for the same reason.  For connections to the
+             *  same server that authenticate the same way, all the ids should be
+             *  the same, which makes it easy to see changes.  This is useful for
+             *  automated testing as well.
+             *
+             *  Parameters:
+             *    (String) suffix - A optional suffix to append to the id.
+             *
+             *  Returns:
+             *    A unique string to be used for the id attribute.
+             */
+            getUniqueId(suffix?: string | number): string;
+
+            /** Function: connect
+             *  Starts the connection process.
+             *
+             *  As the connection process proceeds, the user supplied callback will
+             *  be triggered multiple times with status updates.  The callback
+             *  should take two arguments - the status code and the error condition.
+             *
+             *  The status code will be one of the values in the Strophe.Status
+             *  constants.  The error condition will be one of the conditions
+             *  defined in RFC 3920 or the condition 'strophe-parsererror'.
+             *
+             *  The Parameters _wait_, _hold_ and _route_ are optional and only relevant
+             *  for BOSH connections. Please see XEP 124 for a more detailed explanation
+             *  of the optional parameters.
+             *
+             *  Parameters:
+             *    (String) jid - The user's JID.  This may be a bare JID,
+             *      or a full JID.  If a node is not supplied, SASL ANONYMOUS
+             *      authentication will be attempted.
+             *    (String) pass - The user's password.
+             *    (Function) callback - The connect callback function.
+             *    (Integer) wait - The optional HTTPBIND wait value.  This is the
+             *      time the server will wait before returning an empty result for
+             *      a request.  The default setting of 60 seconds is recommended.
+             *    (Integer) hold - The optional HTTPBIND hold value.  This is the
+             *      number of connections the server will hold at one time.  This
+             *      should almost always be set to 1 (the default).
+             *    (String) route - The optional route value.
+             */
+            connect(jid?: string, pass?: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, route?: string): void;
+
+            /** Function: attach
+             *  Attach to an already created and authenticated BOSH session.
+             *
+             *  This function is provided to allow Strophe to attach to BOSH
+             *  sessions which have been created externally, perhaps by a Web
+             *  application.  This is often used to support auto-login type features
+             *  without putting user credentials into the page.
+             *
+             *  Parameters:
+             *    (String) jid - The full JID that is bound by the session.
+             *    (String) sid - The SID of the BOSH session.
+             *    (String) rid - The current RID of the BOSH session.  This RID
+             *      will be used by the next request.
+             *    (Function) callback The connect callback function.
+             *    (Integer) wait - The optional HTTPBIND wait value.  This is the
+             *      time the server will wait before returning an empty result for
+             *      a request.  The default setting of 60 seconds is recommended.
+             *      Other settings will require tweaks to the Strophe.TIMEOUT value.
+             *    (Integer) hold - The optional HTTPBIND hold value.  This is the
+             *      number of connections the server will hold at one time.  This
+             *      should almost always be set to 1 (the default).
+             *    (Integer) wind - The optional HTTBIND window value.  This is the
+             *      allowed range of request ids that are valid.  The default is 5.
+             */
+            attach(jid: string, sid: string, rid: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, wind?: number): void;
+
+            /** Function: xmlInput
+             *  User overrideable function that receives XML data coming into the
+             *  connection.
+             *
+             *  The default function does nothing.  User code can override this with
+             *  > Strophe.Connection.xmlInput = function (elem) {
+             *  >   (user code)
+             *  > };
+             *
+             *  Due to limitations of current Browsers' XML-Parsers the opening and closing
+             *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
+             *
+             *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
+             *  <Strophe.Bosh.strip> if you want to strip this tag.
+             *
+             *  Parameters:
+             *    (XMLElement) elem - The XML data received by the connection.
+             */
+            xmlInput(elem: Element): void;
+
+            /** Function: xmlOutput
+             *  User overrideable function that receives XML data sent to the
+             *  connection.
+             *
+             *  The default function does nothing.  User code can override this with
+             *  > Strophe.Connection.xmlOutput = function (elem) {
+             *  >   (user code)
+             *  > };
+             *
+             *  Due to limitations of current Browsers' XML-Parsers the opening and closing
+             *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
+             *
+             *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
+             *  <Strophe.Bosh.strip> if you want to strip this tag.
+             *
+             *  Parameters:
+             *    (XMLElement) elem - The XMLdata sent by the connection.
+             */
+            xmlOutput(elem: Element): void;
+
+            /** Function: rawInput
+             *  User overrideable function that receives raw data coming into the
+             *  connection.
+             *
+             *  The default function does nothing.  User code can override this with
+             *  > Strophe.Connection.rawInput = function (data) {
+             *  >   (user code)
+             *  > };
+             *
+             *  Parameters:
+             *    (String) data - The data received by the connection.
+             */
+            rawInput(data: string): void;
+
+            /** Function: rawOutput
+             *  User overrideable function that receives raw data sent to the
+             *  connection.
+             *
+             *  The default function does nothing.  User code can override this with
+             *  > Strophe.Connection.rawOutput = function (data) {
+             *  >   (user code)
+             *  > };
+             *
+             *  Parameters:
+             *    (String) data - The data sent by the connection.
+             */
+            rawOutput(data: string): void;
+
+            /** Function: send
+             *  Send a stanza.
+             *
+             *  This function is called to push data onto the send queue to
+             *  go out over the wire.  Whenever a request is sent to the BOSH
+             *  server, all pending data is sent and the queue is flushed.
+             *
+             *  Parameters:
+             *    (XMLElement |
+             *     [XMLElement] |
+             *     Strophe.Builder) elem - The stanza to send.
+             */
+            send(elem: Element | Element[]| Builder): void;
+
+            /** Function: flush
+             *  Immediately send any pending outgoing data.
+             *
+             *  Normally send() queues outgoing data until the next idle period
+             *  (100ms), which optimizes network use in the common cases when
+             *  several send()s are called in succession. flush() can be used to
+             *  immediately send all pending data.
+             */
+            flush(): void;
+
+            /** Function: sendIQ
+             *  Helper function to send IQ stanzas.
+             *
+             *  Parameters:
+             *    (XMLElement) elem - The stanza to send.
+             *    (Function) callback - The callback function for a successful request.
+             *    (Function) errback - The callback function for a failed or timed
+             *      out request.  On timeout, the stanza will be null.
+             *    (Integer) timeout - The time specified in milliseconds for a
+             *      timeout to occur.
+             *
+             *  Returns:
+             *    The id used to send the IQ.
+            */
+            sendIQ(elem: Element | Builder, callback?: (stanza: Element) => any, errback?: (stanza: Element) => any, timeout?: number): string; //todo: Is callback correct?
+
+            /** Function: addTimedHandler
+             *  Add a timed handler to the connection.
+             *
+             *  This function adds a timed handler.  The provided handler will
+             *  be called every period milliseconds until it returns false,
+             *  the connection is terminated, or the handler is removed.  Handlers
+             *  that wish to continue being invoked should return true.
+             *
+             *  Because of method binding it is necessary to save the result of
+             *  this function if you wish to remove a handler with
+             *  deleteTimedHandler().
+             *
+             *  Note that user handlers are not active until authentication is
+             *  successful.
+             *
+             *  Parameters:
+             *    (Integer) period - The period of the handler.
+             *    (Function) handler - The callback function.
+             *
+             *  Returns:
+             *    A reference to the handler that can be used to remove it.
+             */
+            addTimedHandler(period: number, handler: () => boolean): any;
+
+            /** Function: deleteTimedHandler
+             *  Delete a timed handler for a connection.
+             *
+             *  This function removes a timed handler from the connection.  The
+             *  handRef parameter is *not* the function passed to addTimedHandler(),
+             *  but is the reference returned from addTimedHandler().
+             *
+             *  Parameters:
+             *    (Strophe.TimedHandler) handRef - The handler reference.
+             */
+            deleteTimedHandler(handRef: any): void;
+
+
+            /** Function: addHandler
+             *  Add a stanza handler for the connection.
+             *
+             *  This function adds a stanza handler to the connection.  The
+             *  handler callback will be called for any stanza that matches
+             *  the parameters.  Note that if multiple parameters are supplied,
+             *  they must all match for the handler to be invoked.
+             *
+             *  The handler will receive the stanza that triggered it as its argument.
+             *  *The handler should return true if it is to be invoked again;
+             *  returning false will remove the handler after it returns.*
+             *
+             *  As a convenience, the ns parameters applies to the top level element
+             *  and also any of its immediate children.  This is primarily to make
+             *  matching /iq/query elements easy.
+             *
+             *  The options argument contains handler matching flags that affect how
+             *  matches are determined. Currently the only flag is matchBare (a
+             *  boolean). When matchBare is true, the from parameter and the from
+             *  attribute on the stanza will be matched as bare JIDs instead of
+             *  full JIDs. To use this, pass {matchBare: true} as the value of
+             *  options. The default value for matchBare is false.
+             *
+             *  The return value should be saved if you wish to remove the handler
+             *  with deleteHandler().
+             *
+             *  Parameters:
+             *    (Function) handler - The user callback.
+             *    (String) ns - The namespace to match.
+             *    (String) name - The stanza name to match.
+             *    (String) type - The stanza type attribute to match.
+             *    (String) id - The stanza id attribute to match.
+             *    (String) from - The stanza from attribute to match.
+             *    (String) options - The handler options
+             *
+             *  Returns:
+             *    A reference to the handler that can be used to remove it.
+             */
+            addHandler(handler: (stanza: Element) => boolean, ns: string, name: string, type?: string, id?: string, from?: string, options?: { matchBare: boolean }): any; //todo: is callback correct? Also, are the elements specified as optional truly optional?
+
+            /** Function: deleteHandler
+             *  Delete a stanza handler for a connection.
+             *
+             *  This function removes a stanza handler from the connection.  The
+             *  handRef parameter is *not* the function passed to addHandler(),
+             *  but is the reference returned from addHandler().
+             *
+             *  Parameters:
+             *    (Strophe.Handler) handRef - The handler reference.
+             */
+            deleteHandler(handRef: any): void;
+
+            /** Function: disconnect
+             *  Start the graceful disconnection process.
+             *
+             *  This function starts the disconnection process.  This process starts
+             *  by sending unavailable presence and sending BOSH body of type
+             *  terminate.  A timeout handler makes sure that disconnection happens
+             *  even if the BOSH server does not respond.
+             *  If the Connection object isn't connected, at least tries to abort all pending requests
+             *  so the connection object won't generate successful requests (which were already opened).
+             *
+             *  The user supplied connection callback will be notified of the
+             *  progress as this process happens.
+             *
+             *  Parameters:
+             *    (String) reason - The reason the disconnect is occuring.
+             */
+            disconnect(reason: string): void;
+        }
+
+        /** Interface: Strophe.SASLMechanism
+         *
+         *  encapsulates SASL authentication mechanisms.
+         *
+         *  User code may override the priority for each mechanism or disable it completely.
+         *  See <priority> for information about changing priority and <test> for informatian on
+         *  how to disable a mechanism.
+         *
+         *  By default, all mechanisms are enabled and the priorities are
+         *
+         *  SCRAM-SHA1 - 40
+         *  DIGEST-MD5 - 30
+         *  Plain - 20
+         */
+        interface SASLMechanism {
+            /**
+           *  Function: test
+           *  Checks if mechanism able to run.
+           *  To disable a mechanism, make this return false;
+           *
+           *  To disable plain authentication run
+           *  > Strophe.SASLPlain.test = function() {
+           *  >   return false;
+           *  > }
+           *
+           *  See <SASL mechanisms> for a list of available mechanisms.
+           *
+           *  Parameters:
+           *    (Strophe.Connection) connection - Target Connection.
+           *
+           *  Returns:
+           *    (Boolean) If mechanism was able to run.
+           */
+            test(connection: Connection): boolean;
+
+            /** Variable: priority
+           *  Determines which <SASLMechanism> is chosen for authentication (Higher is better).
+           *  Users may override this to prioritize mechanisms differently.
+           *
+           *  In the default configuration the priorities are
+           *
+           *  SCRAM-SHA1 - 40
+           *  DIGEST-MD5 - 30
+           *  Plain - 20
+           *
+           *  Example: (This will cause Strophe to choose the mechanism that the server sent first)
+           *
+           *  > Strophe.SASLMD5.priority = Strophe.SASLSHA1.priority;
+           *
+           *  See <SASL mechanisms> for a list of available mechanisms.
+           *
+           */
+            priority: number;
+        }
+
+        /** Constants: SASL mechanisms
+       *  Available authentication mechanisms
+       *
+       *  Strophe.SASLAnonymous - SASL Anonymous authentication.
+       *  Strophe.SASLPlain - SASL Plain authentication.
+       *  Strophe.SASLMD5 - SASL Digest-MD5 authentication
+       *  Strophe.SASLSHA1 - SASL SCRAM-SHA1 authentication
+       */
+        var SASLAnonymous: SASLMechanism;
+        var SASLPlain: SASLMechanism;
+        var SASLSHA1: SASLMechanism;
+        var SASLMD5: SASLMechanism;
+    }
+}
 
 /** Function: $build
- *  Create a Strophe.Builder.
- *  This is an alias for 'new Strophe.Builder(name, attrs)'.
- *
- *  Parameters:
- *    (String) name - The root element name.
- *    (Object) attrs - The attributes for the root element in object notation.
- *
- *  Returns:
- *    A new Strophe.Builder object.
- */
-declare function $build(name: string, attrs?: any): Strophe.Builder; 
+     *  Create a Strophe.Builder.
+     *  This is an alias for 'new Strophe.Builder(name, attrs)'.
+     *
+     *  Parameters:
+     *    (String) name - The root element name.
+     *    (Object) attrs - The attributes for the root element in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+declare function $build(name: string, attrs?: any): wrapper.Strophe.Builder; 
 
 /** Function: $msg
- *  Create a Strophe.Builder with a <message/> element as the root.
- *
- *  Parmaeters:
- *    (Object) attrs - The <message/> element attributes in object notation.
- *
- *  Returns:
- *    A new Strophe.Builder object.
- */
-declare function $msg(attrs?: any): Strophe.Builder;
+     *  Create a Strophe.Builder with a <message/> element as the root.
+     *
+     *  Parmaeters:
+     *    (Object) attrs - The <message/> element attributes in object notation.
+     *
+     *  Returns:
+     *    A new Strophe.Builder object.
+     */
+declare function $msg(attrs?: any): wrapper.Strophe.Builder;
 
 /** Function: $iq
  *  Create a Strophe.Builder with an <iq/> element as the root.
@@ -36,7 +1100,7 @@ declare function $msg(attrs?: any): Strophe.Builder;
  *  Returns:
  *    A new Strophe.Builder object.
  */
-declare function $iq(attrs?: any): Strophe.Builder;
+declare function $iq(attrs?: any): wrapper.Strophe.Builder;
 
 /** Function: $pres
  *  Create a Strophe.Builder with a <presence/> element as the root.
@@ -47,1022 +1111,26 @@ declare function $iq(attrs?: any): Strophe.Builder;
  *  Returns:
  *    A new Strophe.Builder object.
  */
-declare function $pres(attrs?: any): Strophe.Builder;
+declare function $pres(attrs?: any): wrapper.Strophe.Builder;
 
-declare module Strophe {
-    /** Constant: VERSION
-     *  The version of the Strophe library. Unreleased builds will have
-     *  a version of head-HASH where HASH is a partial revision.
-     */
-    var VERSION: string;
+import Strophe = wrapper.Strophe;
 
-    /** Constants: XMPP Namespace Constants
-     *  Common namespace constants from the XMPP RFCs and XEPs.
-     *
-     *  NS.HTTPBIND - HTTP BIND namespace from XEP 124.
-     *  NS.BOSH - BOSH namespace from XEP 206.
-     *  NS.CLIENT - Main XMPP client namespace.
-     *  NS.AUTH - Legacy authentication namespace.
-     *  NS.ROSTER - Roster operations namespace.
-     *  NS.PROFILE - Profile namespace.
-     *  NS.DISCO_INFO - Service discovery info namespace from XEP 30.
-     *  NS.DISCO_ITEMS - Service discovery items namespace from XEP 30.
-     *  NS.MUC - Multi-User Chat namespace from XEP 45.
-     *  NS.SASL - XMPP SASL namespace from RFC 3920.
-     *  NS.STREAM - XMPP Streams namespace from RFC 3920.
-     *  NS.BIND - XMPP Binding namespace from RFC 3920.
-     *  NS.SESSION - XMPP Session namespace from RFC 3920.
-     *  NS.XHTML_IM - XHTML-IM namespace from XEP 71.
-     *  NS.XHTML - XHTML body namespace from XEP 71.
-     */
-    var NS: {
-        HTTPBIND: string;
-        BOSH: string;
-        CLIENT: string;
-        AUTH: string;
-        ROSTER: string;
-        PROFILE: string;
-        DISCO_INFO: string;
-        DISCO_ITEMS: string;
-        MUC: string;
-        SASL: string;
-        STREAM: string;
-        FRAMING: string;
-        BIND: string;
-        SESSION: string;
-        VERSION: string;
-        STANZAS: string;
-        XHTML_IM: string;
-        XHTML: string;
-    }
-
-    /** Constants: Connection Status Constants
-     *  Connection status constants for use by the connection handler
-     *  callback.
-     *
-     *  Status.ERROR - An error has occurred
-     *  Status.CONNECTING - The connection is currently being made
-     *  Status.CONNFAIL - The connection attempt failed
-     *  Status.AUTHENTICATING - The connection is authenticating
-     *  Status.AUTHFAIL - The authentication attempt failed
-     *  Status.CONNECTED - The connection has succeeded
-     *  Status.DISCONNECTED - The connection has been terminated
-     *  Status.DISCONNECTING - The connection is currently being terminated
-     *  Status.ATTACHED - The connection has been attached
-     */
-    enum Status {
-        ERROR,
-        CONNECTING,
-        CONNFAIL,
-        AUTHENTICATING,
-        AUTHFAIL,
-        CONNECTED,
-        DISCONNECTED,
-        DISCONNECTING,
-        ATTACHED,
-        REDIRECT
-    }
-
-    /** Constants: Log Level Constants
-     *  Logging level indicators.
-     *
-     *  LogLevel.DEBUG - Debug output
-     *  LogLevel.INFO - Informational output
-     *  LogLevel.WARN - Warnings
-     *  LogLevel.ERROR - Errors
-     *  LogLevel.FATAL - Fatal errors
-     */
-    enum LogLevel {
-        DEBUG,
-        INFO,
-        WARN,
-        ERROR,
-        FATAL
-    }
-
-    /** Function: addNamespace
-     *  This function is used to extend the current namespaces in
-     *  Strophe.NS.  It takes a key and a value with the key being the
-     *  name of the new namespace, with its actual value.
-     *  For example:
-     *  Strophe.addNamespace('PUBSUB', "http://jabber.org/protocol/pubsub");
-     *
-     *  Parameters:
-     *    (String) name - The name under which the namespace will be
-     *      referenced under Strophe.NS
-     *    (String) value - The actual namespace.
-     */
-    function addNamespace(name: string, value: string): void; 
-
-    /** Function: forEachChild
-     *  Map a function over some or all child elements of a given element.
-     *
-     *  This is a small convenience function for mapping a function over
-     *  some or all of the children of an element.  If elemName is null, all
-     *  children will be passed to the function, otherwise only children
-     *  whose tag names match elemName will be passed.
-     *
-     *  Parameters:
-     *    (XMLElement) elem - The element to operate on.
-     *    (String) elemName - The child element tag name filter.
-     *    (Function) func - The function to apply to each child.  This
-     *      function should take a single argument, a DOM element.
-     */
-    function forEachChild(elem: Element, elemName: string, func:(child: Element) => any): void; 
-
-    /** Function: isTagEqual
-     *  Compare an element's tag name with a string.
-     *
-     *  This function is case sensitive.
-     *
-     *  Parameters:
-     *    (XMLElement) el - A DOM element.
-     *    (String) name - The element name.
-     *
-     *  Returns:
-     *    true if the element's tag name matches _el_, and false
-     *    otherwise.
-     */
-    function isTagEqual(el: Element, name: string): boolean;
-
-    /** Function: xmlGenerator
-     *  Get the DOM document to generate elements.
-     *
-     *  Returns:
-     *    The currently used DOM document.
-     */
-    function xmlGenerator(): Document;
-
-    /** Function: xmlElement
-     *  Create an XML DOM element.
-     *
-     *  This function creates an XML DOM element correctly across all
-     *  implementations. Note that these are not HTML DOM elements, which
-     *  aren't appropriate for XMPP stanzas.
-     *
-     *  Parameters:
-     *    (String) name - The name for the element.
-     *    (Array|Object) attrs - An optional array or object containing
-     *      key/value pairs to use as element attributes. The object should
-     *      be in the format {'key': 'value'} or {key: 'value'}. The array
-     *      should have the format [['key1', 'value1'], ['key2', 'value2']].
-     *    (String) text - The text child data for the element.
-     *
-     *  Returns:
-     *    A new XML DOM element.
-     */
-    function xmlElement(name: string, attrs?: any, text?: string): Element; 
-    function xmlElement(name: string, text?: string, attrs?: any): Element; 
-
-    /*  Function: xmlescape
-     *  Excapes invalid xml characters.
-     *
-     *  Parameters:
-     *     (String) text - text to escape.
-     *
-     *  Returns:
-     *      Escaped text.
-     */
-    function xmlescape(text: string): string;
-
-    /*  Function: xmlunescape
-    *  Unexcapes invalid xml characters.
-    *
-    *  Parameters:
-    *     (String) text - text to unescape.
-    *
-    *  Returns:
-    *      Unescaped text.
-    */
-    function xmlunescape(text: string): string;
-
-    /** Function: xmlTextNode
-     *  Creates an XML DOM text node.
-     *
-     *  Provides a cross implementation version of document.createTextNode.
-     *
-     *  Parameters:
-     *    (String) text - The content of the text node.
-     *
-     *  Returns:
-     *    A new XML DOM text node.
-     */
-    function xmlTextNode(text: string): Text;
-
-    /** Function: xmlHtmlNode
-     *  Creates an XML DOM html node.
-     *
-     *  Parameters:
-     *    (String) html - The content of the html node.
-     *
-     *  Returns:
-     *    A new XML DOM text node.
-     */
-    function xmlHtmlNode(html: string): Document; 
-
-    /** Function: getText
-         *  Get the concatenation of all text children of an element.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - A DOM element.
-         *
-         *  Returns:
-         *    A String with the concatenated text of all text element children.
-         */
-    function getText(elem: Element): string;
-
-    /** Function: copyElement
-     *  Copy an XML DOM element.
-     *
-     *  This function copies a DOM element and all its descendants and returns
-     *  the new copy.
-     *
-     *  Parameters:
-     *    (XMLElement) elem - A DOM element.
-     *
-     *  Returns:
-     *    A new, copied DOM element tree.
-     */
-    function copyElement(elem: Element): Element; 
-
-    /** Function: createHtml
-     *  Copy an HTML DOM element into an XML DOM.
-     *
-     *  This function copies a DOM element and all its descendants and returns
-     *  the new copy.
-     *
-     *  Parameters:
-     *    (Element) elem - A DOM element.
-     *
-     *  Returns:
-     *    A new, copied DOM element tree.
-     */
-    function createHtml(elem: Element): Element; 
-
-    /** Function: escapeNode
-     *  Escape the node part (also called local part) of a JID.
-     *
-     *  Parameters:
-     *    (String) node - A node (or local part).
-     *
-     *  Returns:
-     *    An escaped node (or local part).
-     */
-    function escapeNode(node: string): string;
-
-    /** Function: unescapeNode
-     *  Unescape a node part (also called local part) of a JID.
-     *
-     *  Parameters:
-     *    (String) node - A node (or local part).
-     *
-     *  Returns:
-     *    An unescaped node (or local part).
-     */
-    function unescapeNode(node: string): string;
-
-    /** Function: getNodeFromJid
-     *  Get the node portion of a JID String.
-     *
-     *  Parameters:
-     *    (String) jid - A JID.
-     *
-     *  Returns:
-     *    A String containing the node.
-     */
-    function getNodeFromJid(jid: string): string;
-
-    /** Function: getDomainFromJid
-     *  Get the domain portion of a JID String.
-     *
-     *  Parameters:
-     *    (String) jid - A JID.
-     *
-     *  Returns:
-     *    A String containing the domain.
-     */
-    function getDomainFromJid(jid: string): string;
-
-    /** Function: getResourceFromJid
-     *  Get the resource portion of a JID String.
-     *
-     *  Parameters:
-     *    (String) jid - A JID.
-     *
-     *  Returns:
-     *    A String containing the resource.
-     */
-    function getResourceFromJid(jid: string): string;
-
-    /** Function: getBareJidFromJid
-     *  Get the bare JID from a JID String.
-     *
-     *  Parameters:
-     *    (String) jid - A JID.
-     *
-     *  Returns:
-     *    A String containing the bare JID.
-     */
-    function getBareJidFromJid(jid: string): string;
-
-    /** Function: log
-     *  User overrideable logging function.
-     *
-     *  This function is called whenever the Strophe library calls any
-     *  of the logging functions.  The default implementation of this
-     *  function does nothing.  If client code wishes to handle the logging
-     *  messages, it should override this with
-     *  > Strophe.log = function (level, msg) {
-     *  >   (user code here)
-     *  > };
-     *
-     *  Please note that data sent and received over the wire is logged
-     *  via Strophe.Connection.rawInput() and Strophe.Connection.rawOutput().
-     *
-     *  The different levels and their meanings are
-     *
-     *    DEBUG - Messages useful for debugging purposes.
-     *    INFO - Informational messages.  This is mostly information like
-     *      'disconnect was called' or 'SASL auth succeeded'.
-     *    WARN - Warnings about potential problems.  This is mostly used
-     *      to report transient connection errors like request timeouts.
-     *    ERROR - Some error occurred.
-     *    FATAL - A non-recoverable fatal error occurred.
-     *
-     *  Parameters:
-     *    (Integer) level - The log level of the log message.  This will
-     *      be one of the values in Strophe.LogLevel.
-     *    (String) msg - The log message.
-     */
-    function log(level: LogLevel, msg: string): void;
-
-    /** Functions: debug, info, warn, error
-     *  Log a message at the appropriate Strophe.LogLevel 
-     *
-     *  Parameters:
-     *    (String) msg - The log message.
-     */
-    function debug(msg: string): void; 
-    function info(msg: string): void; 
-    function warn(msg: string): void; 
-    function error(msg: string): void; 
-    function fatal(msg: string): void; 
-
-    /** Function: serialize
-     *  Render a DOM element and all descendants to a String.
-     *
-     *  Parameters:
-     *    (XMLElement) elem - A DOM element.
-     *
-     *  Returns:
-     *    The serialized element tree as a String.
-     */
-    function serialize(elem: Element | Builder): string;
-
-    /** Function: addConnectionPlugin
-     *  Extends the Strophe.Connection object with the given plugin.
-     *
-     *  Parameters:
-     *    (String) name - The name of the extension.
-     *    (Object) ptype - The plugin's prototype.
-     */
-    function addConnectionPlugin(name: string, ptype: any): void;
-
-    var Builder: {
-        /** Constructor: Strophe.Builder
-         *  Create a Strophe.Builder object.
-         *
-         *  The attributes should be passed in object notation.  For example
-         *  > var b = new Builder('message', {to: 'you', from: 'me'});
-         *  or
-         *  > var b = new Builder('messsage', {'xml:lang': 'en'});
-         *
-         *  Parameters:
-         *    (String) name - The name of the root element.
-         *    (Object) attrs - The attributes for the root element in object notation.
-         *
-         *  Returns:
-         *    A new Strophe.Builder.
-         */
-        new (name: string, attrs?: any): Builder;
-        prototype: any;
-    }
-    
-
-    /** Class: Strophe.Builder
-     *  XML DOM builder.
-     *
-     *  This object provides an interface similar to JQuery but for building
-     *  DOM element easily and rapidly.  All the functions except for toString()
-     *  and tree() return the object, so calls can be chained.  Here's an
-     *  example using the $iq() builder helper.
-     *  > $iq({to: 'you', from: 'me', type: 'get', id: '1'})
-     *  >     .c('query', {xmlns: 'strophe:example'})
-     *  >     .c('example')
-     *  >     .toString()
-     *  The above generates this XML fragment
-     *  > <iq to='you' from='me' type='get' id='1'>
-     *  >   <query xmlns='strophe:example'>
-     *  >     <example/>
-     *  >   </query>
-     *  > </iq>
-     *  The corresponding DOM manipulations to get a similar fragment would be
-     *  a lot more tedious and probably involve several helper variables.
-     *
-     *  Since adding children makes new operations operate on the child, up()
-     *  is provided to traverse up the tree.  To add two children, do
-     *  > builder.c('child1', ...).up().c('child2', ...)
-     *  The next operation on the Builder will be relative to the second child.
-     */
-    interface Builder {
-         /** Function: tree
-         *  Return the DOM tree.
-         *
-         *  This function returns the current DOM tree as an element object.  This
-         *  is suitable for passing to functions like Strophe.Connection.send().
-         *
-         *  Returns:
-         *    The DOM tree as a element object.
-         */
-        tree(): Element;
-
-        /** Function: toString
-         *  Serialize the DOM tree to a String.
-         *
-         *  This function returns a string serialization of the current DOM
-         *  tree.  It is often used internally to pass data to a
-         *  Strophe.Request object.
-         *
-         *  Returns:
-         *    The serialized DOM tree in a String.
-         */
-        toString(): string;
-
-        /** Function: up
-         *  Make the current parent element the new current element.
-         *
-         *  This function is often used after c() to traverse back up the tree.
-         *  For example, to add two children to the same element
-         *  > builder.c('child1', {}).up().c('child2', {});
-         *
-         *  Returns:
-         *    The Stophe.Builder object.
-         */
-        up(): Builder;
-
-        /** Function: attrs
-         *  Add or modify attributes of the current element.
-         *
-         *  The attributes should be passed in object notation.  This function
-         *  does not move the current element pointer.
-         *
-         *  Parameters:
-         *    (Object) moreattrs - The attributes to add/modify in object notation.
-         *
-         *  Returns:
-         *    The Strophe.Builder object.
-         */
-        attrs(moreattrs: any): Builder;
-
-        /** Function: c
-         *  Add a child to the current element and make it the new current
-         *  element.
-         *
-         *  This function moves the current element pointer to the child,
-         *  unless text is provided.  If you need to add another child, it
-         *  is necessary to use up() to go back to the parent in the tree.
-         *
-         *  Parameters:
-         *    (String) name - The name of the child.
-         *    (Object) attrs - The attributes of the child in object notation.
-         *    (String) text - The text to add to the child.
-         *
-         *  Returns:
-         *    The Strophe.Builder object.
-         */
-        c(name: string, attrs?: any, text?: string): Builder;
-
-        /** Function: cnode
-         *  Add a child to the current element and make it the new current
-         *  element.
-         *
-         *  This function is the same as c() except that instead of using a
-         *  name and an attributes object to create the child it uses an
-         *  existing DOM element object.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - A DOM element.
-         *
-         *  Returns:
-         *    The Strophe.Builder object.
-         */
-        cnode(elem: Node): Builder;
-
-        /** Function: t
-         *  Add a child text element.
-         *
-         *  This *does not* make the child the new current element since there
-         *  are no children of text elements.
-         *
-         *  Parameters:
-         *    (String) text - The text data to append to the current element.
-         *
-         *  Returns:
-         *    The Strophe.Builder object.
-         */
-        t(text: string): Builder;
-
-        /** Function: h
-         *  Replace current element contents with the HTML passed in.
-         *
-         *  This *does not* make the child the new current element
-         *
-         *  Parameters:
-         *    (String) html - The html to insert as contents of current element.
-         *
-         *  Returns:
-         *    The Strophe.Builder object.
-         */
-        h(html: string): Builder;
-    }
-
-    interface ConnectionOptions {
-        protocol?: string;
-        sync?: boolean; 
-    }
-    var Connection: {
-        /** Constructor: Strophe.Connection
-         *  Create and initialize a Strophe.Connection object.
-         *
-         *  The transport-protocol for this connection will be chosen automatically
-         *  based on the given service parameter. URLs starting with "ws://" or
-         *  "wss://" will use WebSockets, URLs starting with "http://", "https://"
-         *  or without a protocol will use BOSH.
-         *
-         *  To make Strophe connect to the current host you can leave out the protocol
-         *  and host part and just pass the path, e.g.
-         *
-         *  > var conn = new Strophe.Connection("/http-bind/");
-         *
-         *  WebSocket options:
-         *
-         *  If you want to connect to the current host with a WebSocket connection you
-         *  can tell Strophe to use WebSockets through a "protocol" attribute in the
-         *  optional options parameter. Valid values are "ws" for WebSocket and "wss"
-         *  for Secure WebSocket.
-         *  So to connect to "wss://CURRENT_HOSTNAME/xmpp-websocket" you would call
-         *
-         *  > var conn = new Strophe.Connection("/xmpp-websocket/", {protocol: "wss"});
-         *
-         *  Note that relative URLs _NOT_ starting with a "/" will also include the path
-         *  of the current site.
-         *
-         *  Also because downgrading security is not permitted by browsers, when using
-         *  relative URLs both BOSH and WebSocket connections will use their secure
-         *  variants if the current connection to the site is also secure (https).
-         *
-         *  BOSH options:
-         *
-         *  by adding "sync" to the options, you can control if requests will
-         *  be made synchronously or not. The default behaviour is asynchronous.
-         *  If you want to make requests synchronous, make "sync" evaluate to true:
-         *  > var conn = new Strophe.Connection("/http-bind/", {sync: true});
-         *  You can also toggle this on an already established connection:
-         *  > conn.options.sync = true;
-         *
-         *
-         *  Parameters:
-         *    (String) service - The BOSH or WebSocket service URL.
-         *    (Object) options - A hash of configuration options
-         *
-         *  Returns:
-         *    A new Strophe.Connection object.
-         */
-        new (service: string, options?: ConnectionOptions): Connection; 
-        prototype: any; 
-    }
-
-    /** Class: Strophe.Connection
-     *  XMPP Connection manager.
-     *
-     *  This class is the main part of Strophe.  It manages a BOSH connection
-     *  to an XMPP server and dispatches events to the user callbacks as
-     *  data arrives.  It supports SASL PLAIN, SASL DIGEST-MD5, SASL SCRAM-SHA1
-     *  and legacy authentication.
-     *
-     *  After creating a Strophe.Connection object, the user will typically
-     *  call connect() with a user supplied callback to handle connection level
-     *  events like authentication failure, disconnection, or connection
-     *  complete.
-     *
-     *  The user will also have several event handlers defined by using
-     *  addHandler() and addTimedHandler().  These will allow the user code to
-     *  respond to interesting stanzas or do something periodically with the
-     *  connection.  These handlers will be active once authentication is
-     *  finished.
-     *
-     *  To send data to the connection, use send().
-     */
-    interface Connection {
-
-        jid: string;
-        authzid: string;
-        pass: string;
-        authcid: string;
-        domain: string;
-        servtype: string;
-        maxRetries: number;
-        //todo: what other members are meant to be public?
-
-        /** Function: reset
-        *  Reset the connection.
-        *
-        *  This function should be called after a connection is disconnected
-        *  before that connection is reused.
-        */
-        reset(): void;
-
-        /** Function: pause
-         *  Pause the request manager.
-         *
-         *  This will prevent Strophe from sending any more requests to the
-         *  server.  This is very useful for temporarily pausing
-         *  BOSH-Connections while a lot of send() calls are happening quickly.
-         *  This causes Strophe to send the data in a single request, saving
-         *  many request trips.
-         */
-        pause(): void;
-
-        /** Function: resume
-         *  Resume the request manager.
-         *
-         *  This resumes after pause() has been called.
-         */
-        resume(): void;
-
-        /** Function: getUniqueId
-         *  Generate a unique ID for use in <iq/> elements.
-         *
-         *  All <iq/> stanzas are required to have unique id attributes.  This
-         *  function makes creating these easy.  Each connection instance has
-         *  a counter which starts from zero, and the value of this counter
-         *  plus a colon followed by the suffix becomes the unique id. If no
-         *  suffix is supplied, the counter is used as the unique id.
-         *
-         *  Suffixes are used to make debugging easier when reading the stream
-         *  data, and their use is recommended.  The counter resets to 0 for
-         *  every new connection for the same reason.  For connections to the
-         *  same server that authenticate the same way, all the ids should be
-         *  the same, which makes it easy to see changes.  This is useful for
-         *  automated testing as well.
-         *
-         *  Parameters:
-         *    (String) suffix - A optional suffix to append to the id.
-         *
-         *  Returns:
-         *    A unique string to be used for the id attribute.
-         */
-        getUniqueId(suffix?: string | number): string;
-
-        /** Function: connect
-         *  Starts the connection process.
-         *
-         *  As the connection process proceeds, the user supplied callback will
-         *  be triggered multiple times with status updates.  The callback
-         *  should take two arguments - the status code and the error condition.
-         *
-         *  The status code will be one of the values in the Strophe.Status
-         *  constants.  The error condition will be one of the conditions
-         *  defined in RFC 3920 or the condition 'strophe-parsererror'.
-         *
-         *  The Parameters _wait_, _hold_ and _route_ are optional and only relevant
-         *  for BOSH connections. Please see XEP 124 for a more detailed explanation
-         *  of the optional parameters.
-         *
-         *  Parameters:
-         *    (String) jid - The user's JID.  This may be a bare JID,
-         *      or a full JID.  If a node is not supplied, SASL ANONYMOUS
-         *      authentication will be attempted.
-         *    (String) pass - The user's password.
-         *    (Function) callback - The connect callback function.
-         *    (Integer) wait - The optional HTTPBIND wait value.  This is the
-         *      time the server will wait before returning an empty result for
-         *      a request.  The default setting of 60 seconds is recommended.
-         *    (Integer) hold - The optional HTTPBIND hold value.  This is the
-         *      number of connections the server will hold at one time.  This
-         *      should almost always be set to 1 (the default).
-         *    (String) route - The optional route value.
-         */
-        connect(jid?: string, pass?: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, route?: string): void;
-
-        /** Function: attach
-         *  Attach to an already created and authenticated BOSH session.
-         *
-         *  This function is provided to allow Strophe to attach to BOSH
-         *  sessions which have been created externally, perhaps by a Web
-         *  application.  This is often used to support auto-login type features
-         *  without putting user credentials into the page.
-         *
-         *  Parameters:
-         *    (String) jid - The full JID that is bound by the session.
-         *    (String) sid - The SID of the BOSH session.
-         *    (String) rid - The current RID of the BOSH session.  This RID
-         *      will be used by the next request.
-         *    (Function) callback The connect callback function.
-         *    (Integer) wait - The optional HTTPBIND wait value.  This is the
-         *      time the server will wait before returning an empty result for
-         *      a request.  The default setting of 60 seconds is recommended.
-         *      Other settings will require tweaks to the Strophe.TIMEOUT value.
-         *    (Integer) hold - The optional HTTPBIND hold value.  This is the
-         *      number of connections the server will hold at one time.  This
-         *      should almost always be set to 1 (the default).
-         *    (Integer) wind - The optional HTTBIND window value.  This is the
-         *      allowed range of request ids that are valid.  The default is 5.
-         */
-        attach(jid: string, sid: string, rid: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, wind?: number): void;
-
-        /** Function: xmlInput
-         *  User overrideable function that receives XML data coming into the
-         *  connection.
-         *
-         *  The default function does nothing.  User code can override this with
-         *  > Strophe.Connection.xmlInput = function (elem) {
-         *  >   (user code)
-         *  > };
-         *
-         *  Due to limitations of current Browsers' XML-Parsers the opening and closing
-         *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
-         *
-         *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
-         *  <Strophe.Bosh.strip> if you want to strip this tag.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - The XML data received by the connection.
-         */
-        xmlInput(elem: Element): void;
-
-        /** Function: xmlOutput
-         *  User overrideable function that receives XML data sent to the
-         *  connection.
-         *
-         *  The default function does nothing.  User code can override this with
-         *  > Strophe.Connection.xmlOutput = function (elem) {
-         *  >   (user code)
-         *  > };
-         *
-         *  Due to limitations of current Browsers' XML-Parsers the opening and closing
-         *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
-         *
-         *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
-         *  <Strophe.Bosh.strip> if you want to strip this tag.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - The XMLdata sent by the connection.
-         */
-        xmlOutput(elem: Element): void;
-
-        /** Function: rawInput
-         *  User overrideable function that receives raw data coming into the
-         *  connection.
-         *
-         *  The default function does nothing.  User code can override this with
-         *  > Strophe.Connection.rawInput = function (data) {
-         *  >   (user code)
-         *  > };
-         *
-         *  Parameters:
-         *    (String) data - The data received by the connection.
-         */
-        rawInput(data: string): void;
-
-        /** Function: rawOutput
-         *  User overrideable function that receives raw data sent to the
-         *  connection.
-         *
-         *  The default function does nothing.  User code can override this with
-         *  > Strophe.Connection.rawOutput = function (data) {
-         *  >   (user code)
-         *  > };
-         *
-         *  Parameters:
-         *    (String) data - The data sent by the connection.
-         */
-        rawOutput(data: string): void;
-
-        /** Function: send
-         *  Send a stanza.
-         *
-         *  This function is called to push data onto the send queue to
-         *  go out over the wire.  Whenever a request is sent to the BOSH
-         *  server, all pending data is sent and the queue is flushed.
-         *
-         *  Parameters:
-         *    (XMLElement |
-         *     [XMLElement] |
-         *     Strophe.Builder) elem - The stanza to send.
-         */
-        send(elem: Element | Element[]| Builder): void;
-
-        /** Function: flush
-         *  Immediately send any pending outgoing data.
-         *
-         *  Normally send() queues outgoing data until the next idle period
-         *  (100ms), which optimizes network use in the common cases when
-         *  several send()s are called in succession. flush() can be used to
-         *  immediately send all pending data.
-         */
-        flush(): void;
-
-        /** Function: sendIQ
-         *  Helper function to send IQ stanzas.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - The stanza to send.
-         *    (Function) callback - The callback function for a successful request.
-         *    (Function) errback - The callback function for a failed or timed
-         *      out request.  On timeout, the stanza will be null.
-         *    (Integer) timeout - The time specified in milliseconds for a
-         *      timeout to occur.
-         *
-         *  Returns:
-         *    The id used to send the IQ.
-        */
-        sendIQ(elem: Element | Builder, callback?: (stanza: Element) => any, errback?: (stanza: Element) => any, timeout?: number): string; //todo: Is callback correct?
-
-        /** Function: addTimedHandler
-         *  Add a timed handler to the connection.
-         *
-         *  This function adds a timed handler.  The provided handler will
-         *  be called every period milliseconds until it returns false,
-         *  the connection is terminated, or the handler is removed.  Handlers
-         *  that wish to continue being invoked should return true.
-         *
-         *  Because of method binding it is necessary to save the result of
-         *  this function if you wish to remove a handler with
-         *  deleteTimedHandler().
-         *
-         *  Note that user handlers are not active until authentication is
-         *  successful.
-         *
-         *  Parameters:
-         *    (Integer) period - The period of the handler.
-         *    (Function) handler - The callback function.
-         *
-         *  Returns:
-         *    A reference to the handler that can be used to remove it.
-         */
-        addTimedHandler(period: number, handler: () => boolean): any;
-
-        /** Function: deleteTimedHandler
-         *  Delete a timed handler for a connection.
-         *
-         *  This function removes a timed handler from the connection.  The
-         *  handRef parameter is *not* the function passed to addTimedHandler(),
-         *  but is the reference returned from addTimedHandler().
-         *
-         *  Parameters:
-         *    (Strophe.TimedHandler) handRef - The handler reference.
-         */
-        deleteTimedHandler(handRef: any): void;
-
-
-        /** Function: addHandler
-         *  Add a stanza handler for the connection.
-         *
-         *  This function adds a stanza handler to the connection.  The
-         *  handler callback will be called for any stanza that matches
-         *  the parameters.  Note that if multiple parameters are supplied,
-         *  they must all match for the handler to be invoked.
-         *
-         *  The handler will receive the stanza that triggered it as its argument.
-         *  *The handler should return true if it is to be invoked again;
-         *  returning false will remove the handler after it returns.*
-         *
-         *  As a convenience, the ns parameters applies to the top level element
-         *  and also any of its immediate children.  This is primarily to make
-         *  matching /iq/query elements easy.
-         *
-         *  The options argument contains handler matching flags that affect how
-         *  matches are determined. Currently the only flag is matchBare (a
-         *  boolean). When matchBare is true, the from parameter and the from
-         *  attribute on the stanza will be matched as bare JIDs instead of
-         *  full JIDs. To use this, pass {matchBare: true} as the value of
-         *  options. The default value for matchBare is false.
-         *
-         *  The return value should be saved if you wish to remove the handler
-         *  with deleteHandler().
-         *
-         *  Parameters:
-         *    (Function) handler - The user callback.
-         *    (String) ns - The namespace to match.
-         *    (String) name - The stanza name to match.
-         *    (String) type - The stanza type attribute to match.
-         *    (String) id - The stanza id attribute to match.
-         *    (String) from - The stanza from attribute to match.
-         *    (String) options - The handler options
-         *
-         *  Returns:
-         *    A reference to the handler that can be used to remove it.
-         */
-        addHandler(handler: (stanza: Element) => boolean, ns: string, name: string, type?: string, id?: string, from?: string, options?: { matchBare: boolean }): any; //todo: is callback correct? Also, are the elements specified as optional truly optional?
-
-        /** Function: deleteHandler
-         *  Delete a stanza handler for a connection.
-         *
-         *  This function removes a stanza handler from the connection.  The
-         *  handRef parameter is *not* the function passed to addHandler(),
-         *  but is the reference returned from addHandler().
-         *
-         *  Parameters:
-         *    (Strophe.Handler) handRef - The handler reference.
-         */
-        deleteHandler(handRef: any): void;
-
-        /** Function: disconnect
-         *  Start the graceful disconnection process.
-         *
-         *  This function starts the disconnection process.  This process starts
-         *  by sending unavailable presence and sending BOSH body of type
-         *  terminate.  A timeout handler makes sure that disconnection happens
-         *  even if the BOSH server does not respond.
-         *  If the Connection object isn't connected, at least tries to abort all pending requests
-         *  so the connection object won't generate successful requests (which were already opened).
-         *
-         *  The user supplied connection callback will be notified of the
-         *  progress as this process happens.
-         *
-         *  Parameters:
-         *    (String) reason - The reason the disconnect is occuring.
-         */
-        disconnect(reason: string): void;
-    }
-
-    /** Interface: Strophe.SASLMechanism
-     *
-     *  encapsulates SASL authentication mechanisms.
-     *
-     *  User code may override the priority for each mechanism or disable it completely.
-     *  See <priority> for information about changing priority and <test> for informatian on
-     *  how to disable a mechanism.
-     *
-     *  By default, all mechanisms are enabled and the priorities are
-     *
-     *  SCRAM-SHA1 - 40
-     *  DIGEST-MD5 - 30
-     *  Plain - 20
-     */
-    interface SASLMechanism {
-        /**
-       *  Function: test
-       *  Checks if mechanism able to run.
-       *  To disable a mechanism, make this return false;
-       *
-       *  To disable plain authentication run
-       *  > Strophe.SASLPlain.test = function() {
-       *  >   return false;
-       *  > }
-       *
-       *  See <SASL mechanisms> for a list of available mechanisms.
-       *
-       *  Parameters:
-       *    (Strophe.Connection) connection - Target Connection.
-       *
-       *  Returns:
-       *    (Boolean) If mechanism was able to run.
-       */
-        test(connection: Connection): boolean;
-
-        /** Variable: priority
-       *  Determines which <SASLMechanism> is chosen for authentication (Higher is better).
-       *  Users may override this to prioritize mechanisms differently.
-       *
-       *  In the default configuration the priorities are
-       *
-       *  SCRAM-SHA1 - 40
-       *  DIGEST-MD5 - 30
-       *  Plain - 20
-       *
-       *  Example: (This will cause Strophe to choose the mechanism that the server sent first)
-       *
-       *  > Strophe.SASLMD5.priority = Strophe.SASLSHA1.priority;
-       *
-       *  See <SASL mechanisms> for a list of available mechanisms.
-       *
-       */
-        priority: number;
-    }
-
-    /** Constants: SASL mechanisms
-   *  Available authentication mechanisms
-   *
-   *  Strophe.SASLAnonymous - SASL Anonymous authentication.
-   *  Strophe.SASLPlain - SASL Plain authentication.
-   *  Strophe.SASLMD5 - SASL Digest-MD5 authentication
-   *  Strophe.SASLSHA1 - SASL SCRAM-SHA1 authentication
-   */
-    var SASLAnonymous: SASLMechanism;
-    var SASLPlain: SASLMechanism;
-    var SASLSHA1: SASLMechanism;
-    var SASLMD5: SASLMechanism;
+// Support AMD require
+declare module '$build' {
+    export = wrapper.$build;
+}
+declare module '$msg' {
+    export = wrapper.$msg;
+}
+declare module '$iq' {
+    export = wrapper.$iq;
+}
+declare module '$pres' {
+    export = wrapper.$pres;
+}
+declare module 'Strophe' {
+    export = wrapper.Strophe;
+}
+declare module 'strophe' {
+    export = wrapper;
 }
-
diff --git a/svg-sprite/svg-sprite-tests.ts b/svg-sprite/svg-sprite-tests.ts
new file mode 100644
index 000000000..74097962f
--- /dev/null
+++ b/svg-sprite/svg-sprite-tests.ts
@@ -0,0 +1,327 @@
+/// <reference path="svg-sprite.d.ts" />
+
+import SVGSpriter = require('svg-sprite');
+import * as fs from 'fs';
+
+var config: SVGSpriter.Config;
+
+
+//
+// README.md
+//
+
+// Create spriter instance (see below for `config` examples)
+var spriter       = new SVGSpriter(config);
+
+// Add SVG source files — the manual way ...
+spriter.add('assets/svg-1.svg', null, fs.readFileSync('assets/svg-1.svg', {encoding: 'utf-8'}));
+spriter.add('assets/svg-2.svg', null, fs.readFileSync('assets/svg-2.svg', {encoding: 'utf-8'}));
+/* ... */
+
+// Compile the sprite
+spriter.compile(function(error: any, result: any) {
+    /* ... Write `result` files to disk or do whatever with them ... */
+});
+
+// General configuration options
+
+config                      = {
+    dest                    : '.',                      // Main output directory
+    log                     : null,                     // Logging verbosity (default: no logging)
+    shape                   : {                         // SVG shape related options
+        id                  : {                         // SVG shape ID related options
+            separator       : '--',                     // Separator for directory name traversal
+            generator       : function(svg: string) { /*...*/ return ''; },   // SVG shape ID generator callback
+            pseudo          : '~'                       // File name separator for shape states (e.g. ':hover')
+        },
+        dimension           : {                         // Dimension related options
+            maxWidth        : 2000,                     // Max. shape width
+            maxHeight       : 2000,                     // Max. shape height
+            precision       : 2,                        // Floating point precision
+            attributes      : false,                    // Width and height attributes on embedded shapes
+        },
+        spacing             : {                         // Spacing related options
+            padding         : 0,                        // Padding around all shapes
+            box             : 'content'                 // Padding strategy (similar to CSS `box-sizing`)
+        },
+        transform           : ['svgo'],                 // List of transformations / optimizations
+        meta                : null,                     // Path to YAML file with meta / accessibility data
+        align               : null,                     // Path to YAML file with extended alignment data
+        dest                : null                      // Output directory for optimized intermediate SVG shapes
+    },
+    svg                     : {                         // General options for created SVG files
+        xmlDeclaration      : true,                     // Add XML declaration to SVG sprite
+        doctypeDeclaration  : true,                     // Add DOCTYPE declaration to SVG sprite
+        namespaceIDs        : true,                     // Add namespace token to all IDs in SVG shapes
+        dimensionAttributes : true                      // Width and height attributes on the sprite
+    },
+    variables               : {}                        // Custom Mustache templating variables and functions
+};
+
+// Output modes
+
+config                  = {
+    mode                    : {
+    css                 : true,     // Create a «css» sprite
+    view                : true,     // Create a «view» sprite
+    defs                : true,     // Create a «defs» sprite
+    symbol              : true,     // Create a «symbol» sprite
+    stack               : true      // Create a «stack» sprite
+}
+};
+
+config                  = {
+    mode: {
+        css: {
+            // Configuration for the «css» sprite
+            // ...
+        }
+    }
+};
+
+// Common mode properties
+
+config                  = {
+    mode                    : {
+        mode1              : {
+    dest            : "<mode>",                     // Mode specific output directory
+        prefix          : "svg-%s",                     // Prefix for CSS selectors
+        dimensions      : "-dims",                      // Suffix for dimension CSS selectors
+        sprite          : "svg/sprite.<mode>.svg",       // Sprite path and name
+    bust            : true,                   // Cache busting (mode dependent default value)
+        render          : {                             // Stylesheet rendering definitions
+        /* -------------------------------------------
+         css         : false,                        // CSS stylesheet options
+         scss        : false,                        // Sass stylesheet options
+         less        : false,                        // LESS stylesheet options
+         styl        : false                         // Stylus stylesheet options
+         <custom>    : ...                           // Custom stylesheet options
+         ------------------------------------------- */
+    },
+    example         : false                         // Create an HTML example document
+}
+}
+};
+
+// Basic examples
+
+// A.) Standalone sprite
+
+config                  = {
+    mode                    : {
+    inline              : true,     // Prepare for inline embedding
+    symbol              : true      // Create a «symbol» sprite
+}
+};
+
+// B.) CSS sprite with Sass resource
+
+config                  = {
+    mode                    : {
+    css                 : {         // Create a «css» sprite
+    render          : {
+        scss        : true      // Render a Sass stylesheet
+    }
+}
+}
+};
+
+// C.) Multiple sprites
+
+config                  = {
+    mode                    : {
+    defs                : true,
+    symbol              : true,
+    stack               : true
+}
+};
+
+// D.) No sprite at all
+
+config                  = {
+    shape                   : {
+    dest                : 'path/to/out/dir'
+}
+};
+
+
+
+//
+// docs/configuration.md
+//
+
+config = {
+    shape               : {
+        id              : {                         // SVG shape ID related options
+            separator   : '--',                     // Separator for directory name traversal
+            generator   : function(svg: string) { /*...*/ return ''; },   // SVG shape ID generator callback
+            pseudo      : '~',                      // File name separator for shape states (e.g. ':hover')
+            whitespace  : '_'                       // Whitespace replacement for shape IDs
+        },
+        dimension       : {                         // Dimension related options
+            maxWidth    : 2000,                     // Max. shape width
+            maxHeight   : 2000,                     // Max. shape height
+            precision   : 2,                        // Floating point precision
+            attributes  : false,                    // Width and height attributes on embedded shapes
+        },
+        spacing         : {                         // Spacing related options
+            padding     : 0,                        // Padding around all shapes
+            box         : 'content'                 // Padding strategy (similar to CSS `box-sizing`)
+        },
+        transform       : ['svgo'],                 // List of transformations / optimizations
+        meta            : null,                     // Path to YAML file with meta / accessibility data
+        align           : null,                     // Path to YAML file with extended alignment data
+        dest            : null                      // Output directory for optimized intermediate SVG shapes
+    }
+};
+
+config = // SVGO transformation with default configuration
+{
+    shape               : {
+        transform       : ['svgo']
+        /* ... */
+    }
+};
+
+config = // Equivalent transformation to ['svgo']
+{
+    shape               : {
+        transform       : [
+            {svgo       : {}}
+        ]
+        /* ... */
+    }
+};
+
+config = // SVGO transformation with custom plugin configuration
+{
+    shape               : {
+        transform       : [
+            {svgo       : {
+                plugins : [
+                    {transformsWithOnePath: true},
+                    {moveGroupAttrsToElems: false}
+                ]
+            }}
+        ]
+        /* ... */
+    }
+};
+
+config = // SVGO transformation with custom plugin configuration
+{
+    shape               : {
+        transform       : [
+            {custom     :
+
+                /**
+                 * Custom callback transformation
+                 *
+                 * @param {SVGShape} shape              SVG shape object
+                 * @param {SVGSpriter} spriter          SVG spriter
+                 * @param {Function} callback           Callback
+                 * @return {void}
+                 */
+                    function(shape, sprite, callback) {
+                    /* ... */
+                    callback(null);
+                }
+            }
+        ]
+        /* ... */
+    }
+};
+
+config = // Custom global post-processing transformation
+{
+    svg                 : {
+        transform       : [
+            /**
+             * Custom sprite SVG transformation
+             *
+             * @param {String} svg                  Sprite SVG
+             * @return {String}                     Processed SVG
+             */
+                function(svg) {
+                /* ... */
+                return svg;
+            },
+
+            /* ... */
+        ]
+    }
+};
+
+config = {
+    variables   : {
+        now     : +new Date(),
+        png     : function() {
+            return function(sprite: any, render: any) {
+                return render(sprite).split('.svg').join('.png');
+            }
+        }
+    }
+};
+
+config = // Activate the «css» mode with default configuration
+{
+    mode            : {
+        css         : true
+    }
+};
+
+config = // Equivalent: Provide an empty configuration object
+{
+    mode            : {
+        css         : {}
+    }
+};
+
+config = // Multiple sprites of the same output mode
+{
+    mode            : {
+        sprite1     : {
+            mode    : 'css'     // Sprite with «css» mode
+        },
+        sprite2     : {
+            mode    : 'css'     // Another sprite with «css» mode
+        }
+    }
+};
+
+config = {
+    mode                : {
+        css             : {
+            example     : true
+        }
+    }
+};
+
+config = {
+    mode                : {
+        css             : {
+            example     : {}
+        }
+    }
+};
+
+config = {
+    mode                : {
+        css             : {
+            render      : {
+                css     : {
+                    template    : 'path/to/template.html',  // relative to current working directory
+                    dest        : 'path/to/demo.html'       // relative to current output directory
+                }
+            }
+        }
+    }
+};
+
+config = {
+    mode                : {
+        css             : {
+            example     : false
+        }
+    }
+};
diff --git a/svg-sprite/svg-sprite.d.ts b/svg-sprite/svg-sprite.d.ts
new file mode 100644
index 000000000..3030bc05a
--- /dev/null
+++ b/svg-sprite/svg-sprite.d.ts
@@ -0,0 +1,362 @@
+// Type definitions for svg-sprite
+// Project: https://github.com/jkphl/svg-sprite
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../vinyl/vinyl.d.ts" />
+/// <reference path="../winston/winston.d.ts" />
+
+declare module "svg-sprite" {
+    import File = require('vinyl');
+    import winston = require('winston');
+
+    namespace sprite {
+        interface SVGSpriterConstructor extends NodeJS.EventEmitter {
+            /**
+             * The spriter's constructor (always the entry point)
+             * @param config Main configuration for the spriting process
+             */
+            new(config: Config): SVGSpriter;
+        }
+
+        interface SVGSpriter {
+            /**
+             * Registering source SVG files
+             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
+             * @param name The "local" part of the file path, possibly including subdirectories which will get traversed to CSS selectors using the shape.id.separator configuration option.
+             * @param svg SVG file content.
+             */
+            add(file: string|File, name: string, svg: string): SVGSpriter;
+            /**
+             * Registering source SVG files
+             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
+             */
+            add(file: File): SVGSpriter;
+            /**
+             * Triggering the sprite compilation
+             * @param config Configuration object setting the output mode parameters for a single compilation run. If omitted, the mode property of the main configuration used for the constructor will be used.
+             * @param callback Callback triggered when the compilation has finished.
+             */
+            compile(config: Config, callback: CompileCallback): SVGSpriter;
+            /**
+             * Triggering the sprite compilation
+             * @param callback Callback triggered when the compilation has finished.
+             */
+            compile(callback: CompileCallback): void;
+            /**
+             * Accessing the intermediate SVG resources
+             * @param dest Base directory for the SVG files in case the will be written to disk.
+             * @param callback Callback triggered when the shapes are available.
+             */
+            getShapes(dest: string, callback: GetShapesCallback): void;
+        }
+
+        interface Config {
+            /**
+             * Main output directory
+             * @default '.'
+             */
+            dest?: string;
+            /**
+             * Logging verbosity or custom logger
+             */
+            log?: string|winston.LoggerInstance;
+            /**
+             * SVG shape configuration
+             */
+            shape?: Shape;
+            /**
+             * Sprite SVG options
+             */
+            svg?: Svg;
+            /**
+             * Custom templating variables
+             */
+            variables?: any;
+            /**
+             * Output mode configurations
+             */
+            mode?: Mode;
+        }
+
+        /**
+         * All settings affecting the SVG shapes of the sprite
+         */
+        interface Shape {
+            /**
+             * SVG shape ID related options
+             */
+            id?: {
+                /**
+                 * Separator for directory name traversal
+                 */
+                separator?: string;
+                /**
+                 * SVG shape ID generator callback
+                 */
+                generator?: string|((svg: string) => string);
+                /**
+                 * File name separator for shape states (e.g. ':hover')
+                 */
+                pseudo?: string;
+                /**
+                 * Whitespace replacement for shape IDs
+                 */
+                whitespace?: string;
+            };
+            /**
+             * Dimension related options
+             */
+            dimension?: {
+                /**
+                 * Max. shape width
+                 */
+                maxWidth?: number;
+                /**
+                 * Max. shape height
+                 */
+                maxHeight?: number;
+                /**
+                 * Floating point precision
+                 */
+                precision?: number;
+                /**
+                 * Width and height attributes on embedded shapes
+                 */
+                attributes?: boolean;
+            };
+            /**
+             * Spacing related options
+             */
+            spacing?: {
+                /**
+                 * Padding around all shapes
+                 */
+                padding?: number|number[];
+                /**
+                 * Padding strategy (similar to CSS `box-sizing`)
+                 */
+                box?: string;
+            };
+            /**
+             * List of transformations / optimizations
+             */
+            transform?: (string|CustomConfigurationTransform|CustomCallbackTransform)[];
+            /**
+             * Path to YAML file with meta / accessibility data
+             */
+            meta?: string;
+            /**
+             * Path to YAML file with extended alignment data
+             */
+            align?: string;
+            /**
+             * Output directory for optimized intermediate SVG shapes
+             */
+            dest?: string;
+        }
+
+        /**
+         * Pre-defined shape transformation with custom configuration
+         */
+        interface CustomConfigurationTransform {
+            [transformationName: string]: {
+                plugins?: { [transformationName: string]: boolean }[];
+            }
+        }
+
+        /**
+         * Custom callback transformation
+         */
+        interface CustomCallbackTransform {
+            [transformationName: string]: {
+                /**
+                 * Custom callback transformation
+                 * @param shape SVG shape object
+                 * @param sprite SVG spriter
+                 * @param callback Callback
+                 */
+                (shape: any, sprite: SVGSpriter, callback: Function): any;
+            }
+        }
+
+        interface Svg {
+            /**
+             * Output an XML declaration at the very beginning of each compiled sprite.
+             * If you provide a non-empty string here, it will be used one-to-one as declaration (e.g. <?xml version="1.0" encoding="utf-8"?>).
+             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for an XML declaration and use the first one it can find.
+             * @default true
+             */
+            xmlDeclaration?: boolean|string;
+            /**
+             * Include a <DOCTYPE> declaration in each compiled sprite. If you provide a non-empty string here,
+             * it will be used one-to-one as declaration (e.g. <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">).
+             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for a DOCTYPE declaration and use the first one it can find.
+             * @default true
+             */
+            doctypeDeclaration?: boolean|string;
+            /**
+             * In order to avoid ID clashes, the default behavior is to namespace all IDs in the source SVGs before compiling them into a sprite.
+             * Each ID is prepended with a unique string. In some situations, it might be desirable to disable ID namespacing, e.g. when you want to script the resulting sprite.
+             * Just set svg.namespaceIDs to FALSE then and be aware that you might also want to disable SVGO's ID minification (shape.transform.svgo.plugins: [{cleanupIDs: false}]).
+             * @default true
+             */
+            namespaceIDs?: boolean;
+            /**
+             * In order to avoid CSS class name ambiguities, the default behavior is to namespace CSS class names in the source SVGs before compiling them into a sprite.
+             * Each class name is prepended with a unique string. Disable this option to keep the class names untouched.
+             * @default true
+             */
+            namespaceClassnames?: boolean;
+            /**
+             * If truthy, width and height attributes will be set on the sprite's <svg> element (where applicable).
+             * @default true
+             */
+            dimensionAttributes?: boolean;
+            /**
+             * Shorthand for applying custom attributes to the outermost <svg> element.
+             * Please be aware that certain attributes (e.g. viewBox) will be calculated dynamically and override custom rootAttributes in any case.
+             */
+            rootAttributes?: any;
+            /**
+             * Floating point precision for CSS positioning values (defaults to -1 meaning highest possible precision).
+             */
+            precision?: number;
+            /**
+             * Callback (or list of callbacks) that will be applied to the resulting SVG sprites as global [post-processing transformation](#svg-sprite-customization).
+             * transform: Function∣Array
+             */
+            transform?: SvgTransformer|SvgTransformer[];
+        }
+
+        interface SvgTransformer {
+            /**
+             * Custom sprite SVG transformation
+             * @param svg Sprite SVG
+             * @return Processed SVG
+             */
+            (svg: string): string;
+        }
+
+        interface Mode {
+            css?: CssAndViewSpecificModeConfig|boolean;
+            view?: CssAndViewSpecificModeConfig|boolean;
+            defs?: DefsAndSymbolSpecificModeConfig|boolean;
+            symbol?: DefsAndSymbolSpecificModeConfig|boolean;
+            stack?: ModeConfig|boolean;
+            [customConfigName: string]: ModeConfig;
+        }
+
+        interface ModeConfig {
+            /**
+             * Base directory for sprite and CSS file output. If not absolute, the path will be resolved using the main output directory (see global dest option).
+             * @default "<mode>"
+             */
+            dest?: string;
+            /**
+             * Used for prefixing the [shape ID](#shape-ids) during CSS selector construction. If the value is empty,
+             * no prefix will be used. The prefix may contain the placeholder "%s" (e.g. ".svg %s-svg"),
+             * which will then get replaced by the shape ID. Please be aware that "%" is a special character
+             * in this context and that you'll have to escape it by another percent sign ("%%") in case you want
+             * to output it to your stylesheets (e.g. for a [Sass placeholder selector](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_)).
+             * @default ".svg-%s"
+             */
+            prefix?: string;
+            /**
+             * A non-empty string value will trigger the creation of additional CSS rules specifying the dimensions of each shape in the sprite.
+             * The string will be used as suffix to mode.<mode>.prefix during CSS selector construction and may contain the placeholder "%s",
+             * which will get replaced by the value of mode.<mode>.prefix.
+             * A boolean TRUE will cause the dimensions to be included directly into each shape's CSS rule (only available for «css» and «view» sprites).
+             * @default "-dims"
+             */
+            dimensions?: string|boolean;
+            /**
+             * SVG sprite path and file name, relative to the mode.<mode>.dest directory.
+             * You may omit the file extension, in which case it will be set to ".svg" automatically.
+             * @default "svg/sprite.<mode>.svg"
+             */
+            sprite?: string;
+            /**
+             * Add a content based hash to the name of the sprite file so that clients reliably reload the sprite
+             * when it's content changes («cache busting»). Defaults to false except for «css» and «view» sprites.
+             * @default true∣false
+             */
+            bust?: boolean;
+            /**
+             * Collection of [stylesheet rendering configurations](#rendering-configurations).
+             * The keys are used as file extensions as well as file return keys. At present,
+             * there are default templates for the file extensions css ([CSS](http://www.w3.org/Style/CSS/)),
+             * scss ([Sass](http://sass-lang.com/)), less ([Less](http://lesscss.org/)) and styl ([Stylus](http://learnboost.github.io/stylus/)),
+             * which all reside in the directory tmpl/css. Example: {css: true, scss: {dest: '_sprite.scss'}}
+             * @default {}
+             */
+            render?: { [key: string]: RenderingConfiguration|boolean };
+            /**
+             * Enabling this will trigger the creation of an HTML document demoing the usage of the sprite. Please see below for details on [rendering configurations](#rendering-configurations).
+             * @default false
+             */
+            example?: RenderingConfiguration|boolean;
+            /**
+             * Specify svg-sprite which output mode to use with this configuration
+             */
+            mode?: string;
+        }
+
+        interface RenderingConfiguration {
+            /**
+             * HTML document Mustache template
+             * @default "tmpl/<mode>/sprite.html"
+             */
+            template?: string;
+            /**
+             * HTML document destination
+             * @default "sprite.<mode>.html"
+             */
+            dest?: string;
+        }
+
+        interface CssAndViewSpecificModeConfig extends ModeConfig {
+            /**
+             * The arrangement of the shapes within the sprite. Might be "vertical", "horizontal", "diagonal" or "packed"
+             * (with the latter being the most compact type). It depends on your project which layout is best for you.
+             * @default "packed"
+             */
+            layout?: string;
+            /**
+             * If given and not empty, this will be the selector name of a CSS rule commonly specifying the background-image
+             * and background-repeat properties for all the shapes in the sprite (thus saving some bytes by not unnecessarily repeating them for each shape)
+             */
+            common?: string;
+            /**
+             * If given and not empty, a mixin with this name will be added to supporting output formats (e.g. Sass, LESS, Stylus),
+             * specifying the background-image and background-repeat properties for all the shapes in the sprite.
+             * You may use it for creating custom CSS within @media rules. The mixin acts much like the common rule.
+             * In fact, you can even combine the two - if both are enabled, the common rule will use the mixin internally.
+             */
+            mixin?: string;
+        }
+
+        interface DefsAndSymbolSpecificModeConfig extends ModeConfig {
+            /**
+             * If you want to embed the sprite into your HTML source, you will want to set this to true
+             * in order to prevent the creation of SVG namespace declarations and to set some other attributes for effectively hiding the library sprite.
+             * @default false
+             */
+            inline?: boolean;
+        }
+
+        interface CompileCallback {
+            (error: Error, result: any, data: any): any;
+        }
+
+        interface GetShapesCallback {
+            (error: Error, result: File[]): any;
+        }
+    }
+
+    var sprite: sprite.SVGSpriterConstructor;
+
+    export = sprite;
+}
+
diff --git a/swaggerize-express/swaggerize-express-tests.ts b/swaggerize-express/swaggerize-express-tests.ts
new file mode 100644
index 000000000..03a0807ef
--- /dev/null
+++ b/swaggerize-express/swaggerize-express-tests.ts
@@ -0,0 +1,25 @@
+/// <reference path="swaggerize-express.d.ts" />
+import http = require('http');
+import express = require('express');
+import swaggerize = require('swaggerize-express');
+
+var app = express();
+app.use(swaggerize(<swaggerize.Options>{
+    api: {
+        swagger: "2.0",
+        host: "localhost:8080",
+        info: {
+            title: "swaggerize-express.d.ts test",
+            version: "1"
+        },
+        paths: {
+
+        }
+    },
+    docspath: '/api-docs',
+    handlers: './handlers'
+}));
+
+var server = app.listen(18888, 'localhost', function () {
+    (<swaggerize.SwaggerizedExpress>app).swagger.api.host = server.address().address + ':' + server.address().port;
+});
diff --git a/swaggerize-express/swaggerize-express.d.ts b/swaggerize-express/swaggerize-express.d.ts
new file mode 100644
index 000000000..0f62b1088
--- /dev/null
+++ b/swaggerize-express/swaggerize-express.d.ts
@@ -0,0 +1,289 @@
+// Type definitions for swaggerize-express 4.x
+// Project: https://github.com/krakenjs/swaggerize-express
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+ import express = require('express');
+ import swaggerize = require('swaggerize-express');
+ var app = express();
+ app.use(swaggerize({
+    api: require('./api.json'),
+    docspath: '/api-docs',
+    handlers: './handlers'
+ });
+
+ =============================================== */
+
+/// <reference path="../express/express.d.ts" />
+
+declare module "swaggerize-express" {
+    import express = require('express');
+    function swaggerize(options: swaggerize.Options): express.RequestHandler;
+
+    module swaggerize {
+        export module Swagger {
+            export interface ApiDefinition {
+                swagger: string
+                info: InfoObject
+                host?: string
+                basePath?: string
+                schemes?: string[]
+                consumes?: MimeTypes
+                produces?: MimeTypes
+                paths: PathsObject
+                definitions?: DefinitionsObject
+                parameters?: ParametersDefinitionsObject
+                responses?: ResponsesDefinitionsObject
+                securityDefinitions?: SecurityDefinitionsObject
+                security?: SecurityRequirementObject[]
+                tags?: TagObject[]
+                externalDocs?: ExternalDocumentationObject
+            }
+
+            type MimeTypes = string[]
+
+            export interface InfoObject {
+                title: string
+                description?: string
+                termsOfService?: string
+                contact?: ContactObject
+                license?: LicenseObject
+                version: string
+            }
+
+            export interface ContactObject {
+                name?: string
+                url?: string
+                email?: string
+            }
+
+            export interface LicenseObject {
+                name: string
+                url?: string
+            }
+
+            export interface PathsObject {
+                [index: string]: PathItemObject|any
+            }
+
+            export interface PathItemObject {
+                $ref?: string
+                get?: OperationObject
+                put?: OperationObject
+                post?: OperationObject
+                'delete'?: OperationObject
+                options?: OperationObject
+                head?: OperationObject
+                patch?: OperationObject
+                parameters?: Parameters
+            }
+
+            export interface OperationObject {
+                tags?: string[]
+                summary?: string
+                description?: string
+                externalDocs?: ExternalDocumentationObject
+                operationId?: string
+                consumes?: MimeTypes
+                produces?: MimeTypes
+                parameters?: Parameters
+                responses: ResponsesObject
+                schemes?: string[]
+                deprecated?: boolean
+                security?: SecurityRequirementObject[]
+            }
+
+            export interface DefinitionsObject {
+                [index: string]: SchemaObject
+            }
+
+            export interface ResponsesObject {
+                [index: string]: Response|any
+                'default': Response
+            }
+
+            type Response = ResponseObject|ReferenceObject
+
+            export interface ResponsesDefinitionsObject {
+                [index: string]: ResponseObject
+            }
+
+            export interface ResponseObject {
+                description: string
+                schema?: SchemaObject
+                headers?: HeadersObject
+                examples?: ExampleObject
+            }
+
+            export interface HeadersObject {
+                [index: string]: HeaderObject
+            }
+
+            export interface HeaderObject extends ItemsObject {
+            }
+
+            export interface ExampleObject {
+                [index: string]: any
+            }
+
+            export interface SecurityDefinitionsObject {
+                [index: string]: SecuritySchemeObject
+            }
+
+            export interface SecuritySchemeObject {
+                type: string
+                description?: string
+                name: string
+                'in': string
+                flow: string
+                authorizationUrl: string
+                tokenUrl: string
+                scopes: ScopesObject
+            }
+
+            export interface ScopesObject {
+                [index: string]: any
+            }
+
+            export interface SecurityRequirementObject {
+                [index: string]: string[]
+            }
+
+            export interface TagObject {
+                name: string
+                description?: string
+                externalDocs?: ExternalDocumentationObject
+            }
+
+            export interface ItemsObject {
+                type: string
+                format?: string
+                items?: ItemsObject
+                collectionFormat?: string
+                'default'?: any
+                maximum?: number
+                exclusiveMaximum: boolean
+                minimum?: number
+                exclusiveMinimum?: boolean
+                maxLength?: number
+                minLength?: number
+                pattern?: string
+                maxItems?: number
+                minItems?: number
+                uniqueItems?: boolean
+                'enum'?: any[]
+                multipleOf?: number
+            }
+
+            export interface ParametersDefinitionsObject {
+                [index: string]: ParameterObject
+            }
+
+            type Parameters = (ParameterObject|ReferenceObject)[]
+
+            export interface ParameterObject {
+                name: string
+                'in': string
+                description?: string
+                required?: boolean
+            }
+
+            export interface InBodyParameterObject extends ParameterObject {
+                schema: SchemaObject
+            }
+
+            export interface GeneralParameterObject extends ParameterObject, ItemsObject {
+                allowEmptyValue?: boolean
+            }
+
+            export interface ReferenceObject {
+                $ref: string
+            }
+
+            export interface ExternalDocumentationObject {
+                [index: string]: any
+                description?: string
+                url: string
+            }
+
+            export interface SchemaObject extends IJsonSchema {
+                [index: string]: any
+                discriminator?: string
+                readOnly?: boolean
+                xml?: XMLObject
+                externalDocs: ExternalDocumentationObject
+                example: any
+            }
+
+            export interface XMLObject {
+                [index: string]: any
+                name?: string
+                namespace?: string
+                prefix?: string
+                attribute?: boolean
+                wrapped?: boolean
+            }
+        }
+
+        export interface Options {
+            api: Swagger.ApiDefinition
+            docspath: String
+            handlers: String
+        }
+
+        export interface IConfig {
+            api: Swagger.ApiDefinition
+            routes: express.IRoute[]
+        }
+
+        export interface SwaggerizedExpress extends express.Express {
+            swagger: IConfig
+        }
+    }
+
+    interface IJsonSchema {
+        id?: string
+        $schema?: string
+        title?: string
+        description?: string
+        multipleOf?: number
+        maximum?: number
+        exclusiveMaximum?: boolean
+        minimum?: number
+        exclusiveMinimum?: boolean
+        maxLength?: number
+        minLength?: number
+        pattern?: string
+        additionalItems?: boolean | IJsonSchema
+        items?: IJsonSchema | IJsonSchema[]
+        maxItems?: number
+        minItems?: number
+        uniqueItems?: boolean
+        maxProperties?: number
+        minProperties?: number
+        required?: string[]
+        additionalProperties?: boolean | IJsonSchema
+        definitions?: {
+            [name: string]: IJsonSchema
+        }
+        properties?: {
+            [name: string]: IJsonSchema
+        }
+        patternProperties?: {
+            [name: string]: IJsonSchema
+        }
+        dependencies?: {
+            [name: string]: IJsonSchema | string[]
+        }
+        'enum'?: any[]
+        type?: string | string[]
+        allOf?: IJsonSchema[]
+        anyOf?: IJsonSchema[]
+        oneOf?: IJsonSchema[]
+        not?: IJsonSchema
+    }
+
+    export = swaggerize;
+}
diff --git a/switchery/switchery-tests.ts b/switchery/switchery-tests.ts
index 2a0679502..35bd77920 100644
--- a/switchery/switchery-tests.ts
+++ b/switchery/switchery-tests.ts
@@ -3,69 +3,86 @@
 //
 // Examples from https://github.com/abpetkov/switchery
 //
+import {default as Switchery} from "switchery";
 
 function multipleSwitches() {
 
-    var elems = Array.prototype.slice.call( document.querySelectorAll( '.js-switch' ) );
+    var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
 
-    elems.forEach( (html: Element)  => {
-        var switchery = new Switchery( html );
-    } );
+    elems.forEach((html: Element) => {
+        var switchery = new Switchery(html);
+    });
 }
 
 
 function disabledSwitch() {
 
-    var elem = document.querySelector( '.js-switch' )
+    var elem = document.querySelector('.js-switch')
 
     //inactive switch
-    var switchery = new Switchery( elem, {disabled: true} );
+    var switchery = new Switchery(elem, { disabled: true });
 
     //Customize the default opacity of the disabled switch, using the disabledOpacity option.
-    switchery = new Switchery( elem, {disabled: true, disabledOpacity: 0.75} );
+    switchery = new Switchery(elem, { disabled: true, disabledOpacity: 0.75 });
 }
 
 
 function coloredSwitch() {
 
-    var elem = document.querySelector( '.js-switch' )
+    var elem = document.querySelector('.js-switch')
 
     //You can change the primary color of the switch to fit your design perfectly:
-    var switchery = new Switchery( elem, {color: '#41b7f1'} );
+    var switchery = new Switchery(elem, { color: '#41b7f1' });
 
     //Or the secondary color, which will change the switch background color and border color:
-    switchery = new Switchery( elem, {secondaryColor: '#bbf0f0'} );
+    switchery = new Switchery(elem, { secondaryColor: '#bbf0f0' });
 
     //Since version 0.6.3, you're even allowed to change the jack color from JS, as follows:
-    switchery = new Switchery( elem, {jackColor: '#fffc00'} );
+    switchery = new Switchery(elem, { jackColor: '#fffc00', jackSecondaryColor: '#41b7f1' });
 }
 
 function switchSizes() {
 
-    var elem = document.querySelector( '.js-switch' )
+    var elem = document.querySelector('.js-switch')
 
-    var switchery = new Switchery( elem, {size: 'small'} );
-    switchery = new Switchery( elem, {size: 'large'} );
+    var switchery = new Switchery(elem, { size: 'small' });
+    switchery = new Switchery(elem, { size: 'large' });
 }
 
 function checkingState() {
 
-    var elem = document.querySelector( '.js-switch' )
+    var elem = document.querySelector('.js-switch')
 
     //On click:
 
-    var clickCheckbox = <HTMLInputElement> document.querySelector( '.js-check-click' )
-    var clickButton = <HTMLInputElement> document.querySelector( '.js-check-click-button' );
+    var clickCheckbox = <HTMLInputElement> document.querySelector('.js-check-click')
+    var clickButton = <HTMLInputElement> document.querySelector('.js-check-click-button');
 
-    clickButton.addEventListener( 'click', () => {
-        alert( clickCheckbox.checked );
-    } );
+    clickButton.addEventListener('click', () => {
+        alert(clickCheckbox.checked);
+    });
 
     //On change:
 
-    var changeCheckbox = <HTMLInputElement> document.querySelector( '.js-check-change' );
+    var changeCheckbox = <HTMLInputElement> document.querySelector('.js-check-change');
 
-    changeCheckbox.onchange = function () {
-        alert( changeCheckbox.checked );
+    changeCheckbox.onchange = function() {
+        alert(changeCheckbox.checked);
     };
+}
+
+function detached() {
+    var elem = document.querySelector('.js-switch')
+    var switchery = new Switchery(elem, { size: 'small' });
+
+    switchery.destroy();
+}
+
+function toggleState() {
+    var elem = document.querySelector('.js-switch')
+    var switchery = new Switchery(elem, { size: 'small' });
+    var isDisabled = switchery.isDisabled();
+
+    switchery.enable();
+    switchery.disable();
 }
\ No newline at end of file
diff --git a/switchery/switchery.d.ts b/switchery/switchery.d.ts
index 4d953aff8..79934c776 100644
--- a/switchery/switchery.d.ts
+++ b/switchery/switchery.d.ts
@@ -1,64 +1,93 @@
-// Type definitions for switchery 0.7.0
+// Type definitions for switchery 0.8.1
 // Project: https://github.com/abpetkov/switchery
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Clayton Lautier <https://github.com/claylaut>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module Switchery {
 
-    export interface Options {
+    interface SwitcheryStatic {
+        new (node: Node, options?: Options): Switchery;
+    }
+
+    interface Options {
 
         /**
          * color of the switch element (HEX or RGB value)
          * @default '#64bd63'
          */
-        color? : string;
+        color?: string;
         /**
          * secondary color for background color and border, when the switch is off
          * @default '#dfdfdf'
          */
-        secondaryColor? : string;
+        secondaryColor?: string;
         /**
          * color of the jack/handle element
          * @default '#fff'
          */
-        jackColor? : string;
+        jackColor?: string;
+        /**
+         * color of unchecked jack/handle element
+         * @default 'null'
+		 */
+        jackSecondaryColor?: string;
         /**
          * class name for the switch element (by default styled in switchery.css)
          * @default 'switchery'
          */
-        className? : string;
+        className?: string;
         /**
          * enable or disable click events and changing the state of the switch (boolean value)
          * @default false
          */
-        disabled? : boolean;
+        disabled?: boolean;
         /**
          * opacity of the switch when it's disabled (0 to 1)
          * @default 0.5
          */
-        disabledOpacity? : number;
+        disabledOpacity?: number;
         /**
          * length of time that the transition will take, ex. '0.4s', '1s', '2.2s' (Note: transition speed of the handle is twice shorter)
-         * @default '0.4s'
+         * @default '0.1s'
          */
-        speed? : string;
+        speed?: string;
         /**
          * size of the switch element (small or large)
          * @default 'default'
          */
-        size? : string;
+        size?: string;
     }
-
-
 }
 
-declare class Switchery {
+interface Switchery {
 
-    constructor(node: Node, options?: Switchery.Options);
+	/**
+     * Unbinding all event handlers attached to the switch element to prepare the object for garbage collection.
+     * @returns {void} 
+     */
+    destroy(): void;
 
+	/**
+     * Enable disabled switch by re-adding event handlers and changing the opacity to 1.
+     * @returns {void} 
+     */
+    enable(): void;
+
+	/**
+     * Disable switch by unbinding attached events and changing opacity to disabledOpacity value
+     * @returns {void} 
+     */
+    disable(): void;
+
+	/**
+     * Check if switch is currently disabled by checking the readonly and disabled attributes on the checkbox and the disabled option set via JS.
+     *  If any of those are present, the returned value is true.
+     * @returns {boolean} whether it's disabled or not. 
+     */
+    isDisabled(): boolean;
 }
 
 declare module "switchery" {
-
-    export = Switchery
+    var switchery: Switchery.SwitcheryStatic;
+    export default switchery;
 }
\ No newline at end of file
diff --git a/tabris/README.md b/tabris/README.md
new file mode 100644
index 000000000..23d3d1a49
--- /dev/null
+++ b/tabris/README.md
@@ -0,0 +1,8 @@
+# TypeScript definitions for Tabris.js
+
+[Tabris.js](http://tabrisjs.com) is a framework for developing mobile apps with native UIs in JavaScript.
+The JavaScript library is available on [npm](https://www.npmjs.com/package/tabris).
+
+Current supported version is 1.2.
+
+See http://definitelytyped.org/guides/contributing.html
diff --git a/tabris/tabris-tests.ts b/tabris/tabris-tests.ts
new file mode 100644
index 000000000..28ab53cec
--- /dev/null
+++ b/tabris/tabris-tests.ts
@@ -0,0 +1,302 @@
+/// <reference path="./tabris.d.ts" />
+
+var page = tabris.create("Page", {});
+
+function test_events() {
+  var listener = () => console.log("triggered");
+  var widget = tabris.create("Composite", {});
+  widget.on("foo", listener);
+  widget.trigger("foo", "details");
+  widget.off("foo", listener);
+  widget.off("foo");
+  widget.off(null, listener);
+  widget.off();
+}
+
+function test_Action() {
+  var widget: tabris.Action = tabris.create("Action", {});
+  widget.set("foo", 23);
+  widget.set({
+    image: {src: "http://example.org"},
+    title: "foo",
+    placementPriority: "high"
+  });
+  var self: tabris.Action = widget.on("event", function(widget: tabris.Action) {});
+}
+
+function test_Button() {
+  var widget: tabris.Button = tabris.create("Button", {});
+  widget.set("foo", 23);
+  widget.set({
+    width: 200,
+    height: 400,
+    alignment: "center",
+    image: {src: "http://example.org"},
+    text: "foo"
+  });
+}
+
+function test_CheckBox() {
+  var widget: tabris.CheckBox = tabris.create("CheckBox", {});
+  widget.set("foo", 23);
+  widget.set({
+    selection: true,
+    text: "foo"
+  });
+}
+
+function test_Canvas() {
+  var widget: tabris.Canvas = tabris.create("Canvas", {});
+  widget.set("foo", 23);
+  widget.set({
+  });
+  var ctx: tabris.CanvasContext = widget.getContext("2d", 200, 300);
+}
+
+function test_Cell() {
+  var widget: tabris.Cell = tabris.create("Cell", {});
+  widget.set("foo", 23);
+  widget.set({
+  });
+}
+
+function test_CollectionView() {
+  var widget: tabris.CollectionView = tabris.create("CollectionView", {});
+  widget.set("foo", 23);
+  widget.set({
+    cellType: (item: any) => "foo",
+    initializeCell: (cell: tabris.Cell, type: string) => {},
+    itemHeight: (item: any, type: string) => 23,
+    items: ["foo", "bar", "baz"],
+    refreshEnabled: true,
+    refreshIndicator: true,
+    refreshMessage: "foo"
+  });
+  widget.insert(["item1", "item2"]);
+  widget.insert(["item1", "item2"], 3);
+  widget.refresh();
+  widget.refresh(3);
+  widget.remove(3);
+  widget.remove(3, 2);
+  widget.reveal(23);
+}
+
+function test_Composite() {
+  var widget: tabris.Composite = tabris.create("Composite", {});
+  widget.set("foo", 23);
+  widget.set({
+  });
+}
+
+function test_Drawer() {
+  var widget: tabris.Drawer = tabris.create("Drawer", {});
+  widget.set("foo", 23);
+  widget.set({
+  });
+  var same: tabris.Drawer = widget.open();
+  var same: tabris.Drawer = widget.close();
+}
+
+function test_ImageView() {
+  var widget: tabris.ImageView = tabris.create("ImageView", {});
+  widget.set("foo", 23);
+  widget.set({
+    image: {src: "http://example.com"},
+    scaleMode: "auto"
+  });
+}
+
+function test_Page() {
+  var page: tabris.Page = tabris.create("Page", {});
+  page.set("foo", 23);
+  page.set({
+    image: {src: "http://example.com"},
+    title: "foo",
+    topLevel: true
+  });
+  page.open().close();
+}
+
+function test_PageSelector() {
+  var widget: tabris.PageSelector = tabris.create("PageSelector", {});
+  widget.set("foo", 23);
+  widget.set({
+  });
+}
+
+function test_Picker() {
+  var widget: tabris.Picker = tabris.create("Picker", {});
+  widget.set("foo", 23);
+  widget.set({
+    selection: "foo",
+    selectionIndex: 23,
+    items: ["foo", "bar", "baz"]
+  });
+}
+
+function test_ProgressBar() {
+  var widget: tabris.ProgressBar = tabris.create("ProgressBar", {});
+  widget.set("foo", 23);
+  widget.set({
+    minimum: 0,
+    maximum: 100,
+    selection: 23,
+    state: "normal"
+  });
+}
+
+function test_RadioButton() {
+  var widget: tabris.RadioButton = tabris.create("RadioButton", {});
+  widget.set("foo", 23);
+  widget.set({
+    selection: true,
+    text: "foo"
+  });
+}
+
+function test_ScrollView() {
+  var widget: tabris.ScrollView = tabris.create("ScrollView", {});
+  widget.set("foo", 23);
+  widget.set({
+    direction: "horizontal"
+  });
+}
+
+function test_SearchAction() {
+  var widget: tabris.SearchAction = tabris.create("SearchAction", {});
+  widget.set("foo", 23);
+  widget.set({
+    message: "foo",
+    proposals: ["foo", "bar", "baz"],
+    text: "foo"
+  });
+}
+
+function test_Slider() {
+  var widget: tabris.Slider = tabris.create("Slider", {});
+  widget.set("foo", 23);
+  widget.set({
+    minimum: 0,
+    maximum: 100,
+    selection: 23
+  });
+}
+
+function test_Switch() {
+  var widget: tabris.Switch = tabris.create("Switch", {});
+  widget.set("foo", 23);
+  widget.set({
+    selection: true
+  });
+}
+
+function test_TextInput() {
+  var widget: tabris.TextInput = tabris.create("TextInput", {});
+  widget.set("foo", 23);
+  widget.set({
+    alignment: "center",
+    autoCapitalize: true,
+    autoCorrect: false,
+    editable: true,
+    text: "foo",
+    message: "bar",
+    type: "search",
+    keyboard: "ascii"
+  });
+}
+
+function test_Tab() {
+  var widget: tabris.Tab = tabris.create("Tab", {});
+  widget.set("foo", 23);
+  widget.set({
+    badge: "foo",
+    title: "bar",
+    image: {src: "http://example.org"}
+  });
+}
+
+function test_TabFolder() {
+  var widget: tabris.TabFolder = tabris.create("TabFolder", {});
+  widget.set("foo", 23);
+  widget.set({
+    paging: true,
+    tabBarLocation: "auto",
+    selection: tab1
+  });
+  var tab1: tabris.Tab, tab2: tabris.Tab;
+  var same: tabris.TabFolder = widget.append(tab1, tab2);
+}
+
+function test_TextView() {
+  var widget: tabris.TextView = tabris.create("TextView", {});
+  widget.set("foo", 23);
+  widget.set({
+    alignment: "center",
+    markupEnabled: true,
+    maxLines: 23,
+    text: "foo"
+  });
+}
+
+function test_ToggleButton() {
+  var widget: tabris.ToggleButton = tabris.create("ToggleButton", {});
+  widget.set("foo", 23);
+  widget.set({
+    alignment: "center",
+    image: {src: "http://example.org/"},
+    selection: true,
+    text: "foo"
+  });
+}
+
+function test_Video() {
+  var widget: tabris.Video = tabris.create("Video", {});
+  widget.set("foo", 23);
+  widget.set({
+    url: "http://example.org"
+  });
+}
+
+function test_WebView() {
+  var widget: tabris.WebView = tabris.create("WebView", {});
+  widget.set("foo", 23);
+  widget.set({
+    html: "<html>",
+    url: "http://example.org"
+  });
+}
+
+function test_WidgetCollection() {
+  var collection: tabris.WidgetCollection = page.find();
+  var length: number = collection.length;
+  var grandParents: tabris.WidgetCollection = collection.parent().parent();
+  var grandChildren: tabris.WidgetCollection = collection.children().children();
+  var found: tabris.WidgetCollection = collection.find().find(".class");
+  collection.appendTo(page);
+  collection.dispose();
+}
+
+function test_tabris_app() {
+  tabris.app.installPatch("url", (error: Error, patch: Object) => {});
+  tabris.app.reload();
+}
+
+function test_tabris_device() {
+  var lang: string = tabris.device.get("language");
+  var model: string = tabris.device.get("model");
+  var orient: string = tabris.device.get("orientation");
+  var platform: string = tabris.device.get("platform");
+  var factor: number = tabris.device.get("scaleFactor");
+  var height: number = tabris.device.get("screenHeight");
+  var width: number = tabris.device.get("screenWidth");
+  var version: string = tabris.device.get("version");
+  var same: tabris.Device = tabris.device.on("change:orientation", () => {}).off("change:orientation");
+}
+
+function test_tabris_ui() {
+  var page: tabris.Page = tabris.ui.get("activePage");
+  var bg: string = tabris.ui.get("background");
+  var tc: string = tabris.ui.get("textColor");
+  var visible: boolean = tabris.ui.get("toolbarVisible");
+  var same: tabris.UI = tabris.ui.on("change:activePage", () => {}).off("change:activePage");
+}
diff --git a/tabris/tabris.d.ts b/tabris/tabris.d.ts
new file mode 100644
index 000000000..9a0b4defe
--- /dev/null
+++ b/tabris/tabris.d.ts
@@ -0,0 +1,1446 @@
+// Type definitions for Tabris.js v1.2
+// Project: http://tabrisjs.com
+// Definitions by: Tabris.js team <http://github.com/eclipsesource/tabris>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module tabris {
+
+  // Types
+
+  interface Bounds {
+
+    /**
+     * the horizontal offset from the parent's left edge in dip
+     */
+    left: number;
+
+    /**
+     * the vertical offset from the parent's top edge in dip
+     */
+    top: number;
+
+    /**
+     * the width of the widget in dip
+     */
+    width: number;
+
+    /**
+     * the height of the widget in dip
+     */
+    height: number;
+
+  }
+
+  interface Transformation {
+
+    /**
+     * Clock-wise rotation in radians. Defaults to `0`.
+     */
+     rotation: number;
+
+    /**
+     * Horizontal scale factor. Defaults to `1`.
+     */
+    scaleX: number;
+
+    /*
+     * Vertical scale factor. Defaults to `1`.
+     */
+    scaleY: number;
+
+    /**
+     * Horizontal translation (shift) in dip. Defaults to `0`.
+     */
+    translationX: number;
+
+    /**
+     * Vertical translation (shift) in dip. Defaults to `0`.
+     */
+    translationY: number;
+
+  }
+
+  // TODO A plain string can be used as a shorthand, e.g. `"image.jpg"` equals `{src: "image.jpg"}`.
+  interface Image {
+
+    /**
+     * Image path or URL.
+     */
+    src?: string;
+
+    /**
+     * Image width, extracted from the image file when missing.
+     */
+    width?: number;
+
+    /**
+     * Image height, extracted from the image file when missing.
+     */
+    height?: number;
+
+    /**
+     * Image scale factor - the image will be scaled down by this factor.
+     * Ignored when width or height are set.
+     */
+    scale?: number;
+
+  }
+
+  interface CanvasContext {
+    // TODO
+  }
+
+  // Events
+
+  /**
+   * Event handling API supported by widgets and various other objects.
+   */
+  interface EventSupport <T> {
+
+    /**
+     * Adds the *listener* to the list of functions to be notified when *event* is fired.
+     * In the listener function, `this` will point to the object itself. Supports chaining.
+     *
+     * @param event the name of the event to listen on
+     * @param listener the listener function
+     */
+    on (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Same as `on`, but removes the listener after it has been invoked by an event.
+     * Supports chaining.
+     *
+     * @param event the name of the event to listen on
+     * @param listener the listener function
+     */
+    once (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Removes all listeners for all events from this widget. Supports chaining.
+     */
+    off (): T;
+
+    /**
+     * Removes all listeners for *event* from this widget. Supports chaining.
+     *
+     * @param event the event name to remove listeners for
+     */
+    off (event: string): T;
+
+    /**
+     * Removes all occurrences of *listener* that are bound to *event* from this widget.
+     * Supports chaining.
+     *
+     * @param event the event to remove the listener from
+     * @param listener the listener function to remove
+     */
+    off (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Triggers an event on this object. Supports chaining.
+     *
+     * @param event the name of the event to trigger
+     * @param args the arguments to pass to the listener functions
+     */
+    trigger (event: string, ...args: any[]): T;
+
+  }
+
+  interface AnimationOptions {
+
+    /**
+     * The time until the animation starts in ms, defaults to `0`.
+     */
+    delay?: number;
+
+    /**
+     * The duration in ms.
+     */
+    duration: number;
+
+    /**
+     * One of `linear`, `ease-in`, `ease-out`, `ease-in-out`.
+     */
+    easing: string;
+
+    /**
+     * The number of times to repeat the animation, defaults to `0`.
+     */
+    repeat: number;
+
+    /**
+     * `true` to alternate the direction of the animation on every repeat.
+     */
+    reverse: boolean;
+
+    /**
+     * No effect, but will be given in animation events.
+     */
+    name: string;
+
+  }
+
+  // Widget
+
+  function create (type: string, properties: WidgetProperties): Widget<any>;
+
+  /**
+   * API supported by all widgets.
+   */
+  interface Widget <T> extends EventSupport <T> {
+
+    // Property Support
+
+    /**
+     * Gets the current value of the given *property*.
+     *
+     * @param property
+     */
+    get (property: string): any;
+
+    /**
+     * Sets the given property. Supports chaining.
+     *
+     * @param property the name of the property to set
+     * @param value the value to set the property to
+     * @param options passed to the change event resulting from this method call
+     */
+    set (property: string, value: any, options?: Object): T;
+
+    /**
+     * Sets all key-value pairs in the properties object as widget properties. Supports chaining.
+     *
+     * @param properties the properties to set
+     * @param options passed to the change event resulting from this method call
+     */
+    set (properties: WidgetProperties, options?: Object): T;
+
+    /**
+     * Starts an animation that transforms the given properties from their current values to the given ones.
+     * Supported properties are *transform* and *opacity*.
+     *
+     * @param properties The properties and target values to animate.
+     * @param options Configures the animation itself.
+     */
+    animate (properties: WidgetProperties, options: AnimationOptions): void;
+
+    /**
+     * Appends this widget to the given parent.
+     * The parent widget must support children (extending *Composite*).
+     *
+     * @param parent the parent widget to append this one to
+     */
+    appendTo (parent: Composite): T;
+
+    /**
+     * Applies the given properties to all descendants that match the associated selector(s).
+     *
+     * @param properties an object in the format
+     *   `{selector: {property: value, property: value, ... }, selector: ...}`
+     */
+    apply (properties: Object): T;
+
+    /**
+     * Returns a (possibly empty) collection of all children of this widget.
+     */
+    children (): WidgetCollection;
+
+    /**
+     * Returns a (possibly empty) collection of all children of this widget that match the selector.
+     *
+     * @param selector a selector string to filter children
+     */
+    children (selector: string): WidgetCollection;
+
+    /**
+     * Removes this widget from its parent and destroys it. Also disposes of all its children.
+     * Triggers a `remove` event on the parent and a `dispose` event on itself.
+     * The widget can no longer be used.
+     */
+    dispose (): void;
+
+    /**
+     * Returns a (possibly empty) collection of all descendants of this widget.
+     */
+    find (): WidgetCollection
+
+    /**
+     * Returns a (possibly empty) collection of all descendants of this widget that match the selector.
+     * @param selector
+     */
+    find (selector: string): WidgetCollection
+
+    /**
+     * Returns `true` if the widget has been disposed, otherwise `false`.
+     */
+    isDisposed (): boolean
+
+    /**
+     * Returns the parent of this widget.
+     */
+    parent (): T;
+
+    /**
+     * An application-wide unique identifier automatically assigned to all widgets on creation.
+     * Do not change it.
+     */
+    cid: string;
+
+    /**
+     * Direct access to the value of the property of the same name.
+     * May be used instead of `widget.get("id");`.
+     * Do not use this field to change the value, instead use `widget.set("id", id);`.
+     */
+    id: string;
+
+    /**
+     * The exact string that was used to create this widget using the `tabris.create` method.
+     */
+    type: string;
+
+  }
+
+  interface WidgetProperties {
+
+    /**
+     * The background color of the widget.
+     */
+    background?: string;
+
+    /**
+     * An image to be displayed on the widget's background.
+     * If the image is smaller than the widget, it will be tiled.
+     */
+    backgroundImage?: Image;
+
+    /**
+     * The vertical position of the widget's baseline relative to a sibling widget.
+     */
+    baseline?: any;
+
+    /**
+     * The position of the widget's bottom edge relative to the parent or a sibling widget.
+     */
+    bottom?: any;
+
+    /**
+     * The actual location and size of the widget, relative to its parent. This property is read-only.
+     */
+    bounds?: Bounds;
+
+    /**
+     * The horizontal position of the widget's center relative to the parent's center.
+     */
+    centerX?: number;
+
+    /**
+     * The vertical position of the widget's center relative to the parent's center.
+     */
+    centerY?: number;
+
+    /**
+     * Whether the widget can be operated.
+     */
+    enabled?: boolean;
+
+    /**
+     * The font used for the widget.
+     */
+    font?: string;
+
+    /**
+     * The height of the widget.
+     */
+    height?: number;
+
+    /**
+     * Whether the entire widget should be highlighted while touched.
+     */
+    highlightOnTouch?: boolean;
+
+    /**
+     * A string to identify the widget by using selectors. Id's are optional.
+     * It is strongly recommended that they are unique within a page.
+     */
+    id?: string;
+
+    /**
+     * Shorthand for all layout properties. See [Layout](../layout.md).
+     */
+    layoutData?: Object;
+
+    /**
+     * The position of the widget's left edge relative to the parent or a sibling widget.
+     */
+    left?: any;
+
+    /**
+     * Opacity of the entire widget. Can be used for fade animations.
+     */
+    opacity?: number;
+
+    /**
+     * The position of the widget's right edge relative to the parent or a sibling widget.
+     */
+    right?: any;
+
+    /**
+     * Text color of the widget.
+     */
+    textColor?: string;
+
+    /**
+     * The position of the widget's top edge relative to the parent or a sibling widget.
+     */
+    top?: any;
+
+    /**
+     * Modifications to the widget's shape, size, or position. Can be used for animations.
+     * **Note:** In Android, the *transform* property does not affect the *bounds* property,
+     * while it does so in iOS.
+     */
+    transform?: Transformation;
+
+    /**
+     * Whether the widget is visible.
+     */
+    visible?: boolean;
+
+    /**
+     * The width of the widget.
+     */
+    width?: number;
+
+  }
+
+  // Action
+
+  function create (type: "Action", properties: ActionProperties): Action;
+
+  /**
+   * An executable item that is integrated in the application's navigation menu.
+   * Add a listener on *select* to implement the action.
+   */
+  interface Action extends Widget <Action> {
+
+    set (property: string, value: any, options?: Object): Action;
+    set (properties: ActionProperties, options?: Object): Action;
+
+  }
+
+  interface ActionProperties extends WidgetProperties {
+
+    /**
+     * Icon image for the action.
+     */
+    image?: Image;
+
+    /**
+     * Actions with higher placement priority will be placed at a more significant position in the UI,
+     * e.g. low priority actions could go into a menu instead of being included in a toolbar.
+     * Any of `low`, `high`, `normal`.
+     */
+    placementPriority?: string;
+
+    /**
+     * The text to be displayed for the action.
+     */
+    title?: string;
+
+  }
+
+  // Button
+
+  function create (type: "Button", properties: ButtonProperties): Button;
+
+  /**
+   * A push button. Can contain a text or an image.
+   */
+  interface Button extends Widget <Button> {
+
+    set (property: string, value: any, options?: Object): Button;
+    set (properties: ButtonProperties, options?: Object): Button;
+
+  }
+
+  interface ButtonProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the button text.
+     * Any of `left`, `right`, `center`. Defaults to `center`.
+     */
+    alignment?: string;
+
+    /**
+     * An image to be displayed on the button.
+     */
+    image?: Image;
+
+    /**
+     * The button's label text.
+     */
+    text?: string;
+
+  }
+
+  // Canvas
+
+  function create (type: "Canvas", properties: WidgetProperties): Canvas;
+
+  /**
+   * Canvas is a widget which allows drawing on it using a canvas context.
+   * Canvas context is a subset of the HTML5 [CanvasRenderingContext2D](https://developer.mozilla.org/en/docs/Web/API/CanvasRenderingContext2D). 
+   */
+  interface Canvas extends Composite {
+
+    /**
+     * Returns the drawing context.
+     *
+     * @param contextType This must be `"2d"`
+     * @param width
+     * @param height
+     */
+    getContext (contextType: string, width: number, height: number): CanvasContext;
+
+  }
+
+  // Cell
+
+  function create (type: "Cell", properties: CellProperties): Cell;
+
+  /**
+   * This widget represents a space in a *CollectionView* on which an item is displayed.
+   * Cell widgets are not created by the application but by the *CollectionView* widget.
+   */
+  interface Cell extends Composite {
+
+    set (property: string, value: any, options?: Object): Cell;
+    set (properties: CellProperties, options?: Object): Cell;
+
+  }
+
+  interface CellProperties extends WidgetProperties {
+
+    /**
+     * The item that is currently represented by this cell.
+     * This property is not set by the application but by the *CollectionView* widget.
+     */
+    item?: any;
+
+    /**
+     * The index of the item that is currently represented by this cell.
+     * This property is not set by the application but by the *CollectionView* widget.
+     */
+    itemIndex?: number;
+
+  }
+
+  // CheckBox
+
+  function create (type: "CheckBox", properties: CheckBoxProperties): CheckBox;
+
+  /**
+   * A check box widget.
+   */
+  interface CheckBox extends Widget <CheckBox> {
+
+    set (property: string, value: any, options?: Object): CheckBox;
+    set (properties: CheckBoxProperties, options?: Object): CheckBox;
+
+  }
+
+  interface CheckBoxProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the check box.
+     */
+    selection?: boolean;
+
+    /**
+     * The label text of the check box.
+     */
+    text?: string;
+
+  }
+
+  // CollectionView
+
+  function create (type: "CollectionView", properties: CollectionViewProperties): CollectionView;
+
+  /**
+   * A scrollable list that displays data items in cells, one per row.
+   * Cells are created on demand and filled with widgets in the *initializeCell* callback.
+   */
+  interface CollectionView extends Widget <CollectionView> {
+
+    set (property: string, value: any, options?: Object): CollectionView;
+    set (properties: CollectionViewProperties, options?: Object): CollectionView;
+
+    /**
+     * Inserts the given items into this view. Items are added at the end.
+     * This operation will modify the *items* property.
+     *
+     * @param items
+     */
+    insert (items: any[]): void;
+
+    /**
+     * Inserts the given items into this view at the given index.
+     * This operation will modify the *items* property.
+     *
+     * @param items
+     * @param index the position to insert the items at.
+     *   If a negative index is given, it is interpreted as relative to the end.
+     *   If the given index is greater than the item count, new items will be appended at the end. 
+     */
+    insert (items: any[], index: number): void;
+
+    /**
+     * Triggers a refresh of all visible items.
+     * This will issue *change:item* events on the corresponding cells.
+     */
+    refresh (): void;
+
+    /**
+     * Triggers a refresh of the item with the given index.
+     * If the item is scrolled into view, an *change:item* event will be issued on the corresponding cell.
+     *
+     * @param index The index of the item that was changed.
+     */
+    refresh (index: number): void;
+
+    /**
+     * Removes the item at the given index from this view. This operation will modify the *items* property.
+     * @param index The index of the item to remove. If this is negative, it is interpreted as relative to the end.
+     */
+    remove (index: number): void;
+
+    /**
+     * Removes *count* items beginning with the given index from this view.
+     * This operation will modify the *items* property.
+     *
+     * @param index The index of the first item to remove.
+     *   If this is negative, it is interpreted as relative to the end.
+     * @param count The number of items to remove.
+     */
+    remove (index: number, count: number): void;
+
+    /**
+     * Scrolls the item with the given index into view.
+     * @param index The index of the item to reveal. If this is negative, it is interpreted as relative to the end
+     */
+    reveal (index: number): void;
+
+  }
+
+  interface CollectionViewProperties extends WidgetProperties {
+
+    /**
+     * The name of the cell type to use for a given item.
+     * This name will be passed to the `initializeCell` and `itemHeight` functions.
+     * Cells will be reused only by items that require the same cell type.
+     * If set to a function, this function will be called for every item, providing the item as a parameter,
+     * and must return a name for the cell type to use for the given item.
+     */
+    cellType?: (item : any) => string | string;
+
+    /**
+     * A callback used to initialize a collection cell by attaching widget and *change:item* listener.
+     * Cells are created by the framework and recycled on scrolling.
+     * This callback receives the cell as the first and the cell type as second parameter.
+     *
+     * @static
+     */
+    initializeCell?: (cell: Cell, type: string) => any;
+
+    /**
+     * The height of a collection cell. If set to a function, this function will be called for every item,
+     * providing the item and the cell type as parameters, and must return the item height for the given item.
+     */
+    itemHeight?: (item: any, type: string) => number | number;
+
+    /**
+     * An array of data items to be displayed by the collection view.
+     * For dynamic content, use the methods `insert` and `remove` instead of setting this property directly.
+     */
+    items?: any[];
+
+    /**
+     * Enables the user to trigger a refresh by using the pull-to-refresh gesture.
+     */
+    refreshEnabled?: boolean;
+
+    /**
+     * Whether the refresh indicator is currently visible. Will be set to `true` when a *refresh* event
+     * is triggered. Reset it to `false` when the refresh is finished.
+     */
+    refreshIndicator?: boolean;
+
+    /**
+     * The message text displayed together with the refresh indicator. Currently not supported on Android.
+     */
+    refreshMessage?: string;
+
+  }
+
+  // Composite
+
+  function create (type: "Composite", properties: WidgetProperties): Composite;
+
+  interface Parent <T> {
+
+    /**
+     * Adds the given widget(s) in the given order to the composite.
+     *
+     * @param child
+     * @param child*
+     */
+    append (...children: Widget<any>[]): T;
+
+    /**
+     * Adds all widgets in the given collection to the composite.
+     * @param collection
+     */
+    append (collection: WidgetCollection): T;
+
+  }
+
+  /**
+   * An empty widget that can contain other widgets.
+   */
+  interface Composite extends Widget <Composite>, Parent <Composite> {
+  }
+
+  // Drawer
+
+  function create (type: "Drawer", properties: WidgetProperties): Drawer;
+
+  /**
+   * A navigation drawer that can be swiped in from the left edge of the screen. Can contain any kind of widgets.
+   * It may be useful to include a `PageSelector` that displays all top-level pages.
+   */
+  interface Drawer extends Composite {
+
+    /**
+     * Closes the drawer.
+     */
+    close (): Drawer;
+
+    /**
+     * Opens the drawer.
+     */
+    open (): Drawer;
+
+  }
+
+  // ImageView
+
+  function create (type: "ImageView", properties: ImageViewProperties): ImageView;
+
+  /**
+   * A widget to display an image.
+   */
+  interface ImageView extends Widget <ImageView> {
+
+    set (property: string, value: any, options?: Object): ImageView;
+    set (properties: ImageViewProperties, options?: Object): ImageView;
+
+  }
+
+  interface ImageViewProperties {
+
+    image?: Image;
+
+    /**
+     * Any of `auto`, `fit`, `fill`, `stretch`, `none`. Defaults to `auto`.;
+     */
+    scaleMode?: string;
+
+  }
+
+  // Page
+
+  function create (type: "Page", properties: PageProperties): Page;
+
+  /**
+   * Pages contain an application's UI. Top-level pages are included in the application's main menu.
+   */
+  interface Page extends Widget <Page>, Parent <Page> {
+
+    set (property: string, value: any, options?: Object): Page;
+    set (properties: PageProperties, options?: Object): Page;
+
+    /**
+     * Opens the page, i.e. makes it the active page.
+     */
+    open (): Page;
+
+    /**
+     * Closes and disposes of the page.
+     */
+    close (): void;
+
+  }
+
+  interface PageProperties extends WidgetProperties {
+
+    image?: Image;
+
+    title?: string;
+
+    topLevel?: boolean;
+
+  }
+
+  // PageSelector
+
+  function create (type: "PageSelector", properties: WidgetProperties): PageSelector;
+
+  /**
+   * A CollectionView that contains all top-level pages and allows to open them.
+   * New top-level pages are added dynamically.
+   */
+  interface PageSelector extends CollectionView {
+  }
+
+  // Picker
+
+  function create (type: "Picker", properties: PickerProperties): Picker;
+
+  /**
+   * A widget with a drop-down list of items to choose from.
+   */
+  interface Picker extends Widget <Picker> {
+
+    set (property: string, value: any, options?: Object): Picker;
+    set (properties: PickerProperties, options?: Object): Picker;
+
+  }
+
+  interface PickerProperties extends WidgetProperties {
+
+    items?: string[];
+
+    selection?: string;
+
+    selectionIndex?: number;
+
+  }
+
+  // ProgressBar
+
+  function create (type: "ProgressBar", properties: ProgressBarProperties): ProgressBar;
+
+  /**
+   * A widget representing a numeric value as a horizontal bar with a growing indicator.
+   */
+  interface ProgressBar extends Widget <ProgressBar> {
+
+    set (property: string, value: any, options?: Object): ProgressBar;
+    set (properties: ProgressBarProperties, options?: Object): ProgressBar;
+
+  }
+
+  interface ProgressBarProperties {
+
+    /**
+     * Defaults to 100.
+     */
+    maximum?: number;
+
+    /**
+     * Defaults to 0.
+     */
+    minimum?: number;
+
+    /**
+     * Defaults to 0.
+     */
+    selection?: number;
+
+    /**
+     * Any of `normal`, `paused, `error`. Defaults to `normal`.
+     */
+    state?: string;
+
+  }
+
+  // RadioButton
+
+  function create (type: "RadioButton", properties: RadioButtonProperties): RadioButton;
+
+  /**
+   * A radio button. Selecting a radio button de-selects all its siblings (i.e. all radio buttons
+   * within the same parent).
+   */
+  interface RadioButton extends Widget <RadioButton> {
+
+    set (property: string, value: any, options?: Object): RadioButton;
+    set (properties: RadioButtonProperties, options?: Object): RadioButton;
+
+  }
+
+  interface RadioButtonProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the radio button.
+     */
+    selection?: boolean;
+
+    /**
+     * The label text of the radio button.
+     */
+    text?: string;
+
+  }
+
+  // ScrollView
+
+  function create (type: "ScrollView", properties: ScrollViewProperties): ScrollView;
+
+  /**
+   * A composite that allows its content to overflow either vertically (default) or horizontally.
+   * Children of a ScrollView may not be attached to its edge in scrolling direction (to the bottom
+   * for vertical scrolling, to the right for horizontal scrolling).
+   */
+  interface ScrollView extends Composite {
+
+    set (property: string, value: any, options?: Object): ScrollView;
+    set (properties: ScrollViewProperties, options?: Object): ScrollView;
+
+  }
+
+  interface ScrollViewProperties extends WidgetProperties {
+
+    /**
+     * Specifies the scrolling direction of the scroll composite.
+     * Either `vertical` or `horizontal`. Default to `vertical`.
+     * @static
+     */
+    direction?: string;
+
+  }
+
+  // SearchAction
+
+  function create (type: "SearchAction", properties: SearchActionProperties): SearchAction;
+
+  /**
+   * An action that displays a search text field with dynamic proposals when selected.
+   * Add a listener on *select* to implement the action. On *input*, you may set a list of *proposals*.
+   */
+  interface SearchAction extends Action {
+
+    set (property: string, value: any, options?: Object): SearchAction;
+    set (properties: SearchActionProperties, options?: Object): SearchAction;
+
+  }
+
+  interface SearchActionProperties extends ActionProperties {
+
+    /**
+     * A hint text that is displayed when the search input is empty.
+     */
+    message?: string;
+
+    /**
+     * The list of proposals to display.
+     */
+    proposals?: string[];
+
+    /**
+     * The text in the search input field.
+     */
+    text?: string;
+
+  }
+
+  // Slider
+
+  function create (type: "Slider", properties: SliderProperties): Slider;
+
+  /**
+   * A widget representing a numeric value as an movable indicator on a horizontal line.
+   */
+  interface Slider extends Widget <Slider> {
+
+    set (property: string, value: any, options?: Object): Slider;
+    set (properties: SliderProperties, options?: Object): Slider;
+
+  }
+
+  interface SliderProperties extends WidgetProperties {
+
+    maximum?: number;
+
+    minimum?: number;
+
+    selection?: number;
+
+  }
+
+  // Switch
+
+  function create (type: "Switch", properties: SwitchProperties): Switch;
+
+  /**
+   * A switch widget that can be toggled.
+   */
+  interface Switch extends Widget <Switch> {
+
+    set (property: string, value: any, options?: Object): Switch;
+    set (properties: SwitchProperties, options?: Object): Switch;
+
+  }
+
+  interface SwitchProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the switch.
+     */
+    selection?: boolean;
+
+  }
+
+  // Tab
+
+  function create (type: "Tab", properties: TabProperties): Tab;
+
+  /**
+   * A container representing a single tab of the TabFolder widget.
+   */
+  interface Tab extends Composite {
+
+    set (property: string, value: any, options?: Object): Tab;
+    set (properties: TabProperties, options?: Object): Tab;
+
+  }
+
+  interface TabProperties extends WidgetProperties {
+
+    badge?: string;
+
+    image?: Image;
+
+    title?: string;
+
+  }
+
+  // TabFolder
+
+  function create (type: "TabFolder", properties: TabFolderProperties): TabFolder;
+
+  /**
+   * A widget that can switch between [tabs](#tab).
+   */
+  interface TabFolder extends Widget <TabFolder> {
+
+    set (property: string, value: any, options?: Object): TabFolder;
+    set (properties: TabFolderProperties, options?: Object): TabFolder;
+
+    /**
+     * Adds the given tabs in the given order to the TabFolder.
+     *
+     * @param children
+     */
+    append (...children: Tab[]): TabFolder;
+
+  }
+
+  interface TabFolderProperties extends WidgetProperties {
+
+    /**
+     * Enables swiping through tabs.
+     */
+    paging?: boolean;
+
+    selection?: Tab;
+
+    /**
+     * The placement of the tab titles. When set to `"auto"`, the position is platform dependent.
+     * Any of `top`, `bottom`, `auto`. Defaults to `auto`.
+     * @static
+     */
+    tabBarLocation?: string;
+
+  }
+
+  // TextInput
+
+  function create (type: "TextInput", properties: TextInputProperties): TextInput;
+
+  /**
+   * A widget that allows to enter text.
+   */
+  interface TextInput extends Widget <TextInput> {
+
+    set (property: string, value: any, options?: Object): TextInput;
+    set (properties: TextInputProperties, options?: Object): TextInput;
+
+  }
+
+  interface TextInputProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * Automatically switch to capital letters after every key pressed.
+     */
+    autoCapitalize?: boolean;
+
+    /**
+     * Enables the spell checker and auto-correction feature.
+     */
+    autoCorrect?: boolean;
+
+    editable?: boolean;
+
+    /**
+     * Selects the keyboard type to use for editing this widget.
+     * Any of `ascii`, `decimal`, `email`, `number`, `numbersAndPunctuation`, `phone`, `url`, `default`.
+     */
+    keyboard?: string;
+
+    /**
+     * A hint text that is displayed when the input field is empty.
+     */
+    message?: string;
+
+    /**
+     * The text in the input field.
+     */
+    text?: string;
+
+    /**
+     * The type of the text widget.
+     * Any of `default`, `password`, `search`, `multiline`.
+     * @static
+     */
+    type?: string;
+
+  }
+
+  // TextView
+
+  function create (type: "TextView", properties: TextViewProperties): TextView;
+
+  /**
+   * A widget to display a text. For images, use ImageView.
+   */
+  interface TextView extends Widget <TextView> {
+
+    set (property: string, value: any, options?: Object): TextView;
+    set (properties: TextViewProperties, options?: Object): TextView;
+
+  }
+
+  interface TextViewProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * Allows for a subset of HTML tags in the text.
+     * Supported tags are: `a`, `del`, `ins`, `b`, `i`, `strong`, `em`, `big`, `small`, `br`.
+     * All tags must be closed (e.g. use `<br/>` instead of `<br>`). Nesting tags is currently not supported.
+     * @static
+     */
+    markupEnabled?: boolean;
+
+    /**
+     * Limit the number of lines to be displayed to the given maximum. `null` disables this limit.
+     */
+    maxLines?: number;
+
+    /**
+     * The text to display.
+     */
+    text?: string;
+
+  }
+
+  // ToggleButton
+
+  function create (type: "ToggleButton", properties: ToggleButtonProperties): ToggleButton;
+
+  /**
+   * A push button that "snaps in", i.e. it is selected when pressed and deselected when pressed again.
+   */
+  interface ToggleButton extends Widget <ToggleButton> {
+
+    set (property: string, value: any, options?: Object): ToggleButton;
+    set (properties: ToggleButtonProperties, options?: Object): ToggleButton;
+
+  }
+
+  interface ToggleButtonProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the button text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * An image to be displayed on the button.
+     */
+    image?: Image;
+
+    /**
+     * The selection state of the toggle button.
+     */
+    selection?: boolean;
+
+    /**
+     * The button's label text.
+     */
+    text?: string;
+
+  }
+
+  // Video
+
+  function create (type: "Video", properties: VideoProperties): Video;
+
+  /**
+   * A widget that plays a video from a URL.
+   */
+  interface Video extends Widget <Video> {
+
+    set (property: string, value: any, options?: Object): Video;
+    set (properties: VideoProperties, options?: Object): Video;
+
+  }
+
+  interface VideoProperties extends WidgetProperties {
+
+    /**
+     * The URL of the video to play.
+     */
+    url?: string;
+
+  }
+
+  // WebView
+
+  function create (type: "WebView", properties: WebViewProperties): WebView;
+
+  /**
+   * A widget that can display a web page.
+   * Since this widget requires a lot of recourses it's recommended to have no more than one instance at a time.
+   */
+  interface WebView extends Widget <WebView> {
+
+    set (property: string, value: any, options?: Object): Video;
+    set (properties: WebViewProperties, options?: Object): Video;
+
+  }
+
+  interface WebViewProperties extends WidgetProperties {
+
+    /**
+     * A complete HTML document to display. Always returns the last set value.
+     */
+    html?: string;
+
+    /**
+     * The URL of the web page to display. Returns empty string when content from *html* property is displayed.
+     */
+    url?: string;
+
+  }
+
+  // WidgetCollection
+
+  /**
+   */
+  interface WidgetCollection extends EventSupport <WidgetCollection> {
+
+    /**
+     * Animates all widgets in this collection.
+     *
+     * @param properties The properties and target values to animate.
+     * @param options Configures the animation itself.
+     */
+    animate (properties: WidgetProperties, options: AnimationOptions): void;
+
+    /**
+     * Append all widgets in this collection to the given widget.
+     * @param parent
+     */
+    appendTo (parent: Composite): WidgetCollection;
+
+    /**
+     * Returns a collection containing all children of all widgets in this collection.
+     */
+    children (): WidgetCollection;
+
+    /**
+     * Same as `collection.children().filter(selector)`.
+     * @param selector
+     */
+    children (selector: string): WidgetCollection;
+
+    /**
+     * Disposes all widgets in this collection.
+     */
+    dispose (): void;
+
+    /**
+     * Returns a collection containing all descendants of all widgets in this collection.
+     */
+    find (): WidgetCollection;
+
+    /**
+     * Returns a collection containing all descendants of all widgets in this collection that match the given selector.
+     * @param selector
+     */
+    find (selector: string): WidgetCollection;
+
+    /**
+     * Returns a collection containing all direct parents of all widgets in this collection.
+     */
+    parent (): WidgetCollection;
+
+    /**
+     * A read-only field containing the number of widgets in the collection.
+     */
+    length: number;
+
+  }
+
+  // tabris.app
+
+  /**
+   * The object `tabris.app` provides information about the application.
+   */
+  interface App {
+
+    /**
+     * Installs a patch from the given URL.
+     * When the patch is successfully installed, it will remain inactive until the application is reloaded.
+     * @param url The URL to fetch a patch from.
+     * @param callback A callback function to be called when the installation has finished or failed.
+     * In case of a failure, the callback will receive a parameter `error` that contains an Error object.
+     * If the installation succeeds, this parameter will be `undefined` and a second parameter will contain
+     * the parsed content of the file `patch.json` from the installed patch.
+     * @provisional
+     */
+    installPatch (url : string, callback : (error: Error, patch: Object) => any): void;
+
+    /**
+     * Forces the running application to reload the main module and start over.
+     */
+    reload (): void;
+
+  }
+
+  export var app: App;
+
+  // tabris.device
+
+  /**
+   * The object `tabris.device` provides information about the device that executes the application.
+   * All properties are read-only.
+   */
+  interface Device extends EventSupport <Device> {
+
+    get(property: string): void;
+
+    /**
+     * The user language configured on the device as an [RFC 4646](http://tools.ietf.org/html/rfc4646) compliant string. For example `"de"`, `"es-ES"`, etc. This property is also available globally as `navigator.language`.
+     */
+    get(property: "language"): string;
+
+    /**
+     * The name of the device model. For example `"iPad4,1"` or `"Nexus 7"`.
+     * This property is also available globally as `device.model`.
+     */
+    get(property: "model"): string;
+
+    /**
+     * The device orientation. One of `portrait-primary`, `portrait-secondary`, `landscape-primary`, and `landscape-secondary`.
+     */
+    get(property: "orientation"): string;
+
+    /**
+     * The name of the platform. Currently either `"Android"` or `"iOS"`.
+     * This property is also available globally as `device.platform`.
+     */
+    get(property: "platform"): string;
+
+    /**
+     * The ratio between physical pixels and device independent pixels.
+     * This property is also available globally as [`window.devicePixelRatio`](https://developer.mozilla.org/en-US/docs/Web/API/Window.devicePixelRatio).
+     */
+    get(property: "scaleFactor"): number;
+
+    /**
+     * The entire height of the device's screen in device independent pixel.
+     * Depends on the current device orientation. This property is also available globally as [screen.height](https://developer.mozilla.org/en-US/docs/Web/API/Screen.height).
+     */
+    get(property: "screenHeight"): number;
+
+    /**
+     * The entire width of the device's screen in device independent pixel.
+     * Depends on the current device orientation. This property is also available as globally as [screen.width](https://developer.mozilla.org/en-US/docs/Web/API/Screen.width).
+     */
+    get(property: "screenWidth"): number;
+
+    /**
+     * The platform version. On iOS it lools like this: `"8.1.1"`.
+     * On Android, the [version code](https://developer.android.com/reference/android/os/Build.VERSION_CODES.html)
+     * is returned. This property is also available globally as `device.version`.
+     */
+    get(property: "version"): string;
+
+  }
+
+  export var device: Device;
+
+  // tabris.ui
+
+  /**
+   * The object `tabris.ui` is the root element for all widgets.
+   * This is the parent for all top-level pages, *actions* and the *drawer*.
+   */
+  interface UI extends EventSupport <UI> {
+
+    get(property: string): void;
+
+    /**
+     * The currently visible page.
+     */
+    get(property: "activePage"): Page;
+
+    /**
+     * Background color for the navigation elements.
+     */
+    get(property: "background"): string;
+
+    /**
+     * Text color for the navigation elements.
+     */
+    get(property: "textColor"): string;
+
+    /**
+     * Whether the toolbars above and below pages are visible.
+     */
+    get(property: "toolbarVisible"): boolean;
+
+  }
+
+  export var ui: UI;
+
+}
+
+declare module "tabris" {
+  export = tabris;
+}
diff --git a/tcomb/tcomb-tests.ts b/tcomb/tcomb-tests.ts
index 3a27ffc7f..aafd5e55b 100644
--- a/tcomb/tcomb-tests.ts
+++ b/tcomb/tcomb-tests.ts
@@ -577,17 +577,16 @@ describe('irreducible types constructors', function () {
     {T: Dat, x: new Date()}
   ].forEach(function (o) {
 
-    var T = o.T;
-    var x = o.x;
+    var { T, x } = o;
 
     it('should accept only valid values', function () {
-      eq(T(x), x);
+      eq((<any>T)(x), x);
     });
 
     it('should throw if used with new', function () {
       throwsWithMessage(function () {
         /* jshint ignore:start */
-        var x = new    (<any>T) ();
+        var x = new (<any>T) ();
         /* jshint ignore:end */
       }, 'Operator `new` is forbidden for type `' + getTypeName(T) + '`');
     });
diff --git a/tcomb/tcomb.d.ts b/tcomb/tcomb.d.ts
index c189a6a0f..c4676adfd 100644
--- a/tcomb/tcomb.d.ts
+++ b/tcomb/tcomb.d.ts
@@ -16,7 +16,7 @@ declare module TComb {
     assert: (condition: boolean, message?: string, ...values: any[]) => void;
     fail: (message?: string) => void;
     Any: Any_Static;
-    Nil: Str_Static;
+    Nil: Nil_Static;
     Str: Str_Static;
     Num: Num_Static;
     Bool: Bool_Static;
@@ -24,8 +24,9 @@ declare module TComb {
     Obj: Obj_Static;
 
     Func: Func_Static;
-    func:    { (domain: TCombBase[], codomain: TCombBase, name?: string) : Func_Static;
-                (domain: TCombBase, codomain: TCombBase, name?: string) : Func_Static;
+    func: {
+        (domain: TCombBase[], codomain: TCombBase, name?: string): Func_Static;
+        (domain: TCombBase, codomain: TCombBase, name?: string) : Func_Static;
     }
     Err: Err_Static;
     Re: Re_Static;
@@ -61,13 +62,13 @@ declare module TComb {
 
   export interface TCombBase {
     meta: {
-			/**
-			 * The type kind, equal to "irreducible" for irreducible types.
-			 */
+      /**
+       * The type kind, equal to "irreducible" for irreducible types.
+       */
       kind: string;
-			/**
-			 * The type name.
-			 */
+      /**
+       * The type name.
+       */
       name: string;
     };
     displayName: string;
@@ -107,17 +108,17 @@ declare module TComb {
     new (value: string): Str_Instance;
     (value: string): Str_Instance;
     meta: {
-			/**
-			 * The type kind, equal to "irreducible" for irreducible types.
-			 */
+      /**
+       * The type kind, equal to "irreducible" for irreducible types.
+       */
       kind: string;
-			/**
-			 * The type name.
-			 */
+      /**
+       * The type name.
+       */
       name: string;
-			/**
-			 * The type predicate.
-			 */
+      /**
+       * The type predicate.
+       */
       is: TypePredicate;
     };
   }
@@ -210,15 +211,15 @@ declare module TComb {
 
 
 
-	/**
-	 * @param name - The type name.
-	 * @param is - A predicate.
-	 */
+  /**
+   * @param name - The type name.
+   * @param is - A predicate.
+   */
 
-	/**
-	 * @param props - A hash whose keys are the field names and the values are the fields types.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param props - A hash whose keys are the field names and the values are the fields types.
+   * @param name - Useful for debugging purposes.
+   */
 
 
   export interface Struct_Static extends TCombBase {
@@ -229,52 +230,52 @@ declare module TComb {
       name: string;
       props: any[];
     };
-		/**
-		 * @param mixins - Contains the new props.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param mixins - Contains the new props.
+     * @param name - Useful for debugging purposes.
+     */
     extend(mixins: Object, name?: string): Struct_Static;
-		/**
-		 * @param mixins - Contains the new props.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param mixins - Contains the new props.
+     * @param name - Useful for debugging purposes.
+     */
     extend(mixins: Struct_Static, name?: string): Struct_Static;
-		/**
-		 * @param mixins - Contains the new props.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param mixins - Contains the new props.
+     * @param name - Useful for debugging purposes.
+     */
     extend(mixins: Object[], name?: string): Struct_Static;
-		/**
-		 * @param mixins - Contains the new props.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param mixins - Contains the new props.
+     * @param name - Useful for debugging purposes.
+     */
     extend(mixins: Struct_Static[], name?: string): Struct_Static;
   }
 
   interface Struct_Instance {
   }
 
-	/**
-	 * @param map - A hash whose keys are the enums (values are free).
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param map - A hash whose keys are the enums (values are free).
+   * @param name - Useful for debugging purposes.
+   */
 
   export module enums {
-		/**
-		 * @param keys - Array of enums.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param keys - Array of enums.
+     * @param name - Useful for debugging purposes.
+     */
     export function of(keys: string[], name?: string): TCombBase;
-		/**
-		 * @param keys - String of enums separated by spaces.
-		 * @param name - Useful for debugging purposes.
-		 */
+    /**
+     * @param keys - String of enums separated by spaces.
+     * @param name - Useful for debugging purposes.
+     */
     export function of(keys: string, name?: string): TCombBase;
   }
 
-	/**
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param name - Useful for debugging purposes.
+   */
 
   export interface Union_Static extends TCombBase {
     new (value: any, mutable?: boolean): Union_Instance;
@@ -291,10 +292,10 @@ declare module TComb {
   }
 
 
-	/**
-	 * @param type - The wrapped type.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param type - The wrapped type.
+   * @param name - Useful for debugging purposes.
+   */
 
 
 
@@ -312,9 +313,9 @@ declare module TComb {
   }
 
 
-	/**
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param name - Useful for debugging purposes.
+   */
 
   interface Tuple_Static extends TCombBase {
     new (value: any, mutable?: boolean): Tuple_Instance;
@@ -329,11 +330,11 @@ declare module TComb {
   interface Tuple_Instance {
   }
 
-	/**
-	 * Combines old types into a new one.
-	 * @param type - A type already defined.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * Combines old types into a new one.
+   * @param type - A type already defined.
+   * @param name - Useful for debugging purposes.
+   */
 
 
   export interface Subtype_Static extends TCombBase {
@@ -350,10 +351,10 @@ declare module TComb {
   interface Subtype_Instance {
   }
 
-	/**
-	 * @param type - The type of list items.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param type - The type of list items.
+   * @param name - Useful for debugging purposes.
+   */
   export function list(type: TCombBase, name?: string): List_Static;
 
   interface List_Static extends TCombBase {
@@ -369,11 +370,11 @@ declare module TComb {
   interface List_Instance {
   }
 
-	/**
-	 * @param domain - The type of keys.
-	 * @param codomain - The type of values.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param domain - The type of keys.
+   * @param codomain - The type of values.
+   * @param name - Useful for debugging purposes.
+   */
 
 
   interface Dict_Static extends TCombBase {
@@ -390,16 +391,16 @@ declare module TComb {
   interface Dict_Instance {
   }
 
-	/**
-	 * @param type - The type of the function's argument.
-	 * @param codomain - The type of the function's return value.
-	 * @param name - Useful for debugging purposes.
-	 */
-	/**
-	 * @param type - The list of types of the function's arguments.
-	 * @param codomain - The type of the function's return value.
-	 * @param name - Useful for debugging purposes.
-	 */
+  /**
+   * @param type - The type of the function's argument.
+   * @param codomain - The type of the function's return value.
+   * @param name - Useful for debugging purposes.
+   */
+  /**
+   * @param type - The list of types of the function's arguments.
+   * @param codomain - The type of the function's return value.
+   * @param name - Useful for debugging purposes.
+   */
 
   interface Func_Static extends TCombBase {
     new (value: any, mutable?: boolean): Func_Instance;
diff --git a/tedious-connection-pool/tedious-connection-pool-tests.ts b/tedious-connection-pool/tedious-connection-pool-tests.ts
index aef2c9f60..60ca44d7e 100644
--- a/tedious-connection-pool/tedious-connection-pool-tests.ts
+++ b/tedious-connection-pool/tedious-connection-pool-tests.ts
@@ -16,7 +16,7 @@ var config: tedious.ConnectionConfig = {
 	server: "127.0.0.1",
 	options: {
 		database: "somedb",
-		instance: "someinstance"
+		instanceName: "someinstance"
 	}
 };
 
diff --git a/tedious/tedious-tests.ts b/tedious/tedious-tests.ts
index 32c243614..f7346a174 100644
--- a/tedious/tedious-tests.ts
+++ b/tedious/tedious-tests.ts
@@ -11,7 +11,7 @@ var config: tedious.ConnectionConfig = {
 	server: "127.0.0.1",
 	options: {
 		database: "somedb",
-		instance: "someinstance"
+		instanceName: "someinstance",
 	}
 }
 
diff --git a/tether-shepherd/tether-shepherd-tests.ts b/tether-shepherd/tether-shepherd-tests.ts
index 48bef675b..085da575b 100644
--- a/tether-shepherd/tether-shepherd-tests.ts
+++ b/tether-shepherd/tether-shepherd-tests.ts
@@ -6,11 +6,56 @@ var tour = new Shepherd.Tour({
     }
 });
 
-tour.addStep('test-step', {
+var step1Options: TetherShepherd.IShepherdTourStepOptions = {
     text: 'This is a test step being added to the test tour',
     title: 'Test Step Title',
     attachTo: {
         element: '#button',
         on: 'right'
+    },
+    buttons: [
+        {
+            text: 'Continue',
+            action: tour.next
+        },
+        {
+            text: 'Cancel',
+            action: tour.cancel
+        }
+    ]
+};
+
+tour.addStep('test-step', step1Options);
+
+var step2Options: TetherShepherd.IShepherdTourStepOptions = {
+    text: 'This is the next step being added to the test tour',
+    title: 'Test Step Title 2 - Electric Boogaloo',
+    attachTo: '#anotherButton right',
+    buttons: [
+        {
+            text: 'Done',
+            action: tour.next,
+            events: {
+                'mouseover': () => {
+                    console.log('I did not feel like making a function body that pretended to do something else');
+                }
+            }
+        }
+    ],
+    when: {
+        destroy: () => {
+            console.log('Destroyed the Step 2');
+        }
+    },
+    showOn: () => {
+        return true;
     }
-});
+};
+
+tour.addStep('test-step-2', step2Options);
+
+var queriedStep = tour.getById('test-step-2');
+
+queriedStep.destroy();
+
+tour.start();
diff --git a/tether-shepherd/tether-shepherd.d.ts b/tether-shepherd/tether-shepherd.d.ts
index b632fb771..413d569ed 100644
--- a/tether-shepherd/tether-shepherd.d.ts
+++ b/tether-shepherd/tether-shepherd.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Tether-Shepherd v1.1.2
+// Type definitions for Tether-Shepherd v1.2.0
 // Project: http://github.hubspot.com/shepherd/
 // Definitions by: Matt Gibbs <https://github.com/mtgibbs>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -143,12 +143,13 @@ declare module TetherShepherd {
         title?: string;
         attachTo?: any;
         beforeShowPromise?: any;
-        classes?: any;
+        classes?: string;
         buttons?: IShepherdTourButton[];
         advanceOn?: any;
         showCancelLink?: boolean;
         scrollTo?: boolean;
         when?: any;
+        showOn?: () => boolean;
 
         // TODO: Tie this in with the tether.d.ts
         tetherOptions?: any;
@@ -156,9 +157,13 @@ declare module TetherShepherd {
 
     interface IShepherdTourButton {
         text: string;
-        classes: string[];
-        action?: any;
-        events?: any;
+        classes?: string;
+        action?: Function;
+        events?: IShepherdTourButtonEventHash;
+    }
+
+    interface IShepherdTourButtonEventHash {
+        [Key: string]: Function;
     }
 
     interface IShepherdTourAttachProperties {
diff --git a/threejs/tests/canvas/canvas_lights_pointlights.ts b/threejs/tests/canvas/canvas_lights_pointlights.ts
index e810f2b21..8ca0bc22b 100644
--- a/threejs/tests/canvas/canvas_lights_pointlights.ts
+++ b/threejs/tests/canvas/canvas_lights_pointlights.ts
@@ -42,7 +42,7 @@
 
         }
 
-				var sprite = new THREE.Sprite(new THREE.SpriteCanvasMaterial({ color: 0xff0040, program: program }));
+        var sprite = new THREE.Sprite(new THREE.SpriteCanvasMaterial({ color: 0xff0040, program: program }));
         light1.add(sprite);
 
         var sprite = new THREE.Sprite(new THREE.SpriteCanvasMaterial({ color: 0x0040ff, program: program }));
diff --git a/threejs/tests/webgl/webgl_animation_cloth.ts b/threejs/tests/webgl/webgl_animation_cloth.ts
index c85c0d09e..e58d46098 100644
--- a/threejs/tests/webgl/webgl_animation_cloth.ts
+++ b/threejs/tests/webgl/webgl_animation_cloth.ts
@@ -107,7 +107,7 @@
         clothTexture.wrapS = clothTexture.wrapT = THREE.RepeatWrapping;
         clothTexture.anisotropy = 16;
 
-        var clothMaterial = new THREE.MeshPhongMaterial({ alphaTest: 0.5, ambient: 0xffffff, color: 0xffffff, specular: 0x030303, emissive: 0x111111, shiness: 10, map: clothTexture, side: THREE.DoubleSide });
+        var clothMaterial = new THREE.MeshPhongMaterial({ alphaTest: 0.5, color: 0xffffff, specular: 0x030303, emissive: 0x111111, shininess: 10, map: clothTexture, side: THREE.DoubleSide });
 
         // cloth geometry
         clothGeometry = new THREE.ParametricGeometry(clothFunction, cloth.w, cloth.h);
@@ -162,7 +162,7 @@
         // poles
 
         var poleGeo = new THREE.BoxGeometry(5, 375, 5);
-        var poleMat = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0x111111, shiness: 100 });
+        var poleMat = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0x111111, shininess: 100 });
 
         var mesh = new THREE.Mesh(poleGeo, poleMat);
         mesh.position.x = -125;
diff --git a/threejs/tests/webgl/webgl_buffergeometry.ts b/threejs/tests/webgl/webgl_buffergeometry.ts
index 2923cba76..cedd78d9c 100644
--- a/threejs/tests/webgl/webgl_buffergeometry.ts
+++ b/threejs/tests/webgl/webgl_buffergeometry.ts
@@ -184,7 +184,7 @@
         geometry.computeBoundingSphere();
 
         var material = new THREE.MeshPhongMaterial({
-            color: 0xaaaaaa, ambient: 0xaaaaaa, specular: 0xffffff, shininess: 250,
+            color: 0xaaaaaa, specular: 0xffffff, shininess: 250,
             side: THREE.DoubleSide, vertexColors: THREE.VertexColors
         });
 
diff --git a/threejs/tests/webgl/webgl_geometries.ts b/threejs/tests/webgl/webgl_geometries.ts
index f5de1e725..7840641b2 100644
--- a/threejs/tests/webgl/webgl_geometries.ts
+++ b/threejs/tests/webgl/webgl_geometries.ts
@@ -35,7 +35,7 @@
         map.wrapS = map.wrapT = THREE.RepeatWrapping;
         map.anisotropy = 16;
 
-        var material = new THREE.MeshLambertMaterial({ ambient: 0xbbbbbb, map: map, side: THREE.DoubleSide });
+        var material = new THREE.MeshLambertMaterial({ map: map, side: THREE.DoubleSide });
 
         //
 
diff --git a/threejs/tests/webgl/webgl_lensflares.ts b/threejs/tests/webgl/webgl_lensflares.ts
index 50c82555c..f673d5c96 100644
--- a/threejs/tests/webgl/webgl_lensflares.ts
+++ b/threejs/tests/webgl/webgl_lensflares.ts
@@ -48,7 +48,7 @@
         var s = 250;
 
         var cube = new THREE.BoxGeometry(s, s, s);
-        var material = new THREE.MeshPhongMaterial({ ambient: 0x333333, color: 0xffffff, specular: 0xffffff, shininess: 50 });
+        var material = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0xffffff, shininess: 50 });
 
 
         for (var i = 0; i < 3000; i++) {
diff --git a/threejs/tests/webgl/webgl_lights_heimsphere.ts b/threejs/tests/webgl/webgl_lights_heimsphere.ts
index 2d9a29ad7..a8cf0a7d1 100644
--- a/threejs/tests/webgl/webgl_lights_heimsphere.ts
+++ b/threejs/tests/webgl/webgl_lights_heimsphere.ts
@@ -80,7 +80,7 @@
         // GROUND
 
         var groundGeo = new THREE.PlaneBufferGeometry(10000, 10000);
-        var groundMat = new THREE.MeshPhongMaterial({ ambient: 0xffffff, color: 0xffffff, specular: 0x050505 });
+        var groundMat = new THREE.MeshPhongMaterial({ color: 0xffffff, specular: 0x050505 });
         groundMat.color.setHSL(0.095, 1, 0.75);
 
         var ground = new THREE.Mesh(groundGeo, groundMat);
diff --git a/threejs/tests/webgl/webgl_materials.ts b/threejs/tests/webgl/webgl_materials.ts
index 5da02b84a..9509768a6 100644
--- a/threejs/tests/webgl/webgl_materials.ts
+++ b/threejs/tests/webgl/webgl_materials.ts
@@ -55,20 +55,20 @@
 
         materials.push(new THREE.MeshLambertMaterial({ map: texture, transparent: true }));
         materials.push(new THREE.MeshLambertMaterial({ color: 0xdddddd, shading: THREE.FlatShading }));
-        materials.push(new THREE.MeshPhongMaterial({ ambient: 0x030303, color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading }));
+        materials.push(new THREE.MeshPhongMaterial({ color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading }));
         materials.push(new THREE.MeshNormalMaterial());
         materials.push(new THREE.MeshBasicMaterial({ color: 0xffaa00, transparent: true, blending: THREE.AdditiveBlending }));
         //materials.push( new THREE.MeshBasicMaterial( { color: 0xff0000, blending: THREE.SubtractiveBlending } ) );
 
         materials.push(new THREE.MeshLambertMaterial({ color: 0xdddddd, shading: THREE.SmoothShading }));
-        materials.push(new THREE.MeshPhongMaterial({ ambient: 0x030303, color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading, map: texture, transparent: true }));
+        materials.push(new THREE.MeshPhongMaterial({ color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading, map: texture, transparent: true }));
         materials.push(new THREE.MeshNormalMaterial({ shading: THREE.SmoothShading }));
         materials.push(new THREE.MeshBasicMaterial({ color: 0xffaa00, wireframe: true }));
 
         materials.push(new THREE.MeshDepthMaterial());
 
-        materials.push(new THREE.MeshLambertMaterial({ color: 0x666666, emissive: 0xff0000, ambient: 0x000000, shading: THREE.SmoothShading }));
-        materials.push(new THREE.MeshPhongMaterial({ color: 0x000000, specular: 0x666666, emissive: 0xff0000, ambient: 0x000000, shininess: 10, shading: THREE.SmoothShading, opacity: 0.9, transparent: true }));
+        materials.push(new THREE.MeshLambertMaterial({ color: 0x666666, emissive: 0xff0000, shading: THREE.SmoothShading }));
+        materials.push(new THREE.MeshPhongMaterial({ color: 0x000000, specular: 0x666666, emissive: 0xff0000, shininess: 10, shading: THREE.SmoothShading, opacity: 0.9, transparent: true }));
 
         materials.push(new THREE.MeshBasicMaterial({ map: texture, transparent: true }));
 
diff --git a/threejs/three-canvasrenderer.d.ts b/threejs/three-canvasrenderer.d.ts
index bcfb22684..cb4e610bc 100644
--- a/threejs/three-canvasrenderer.d.ts
+++ b/threejs/three-canvasrenderer.d.ts
@@ -8,7 +8,7 @@
 declare module THREE {
     export interface SpriteCanvasMaterialParameters extends MaterialParameters{
         color?: number;
-
+        program?: (context: any, color: Color) => void;
     }
 
     export class SpriteCanvasMaterial extends Material {
diff --git a/threejs/three.d.ts b/threejs/three.d.ts
index 826d6332f..66601f301 100644
--- a/threejs/three.d.ts
+++ b/threejs/three.d.ts
@@ -3,18 +3,13 @@
 // Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped  
 
-///<reference path="../webaudioapi/waa.d.ts"/>
-
 interface WebGLRenderingContext {}
 
 declare module THREE {
     export var REVISION: string;
 
     // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
-    export enum MOUSE { }
-    export var LEFT: MOUSE;
-    export var MIDDLE: MOUSE;
-    export var RIGHT: MOUSE;
+    export enum MOUSE {LEFT, MIDDLE, RIGHT}
 
     // GL STATE CONSTANTS
     export enum CullFace { }
@@ -2239,8 +2234,35 @@ declare module THREE {
     }
 
     export interface MeshNormalMaterialParameters extends MaterialParameters{
+        /** Line color in hexadecimal. Default is 0xffffff. */
+        color?: number;
+        /** Sets the texture map. Default is null  */
+        map?: Texture;
+        /** Set light map. Default is null. */
+        lightMap?: Texture;
+        /** Set specular map. Default is null. */
+        specularMap?: Texture;
+        /** Set alpha map. Default is null. */
+        alphaMap?: Texture;
+        /** Set env map. Default is null. */
+        envMap?: Texture;
+        /** Define whether the material color is affected by global fog settings. Default is false. */
+        fog?: boolean;
+        /** How the triangles of a curved surface are rendered. Default is THREE.SmoothShading. */
+        shading?: Shading;
+        /** Render geometry as wireframe. Default is false (i.e. render as smooth shaded). */
         wireframe?: boolean;
+        /** Controls wireframe thickness. Default is 1. */
         wireframeLinewidth?: number;
+        /** Define appearance of line ends. Default is 'round'. */
+        wireframeLinecap?: string;
+        /** Define appearance of line joints. Default is 'round'. */
+        wireframeLinejoin?: string;
+        /** Define how the vertices gets colored. Default is THREE.NoColors. */
+        vertexColors?: Colors;
+        /** Define whether the material uses skinning. Default is false. */
+        skinning?: boolean;
+        /** Define whether the material uses morphTargets. Default is false. */
         morphTargets?: boolean;
     }
 
@@ -2254,35 +2276,52 @@ declare module THREE {
         clone(): MeshNormalMaterial;
     }
 
-    export interface MeshPhongMaterialParameters extends MaterialParameters{
-        color?: number; // diffuse
+    export interface MeshPhongMaterialParameters extends MaterialParameters {
+        /** geometry color in hexadecimal. Default is 0xffffff. */
+        color?: number;
+        /** Sets the texture map. Default is null */
+        map?: Texture;
+        /** Set light map. Default is null */
+        lightMap?: Texture;
+        /** Set specular map. Default is null */
+        specularMap?: Texture;
+        /** Set alpha map. Default is null */
+        alphaMap?: Texture;
+        /** Set env map. Default is null */
+        envMap?: Texture;
+        /** Define whether the material color is affected by global fog settings. Default is true */
+        fog?: boolean;
+        /** Define shading type. Default is THREE.SmoothShading */
+        shading?: Shading;
+        /** render geometry as wireframe. Default is false */
+        wireframe?: string;
+        /** Line thickness. Default is 1. */
+        wireframeLinewidth?: number;
+        /** Define appearance of line ends. Default is 'round' */
+        wireframeLinecap?: string;
+        /** Define appearance of line joints. Default is 'round'. */
+        wireframeLinejoin?: string;
+        /** Define how the vertices gets colored. Default is THREE.NoColors. */
+        vertexColors?: Colors;
+        /** Define whether the material uses skinning. Default is false. */
+        skinning?: boolean;
+
+        /** Define whether the material uses morphTargets. Default is false. */
+        morphTargets?: boolean;
+
         emissive?: number;
         specular?: number;
         shininess?: number;
         metal?: boolean;
         wrapAround?: boolean;
         wrapRGB?: Vector3;
-        map?: Texture;
-        lightMap?: Texture;
         bumpMap?: Texture;
         bumpScale?: number;
         normalMap?: Texture;
         normalScale?: Vector2;
-        specularMap?: Texture;
-        alphaMap?: Texture;
-        envMap?: Texture;
         combine?: Combine;
         reflectivity?: number;
         refractionRatio?: number;
-        fog?: boolean;
-        shading?: Shading;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
         morphNormals?: boolean;
     }
 
diff --git a/through/through-tests.ts b/through/through-tests.ts
index 93fc6d2fa..35822c9e8 100644
--- a/through/through-tests.ts
+++ b/through/through-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./through.d.ts" />
+
 import through = require('through');
 
 var i = 0;
@@ -6,4 +8,4 @@ through(
 		this.queue((i++).toString());
 	}, function () {
 		this.queue(null);
-	}, { autoDestroy: true }).pipe(process.stdout);
\ No newline at end of file
+	}, { autoDestroy: true }).pipe(process.stdout);
diff --git a/through/through.d.ts b/through/through.d.ts
index 1491085a2..6e13e4d62 100644
--- a/through/through.d.ts
+++ b/through/through.d.ts
@@ -8,7 +8,7 @@
 declare module "through" {
 	import stream = require("stream");
 
-	function through(write?: (data) => void,
+	function through(write?: (data: any) => void,
 		end?: () => void,
 		opts?: {
 			autoDestroy: boolean;
@@ -21,4 +21,4 @@ declare module "through" {
 	}
 
 	export = through;
-}
\ No newline at end of file
+}
diff --git a/tooltipster/tooltipster-tests.ts b/tooltipster/tooltipster-tests.ts
new file mode 100644
index 000000000..0af2cf4f3
--- /dev/null
+++ b/tooltipster/tooltipster-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="tooltipster.d.ts" />
+
+$(function() {
+	var tooltips = <JQueryTooltipster.ITooltipsterInstance[]>$("#tooltip").tooltipster({
+		content: "hi friend!",
+		delay: 300,
+		functionAfter: (origin) => {
+			console.log("tooltip closed!");
+		},
+		multiple: true
+	});
+	tooltips[0].show();
+	tooltips[0].hide();
+	tooltips[0].destroy();
+});
\ No newline at end of file
diff --git a/tooltipster/tooltipster.d.ts b/tooltipster/tooltipster.d.ts
new file mode 100644
index 000000000..b1c263c16
--- /dev/null
+++ b/tooltipster/tooltipster.d.ts
@@ -0,0 +1,278 @@
+// Type definitions for tooltipster
+// Project: https://github.com/iamceege/tooltipster
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+
+declare module JQueryTooltipster {
+	/**
+	* Tooltipster options @see http://iamceege.github.io/tooltipster/
+	*/
+	export interface ITooltipsterOptions {
+
+		/**
+		 * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file. 
+		 * In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
+		 */
+		animation?: string;
+
+		/**
+		 * Adds the "speech bubble arrow" to the tooltip. Default: true
+		 */
+		arrow?: boolean;
+
+		/**
+		 * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
+		 */
+		arrowColor?: string;
+
+		/**
+		 * If autoClose is set to false, the tooltip will never close unless you call the 'hide' method yourself. Default: true
+		 */
+		autoClose?: boolean;
+
+		/**
+		 * If set, this will override the content of the tooltip. Default: null
+		 */
+		content?: string;
+
+		/**
+		 * If the content of the tooltip is provided as a string, it is displayed as plain text by default. 
+		 * If this content should actually be interpreted as HTML, set this option to true. Default: false
+		 */
+		contentAsHTML?: boolean;
+
+		/**
+		 * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 */
+		contentCloning?: boolean;
+
+		/**
+		 * Tooltipster logs notices into the console when you're doing something you ideally shouldn't be doing. Set to false to disable logging. Default: true
+		 */
+		debug?: boolean;
+
+		/**
+		 * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
+		 */
+		delay?: number;
+
+		/**
+		 * Set a minimum width for the tooltip. Default: 0 (auto width)
+		 */
+		minWidth?: number;
+
+		/**
+		 * Set a maximum width for the tooltip. Default: null (no max width)
+		 */
+		maxWidth?: number;
+
+		/**
+		 * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip.
+		 * @param origin
+		 * @param content
+		 */
+		functionInit?: (origin: JQuery, content: string) => void;
+
+		/**
+		 * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening.
+		 * @param origin
+		 * @param continueTooltip
+		 */
+		functionBefore?: (origin: JQuery, continueTooltip: () => void) => void;
+
+		/**
+		 * Create a custom function to be fired when the tooltip and its contents have been added to the DOM.
+		 * @param origin
+		 * @param tooltip
+		 */
+		functionReady?: (origin: JQuery, tooltip: JQuery) => void;
+
+		/**
+		 * Create a custom function to be fired once the tooltip has been closed and removed from the DOM.
+		 * @param origin
+		 */
+		functionAfter?: (origin: JQuery) => void;
+
+		/**
+		 * If true, the tooltip will close if its origin is clicked. This option only applies when 'trigger' is 'hover' and 'autoClose' is false. Default: false
+		 */
+		hideOnClick?: boolean;
+
+		/**
+		 * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
+		 */
+		icon?: string|JQuery;
+
+		/**
+		 * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 */
+		iconCloning?: boolean;
+
+		/**
+		 * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
+		 */
+		iconDesktop?: boolean;
+
+		/**
+		 * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
+		 */
+		iconTheme?: string;
+
+		/**
+		 * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
+		 */
+		iconTouch?: boolean;
+
+		/**
+		 * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip. 
+		 * Default: false
+		 */
+		interactive?: boolean;
+
+		/**
+		 * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off 
+		 * of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
+		 */
+		interactiveTolerance?: number;
+
+		/**
+		 * Allows you to put multiple tooltips on a single element. Read further instructions down this page. Default: false
+		 */
+		multiple?: boolean;
+
+		/**
+		 * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
+		 */
+		offsetX?: number;
+
+		/**
+		 * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
+		 */
+		offsetY?: number;
+
+		/**
+		 * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
+		 */
+		onlyOne?: boolean;
+
+		/**
+		 * Set the position of the tooltip. Default: 'top'
+		 * Possible values: right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
+		 */
+		position?: string;
+
+		/**
+		 * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
+		 */
+		positionTracker?: boolean;
+
+		/**
+		 * Called after the tooltip has been repositioned by the position tracker (if enabled). 
+		 * Default: A function that will close the tooltip if the trigger is 'hover' and autoClose is false.
+		 */
+		positionTrackerCallback?: Function;
+
+		/**
+		 * Specify if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' method. 
+		 * This attribute may be omitted, or be restored with the value that existed before Tooltipster was initialized, or be restored with the stringified value of the current content. 
+		 * Note: in case of multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. Default: 'current'
+		 *
+		 * Possible values: 'none', 'previous' or 'current'
+		 */
+		restoration?: string;
+
+		/**
+		 * Set the speed of the animation. Default: 350
+		 */
+		speed?: number;
+
+		/**
+		 * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
+		 */
+		timer?: number;
+
+		/**
+		 * Set the theme (CSS class) used for your tooltip. Default: 'tooltipster-default'
+		 */
+		theme?: string;
+
+		/**
+		 * 
+		 * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method. 
+		 * Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
+		 */
+		touchDevices?: boolean;
+
+		/**
+		 * Set how tooltips should be activated and closed.
+		 * Possible values: hover, click or custom.
+		 */
+		trigger?: string;
+
+		/**
+		 * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
+		 */
+		updateAnimation?: boolean;
+	}
+
+	/**
+	* Tooltipster tooltip instance object.
+	*/
+	export interface ITooltipsterInstance {
+
+		/**
+		 * Updates the content of the tooltip.
+		 * @param value 
+		 * @returns {} 
+		 */
+		content(value: string): JQuery;
+
+		/**
+		 * Shows the tooltip.
+		 */
+		show(): void;
+
+		/**
+		 * Hides the tooltip (this will aslo causo it to be removed from the DOM, not simply hides it), however leaving the listeners.
+		 */
+		hide(): void;
+
+		/**
+		 * Disables the tooltip, causing it to not show unless its re-enabled.
+		 */
+		disable(): void;
+
+		/**
+		 * Enables the tooltip.
+		 */
+		enable(): void;
+
+		/**
+		 * Destroy the tooltip and its listeners.
+		 */
+		destroy(): void;
+		
+		/**
+		 * Reposition and resize the tooltip.
+		 */
+		reposition(): void;
+
+		/**
+		 * Returns the root element of the tooltip.
+		 */
+		elementTooltip(): JQuery;
+
+		/**
+		 * Returns the root element of the icon if there is one, otherwise 'undefined'.
+		 */
+		elementIcon(): JQuery;
+	}
+}
+
+
+interface JQuery {
+	tooltipster(options?: JQueryTooltipster.ITooltipsterOptions): JQuery|JQueryTooltipster.ITooltipsterInstance[];
+}
\ No newline at end of file
diff --git a/tspromise/tspromise-tests.ts b/tspromise/tspromise-tests.ts
index fcb52212a..e1ce0c1d5 100644
--- a/tspromise/tspromise-tests.ts
+++ b/tspromise/tspromise-tests.ts
@@ -4,7 +4,7 @@ import Promise = require('tspromise');
 
 var MyFuncFunc = Promise.async((a: boolean, b: number) => {
 	console.log('[a] ' + a);
-	yield(Promise.waitAsync(1000));
+	// NOTE( https://github.com/borisyankov/DefinitelyTyped/pull/5590 ) yield(Promise.waitAsync(1000));
 	console.log('[b]' + b);
 });
 
@@ -18,4 +18,4 @@ Promise.all([Promise.waitAsync(10), Promise.waitAsync(20)]).then(() => {
 	throw (new Error());
 }).catch((e) => {
 	console.log(e.message);
-});
\ No newline at end of file
+});
diff --git a/tv4/tv4-1.2.4-tests.ts b/tv4/tv4-1.2.4-tests.ts
new file mode 100644
index 000000000..d899be50f
--- /dev/null
+++ b/tv4/tv4-1.2.4-tests.ts
@@ -0,0 +1,43 @@
+///<reference path="tv4-1.2.4.d.ts" />
+
+var str:string;
+var strArr:string[];
+var bool:boolean;
+var num:number;
+var obj:any;
+var tv4:TV4;
+var err:TV4Error;
+var errs:TV4Error[];
+var single:TV4SingleResult;
+var multi:TV4MultiResult;
+
+single = tv4.validateResult(obj, obj);
+bool = single.valid;
+strArr = single.missing;
+err = single.error;
+
+num = err.code;
+str = err.message;
+str = err.dataPath;
+str = err.schemaPath;
+
+multi = tv4.validateMultiple(obj, obj);
+bool = multi.valid;
+strArr = multi.missing;
+errs = multi.errors;
+
+bool = tv4.addSchema(str, obj);
+obj = tv4.getSchema(str);
+obj = tv4.normSchema(str, str);
+str = tv4.resolveUrl(str, str);
+
+tv4 = tv4.freshApi();
+tv4.dropSchemas();
+tv4.reset();
+
+strArr = tv4.getMissingUris(/abc/);
+strArr = tv4.getSchemaUris(/abc/);
+obj = tv4.getSchemaMap()[str];
+num = tv4.errorCodes['bla'];
+
+num = tv4.errorCodes['MY_NAME'];
diff --git a/tv4/tv4-1.2.4.d.ts b/tv4/tv4-1.2.4.d.ts
new file mode 100644
index 000000000..02b7ebba2
--- /dev/null
+++ b/tv4/tv4-1.2.4.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for Tiny Validator tv4 1.0.6
+// Project: https://github.com/geraintluff/tv4
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface TV4ErrorCodes {
+	[key:string]:number;
+}
+interface TV4Error {
+	code:number;
+	message:string;
+	dataPath:string;
+	schemaPath:string;
+}
+interface TV4SchemaMap {
+	[uri:string]:any;
+}
+interface TV4BaseResult {
+	missing:string[];
+	valid:boolean;
+}
+interface TV4SingleResult extends TV4BaseResult {
+	error:TV4Error;
+}
+interface TV4MultiResult extends TV4BaseResult {
+	errors:TV4Error[];
+}
+interface TV4 {
+	validateResult(data:any, schema:any):TV4SingleResult;
+	validateMultiple(data:any, schema:any):TV4MultiResult;
+
+	addSchema(uri:string, schema:any):boolean;
+	getSchema(uri:string):any;
+	normSchema(schema:any, baseUri:string):any;
+	resolveUrl(base:string, href:string):string;
+	freshApi():TV4;
+	dropSchemas():void;
+	reset():void;
+
+	getMissingUris(exp?:RegExp):string[];
+	getSchemaUris(exp?:RegExp):string[];
+	getSchemaMap():TV4SchemaMap;
+	errorCodes:TV4ErrorCodes;
+}
+declare module "tv4" {
+	var tv4: TV4
+	export = tv4;
+}
diff --git a/tv4/tv4-tests.ts b/tv4/tv4-tests.ts
index 2768d9f5f..84a4ee328 100644
--- a/tv4/tv4-tests.ts
+++ b/tv4/tv4-tests.ts
@@ -5,13 +5,13 @@ var strArr:string[];
 var bool:boolean;
 var num:number;
 var obj:any;
-var tv4:TV4;
-var err:TV4Error;
-var errs:TV4Error[];
-var single:TV4SingleResult;
-var multi:TV4MultiResult;
+var validator: tv4.TV4;
+var err:tv4.ValidationError;
+var errs:tv4.ValidationError[];
+var single:tv4.SingleResult;
+var multi:tv4.MultiResult;
 
-single = tv4.validateResult(obj, obj);
+single = validator.validateResult(obj, obj);
 bool = single.valid;
 strArr = single.missing;
 err = single.error;
@@ -21,23 +21,154 @@ str = err.message;
 str = err.dataPath;
 str = err.schemaPath;
 
-multi = tv4.validateMultiple(obj, obj);
+multi = validator.validateMultiple(obj, obj);
 bool = multi.valid;
 strArr = multi.missing;
 errs = multi.errors;
 
-bool = tv4.addSchema(str, obj);
-obj = tv4.getSchema(str);
-obj = tv4.normSchema(str, str);
-str = tv4.resolveUrl(str, str);
+validator.addSchema(str, obj);
+obj = validator.getSchema(str);
+str = validator.resolveUrl(str, str);
+
+validator = validator.freshApi();
+validator.dropSchemas();
+validator.reset();
+
+strArr = validator.getMissingUris(/abc/);
+strArr = validator.getSchemaUris(/abc/);
+obj = validator.getSchemaMap()[str];
+num = validator.errorCodes['bla'];
+
+num = validator.errorCodes['MY_NAME'];
+
+
+// Here are all the examples from the v1.2.3 documentation at https://www.npmjs.com/package/validator
+var data = '';
+var schema : tv4.JsonSchema = {type: "string"}
+var valid = validator.validate(data, schema);
+var url = 'http://example.com/schema';
+validator.addSchema(url, schema);
+var singleErrorResult = validator.validateResult(data, schema);
+var multiErrorResult = validator.validateMultiple(data, schema);
+// async
+validator.validate(data, schema, function (isValid, validationError) {});
+
+// checkRecursive
+var a : tv4.JsonSchema = {};
+var b = { a: a };
+a['b'] = b;
+var aSchema : tv4.JsonSchema = { properties: { b: { $ref: 'bSchema' }}};
+var bSchema : tv4.JsonSchema = { properties: { a: { $ref: 'aSchema' }}};
+validator.addSchema('aSchema', aSchema);
+validator.addSchema('bSchema', bSchema);
+validator.validate(a, aSchema, true);
+validator.validateResult(data, aSchema, true);
+validator.validateMultiple(data, aSchema, true);
+
+
+// banUnknownProperties
+var checkRecursive = true;
+validator.validate(data, schema, checkRecursive, true);
+validator.validateResult(data, schema, checkRecursive, true);
+validator.validateMultiple(data, schema, checkRecursive, true);
+
+// API
+validator.addSchema('http://example.com/schema', {});
+validator.addSchema({});
+var schema = validator.getSchema('http://example.com/schema');
+var map = validator.getSchemaMap();
+var schema = map[uri];
+var arr = validator.getSchemaUris();
+// optional filter using a RegExp
+arr = validator.getSchemaUris(/^https?:\/\/example.com/);
+var arr = validator.getMissingUris();
+// optional filter using a RegExp
+var arr = validator.getMissingUris(/^https?:\/\/example.com/);
+validator.dropSchemas();
+var other_tv4 = validator.freshApi();
+validator.reset();
+validator.setErrorReporter(function (error, data, schema) {
+    return "Error code: " + error.code;
+});
+validator.language('en-gb');
+validator.addLanguage('fr', {});
+validator.language('fr')
+validator.addFormat('decimal-digits', function (data, schema) {
+    if (typeof data === 'string' && !/^[0-9]+$/.test(data)) {
+        return null;
+    }
+    return "must be string of decimal digits";
+});
+validator.addFormat({
+    'my-format': function (data: any, schema: any): string {return null;},
+    'other-format': function (data: any, schema: any): string {return 'oops';}
+});
+function simpleFailure() {return true;}
+function detailedFailure() {return true;}
+validator.defineKeyword('my-custom-keyword', function (data, value, schema) {
+    if (simpleFailure()) {
+        return "Failure";
+    } else if (detailedFailure()) {
+        return {code: validator.errorCodes['MY_CUSTOM_CODE'], message: {param1: 'a', param2: 'b'}};
+    } else {
+        return null;
+    }
+});
+
+
+// Demos
+schema = {
+    "items": {
+        "type": "boolean"
+    }
+};
+{
+    let data1 = [true, false];
+    let data2 = [true, 123];
+    alert("data 1: " + validator.validate(data1, schema)); // true
+    alert("data 2: " + validator.validate(data2, schema)); // false
+    alert("data 2 error: " + JSON.stringify(validator.error, null, 4));
+
+    schema = {
+        "type": "array",
+        "items": {"$ref": "#"}
+    };
+}
+{
+let data1 : any = [[], [[]]];
+let data2 : any = [[], [true, []]];
+alert("data 1: " + validator.validate(data1, schema)); // true
+alert("data 2: " + validator.validate(data2, schema)); // false
+}
+
+{
+    schema = {
+        "type": "array",
+        "items": {"$ref": "http://example.com/schema" }
+    };
+    let data = [1, 2, 3];
+    alert("Valid: " + validator.validate(data, schema)); // true
+    alert("Missing schemas: " + JSON.stringify(validator.missing));
+}
+{
+    validator.addSchema("http://example.com/schema", {
+        "definitions": {
+            "arrayItem": {"type": "boolean"}
+        }
+    });
+    let schema : tv4.JsonSchema = {
+        "type": "array",
+        "items": {"$ref": "http://example.com/schema#/definitions/arrayItem" }
+    };
+    let data1 : any = [true, false, true];
+    let data2 : any = [1, 2, 3];
+    alert("data 1: " + validator.validate(data1, schema)); // true
+    alert("data 2: " + validator.validate(data2, schema)); // false
+}
+
+// undocumented functions
+var uri = '';
+obj = validator.normSchema(schema, uri);
 
-tv4 = tv4.freshApi();
-tv4.dropSchemas();
-tv4.reset();
 
-strArr = tv4.getMissingUris(/abc/);
-strArr = tv4.getSchemaUris(/abc/);
-obj = tv4.getSchemaMap()[str];
-num = tv4.errorCodes['bla'];
 
-num = tv4.errorCodes['MY_NAME'];
diff --git a/tv4/tv4.d.ts b/tv4/tv4.d.ts
index 02b7ebba2..5e762155a 100644
--- a/tv4/tv4.d.ts
+++ b/tv4/tv4.d.ts
@@ -1,48 +1,103 @@
-// Type definitions for Tiny Validator tv4 1.0.6
+// Type definitions for Tiny Validator tv4 1.2.5
 // Project: https://github.com/geraintluff/tv4
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Peter Snider <https://github.com/psnider>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-interface TV4ErrorCodes {
-	[key:string]:number;
-}
-interface TV4Error {
-	code:number;
-	message:string;
-	dataPath:string;
-	schemaPath:string;
-}
-interface TV4SchemaMap {
-	[uri:string]:any;
-}
-interface TV4BaseResult {
-	missing:string[];
-	valid:boolean;
-}
-interface TV4SingleResult extends TV4BaseResult {
-	error:TV4Error;
-}
-interface TV4MultiResult extends TV4BaseResult {
-	errors:TV4Error[];
-}
-interface TV4 {
-	validateResult(data:any, schema:any):TV4SingleResult;
-	validateMultiple(data:any, schema:any):TV4MultiResult;
+declare module tv4 {
+    
+    // Note that every top-level property is optional in json-schema
+    export interface JsonSchema {
+        [key: string]: any;
+        title?: string;          // used for humans only, and not used for computation
+        description?: string;    // used for humans only, and not used for computation
+        id?: string;
+        $schema?: string;
+        type?: string;
+        items?: any;
+        properties?: any;
+        patternProperties?: any; 
+        additionalProperties?: boolean;
+        required?: string[];
+        definitions?: any;
+        default?: any;
+    }
 
-	addSchema(uri:string, schema:any):boolean;
-	getSchema(uri:string):any;
-	normSchema(schema:any, baseUri:string):any;
-	resolveUrl(base:string, href:string):string;
-	freshApi():TV4;
-	dropSchemas():void;
-	reset():void;
+    export type SchemaMap = {[uri: string]: JsonSchema;};
+    // maps error codes/names to human readable error description for a single language
+    export type ErrorMap  = {[errorCode: string]: string;};
 
-	getMissingUris(exp?:RegExp):string[];
-	getSchemaUris(exp?:RegExp):string[];
-	getSchemaMap():TV4SchemaMap;
-	errorCodes:TV4ErrorCodes;
+
+    export interface ErrorCodes {
+        [key:string]:number;
+    }
+    export interface ValidationError {
+        code:number;
+        message:any;
+        dataPath?:string;
+        schemaPath?:string;
+        subErrors?: ValidationError[];
+    }
+    export interface ErrorVar extends ValidationError {
+        params: any;
+        subErrors: any;
+        stack: string;
+    }
+    export interface BaseResult {
+        missing:string[];
+        valid:boolean;
+    }
+    export interface SingleResult extends BaseResult {
+        error:ValidationError;
+    }
+    export interface MultiResult extends BaseResult {
+        errors:ValidationError[];
+    }
+    export type FormatValidationFunction = (data: any, schema: JsonSchema) => string;
+    // documentation doesnt agree with code in tv4, this type agrees with code
+    export type KeywordValidationFunction = (data: any, value: any, schema: JsonSchema, dataPointerPath: string) => string | ValidationError;
+    export type AsyncValidationCallback = (isValid: boolean, error: ValidationError) => void;
+    export interface TV4 {
+        error: ErrorVar;
+        missing: string[];
+        // primary API
+        validate(data: any, schema: JsonSchema, checkRecursive?: boolean): boolean;
+        validate(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): boolean;
+        validateResult(data: any, schema: JsonSchema, checkRecursive?: boolean): SingleResult;
+        validateResult(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): SingleResult;
+        validateMultiple(data: any, schema: JsonSchema, checkRecursive?: boolean): MultiResult;
+        validateMultiple(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): MultiResult;
+        // from including: tv4.async-jquery.js
+        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive?: boolean): void;
+        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive: boolean, banUnknownProperties: boolean): void;
+
+        // additional API for more complex cases
+        addSchema(schema: JsonSchema): void;
+        addSchema(uri:string, schema: JsonSchema): void;
+        getSchema(uri:string): JsonSchema;
+        getSchemaMap(): SchemaMap;
+        getSchemaUris(filter?: RegExp): string[];
+        getMissingUris(filter?: RegExp): string[];
+        dropSchemas(): void;
+        freshApi(): TV4;
+        reset(): void;
+        setErrorReporter(lang: string): void;
+        setErrorReporter(reporter: (error: ValidationError, data: any, schema: JsonSchema) => string): void;
+        language(code: string): void;
+        addLanguage(code: string, map: ErrorMap): void;
+        addFormat(format: string, validationFunction: FormatValidationFunction): void;
+        addFormat(formats: {[formatName: string]: FormatValidationFunction;}): void;
+        defineKeyword(keyword: string, validationFunction: KeywordValidationFunction): void;
+        defineError(codeName: string, codeNumber: number, defaultMessage: string): void;
+
+        // not documented
+        normSchema(schema: JsonSchema, baseUri:string):any;
+        resolveUrl(base:string, href:string):string;
+
+        errorCodes:ErrorCodes;
+    }
 }
+
 declare module "tv4" {
-	var tv4: TV4
-	export = tv4;
+    var out: tv4.TV4
+    export = out;
 }
diff --git a/typeahead/typeahead.d.ts b/typeahead/typeahead.d.ts
index 159caaacd..7317aa4c7 100644
--- a/typeahead/typeahead.d.ts
+++ b/typeahead/typeahead.d.ts
@@ -119,8 +119,8 @@ declare module Twitter.Typeahead {
          * For a given suggestion object, determines the string representation of it.
          * This will be used when setting the value of the input control after a suggestion is selected. Can be either a key string or a function that transforms a suggestion object into a string.
          * Defaults to value.
-          */
-        displayKey?: string;
+         */
+        displayKey?: string | ((obj: any) => string);
 
         /**
          * A hash of templates to be used when rendering the dataset.
diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index 21d42c021..95c81298a 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -1,20 +1,26 @@
 /// <reference path="ui-grid.d.ts" />
 /// <reference path="../angularjs/angular.d.ts" />
 
-var columnDef: uiGrid.IColumnDef;
+interface IMyEntity {
+    name: string;
+    age: number;
+}
+
+var columnDef: uiGrid.IColumnDefOf<IMyEntity>;
 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.cellClass = (gridRow, gridCol, index) => {
+    //types of gridRow, gridCol, and index are flowed in correctly
+    return `${gridRow.entity.name}-${gridCol.field}-${index + 1}`;
 };
 columnDef.cellFilter = 'date';
 columnDef.cellTemplate = '<div blah="something">hello</div>';
 columnDef.cellTooltip = 'blah';
 columnDef.cellTooltip = function (gridRow: uiGrid.IGridRow, gridCol: uiGrid.IGridColumn) {
-    return 'blah';
+    return `${gridRow.entity.unknownProperty}-${gridCol.displayName}`;
 };
 columnDef.displayName = 'Jumper';
 columnDef.enableColumnMenu = false;
@@ -38,24 +44,26 @@ columnDef.filter = {
 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 = (gridRow, rowRenderIndex, gridCol, colRenderIndex) => {
+        //types for gridRow, rowRenderIndex, gridCol, and colRenderIndex flow in properly
+        return `${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
     };
 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';
+    (gridRow, rowRenderIndex, gridCol, colRenderIndex) => {
+        //types for gridRow, rowRenderIndex, gridCol, and colRenderIndex flow in properly
+        return `${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
     };
 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.headerTooltip = (col) => {
+    //type of col flows in properly
+    return col.displayName;
 };
 columnDef.maxWidth = 200;
 columnDef.menuItems = [{
@@ -87,10 +95,10 @@ columnDef.width = 100;
 columnDef.width = '*';
 
 
-var gridApi: uiGrid.IGridApi;
-var gridInstance: uiGrid.IGridInstance;
+var gridApi: uiGrid.IGridApiOf<IMyEntity>;
+var gridInstance: uiGrid.IGridInstanceOf<IMyEntity>;
 var menuItem: uiGrid.IMenuItem;
-var colProcessor: uiGrid.IColumnProcessor;
+var colProcessor: uiGrid.IColumnProcessor<IMyEntity>;
 
 gridApi.core.clearAllFilters(true);
 gridApi.core.addToGridMenu(gridInstance, [menuItem]);
@@ -100,3 +108,25 @@ gridApi.core.queueGridRefresh()
 gridApi.core.queueRefresh();
 gridApi.core.registerColumnsProcessor(colProcessor, 100);
 
+var gridOptions: uiGrid.IGridOptionsOf<IMyEntity> = {
+    data: [{name: 'Bob', age: 100}],
+    onRegisterApi: (api) => {
+        api.selection.on.rowSelectionChanged(null, (row) => {
+            console.log(row.entity.name);
+        })
+    }
+}
+interface IAnotherEntity {
+    anObject: string
+}
+var anotherGridInstance: uiGrid.IGridInstance;
+var rowEntityToScrollTo = {
+    anObject: 'inGridOptionsData'
+};
+var columnDefToScrollTo: uiGrid.IColumnDef;
+anotherGridInstance.scrollTo();
+anotherGridInstance.scrollTo(rowEntityToScrollTo);
+anotherGridInstance.scrollTo(rowEntityToScrollTo, columnDefToScrollTo);
+
+var selectedRowEntities: Array<IMyEntity> = gridApi.selection.getSelectedRows();
+var selectedGridRows: Array<uiGrid.IGridRow> = gridApi.selection.getSelectedGridRows();
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index 981f363b2..481326b13 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -1,18 +1,23 @@
 // Type definitions for ui-grid
 // Project: http://www.ui-grid.info/
-// Definitions by: Ben Tesser <https://github.com/btesser>
+// Definitions by: Ben Tesser <https://github.com/btesser>, Joe Skeen <http://github.com/joeskeen>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 // These are very definitely preliminary. Please feel free to improve.
 
 // Changelog:
+// 8/11/2015 ui-grid  v3.0.3
+//   Extensive plugin support added (Plugin specific API, ColumnDef, GridOptions, GridRow, Constants).
+//   Added docs for all existing interfaces.
+//   Fixed a few incorrect interfaces, updated interfaces to reflect latest version.
+//   Did some cleanup... Moved all plugins into their own modules
 // 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='../jquery/jquery.d.ts' />
 /// <reference path='../angularjs/angular.d.ts' />
 
 declare module uiGrid {
-    export interface UIGridConstants {
+    export interface IUiGridConstants {
         LOG_DEBUG_MESSAGES: boolean;
         LOG_WARN_MESSAGES: boolean;
         LOG_ERROR_MESSAGES: boolean;
@@ -115,216 +120,3108 @@ declare module uiGrid {
             ALWAYS: number;
         }
     }
-    export interface IGridInstance {
-        appScope?: ng.IScope;
-        columnFooterHeight?: number;
-        footerHeight?: number;
-        isScrollingHorizontally?: boolean;
-        isScrollingVertically?: boolean;
-        scrollDirection?: number;
-        addRowHeaderColumn(column: IGridColumn): void;
+    export type IGridInstance = IGridInstanceOf<any>;
+    export interface IGridInstanceOf<TEntity> {
+        /**
+         * adds a row header column to the grid
+         * @param {IColumnDef} colDef The column definition
+         */
+        addRowHeaderColumn(colDef: IColumnDefOf<TEntity>): void;
+        /**
+         * uses the first row of data to assign colDef.type for any types not defined.
+         */
         assignTypes(): void;
-        buildColumnDefsFromData(rowBuilder: IRowBuilder): void;
+        /**
+         * Populates columnDefs from the provided data
+         * @param {IRowBuilder} rowBuilder function to be called
+         */
+        buildColumnDefsFromData(rowBuilder: IRowBuilder<TEntity>): void;
+        /**
+         * creates GridColumn objects from the columnDefinition.
+         * Calls each registered columnBuilder to further process the column
+         * @param {IBuildColumnsOptions} options An object containing options to use when building columns
+         *        * orderByColumnDefs: defaults to false.  When true, buildColumns will order existing columns
+         *        according to the order within the column definitions
+         * @returns {ng.IPromise} A promise to load any needed column resources
+         */
         buildColumns(options: IBuildColumnsOptions): ng.IPromise<any>;
+        /**
+         * calls each styleComputation function
+         */
         buildStyles(): void;
+        /**
+         * Calls the callbacks based on the type of data change that has occurred.
+         * Always calls the ALL callbacks, calls the ROW, EDIT, COLUMN and OPTIONS callbacks
+         * if the event type is matching, or if the type is ALL.
+         * @param {number} type the type of event that occurred - one of the uiGridConstants.dataChange values
+         *        (ALL, ROW, EDIT, COLUMN, OPTIONS
+         */
         callDataChangeCallbacks(type: number): void;
-        clearAllFilters(refreshRows: boolean, clearConditions: boolean, clearFlags: boolean): void;
+        /**
+         * Clears all filters and optionally refreshes the visible rows.
+         * @param {boolean} [refreshRows=true] Refresh the rows?
+         * @param {boolean} [clearConditions=true] Clear conditions?
+         * @param {boolean} [clearFlags=true] Clear flags?
+         * @returns {ng.IPromise<any>} If refreshRows is true, returns a promise of the rows refreshing
+         */
+        clearAllFilters(refreshRows: boolean, clearConditions: boolean,
+            clearFlags: boolean): ng.IPromise<any>;
+        /**
+         * refreshes the grid when a column refresh is notified, which triggers handling of the visible flag.
+         * This is called on uiGridConstants.dataChange.COLUMN, and is registered as a dataChangeCallback in grid.js
+         * @param {string} name column name
+         */
         columnRefreshCallback(name: string): void;
+        /**
+         * creates the left render container if it doesn't already exist
+         */
         createLeftContainer(): void;
+        /**
+         * creates the right render container if it doesn't already exist
+         */
         createRightContainer(): void;
+        /**
+         * sets isScrollingHorizontally to true and sets it to false in a debounced function
+         */
         flagScrollingHorizontally(): void;
+        /**
+         * sets isScrollingVertically to true and sets it to false in a debounced function
+         */
         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;
+        /**
+         * Gets the displayed value of a cell after applying any the cellFilter
+         * @param {IGridRow} row Row to access
+         * @param {IGridColumn} col Column to access
+         * @returns {string} Cell display value
+         */
+        getCellDisplayValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): string;
+        /**
+         * Gets the displayed value of a cell
+         * @param {IGridRow} row Row to access
+         * @param {IGridColumn} col Column to access
+         * @returns {any} Cell value
+         */
+        getCellValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): any;
+        /**
+         * returns a grid colDef for the column name
+         * @param {string} name Column name
+         * @returns {IColumnDef} The column definition
+         */
+        getColDef(name: string): IColumnDefOf<TEntity>;
+        /**
+         * returns a grid column by name
+         * @param {string} name Column name
+         * @returns {IGridColumn} The column
+         */
+        getColumn(name: string): IGridColumnOf<TEntity>;
+        /**
+         * Return the columns that the grid is currently being sorted by
+         * @returns {Array<IGridColumn>} the columns that the grid is currently being sorted by
+         */
+        getColumnSorting(): Array<IGridColumnOf<TEntity>>;
+        /**
+         * Returns the $parse-able accessor for a column within its $scope
+         * @param {IGridColumn} col Column object
+         * @returns {string} $parse-able accessor for a column within its $scope
+         */
+        getGridQualifiedColField(col: IGridColumnOf<TEntity>): string;
+        /**
+         * returns all columns except for rowHeader columns
+         * @returns {Array<IGridColumn>} All data columns
+         */
+        getOnlyDataColumns(): Array<IGridColumnOf<TEntity>>;
+        /**
+         * returns the GridRow that contains the rowEntity
+         * @param {TEntity} rowEntity the gridOptionms.data array element instance
+         * @param {Array<IGridRow>} rows The rows to look in.  if not provided then it looks in grid.rows
+         */
+        getRow(rowEntity: TEntity, rows?: Array<IGridRowOf<TEntity>>): IGridRowOf<TEntity>;
+        /**
+         * Triggered when the browser window resizes; automatically resizes the grid
+         * @param {ng.IAngularEvent} $event Resize event
+         */
+        handleWindowResize($event: ng.IAngularEvent): void;
+        /**
+         * returns true if leftContainer exists
+         * @returns {boolean} container exists?
+         */
         hasLeftContainer(): boolean;
+        /**
+         * returns true if rightContainer exists
+         * @returns {boolean} container exists?
+         */
         hasRightContainer(): boolean;
+        /**
+         * returns true if leftContainer has columns
+         * @returns {boolean} container has columns
+         */
         hasLeftContainerColumns(): boolean;
+        /**
+         * returns true if rightContainer has columns
+         * @returns {boolean} container has columns
+         */
         hasRightContainerColumns(): boolean;
+        /**
+         * Is grid right to left
+         * @returns {boolean} true if grid is RTL
+         */
         isRTL(): boolean;
-        isRowHeaderColumn(col: IGridColumn): boolean;
-        modifyRows(): void;
+        /**
+         * Checks if column is a row header
+         * @param {IGridColumn} column The column
+         * @returns {boolean} true if the column is a row header
+         */
+        isRowHeaderColumn(column: IGridColumnOf<TEntity>): boolean;
+        /**
+         * creates or removes GridRow objects from the newRawData array.  Calls each registered
+         * rowBuilder to further process the row
+         *
+         * This method aims to achieve three things:
+         * 1. the resulting rows array is in the same order as the newRawData, we'll call
+         * rowsProcessors immediately after to sort the data anyway
+         * 2. if we have row hashing available, we try to use the rowHash to find the row
+         * 3. no memory leaks - rows that are no longer in newRawData need to be garbage collected
+         *
+         * The basic logic flow makes use of the newRawData, oldRows and oldHash, and creates
+         * the newRows and newHash
+         *
+         * Rows are identified using the hashKey if configured.  If not configured, then rows
+         * are identified using the gridOptions.rowEquality function
+         * @param {Array<TEntity>} newRawData The new grid data
+         * @return {ng.IPromise<any>} Promise which resolves when the rows have been created or removed
+         */
+        modifyRows(newRawData: Array<TEntity>): ng.IPromise<any>;
+        /**
+         * Notify the grid that a data or config change has occurred,
+         * where that change isn't something the grid was otherwise noticing.  This
+         * might be particularly relevant where you've changed values within the data
+         * and you'd like cell classes to be re-evaluated, or changed config within
+         * the columnDef and you'd like headerCellClasses to be re-evaluated.
+         * @param {string} type one of the uiGridConstants.dataChange values [ALL, ROW, EDIT, COLUMN], which tells
+         * us which refreshes to fire
+         */
         notifyDataChange(type: string): void;
+        /**
+         * precompiles all cell templates
+         */
         precompileCellTemplates(): void;
-        processRowBuilders(gridRow: IGridRow): IGridRow;
+        /**
+         * processes all RowBuilders for the gridRow
+         * @param {IGridRow} gridRow reference to gridRow
+         * @returns {IGridRow} the gridRow with all additional behavior added
+         */
+        processRowBuilders(gridRow: IGridRowOf<TEntity>): IGridRowOf<TEntity>;
+        /**
+         * calls the row processors, specifically
+         * intended to reset the sorting when an edit is called,
+         * registered as a dataChangeCallback on uiGridConstants.dataChange.EDIT
+         * @param {string} name column name
+         */
         processRowsCallback(name: string): void;
+        /**
+         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
+         */
         queueGridRefresh(): void;
+        /**
+         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
+         */
         queueRefresh(): void;
+        /**
+         * Redraw the rows and columns based on our current scroll position
+         * @param {boolean} [rowsAdded] Optional to indicate rows are added and the scroll percentage must be
+         *        recalculated
+         */
         redrawCanvas(rowsAdded?: boolean): void;
+        /**
+         * Refresh the rendered grid on screen.
+         * The refresh method re-runs both the columnProcessors and the
+         * rowProcessors, as well as calling refreshCanvas to update all
+         * the grid sizing.  In general you should prefer to use queueGridRefresh
+         * instead, which is basically a debounced version of refresh.
+         *
+         * If you only want to resize the grid, not regenerate all the rows
+         * and columns, you should consider directly calling refreshCanvas instead.
+         * @param {boolean} rowsAltered Optional flag for refreshing when the number of rows has changed
+         */
         refresh(rowsAltered?: boolean): void;
+        /**
+         * Builds all styles and recalculates much of the grid sizing
+         * @param {boolean} buildStyles optional parameter.  Use TBD
+         * @returns {ng.IPromise<any>} promise that is resolved when the canvas
+         *          has been refreshed
+         */
         refreshCanvas(buildStyles?: boolean): ng.IPromise<any>;
+        /**
+         * Refresh the rendered rows on screen?  Note: not functional at present
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
         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;
+        /**
+         * When the build creates columns from column definitions, the columnbuilders will be called to add
+         * additional properties to the column.
+         * @param {IColumnBuilder} columnBuilder function to be called
+         */
+        registerColumnBuilder(columnBuilder: IColumnBuilder<TEntity>): void;
+        /**
+         * Register a "columns processor" function. When the columns are updated,
+         * the grid calls each registered "columns processor", which has a chance
+         * to alter the set of columns, as long as the count is not modified.
+         * @param {IColumnProcessor} columnProcessor column processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and
+         *        which must return an updated renderedColumnsToProcess which can be passed to the next processor
+         *        in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         * for other people to inject columns processors at intermediate priorities.
+         * Lower priority columnsProcessors run earlier.priority
+         */
+        registerColumnsProcessor(columnProcessor: IColumnProcessor<TEntity>, priority: number): void;
+        /**
+         * When a data change occurs, the data change callbacks of the specified type
+         * will be called.  The rules are:
+         *
+         * - when the data watch fires, that is considered a ROW change (the data watch only notices
+         *   added or removed rows)
+         * - when the api is called to inform us of a change, the declared type of that change is used
+         * - when a cell edit completes, the EDIT callbacks are triggered
+         * - when the columnDef watch fires, the COLUMN callbacks are triggered
+         * - when the options watch fires, the OPTIONS callbacks are triggered
+         *
+         * For a given event:
+         * - ALL calls ROW, EDIT, COLUMN, OPTIONS and ALL callbacks
+         * - ROW calls ROW and ALL callbacks
+         * - EDIT calls EDIT and ALL callbacks
+         * - COLUMN calls COLUMN and ALL callbacks
+         * - OPTIONS calls OPTIONS and ALL callbacks
+         *
+         * @param {(grid: IGridInstance) => void} callback function to be called
+         * @param {Array<string>} types the types of data change you want to be informed of.  Values from
+         * the uiGridConstants.dataChange values ( ALL, EDIT, ROW, COLUMN, OPTIONS ).  Optional and defaults to
+         * ALL
+         * @returns {Function} deregister function - a function that can be called to deregister this callback
+         */
+        registerDataChangeCallback(callback: (grid: IGridInstanceOf<TEntity>) => void, types: Array<string>): Function;
+        /**
+         * When the build creates rows from gridOptions.data, the rowBuilders will be called to add
+         * additional properties to the row.
+         * @param {IRowBuilder} rowBuilder Function to be called
+         */
+        registerRowBuilder(rowBuilder: IRowBuilder<TEntity>): void;
+        /**
+         * Register a "rows processor" function. When the rows are updated,
+         * the grid calls each registered "rows processor", which has a chance
+         * to alter the set of rows (sorting, etc) as long as the count is not
+         * modified.
+         *
+         * @param {IRowProcessor} rowProcessor rows processor function, which
+         * is run in the context of the grid (i.e. this for the function will be the grid), and must
+         * return the updated rows list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.
+         *        In general we try to do them in 100s to leave room for other people to inject rows processors at
+         *        intermediate priorities.  Lower priority rowsProcessors run earlier. At present all rows visible
+         *        is running at 50, filter is running at 100, sort is at 200, grouping at 400, selectable rows at
+         *        500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
+        /**
+         * registered a styleComputation function
+         *
+         * If the function returns a value it will be appended into the grid's `<style>` block
+         * @param {IStyleComputation} styleComputation function
+         */
         registerStyleComputation(styleComputation: ($scope: ng.IScope) => string): void;
-        removeRowsProcessor(rows: IRowProcessor): void;
-        resetColumnSorting(excludedColumn: IGridColumn): void;
-        scrollTo(rowEntity: IGridRow, colDef: IColumnDef): ng.IPromise<any>;
-        scrollToIfNecessary(gridRow: IGridRow, gridCol: IGridColumn): ng.IPromise<any>;
-        sortColumn(column: IGridColumn, direction?: string, add?: boolean): ng.IPromise<IGridColumn>;
+        /**
+         * Remove a registered rows processor
+         * @param {IRowProcessor} rows processor function
+         */
+        removeRowsProcessor(rows: IRowProcessor<TEntity>): void;
+        /**
+         * Return the columns that the grid is currently being sorted by
+         * @param {IGridColumn} [excludedColumn] Optional GridColumn to exclude from having its sorting reset
+         */
+        resetColumnSorting(excludedColumn: IGridColumnOf<TEntity>): void;
+        /**
+         * Scroll the grid such that the specified
+         * row and column is in view
+         * @param {TEntity} rowEntity gridOptions.data[] array element to make visible
+         * @param {IColumnDef} colDef to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
+         */
+        scrollTo(rowEntity?: TEntity, colDef?: IColumnDefOf<TEntity>): ng.IPromise<any>;
+        /**
+         * Scrolls the grid to make a certain row and column combo visible,
+         * in the case that it is not completely visible on the screen already.
+         * @param {IGridRow} gridRow row to make visible
+         * @param {IGridColumn} gridCol column to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
+         */
+        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): ng.IPromise<any>;
+        /**
+         * Set the sorting on a given column, optionally resetting any existing sorting on the Grid.
+         * Emits the sortChanged event whenever the sort criteria are changed.
+         * @param {IGridColumn} column Column to set the sorting on
+         * @param {uiGridConstants.ASC|uiGridConstants.DESC} [direction] Direction to sort by,
+         *        either descending or ascending.  If not provided, the column will iterate through the sort
+         *        directions: ascending, descending, unsorted.
+         * @param {boolean} [add] Add this column to the sorting. If not provided or set to `false`, the Grid will
+         *        reset any existing sorting and sort by this column only
+         * @returns {ng.IPromise<IGridColumn>} A resolved promise that supplies the column.
+         */
+        sortColumn(column: IGridColumnOf<TEntity>, direction?: string, add?: boolean)
+            : ng.IPromise<IGridColumnOf<TEntity>>;
+        /**
+         * flags all render containers to update their canvas height
+         */
         updateCanvasHeight(): void;
+        /**
+         * recalculates the footer height,
+         * registered as a dataChangeCallback on uiGridConstants.dataChange.OPTIONS
+         * @param {string} name column name
+         */
         updateFooterHeightCallback(name: string): void;
+        /**
+         * reference to the application scope (the parent scope of the ui-grid element). Assigned in ui-grid controller
+         * use gridOptions.appScopeProvider to override the default assignment of $scope.$parent with any reference
+         */
+        appScope?: ng.IScope;
+        /**
+         * returns the total column footer height
+         */
+        columnFooterHeight?: number;
+        /**
+         * returns the total footer height gridFooter + columnFooter
+         */
+        footerHeight?: number;
+        /**
+         * returns or sets grid height in pixels
+         */
+        gridHeight?: number;
+        /**
+         * set to true when Grid is scrolling horizontally. Set to false via debounced method
+         */
+        isScrollingHorizontally?: boolean;
+        /**
+         * set to true when Grid is scrolling vertically. Set to false via debounced method
+         */
+        isScrollingVertically?: boolean;
+        /**
+         * set one of the uiGridConstants.scrollDirection values (UP, DOWN, LEFT, RIGHT, NONE),
+         * which tells us which direction we are scrolling. Set to NONE via debounced method
+         */
+        scrollDirection?: number;
     }
     export interface IBuildColumnsOptions {
         orderByColumnDefs?: boolean;
     }
-    export interface IColumnBuilder {
-        (colDef: IColumnDef, col: IGridColumn, gridOptions: IGridOptions): void;
+    export interface IStyleComputation {
+        ($scope: ng.IScope): string;
     }
-    export interface IRowBuilder {
-        (row: IGridRow, gridOptions: IGridOptions): void;
+    export interface IColumnBuilder<TEntity> {
+        (colDef: IColumnDefOf<TEntity>, col: IGridColumnOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
     }
-    export interface IRowProcessor {
-        (renderedRowsToProcess: Array<IGridRow>, columns: Array<IGridColumn>): Array<IGridRow>;
+    export interface IRowBuilder<TEntity> {
+        (row: IGridRowOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
     }
-    export interface IColumnProcessor {
-        (renderedColumnsToProcess: Array<IGridColumn>, rows: Array<IGridRow>): Array<IGridColumn>;
+    export interface IRowProcessor<TEntity> {
+        (renderedRowsToProcess: Array<IGridRowOf<TEntity>>, columns: Array<IGridColumnOf<TEntity>>)
+            : Array<IGridRowOf<TEntity>>;
     }
-    export interface IGridOptions {
+    export interface IColumnProcessor<TEntity> {
+        (renderedColumnsToProcess: Array<IGridColumnOf<TEntity>>, rows: Array<IGridRowOf<TEntity>>)
+            : Array<IGridColumnOf<TEntity>>;
+    }
+    export type IGridOptions = IGridOptionsOf<any>;
+    export interface IGridOptionsOf<TEntity> extends cellNav.IGridOptions, edit.IGridOptions, expandable.IGridOptions,
+        exporter.IGridOptions<TEntity>, grouping.IGridOptions, importer.IGridOptions<TEntity>, 
+        infiniteScroll.IGridOptions, moveColumns.IGridOptions, pagination.IGridOptions, pinning.IGridOptions,
+        resizeColumns.IGridOptions, rowEdit.IGridOptions, saveState.IGridOptions, selection.IGridOptions, 
+        treeBase.IGridOptions<TEntity>, treeView.IGridOptions {
+        /**
+         * Default time in milliseconds to throttle aggregation calcuations, defaults to 500ms
+         */
         aggregationCalcThrottle?: number;
+        /**
+         * by default, the parent scope of the ui-grid element will be assigned to grid.appScope
+         * this property allows you to assign any reference you want to grid.appScope
+         */
         appScopeProvider?: ng.IScope | Object;
-        columnDefs?: Array<IColumnDef>;
+        /**
+         * Array of columnDef objects.  Only required property is name.
+         */
+        columnDefs?: Array<IColumnDefOf<TEntity>>;
+        /**
+         * The height of the footer rows (column footer and grid footer) in pixels
+         */
         columnFooterHeight?: number;
+        /**
+         * Turn virtualization on when number of columns goes over this number, defaults to 10
+         * @default 10
+         */
         columnVirtualizationThreshold?: number;
-        data?: Array<any> | string;
+        /**
+         * (mandatory) Array of data to be rendered into the grid, providing the data source or data binding for
+         * the grid.
+         *
+         * Most commonly the data is an array of objects, where each object has a number of attributes.
+         * Each attribute automatically becomes a column in your grid.  This array could, for example, be sourced from
+         * an angularJS $resource query request.  The array can also contain complex objects, refer the binding tutorial
+         * for examples of that.
+         *
+         * The most flexible usage is to set your data on $scope:
+         *
+         * `$scope.data = data;`
+         *
+         * And then direct the grid to resolve whatever is in $scope.data:
+         *
+         * `$scope.gridOptions.data = 'data';`
+         *
+         * This is the most flexible approach as it allows you to replace $scope.data whenever you feel like it without
+         * getting pointer issues.
+         *
+         * Alternatively you can directly set the data array:
+         *
+         * `$scope.gridOptions.data = [ ];`
+         * or
+         *
+         * `$http.get('/data/100.json')
+         * .success(function(data) {
+         *   $scope.myData = data;
+         *   $scope.gridOptions.data = $scope.myData;
+         *  });`
+         *
+         * Where you do this, you need to take care in updating the data - you can't just update `$scope.myData` to some
+         * other array, you need to update $scope.gridOptions.data to point to that new array as well.
+         */
+        data?: Array<TEntity> | string;
+        /**
+         * True by default. When enabled, this setting displays a column
+         * menu within each column.
+         * @default true
+         */
         enableColumnMenus?: boolean;
-        enablePagiationControls?: boolean;
+        /**
+         * False by default. When enabled, this setting adds filter
+         * boxes to each column header, allowing filtering within the column for the entire grid.
+         * Filtering can then be disabled on individual columns using the columnDefs.
+         * @default false
+         */
         enableFiltering?: boolean;
-        enableHorizontalScrollbar?: boolean;
+        /**
+         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the horizontal scrollbar for the grid.
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * @default 1
+         */
+        enableHorizontalScrollbar?: boolean | number;
+        /**
+         * True by default. When enabled, a newly initialized grid will check to see if it is tall enough to display
+         * at least one row of data.  If the grid is not tall enough, it will resize the DOM element to display
+         * minRowsToShow number of rows.
+         * @default true
+         */
         enableMinHeightCheck?: boolean;
+        /**
+         * True by default. When enabled, this setting allows uiGrid to add
+         * `$$hashKey`-type properties (similar to Angular) to elements in the `data` array. This allows
+         * the grid to maintain state while vastly speeding up the process of altering `data` by
+         * adding/moving/removing rows.
+         *
+         * Note that this DOES add properties to your data that you may not want, but they are stripped out when
+         * using `angular.toJson()`. IF you do not want this at all you can disable this setting but you will take a
+         * performance hit if you are using large numbers of rows
+         * and are altering the data set often.
+         * @default true
+         */
         enableRowHashing?: boolean;
-        enableRowSelection?: boolean;
+        /**
+         * True by default. When enabled, this setting adds sort
+         * widgets to the column headers, allowing sorting of the data for the entire grid.
+         * Sorting can then be disabled on individual columns using the columnDefs.
+         * @default true
+         */
         enableSorting?: boolean;
-        enableVerticalScrollbar?: boolean;
+        /**
+         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the vertical scrollbar for the grid.
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * @default 1
+         */
+        enableVerticalScrollbar?: boolean | number;
+        /**
+         * Extra columns to to render outside of the viewport, which helps with smoothness of scrolling.
+         * Defaults to 4
+         * @default 4
+         */
         excessColumns?: number;
+        /**
+         * Extra rows to to render outside of the viewport, which helps with smoothness of scrolling.
+         * Defaults to 4
+         * @default 4
+         */
         excessRows?: number;
+        /**
+         * Array of property names in data to ignore when auto-generating column names.  Provides the
+         * inverse of columnDefs - columnDefs is a list of columns to include, excludeProperties is a list of columns
+         * to exclude.
+         *
+         * If columnDefs is defined, this will be ignored.
+         *
+         * Defaults to ['$$hashKey']
+         */
         excludeProperties?: Array<string>;
+        /**
+         * Set to true if your columns are all related directly to fields in a flat object structure - i.e.
+         * each of your columns associate directly with a propery one each of the entities in your data array.
+         *
+         * In that situation we can avoid all the logic associated with complex binding to functions or to properties
+         * of sub-objects, which can provide a significant speed improvement with large data sets, with filtering and
+         * with sorting.
+         *
+         * By default false
+         * @default false
+         */
         flatEntityAccess?: boolean;
+        /**
+         * (optional) ui-grid/ui-grid-footer by default.  This footer shows the per-column
+         * aggregation totals.
+         * When provided, this setting uses a custom footer template. Can be set to either the name of a template
+         * file 'footer_template.html', inline html
+         * <pre>'<div class="ui-grid-bottom-panel" style="text-align: center">I am a Custom Grid Footer</div>'</pre>,
+         * or the id of a precompiled template (TBD how to use this).  Refer to the custom footer tutorial for more
+         * information.
+         * @default 'ui-grid/ui-grid-footer'
+         */
         footerTemplate?: string;
-        gridFooterTemplate?: string;
-        gridMenuCustomItems?: Array<IMenuItem>;
-        gridMenuShowHideColumns?: boolean;
-        gridMenuTitleFilter?: (title: string) => ng.IPromise<string> | string;
+        /**
+         * (optional) ui-grid/ui-grid-grid-footer by default. This template by default shows the
+         * total items at the bottom of the grid, and the selected items if selection is enabled.
+         * @default 'ui-grid/ui-grid-grid-footer'
+         */
+        gridFooterTemplate?: string
+        /**
+         * Null by default. When provided, this setting uses a custom header
+         * template, rather than the default template. Can be set to either the name of a template file:
+         * <pre>  $scope.gridOptions.headerTemplate = 'header_template.html';</pre>
+         * inline html
+         * <pre>  $scope.gridOptions.headerTemplate = '<div class="ui-grid-top-panel" style="text-align: center">
+         *     I am a Custom Grid Header</div>'</pre>
+         * or the id of a precompiled template (TBD how to use this).
+         * </br>Refer to the custom header tutorial for more information.
+         * If you want no header at all, you can set to an empty div:
+         * <pre>  $scope.gridOptions.headerTemplate = '<div></div>';</pre>
+         *
+         * If you want to only have a static header, then you can set to static content.  If
+         * you want to tailor the existing column headers, then you should look at the
+         * current 'ui-grid-header.html' template in github as your starting point.
+         * @default null
+         */
         headerTemplate?: string;
+        /**
+         * Defaults to 4
+         * @default 4
+         */
         horizontalScrollThreshold?: number;
-        infiniteScrollDown?: boolean;
-        infiniteScrollRowsFromEnd?: number;
-        infiniteScrollUp?: boolean;
+        /**
+         * Defaults to 200
+         * @default 200
+         */
         maxVisibleColumnCount?: number;
+        /**
+         * Minimum number of rows to show when the grid doesn't have a defined height. Defaults to "10".
+         * @default 10
+         */
         minRowsToShow?: number;
+        /**
+         * Columns can't be smaller than this, defaults to 10 pixels
+         * @default 10
+         */
         minimumColumnSize?: number;
-        onRegisterApi?: (gridApi: IGridApi) => void;
+        /**
+         * A callback that returns the gridApi once the grid is instantiated, which is
+         * then used to interact with the grid programatically.
+         *
+         * Note that the gridApi.core.renderingComplete event is identical to this
+         * callback, but has the advantage that it can be called from multiple places
+         * if needed
+         * @param {IGridApi} gridApi
+         */
+        onRegisterApi?: (gridApi: IGridApiOf<TEntity>) => void;
+        /**
+         * The height of the row in pixels, defaults to 30
+         * @default 30
+         */
         rowHeight?: number;
+        /**
+         * 'ui-grid/ui-grid-row' by default. When provided, this setting uses a
+         * custom row template.  Can be set to either the name of a template file:
+         * <pre> $scope.gridOptions.rowTemplate = 'row_template.html';</pre>
+         * inline html
+         * <pre>  $scope.gridOptions.rowTemplate =
+         * '<div style="background-color: aquamarine"
+         *       ng-click="grid.appScope.fnOne(row)"
+         *       ng-repeat="col in colContainer.renderedColumns track by col.colDef.name"
+         *       class="ui-grid-cell" ui-grid-cell></div>';</pre>
+         * or the id of a precompiled template (TBD how to use this) can be provided.
+         * </br>Refer to the custom row template tutorial for more information.
+         * @default 'ui-grid/ui-grid-row'
+         */
         rowTemplate?: string;
+        /**
+         * Default time in milliseconds to debounce scroll events, defaults to 300ms
+         * @default 300
+         */
         scrollDebounce?: number;
+        /**
+         * Defaults to 4
+         * @default 4
+         */
         scrollThreshold?: number;
+        /**
+         * Whether or not to show the column footer, defaults to false
+         * The column footer displays column aggregates
+         * @default false
+         */
         showColumnFooter?: boolean;
+        /**
+         * Whether or not to show the footer, defaults to false
+         * The footer display Total Rows and Visible Rows (filtered rows)
+         * @default false
+         */
         showGridFooter?: boolean;
+        /**
+         * True by default. When set to false, this setting will replace the
+         * standard header template with '<div></div>', resulting in no header being shown.
+         * @default true
+         */
         showHeader?: boolean;
-        useExternalFiltering?: boolean;
-        useExternalSorting?: boolean;
+        /**
+         * Turn virtualization on when number of data elements goes over this number, defaults to 20
+         * @default 20
+         */
         virtualizationThreshold?: number;
+        /**
+         * Default time in milliseconds to throttle scroll events to, defaults to 70ms
+         * @default 70
+         */
         wheelScrollThrottle?: number;
-        getRowIdentity?(): any;
-        rowEquality?(entityA: IGridRow, entityB: IGridRow): boolean;
-        rowIdentity? (): any;
-        totalItems?: number;
-        paginationPageSize?: number;
-        paginationCurrentPage?: number;
+        /**
+         * This function returns the identity value uniquely identifying this row,
+         * if one is not present it does not set it.
+         *
+         * By default it returns the `$$hashKey` property but can be overridden to use any property
+         * or set of properties you want.
+         * @param {IGridRow} row The row for which you want the unique id
+         * @returns {string} row uid
+         */
+        getRowIdentity?(row: IGridRowOf<TEntity>): any;
+        /**
+         * By default, rows are compared using object equality.  This option can be overridden
+         * to compare on any data item property or function
+         * @param {TEntity} entityA First Data Item to compare
+         * @param {TEntity} entityB Second Data Item to compare
+         */
+        rowEquality?(entityA: TEntity, entityB: TEntity): boolean;
+        /**
+         * This function is used to get and, if necessary, set the value uniquely identifying this row
+         * (i.e. if an identity is not present it will set one).
+         *
+         * By default it returns the `$$hashKey` property if it exists. If it doesn't it uses gridUtil.nextUid()
+         * to generate one
+         */
+        rowIdentity?(): any;
     }
-    export interface IGridCoreApi {
-        addRowHeaderColumn(column: IColumnDef): void;
-        addToGridMenu(grid: IGridInstance, items: Array<IMenuItem>):  void;
-        clearAllFilters(refreshRows?: boolean, clearConditions?: boolean, clearFlags?: boolean): ng.IPromise<Array<IGridRow>>;
-        clearRowInvisible(rowEntity: any): void;
-        getVisibleRows(grid: IGridInstance): Array<IGridRow>;
+    export interface IGridCoreApi<TEntity> {
+        // Methods
+        /**
+         * adds a row header column to the grid
+         * @param {IColumnDef} column Column Definition
+         */
+        addRowHeaderColumn(column: IColumnDefOf<TEntity>): void;
+        /**
+         * add items to the grid menu.  Used by features
+         * to add their menu items if they are enabled, can also be used by
+         * end users to add menu items.  This method has the advantage of allowing
+         * remove again, which can simplify management of which items are included
+         * in the menu when.  (Noting that in most cases the shown and active functions
+         * provide a better way to handle visibility of menu items)
+         * @param {IGridInstance} grid the grid on which we are acting
+         * @param {Array<IMenuItem>} items menu items in the format as described in the tutorial, with
+         * the added note that if you want to use remove you must also specify an `id` field,
+         * which is provided when you want to remove an item.  The id should be unique.
+
+         */
+        addToGridMenu(grid: IGridInstanceOf<TEntity>, items: Array<IMenuItem>):  void;
+        /**
+         * Clears all filters and optionally refreshes the visible rows.
+         * @param {boolean} [refreshRows=true] Defaults to true.
+         * @param {boolean} [clearConditions=false] Defaults to false.
+         * @param {boolean} [clearFlags=false] Defaults to false.
+         * @returns {ng.IPromise<any>} If `refreshRows` is true, returns a promise of the rows refreshing.
+         */
+        clearAllFilters(refreshRows?: boolean, clearConditions?: boolean,
+            clearFlags?: boolean): ng.IPromise<Array<IGridRowOf<TEntity>>>;
+        /**
+         * Clears any override on visibility for the row so that it returns to
+         * using normal filtering and other visibility calculations.
+         * If the row is currently invisible then sets it to visible and calls
+         * both grid refresh and emits the rowsVisibleChanged event
+         * TODO: if a filter is active then we can't just set it to visible?
+         * @param {TEntity} rowEntity gridOptions.data[] array instance
+         */
+        clearRowInvisible(rowEntity: TEntity): void;
+        /**
+         * Returns all visible rows
+         * @param {IGridInstance} grid the grid you want to get visible rows from
+         * @returns {Array<IGridRow>} an array of gridRow
+         */
+        getVisibleRows(grid: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+        /**
+         * Trigger a grid resize, normally this would be picked
+         * up by a watch on window size, but in some circumstances it is necessary
+         * to call this manually
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
         handleWindowResize(): void;
-        notifiyDataChange(type: string): void;
+        /**
+         * Notify the grid that a data or config change has occurred,
+         * where that change isn't something the grid was otherwise noticing.  This
+         * might be particularly relevant where you've changed values within the data
+         * and you'd like cell classes to be re-evaluated, or changed config within
+         * the columnDef and you'd like headerCellClasses to be re-evaluated.
+         * @param {string} type one of the
+         *        uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN), which tells
+         *        us which refreshes to fire.
+         */
+        notifyDataChange(type: string): void;
+        /**
+         * Refresh the rendered rows on screen?  Note: not functional at present
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
         refreshRows(): ng.IPromise<boolean>;
-        registerColumnsProcessor(processorFunction: IColumnProcessor, priority: number): void;
-        registerRowsProcessor(rowProcessor: IRowProcessor, priority: number): void;
-        removeFromGridMenu(grid: IGridInstance, id: string): void;
-        scrollTo(entity: any, colDef: IColumnDef): void; /*A row entity can be anything?*/
-        scrollToIfNecessary(gridRow: IGridRow, gridCol: IGridColumn): void;
-        setRowInvisible(rowEntity: any): void;
-        sortHandleNulls(a: any,b: any): number;
+        /**
+         * Register a "columns processor" function. When the columns are updated,
+         * the grid calls each registered "columns processor", which has a chance
+         * to alter the set of columns as long as the count is not
+         * modified.
+         *
+         * @param {IColumnProcessor} processorFunction columns processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
+         *        return the updated columns list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         *        for other people to inject columns processors at intermediate priorities.  Lower priority
+         *        columnsProcessors run earlier.
+         *
+         * At present allRowsVisible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
+         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerColumnsProcessor(processorFunction: IColumnProcessor<TEntity>, priority: number): void;
+        /**
+         * Register a "rows processor" function. When the rows are updated,
+         * the grid calls each registered "rows processor", which has a chance
+         * to alter the set of rows (sorting, etc) as long as the count is not
+         * modified.
+         *
+         * @param {IRowProcessor} rowProcessor rows processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
+         *        return the updated rows list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         *        for other people to inject rows processors at intermediate priorities.  Lower priority rowsProcessors
+         *        run earlier.
+         *
+         * At present all rows visible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
+         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
+        /**
+         * Scroll the grid such that the specified
+         * row and column is in view
+         * @param {TEntity} entity gridOptions.data[] array instance to make visible
+         * @param {IColumnDef} colDef to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
+         */
+        scrollTo(entity: TEntity, colDef: IColumnDefOf<TEntity>): void; /*A row entity can be anything?*/
+        /**
+         * Scrolls the grid to make a certain row and column combo visible,
+         * in the case that it is not completely visible on the screen already.
+         * @param {IGridRow} gridRow row to make visible
+         * @param {IGridColumn} gridCol column to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
+         */
+        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): void;
+        /**
+         * A null handling method that can be used when building custom sort
+         * functions
+         * @param {any} a Sort value a
+         * @param {any} b Sort value b
+         * @returns {number} null if there were no nulls/undefineds, otherwise returns
+         * a sort value that should be passed back from the sort function
+         */
+        sortHandleNulls(a: any, b: any): number;
+        /**
+         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
+         */
         queueGridRefresh(): void;
+        /**
+         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
+         */
         queueRefresh(): void;
-        on: {
-            sortChanged: (scope: ng.IScope, handler: (grid: IGridInstance, sortColumns: Array<IColumnDef>) => void) => void;
-            columnVisibilityChanged: (scope: ng.IScope, handler: (grid: IGridColumn) => void) => void;
-            canvasHeightChanged: (scope: ng.IScope, handler: (oldHeight: number, newHeight: number) => void) => void;
 
+        // Events
+        on: {
             /**
-             * filterChangedis raised after the filter is changed. The nature of the watch expression doesn't allow notification
-             * of what changed, so the receiver of this event will need to re-extract the filter conditions from the columns.
-             * http://ui-grid.info/docs/#/api/ui.grid.core.api:PublicApi
+             * is raised when the canvas height has changed
+             * @param {ng.IScope} scope Grid scope
+             * @param {canvasHeightChangedHandler} handler Callback
              */
-            filterChanged: (scope: ng.IScope, handler: () => void) => void;
-            rowsRendered: (scope: ng.IScope, handler: () => void) => void;
-            rowsVisibleChanged: (scope: ng.IScope, handler: () => void) => void;
-            scrollBegin: (scope: ng.IScope, handler: () => void) => void;
-            scrollEnd: (scope: ng.IScope, handler: () => void) => void;
+            canvasHeightChanged: (scope: ng.IScope, handler: canvasHeightChangedHandler) => void;
+            /**
+             * The visibility of a column has changed, the column itself is passed out as a parameter of the event
+             * @param {ng.IScope} scope The scope of the controller. This is used to deregister this event when the
+             *        scope is destroyed
+             * @param {columnVisibilityChangedHandler} callBack Will be called when the event is emited.
+             *        The function passes back the GridCol that has changed
+             */
+            columnVisibilityChanged: (scope: ng.IScope, callBack: columnVisibilityChangedHandler<TEntity>) => void;
+            /**
+             * is raised after the filter is changed.
+             * The nature of the watch expression doesn't allow notification of what changed,
+             * so the receiver of this event will need to re-extract the filter conditions from the columns.
+             * @param {ng.IScope} scope Grid scope
+             * @param {filterChangedHandler} handler Callback
+             */
+            filterChanged: (scope: ng.IScope, handler: filterChangedHandler<TEntity>) => void;
+            /**
+             * is raised after the cache of visible rows is changed
+             * @param {ng.IScope} scope Grid scope
+             * @param {rowsRenderedHandler} handler callback
+             */
+            rowsRendered: (scope: ng.IScope, handler: rowsRenderedHandler<TEntity>) => void;
+            /**
+             * is raised after the rows that are visible change.
+             * The filtering is zero-based, so it isn't possible to say which rows changed
+             * (unlike in the selection feature). We can plausibly know which row was changed when setRowInvisible is
+             * called, but in that situation the user already knows which row they changed.
+             * When a filter runs we don't know what changed, and that is the one that would have been useful.
+             * @param {ng.IScope} scope Grid scope
+             * @param {rowsVisibleChangedHandler} handler callback
+             */
+            rowsVisibleChanged: (scope: ng.IScope, handler: rowsVisibleChangedHandler<TEntity>) => void;
+            /**
+             * is raised when scroll begins. Is throttled, so won't be raised too frequently
+             * @param {ng.IScope} scope Grid scope
+             * @param {scrollBeginHandler} handler callback
+             */
+            scrollBegin: (scope: ng.IScope, handler: scrollBeginHandler) => void;
+            /**
+             * is raised when scroll has finished. Is throttled, so won't be raised too frequently
+             * @param {ng.IScope} scope Grid scope
+             * @param {scrollEndHandler} handler callback
+             */
+            scrollEnd: (scope: ng.IScope, handler: scrollEndHandler) => void;
         }
     }
-    export interface IGridSelectionApi {
-        toggleRowSelection: (rowEntity: IGridRow, event?: Event) => void;
-        selectRow: (rowEntity: IGridRow, event?: Event) => void;
-        selectRowByVisibleIndex: (rowEntity: number, event?: Event) => void;
-        unSelectRow: (rowEntity: IGridRow, event?: Event) => void;
-        selectAllRows: (event?: Event) => void;
-        selectAllVisibleRows: (event?: Event) => void;
-        clearSelectedRows: (event?: Event) => void;
-        getSelectedRows: () => Array<IGridRow>;
-        getSelectedGridRows: () => Array<IGridRow>;
-        setMultiSelect: (multiSelect: boolean) => void;
-        setModifierKeysToMultiSelect: (multiSelect: boolean) => void;
-        getSelectAllState: () => boolean;
-        on: {
-            rowSelectionChanged: (scope: ng.IScope, handler: (row: IGridRow, event?: Event) => void) => void;
-            rowSelectionChangedBatch: (scope: ng.IScope, handler: (row: Array<IGridRow>, event?: Event) => void) => void;
-        }
+    export interface columnVisibilityChangedHandler<TEntity> {
+        /**
+         * Column visibility changed event handler
+         * @param {IGridColumn} column Ui Grid column
+         */
+        (column: IGridColumnOf<TEntity>): void;
     }
-    export interface IGridPaginationApi {
-        getPage: () => number;
-        getTotalPages: () => number;
-        nextPage: () => void;
-        previousPage: () => void;
-        seek: () => void;
-        on: {
-            paginationChanged: (scope: ng.IScope, handler: (newPage: number, pageSize: number) => void) => void;
-        }
+    export interface canvasHeightChangedHandler {
+        /**
+         * Canvas height changed callback
+         * @param {number} oldHeight old Height
+         * @param {number} newHeight new Height
+         */
+        (oldHeight: number, newHeight: number): void;
     }
-    export interface IGridRowEditApi {
-        flushDirtyRows(grid?: IGridInstance): ng.IPromise<boolean>;
-        getDirtyRows(grid?: IGridInstance): Array<IGridRow>;
-        getErrorRows(grid?: IGridInstance): Array<IGridRow>;
-        setRowsClean(dataRows: Array<any>):  Array<any>;
-        setRowsDirty(dataRows: Array<any>): Array<any>;
-        setSavePromise(rowEntity: Object, savePromise: ng.IPromise<any>): void;
-        on: {
-            saveRow: (scope: ng.IScope, handler: (rowEntity: Array<any>) => void) => void;
-        }
+
+    export interface filterChangedHandler<TEntity> {
+        /**
+         * Filter changed event callback
+         * @param {IGridApi} gridApi grid api
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
     }
-    export interface IGridRowResizableApi {
-        on: {
-            columnSizeChanged: (scope: ng.IScope, handler: (coldDef: IColumnDef) => void) => void;
+
+    export interface rowsRenderedHandler<TEntity> {
+        /**
+         * Rows rendered event callback
+         * @param {IGridApi} gridApi Grid api object
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
+    }
+
+    export interface rowsVisibleChangedHandler<TEntity> {
+        /**
+         * Rows visible changed event callback
+         * @param {IGridApi} gridApi grid api object
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
+    }
+
+    export interface scrollBeginHandler {
+        /**
+         * Scroll begin event callback
+         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
+         */
+        (scrollEvent: JQueryMouseEventObject): void;
+    }
+
+    export interface scrollEndHandler {
+        /**
+         * Scroll end event callback
+         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
+         */
+        (scrollEvent: JQueryMouseEventObject): void;
+    }
+
+    export module cellNav {
+        /**
+         * Column Definitions for cellNav feature, these are available to be set using the ui-grid
+         * gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable focus on a cell within this column.
+             * Defaults to true
+             * @default true
+             */
+            allowCellFocus?: boolean;
+        }
+
+        /**
+         * GridOptions for cellNav feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Enable multiple cell selection only when using the ctrlKey or shiftKey.
+             * Defaults to false
+             * @default false
+             */
+            modifierKeysToMultiSelectCells?: boolean;
+        }
+
+        /**
+         * Cell Nav related grid row
+         */
+        export interface IGridRow {
+            /**
+             * Enable focus on a cell within this row. If set to false then no cells in this row can be focused
+             * Group header rows, for example, would set this to false.
+             * Defaults to true
+             */
+            allowCellFocus?: boolean;
+        }
+
+        export interface ICellNavApi<TEntity> {
+            // Methods
+            /**
+             * Gets the currently selected rows and columns.  array is empty if no selection has occurred
+             * @returns {Array<IRowCol>} an array containing the current selection
+             */
+            getCurrentSelection(): Array<IRowCol<TEntity>>;
+            /**
+             * Gets the current focused cell.  value is null if no selection has occurred
+             * @returns {IRowCol} the current (or last if Grid does not have focus) focused row and column
+             */
+            getFocusedCell(): IRowCol<TEntity>;
+            /**
+             * Gets the index of the passed rowCol.  Returns -1 if the RowCol isn't selected
+             * @param rowCol
+             * @returns the index in the order in which the RowCol was selected
+             */
+            rowColSelectIndex(rowCol: IRowCol<TEntity>): number;
+            /**
+             * Brings the specified row and column into view, and sets focus to that cell
+             * @param {TEntity} rowEntity gridOptions.data[] array instance to make visible and set focus
+             * @param {IColumnDef} colDef Column definition to make visible and set focus
+             */
+            scrollToFocus(rowEntity: TEntity, colDef: IColumnDef): ng.IPromise<any>;
+
+            // Events
+            on: {
+                /**
+                 * raised when the active cell is changed
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {navigateHandler} handler Callback
+                 */
+                navigate: (scope: ng.IScope, handler: navigateHandler<TEntity>) => void;
+                /**
+                 * viewportKeyDown is raised when the viewPort receives a keyDown event.
+                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
+                 * not visible in the viewport. Use this event whenever you need a keydown event on a cell.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {viewportKeyDownHandler} handler Callback
+                 */
+                viewportKeyDown: (scope: ng.IScope, handler: viewportKeyDownHandler<TEntity>) => void;
+                /**
+                 * viewportKeyPress is raised when the viewPort receives a keyPress event.
+                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
+                 * not visible in the viewport. Use this event whenever you need a keypress event on a cell.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {viewportKeyPressHandler} handler Callback
+                 */
+                viewportKeyPress: (scope: ng.IScope, handler: viewportKeyPressHandler<TEntity>) => void;
+            }
+        }
+
+        export interface navigateHandler<TEntity> {
+            /**
+             * Callback for navigate event
+             * @param {IRowCol} newRowCol New position
+             * @param {IRowCol} oldRowCol Old position
+             */
+            (newRowCol: IRowCol<TEntity>, oldRowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface viewportKeyDownHandler<TEntity> {
+            /**
+             * Callback for viewport key down event
+             * @param {JQueryKeyEventObject} event Keydown event
+             * @param {IRowCol} rowCol Current row Col position
+             */
+            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface viewportKeyPressHandler<TEntity> {
+            /**
+             * Callback for viewport key press event
+             * @param {JQueryKeyEventObject} event Keypress event
+             * @param {IRowCol} rowCol Current row Col position
+             */
+            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface IRowColConstructor<TEntity> {
+            new (row: uiGrid.IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): IRowCol<TEntity>;
+        }
+
+        /**
+         * A row and column pair that represents the intersection of these two entities
+         */
+        export interface IRowCol<TEntity> {
+            row: uiGrid.IGridRowOf<TEntity>;
+            col: IGridColumnOf<TEntity>;
+            /**
+             * Gets the intersection of where the row and column meet
+             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
+             *          will NOT return the filtered value.
+             */
+            getIntersectionValueRaw(): String | Number | Object;
+            /**
+             * Gets the intersection of where the row and column meet.
+             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
+             *          will also apply the filter to it and return the value that the filter displays
+             */
+            getIntersectionValueFiltered(): String | Number | Object;
+        }
+        /**
+         * constants available in cellNav
+         */
+        export interface IUiGridCellNavConstants {
+            FEATURE_NAME: string;
+            CELL_NAV_EVENT: string;
+            direction: {
+                LEFT: number;
+                RIGHT: number;
+                UP: number;
+                DOWN: number;
+                PG_UP: number;
+                PG_DOWN: number;
+            };
+            EVENT_TYPE: {
+                KEYDOWN: number;
+                CLICK: number;
+                CLEAR: number;
+            }
         }
     }
 
-    export interface IGridApiConstructor {
-        new (grid: IGridInstance): IGridApi;
+    export module edit {
+        /**
+         * Edit related Column Definition
+         */
+        export interface IColumnDef<TEntity> {
+            /**
+             * If specified, either a value or function evaluated before editing cell.
+             * If falsy, then editing of cell is not allowed.
+             */
+            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
+            /** A filter that you would like to apply to the values in the options list of the dropdown */
+            editDropdownFilter?: string;
+            /** the label for the "id" field in the editDropdownOptionsArray. Defaults to 'id' */
+            editDropdownIdLabel?: string;
+            /** an array of values in the format [ {id: xxx, value: xxx} ], which is populated into the edit dropdown */
+            editDropdownOptionsArray?: Array<IEditDropdown>;
+            /**
+             * a path to a property on row.entity containing an array of values in the format `[{id: xxx, value:
+             * xxx}]`,
+             * which will be used to populate the edit dropdown.  This can be used when the dropdown values are
+             * dependent on the backing row entity.  If this property is set then editDropdownOptionsArray will be
+             * ignored.
+             */
+            editDropdownRowEntityOptionsArrayPath?: string;
+            /** the label of the 'value' field in the editDropdownOptionsArray.  Defaults to 'value' */
+            editDropdownValueLabel?: string;
+            /**
+             * A function that should be called when any files have been chosen by the user.
+             * You should use this to process the files appropriately for your application.
+             *
+             * It passes the gridCol, the gridRow (from which you can get gridRow.entity), and the files.
+             * The files are in the format as returned from the file chooser, an array of files,
+             * with each having useful information such as:
+             *
+             * * files[0].lastModifiedDate
+             * * files[0].name
+             * * files[0].size (appears to be in bytes)
+             * * files[0].type (MIME type)
+             *
+             * Typically you would do something with these files.
+             * Most commonly you would use the filename or read the file itself in. This example does both:
+             * @example
+             editFileChooserCallBack: (gridRow, gridCol, files) => {
+               // ignore all but the first file, it can only choose one anyway
+               // set the filename into this column
+               gridRow.entity.filename = file[0].name;
+
+               // read the file and set it into a hidden column, which we may do stuff with later
+               var setFile = function(fileContent){
+                   gridRow.entity.file = fileContent.currentTarget.result;
+               };
+               var reader = new FileReader();
+               reader.onload = setFile;
+               reader.readAsText( files[0] );
+           }
+             */
+            editFileChooserCallback?: (gridRow: uiGrid.IGridRowOf<TEntity>, 
+                                       gridCol: IGridColumnOf<TEntity>, 
+                                       files: FileList) => void;
+            /**
+             * A bindable string value that is used when binding to edit controls instead of colDef.field
+             * For example if you have a complex property on an object like:
+             * ```typescript
+             * state: {abbrev:'MS',name:'Mississippi'}.
+             * ```
+             * The grid should display `state.name` in the cell and sort/filter based on the state.name property, but
+             * the editor requires the full state object. so this let's you bind to that
+             * @example
+             colDef.field = 'state.name';
+             colDef.editModelField = 'state';
+             */
+            editModelField?: string;
+            /**
+             * Cell template to be used when editing this column. Can be Url or text template.
+             * Defaults to gridOptions.editableCellTemplate
+             */
+            editableCellTemplate?: string;
+            /** Enable editing on a column */
+            enableCellEdit?: boolean;
+            /** If true, then editor is invoked as soon as cell receives focus. Default false.
+             * _Requires both the cellNav feature and the edit feature to be enabled_
+             */
+            enableCellEditOnFocus?: boolean;
+        }
+
+        export interface IEditDropdown {
+            id: number | string;
+            value: any;
+        }
+
+        /**
+         * Options for configuring the edit feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * If specified, either a value or function to be used by all columns before editing.
+             * If falsy, then editing of cell is not allowed
+             */
+            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
+            /**
+             * If specified, cellTemplate to use as the editor for all columns.
+             * defaults to 'ui-grid/cellTextEditor'
+             * @default 'ui-grid/cellTextEditor'
+             */
+            editableCellTemplate?: string;
+            /**
+             * If defined, sets the default value for the editable flag on each individual colDefs if their individual
+             * enableCellEdit configuration is not defined.
+             * Defaults to undefined.
+             * @default undefined
+             */
+            enableCellEdit?: boolean;
+            /**
+             * If true, then editor is invoked as soon as cell receives focus.
+             * Default false.
+             * _requires cellNav feature and the edit feature to be enabled_
+             * @default false
+             */
+            enableCellEditOnFocus?: boolean;
+        }
+
+        /**
+         * GridRow options for edit feature, these are available to be set internally only, by other features
+         */
+        export interface IGridRow {
+            /** enable editing on row, grouping for example might disable editing on group header rows */
+            enableCellEdit?: boolean;
+        }
+
+        /**
+         * Public Api for edit feature
+         */
+        export interface IGridEditApi<TEntity> {
+            on: {
+                /**
+                 * raised when cell editing is complete
+                 * @param scope The grid scope
+                 * @param {afterCellEditHandler} handler Callback
+                 */
+                afterCellEdit: (scope: ng.IScope, handler: afterCellEditHandler<TEntity>) => void;
+                /**
+                 * raised when cell editing starts on a cell
+                 * @param scope The grid scope
+                 * @param {beginCellEditHandler} handler Callback
+                 */
+                beginCellEdit: (scope: ng.IScope, handler: beginCellEditHandler<TEntity>) => void;
+                /**
+                 * raised when cell editing is cancelled on a cell
+                 * @param scope The grid scope
+                 * @param {cancelCellEditHandler} handler Callback
+                 */
+                cancelCellEdit: (scope: ng.IScope, handler: cancelCellEditHandler<TEntity>) => void;
+            }
+        }
+        export interface afterCellEditHandler<TEntity> {
+            /**
+             * raised when cell editing is complete
+             * @param {TEntity} rowEntity the options.data element that was edited
+             * @param {IColumnDef} colDef The column that was edited
+             * @param {any} newValue New Value
+             * @param {any} oldValue Old Value
+             */
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, newValue: any, oldValue: any): void;
+        }
+
+        /**
+         * raised when cell editing starts on a cell
+         * @param {TEntity} rowEntity the options.data element that was edited
+         * @param {IColumnDef} colDef The column that was edited
+         * @param {JQueryEventObject} triggerEvent the event that triggered the edit. Useful to prevent losing
+         *     keystrokes on some complex editors
+         */
+        export interface beginCellEditHandler<TEntity> {
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, triggerEvent: JQueryEventObject): void;
+        }
+
+        /**
+         * raised when cell editing is cancelled on a cell
+         * @param {TEntity} rowEntity the options.data element that was edited
+         * @param {IColumnDef} colDef The column that was edited
+         */
+        export interface cancelCellEditHandler<TEntity> {
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>): void;
+        }
+
+        /**
+         * constants available in edit module
+         */
+        export interface IUiGridEditConstants {
+            EDITABLE_CELL_TEMPLATE: string;
+            EDITABLE_CELL_DIRECTIVE: string;
+            events: {
+                BEGIN_CELL_EDIT: string;
+                END_CELL_EDIT: string;
+                CANCEL_CELL_EDIT: string;
+            }
+        }
     }
-    export interface IGridApi {
+
+    export module expandable {
+        /**
+         * Options for configuring the expandable feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Width in pixels of the expandable column. Defaults to 40
+             */
+            expandableRowHeaderWidth?: number;
+            /**
+             * Whether or not to use expandable feature.  Allows you to turn off expandable on specific grids within
+             * your application, or in specific modes on this grid.
+             * Defaults to true.
+             */
+            enableExpandable?: boolean;
+            /**
+             * Show a rowHeader to provide the expandable buttons. If set to false then implies you're going to use a
+             * custom method for expanding and collapsing the subgrids.
+             * Defaults to true.
+             */
+            enableExpandableRowHeader?: boolean;
+            /**
+             * Height in pixels of the expanded subgrid.
+             * Defaults to 150
+             */
+            expandableRowHeight?: number;
+            /**
+             * Mandatory. The template for your expanded row
+             */
+            expandableRowTemplate?: string;
+        }
+
+        /**
+         * Public Api for expandable feature
+         */
+        export interface IGridExpandableApi<TEntity> {
+            // Methods
+            /**
+             * Collapse all subgrids.
+             */
+            collapseAllRows(): void;
+            /**
+             * expand all subgrids
+             */
+            expandAllRows(): void;
+            /**
+             * Toggle all subgrids
+             */
+            toggleAllRows(): void;
+            /**
+             * Toggle a specific row
+             * @param {TEntity} rowEntity The data entity for the row you want to expand
+             */
+            toggleRowExpansion(rowEntity: TEntity): void;
+
+            // Events
+            on: {
+                /**
+                 * raised when cell editing is complete
+                 * @param {ng.IScope} scope
+                 * @param {rowExpandedStateChangedHandler} handler
+                 */
+                rowExpandedStateChanged: (scope: ng.IScope, handler: rowExpandedStateChangedHandler<TEntity>) => void;
+            }
+        }
+
+        export interface rowExpandedStateChangedHandler<TEntity> {
+            /**
+             * Raised when cell editing is complete
+             * @param {IGridRow} row The row that was expanded
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+    }
+
+    export module exporter {
+        /**
+         * ColumnDef settings for exporter
+         */
+        export interface IColumnDef {
+            /**
+             * the alignment you'd like for this specific column when exported into a pdf.
+             * Can be 'left', 'right', 'center' or any other valid pdfMake alignment option.
+             */
+            exporterPdfAlign?: string;
+            /**
+             * Suppresses export for this column. Used by selection and expandable.
+             */
+            exporterSuppressExport?: boolean;
+        }
+
+        /**
+         * GridOptions for exporter feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * This promise is needed when exporting all rows, and the data need to be provided by server side.
+             * Default is null
+             * @default null
+             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
+             */
+            exporterAllDataFn?: () => ng.IPromise<Array<TEntity>>;
+            /**
+             * @deprecated
+             * DEPRECATED - exporterAllDataFn used to be called this, but it wasn't a promise,
+             * it was a function that returned a promise. Deprecated, but supported for backward compatibility,
+             * use exporterAllDataFn instead.
+             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
+             */
+            exporterAllDataPromise?: () => ng.IPromise<Array<TEntity>>;
+            /**
+             * The character to use as column separator link
+             * Defaults to ','
+             * @default ','
+             */
+            exporterCsvColumnSeparator?: string;
+            /**
+             * The default filename to use when saving the downloaded csv. This will only work in some browsers.
+             * Defaults to 'download.csv'
+             * @default 'download.csv'
+             */
+            exporterCsvFilename?: string;
+            /**
+             * A function to call for each field before exporting it.
+             * Allows massaging of raw data into a display format, for example if you have applied filters to convert
+             * codes into decodes, or you require a specific date format in the exported content.
+             * The method is called once for each field exported, and provides the grid,
+             * the gridCol, and the GridRow for you to use as context in massaging the data.
+             *
+             * @param {IGridInstance} grid The grid
+             * @param {IGridRow} row Current row
+             * @param {IGridColumn} col Current column
+             * @param {any} value The cell value
+             * @returns {any} Formatted value
+             */
+            exporterFieldCallback?: (grid: IGridInstanceOf<TEntity>, 
+                                     row: uiGrid.IGridRowOf<TEntity>, 
+                                     col: IGridColumnOf<TEntity>, 
+                                     value: any) => any;
+            /**
+             * A function to apply to the header displayNames before exporting. Useful for internationalisation,
+             * for example if you were using angular-translate you'd set this to $translate.instant.
+             * Note that this call must be synchronous, it cannot be a call that returns a promise.
+             *
+             * Behaviour can be changed to pass in name instead of displayName through use
+             * of exporterHeaderFilterUseName: true.
+             * @param {string} displayName
+             * @returns {string} The filtered header
+             */
+            exporterHeaderFilter?: (displayName: string) => string;
+            /**
+             * Defaults to false, which leads to displayName being passed into the headerFilter.
+             * If set to true, then will pass name instead.
+             * @default false
+             */
+            exporterHeaderFilterUseName?: boolean;
+            /**
+             * Add csv export menu items to the ui-grid grid menu, if it's present. Defaults to true.
+             * @default true
+             */
+            exporterMenuCsv?: boolean;
+            /**
+             * The text to show on the exporter menu button link
+             * Defaults to 'Export'
+             * @default 'Export'
+             */
+            exporterMenuLabel?: string;
+            /**
+             * Add pdf export menu items to the ui-grid grid menu, if it's present.
+             * Defaults to true.
+             * @default true
+             */
+            exporterMenuPdf?: boolean;
+            /**
+             * Some versions of excel don't like the utf-16 BOM on the front,
+             * and it comes through as  in the first column header.
+             * Setting this option to false will suppress this,
+             * at the expense of proper utf-16 handling in applications that do recognise the BOM
+             * Defaults to false
+             * @default false
+             */
+            exporterOlderExcelCompatibility?: boolean;
+            /**
+             * A custom callback routine that changes the pdf document,
+             * adding any custom styling or content that is supported by pdfMake.
+             * Takes in the complete docDefinition, and must return an updated docDefinition ready for pdfMake.
+             * Example
+             * In this example we add a style to the style array, so that we can use it in our footer definition.
+             * @param {any} docDefinition Document definition in pdfMake format
+             */
+            exporterPdfCustomFormatter?: (docDefinition: any) => any;
+            /**
+             * The default style in pdfMake format
+             * @todo replace with pdfmake format
+             */
+            exporterPdfDefaultStyle?: any;
+            /**
+             * The default filename to use when saving the downloaded pdf,
+             * only used in IE (other browsers open pdfs in a new window)
+             * Defaults to 'download.pdf'
+             * @default 'download.pdf'
+             */
+            exporterPdfFilename?: string;
+            /**
+             * The footer section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
+             * can be a function, allowing page numbers and the like
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfFooter?: string | any | { (currentPage: number, pageCount: number): string };
+            /**
+             * The header section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
+             * can be a function, allowing page numbers and the like
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfHeader?: string | any | { (currentPage: number, pageCount: number): string };
+            /**
+             * The maxium grid width - the current grid width will be scaled to match this,
+             * with any fixed width columns being adjusted accordingly.
+             * Defaults to 720 (for A4 landscape), use 670 for LETTER
+             * @default 720
+             */
+            exporterPdfMaxGridWidth?: number;
+            /**
+             * The orientation, should be a valid pdfMake value, 'landscape' or 'portrait'
+             * Defaults to landscape
+             * @default 'landscape'
+             */
+            exporterPdfOrientation?: string;
+            /**
+             * The orientation, should be a valid pdfMake paper size, usually 'A4' or 'LETTER' pdfMake page sizes
+             * Defaults to A4
+             * @default 'A4'
+             */
+            exporterPdfPageSize?: string;
+            /**
+             * exporterPdfTableHeaderStyle
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableHeaderStyle?: any;
+            /**
+             * A tableLayout in pdfMake format, controls gridlines and the like. We use the default layout usually.
+             * Defaults to null, which means no layout
+             * @default null
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableLayout?: any;
+            /**
+             * The tableStyle in pdfMake format
+             * Defaults to ```{ margin: [0, 5, 0, 15] }```
+             * @default { margin: [0, 5, 0, 15] }
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableStyle?: any;
+            /**
+             * Columns that should not be exported.
+             *
+             * The selectionRowHeader is already automatically suppressed,
+             * but if you had a button column or some other "system" column that shouldn't be shown in the output,
+             * then add it in this list.
+             *
+             * You should provide an array of column names.
+             * Defaults to: []
+             * @default []
+             */
+            exporterSuppressColumns?: Array<string>;
+            /**
+             * Don't show the export menu button, implying the user will roll their own UI for calling the exporter
+             * Defaults to false
+             * @default false
+             */
+            exporterSuppressMenu?: boolean;
+        }
+
+        /**
+         * GridRow settings for exporter
+         */
+        export interface IGridRow {
+            /**
+             * If set to false, then don't export this row, notwithstanding visible or other settings.
+             * Defaults to true
+             * @default true
+             */
+            exporterEnableExporting?: boolean;
+        }
+
+        /**
+         * Public Api for exporter feature
+         */
+        export interface IGridExporterApi {
+            /**
+             * Exports rows from the grid in csv format, the data exported is selected based on the provided options
+             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
+             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE
+             */
+            csvExport(rowTypes: string, colTypes: string): void;
+            /**
+             * Exports rows from the grid in pdf format, the data exported is selected based on the provided options
+             * Note that this function has a dependency on pdfMake, all going well this has been installed for you. The
+             * resulting pdf opens in a new browser window.
+             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
+             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE
+             */
+            pdfExport(rowTypes: string, colTypes: string): void;
+        }
+
+        /**
+         * constants available in exporter module
+         */
+        export interface IUiGridExporterConstants {
+            featureName: string;
+            /** export all data, including data not visible.  Can be set for either rowTypes or colTypes */
+            ALL: string;
+            /** export only visible data, including data not visible.  Can be set for either rowTypes or colTypes */
+            VISIBLE: string;
+            /**
+             * Export all data, including data not visible.
+             * Can be set only for rowTypes, selection of only some columns is not supported
+             */
+            SELECTED: string;
+            CSV_CONTENT: string;
+            BUTTON_LABEL: string;
+            FILE_NAME: string;
+        }
+    }
+
+    export module grouping {
+        /**
+         * ColumnDef for grouping feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /** Enable grouping on this column.  Defaults to true. */
+            enableGrouping?: boolean;
+            /**
+             * Set the grouping for a column.
+             * Note that aggregation used to be included in grouping, but is now separately set on the column via
+             * treeAggregation setting in treeBase
+             *
+             * We group in the priority order given, this will also put these columns to the high order of the sort
+             * irrespective of the sort priority given them.
+             * If there is no sort defined then we sort ascending, if there is a sort defined then we use that sort.
+             *
+             * If the groupPriority is undefined or less than 0, then we expect to be aggregating,
+             * and we look at the aggregation types to determine what sort of aggregation we can do.
+             * Values are in the constants file, but include SUM, COUNT, MAX, MIN
+             *
+             * groupPriorities should generally be sequential, if they're not then the next time getGrouping is called
+             * we'll renumber them to be sequential.
+             * Defaults to undefined.
+             */
+            grouping?: {
+                /**
+                 * number, starts at 0, if less than 0 or undefined then we're aggregating in this column
+                 */
+                groupPriority: number
+            };
+            /**
+             * Show the aggregation menu on this column.  Defaults to true
+             * @default true
+             */
+            groupingShowAggregationMenu?: boolean;
+            /**
+             * Show the grouping (group and ungroup items) menu on this column.  Defaults to true
+             * @default true
+             */
+            groupingShowGroupingMenu?: boolean;
+        }
+
+        /**
+         * GridOptions for grouping feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Allows group header rows to be selected.
+             * Defaults to false
+             * @default false
+             */
+            enableGrouping?: boolean;
+            /**
+             * Enable row grouping for entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enableGroupHeaderSelection?: boolean;
+            /**
+             * The string to use for the grouping header row label on rows which contain
+             * a null or undefined value in the grouped column.
+             * Defaults to "Null"
+             * @default 'Null'
+             */
+            groupingNullLabel?: string;
+            /**
+             * Shows counts on the groupHeader rows.
+             * Note that if you are using a cellFilter or a sortingAlgorithm which relies on a specific format or data
+             * type, showing counts may cause that to break, since the group header rows will always be a string with
+             * groupingShowCounts enabled. Defaults to true except on columns of type 'date'
+             * @default true
+             */
+            groupingShowCounts?: boolean;
+        }
+
+        /**
+         * Public Api for grouping feature
+         */
+        export interface IGridGroupingApi<TEntity> {
+            // Methods
+            /**
+             * Sets the aggregation type on a column.
+             * If the column is currently grouped then it removes the grouping first.
+             * If the aggregationDef is null then will result in the aggregation being removed.
+             * @param {string} columnName The name of the column we want to aggregate
+             * @param {string | function} or aggregationDef one of the recognised types from uiGridGroupingConstants or
+             * a custom aggregation function.
+             * @param {string} [aggregationLabel] The label to use for aggregation
+             */
+            aggregateColumn(columnName: string, or: string | Function, aggregationLabel?: string): void;
+            /**
+             * Clear any grouped columns and any aggregations.
+             * Doesn't remove sorting, as we don't know whether that sorting was added by grouping or was there
+             * beforehand
+             */
+            clearGrouping(): void;
+            /**
+             * Get the grouping configuration for this grid, used by the saveState feature.
+             * Adds expandedState to the information provided by the internal getGrouping,
+             * and removes any aggregations that have a source of grouping
+             * (i.e. will be automatically reapplied when we regroup the column)
+             * @param {boolean} getExpanded whether or not to return the expanded state
+             */
+            getGrouping(getExpanded: boolean): IGridGroupingConfiguration;
+            /**
+             * Adds this column to the existing grouping, at the end of the priority order.
+             * If the column doesn't have a sort, adds one, by default ASC.
+             * This column will move to the left of any non-group columns.
+             * The move is handled in a columnProcessor, so it gets called as part of refresh.
+             * @param {string} columnName the name of the column we want to group
+             */
+            groupColumn(columnName: string): void;
+            /**
+             * Set the grouping configuration for this grid, used by the saveState feature,
+             * but can also be used by any user to specify a combined grouping and aggregation configuration
+             * @param {IGridGroupingConfiguration} config The config to apply, in the format provided out by getGrouping
+             */
+            setGrouping(config: IGridGroupingConfiguration): void;
+            /**
+             * Removes the groupPriority from this column.
+             * If the column was previously aggregated the aggregation will come back. The sort will remain.
+             *
+             * This column will move to the right of any other group columns, the move is handled in a columnProcessor,
+             * so it gets called as part of refresh
+             * @param {string} columnName the name of the column to ungroup
+             */
+            ungroupColumn(columnName: string): void;
+
+            // Events
+            on: {
+                /**
+                 * raised whenever aggregation is changed, added or removed from a column
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {aggregationChangedHandler} handler Callback method
+                 */
+                aggregationChanged: (scope: ng.IScope, handler: aggregationChangedHandler<TEntity>) => void;
+                /**
+                 * raised whenever the grouped columns change
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {groupingChangedHandler} handler Callback method
+                 */
+                groupingChanged: (scope: ng.IScope, handler: groupingChangedHandler<TEntity>) => void;
+            };
+        }
+        /**
+         * Grid grouping configuration for the grid.  Used by the saveState feature
+         */
+        export interface IGridGroupingConfiguration {
+            /**
+             * GroupArray.  Sorted by groupPriority
+             */
+            grouping: Array<IGripGroup>;
+            /**
+             * Array of aggregation objects
+             */
+            treeAggregations: Array<IGridTreeAggregations>;
+            /**
+             * Hash of currently expanded nodes
+             */
+            expandedState?: IGridExpandedHash;
+        }
+
+        export interface IGripGroup {
+            field: string;
+            colName: string;
+            groupPriority: number;
+        }
+
+        export interface IGridTreeAggregations {
+            field: string;
+            colName: string;
+            aggregation: string;
+        }
+
+        /**
+         * Recursive hash of the currently expanded and collapsed nodes.
+         */
+        export interface IGridExpandedHash {
+            [key: string]: IGridExpandedHash | string;
+        }
+        export interface aggregationChangedHandler<TEntity> {
+            /**
+             * raised whenever aggregation is changed, added or removed from a column
+             * @param {IGridColumn} col the column which on which aggregation changed.
+             *        The aggregation type is available as col.treeAggregation.type
+             */
+            (col: IGridColumnOf<TEntity>): void;
+        }
+
+        export interface groupingChangedHandler<TEntity> {
+            /**
+             * raised whenever the grouped columns changes
+             * @param {IGridColumn} col the column which on which grouping changed.
+             *   The new grouping is available as col.grouping
+             */
+            (col: IGridColumnOf<TEntity>): void;
+        }
+
+        /**
+         * Constants available in grouping module including all constants declared in the treeBase module.
+         * These are manually copied as there isn't an easy way to include constants in another constants file, and we
+         * don't want to make users include treeBase.
+         */
+        interface IUiGridGroupingConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export module importer {
+        /**
+         * GridOptions for importer feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * A mandatory callback function that adds data to the source data array.
+             * The grid generally doesn't add rows to the source data array,
+             * it is tidier to handle this through a user callback.
+             * @param {IGridInstance} grid The grid we're importing into, may be useful in some way
+             * @param {Array<TEntity>} newObjects An array of new objects that you should add to your data
+             */
+            importerDataAddCallback?: (grid: IGridInstanceOf<TEntity>, newObjects: Array<TEntity>) => void;
+            /**
+             * A callback function that provides custom error handling,
+             * rather than the standard grid behaviour of an alert box and a console message.
+             * You might use this to internationalise the console log messages,
+             * or to write to a custom logging routine that returned errors to the server.
+             * @param {IGridInstance} grid the grid we're importing into, may be useful if you're positioning messages
+             * @param {string} errorKey one of the i18n keys the importer can return -
+             *        * importer.noHeaders
+             *        * importer.noObjects
+             *        * importer.invalidCsv
+             *        * importer.invalidJson
+             *        * importer.jsonNotArray
+             * @param {string} consoleMessage the English console message that importer would have written
+             * @param {any} context the context data that importer would have appended to that console message,
+             *        often the file content itself or the element that is in error
+             */
+            importerErrorCallback?: (grid: IGridInstanceOf<TEntity>, errorKey: string, consoleMessage: string,
+                context: any) => void;
+            /**
+             * A callback function that will filter (usually translate) a single header.
+             * Used when you want to match the passed in column names to the column displayName after the header filter.
+             * Your callback routine needs to return the filtered header value.
+             * @param {string} displayName The displayName to translate
+             * @returns {string} The translated name
+             */
+            importerHeaderFilter?: (displayName: string) => string;
+            /**
+             * A callback that massages the data for each object.
+             * For example, you might have data stored as a code value, but display the decode.
+             * This callback can be used to change the decoded value back into a code.
+             * Defaults to angular.identity.
+             * @param {IGridInstance} grid The grid
+             * @param {TEntity} newObject The new object as importer has created it.  Modify it and return modified 
+             * version
+             * @returns {TEntity} The modified object
+             * @default angular.identity
+             */
+            importerObjectCallback?: (grid: IGridInstanceOf<TEntity>, newObject: TEntity) => TEntity;
+            /**
+             * A callback function that will process headers using custom
+             * logic.  Set this callback function if the headers that your user will provide in their
+             * import file don't necessarily match the grid header or field names.  This might commonly
+             * occur where your application is internationalised, and therefore the field names
+             * that the user recognises are in a different language than the field names that
+             * ui-grid knows about.
+             *
+             * Defaults to the internal `processHeaders` method, which seeks to match using both
+             * displayName and column.name.  Any non-matching columns are discarded.
+             *
+             * Your callback routine should respond by processing the header array, and returning an array
+             * of matching column names.  A null value in any given position means "don't import this column"
+             * @param {IGridInstance} grid the grid we're importing into
+             * @param {Array<string>} headerArray an array of the text from the first row of the csv file,
+             * which you need to match to column.names
+             * @returns {Array<string>} array of matching column names, in the same order as the headerArray
+             */
+            importerProcessHeaders?: (grid: IGridInstanceOf<TEntity>, headerArray: Array<string>) => Array<string>;
+            /**
+             * Whether or not importer is enabled.  Automatically set
+             * to false if the user's browser does not support the required fileApi.
+             * Otherwise defaults to true.
+             * @default true
+             */
+            enableImporter?: boolean;
+            /**
+             * An object on which we call `new` to create each new row before inserting it into
+             * the data array.  Typically this would be a $resource entity, which means that if you're using
+             * the rowEdit feature, you can directly call save on this entity when the save event is triggered.
+             *
+             * Defaults to a vanilla javascript object
+             * @default {}
+             */
+            importerNewObject?: Function;
+            /**
+             * Whether or not to show an item in the grid menu.
+             * Defaults to true.
+             * @default true
+             */
+            importerShowMenu?: boolean;
+        }
+
+        /**
+         * Public Api for importer feature
+         */
+        export interface IGridImporterApi {
+            /**
+             * Imports a file into the grid using the file object provided. Bypasses the grid menu
+             * @param {File} fileObject The file we want to import as a javascript File object
+             */
+            importFile(fileObject: File): void;
+        }
+
+        /**
+         * constants available in importer module
+         */
+        export interface IUiGridImporterConstants {
+            featureName: string;
+        }
+    }
+
+    /**
+     * This module provides infinite scroll functionality to ui-grid
+     */
+    export module infiniteScroll {
+        /**
+         * GridOptions for infinite scroll feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Enable infinite scrolling for this grid
+             * Defaults to true
+             * @default true
+             */
+            enableInfiniteScroll?: boolean;
+        }
+
+        /**
+         * Public API for infinite scroll feature
+         */
+        export interface IGridInfiniteScrollApi<TEntity> {
+            // Methods
+            /**
+             * Call this function when you have loaded the additional data requested.
+             * You should set scrollUp and scrollDown to indicate whether there are still more pages in each direction.
+             *
+             * If you call dataLoaded without first calling saveScrollPercentage, then we will scroll the user to the
+             * start of the newly loaded data.  This usually makes scrolling smooth, but be jumpy with large
+             * infiniteScrollRowsFromEnd values, and on variable speed internet connections.
+             * Using saveScrollPercentage as demonstrated in the tutorial should give a smoother scrolling experience
+             * for users.
+             *
+             * See infinite_scroll tutorial for example of usage
+             * @param {boolean} scrollUp if set to false flags that there are no more pages upwards, so don't fire any
+             *        more infinite scroll events upward
+             * @param {boolean} scrollDown if set to false flags that there are no more pages downwards, so don't fire
+             *        any more infinite scroll events downward
+             * @returns {ng.IPromise<any>} a promise that is resolved when the grid scrolling is fully adjusted.
+             *          If you're planning to remove pages, you should wait on this promise first, or you'll break the
+             *          scroll positioning
+             */
+            dataLoaded(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedBottom(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom.
+             * You should have called saveScrollPercentage before you remove the data,
+             * and if you're doing this in response to a needMoreData you should wait
+             * until the promise from loadData has resolved before you start removing data
+             *
+             * @param {IGridInstance} grid the grid we're working on
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedBottom(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedTop(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom.
+             * You should have called saveScrollPercentage before you remove the data,
+             * and if you're doing this in response to a needMoreData you should wait
+             * until the promise from loadData has resolved before you start removing data
+             *
+             * @param {IGridInstance} grid the grid we're working on
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedTop(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Call this function when you have taken some action that makes the current scroll position invalid.
+             * For example, if you're using external sorting and you've resorted then you might reset the scroll,
+             * or if you've otherwise substantially changed the data, perhaps you've reused an
+             * existing grid for a new data set
+             *
+             * You must tell us whether there is data upwards or downwards after the reset
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            resetScroll(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Saves the scroll percentage and number of visible rows before you adjust the data,
+             * used if you're subsequently going to call dataRemovedTop or dataRemovedBottom
+             */
+            saveScrollPercentage(): void;
+
+            // Events
+            on: {
+                /**
+                 * This event fires when scroll reaches bottom percentage of grid and needs to load data
+                 */
+                needLoadMoreData: Function;
+                /**
+                 * This event fires when scroll reaches top percentage of grid and needs to load data
+                 */
+                needLoadMoreDataTop: Function;
+            }
+        }
+    }
+
+    export module moveColumns {
+        /**
+         * Column Definition for move column features.
+         * These are available to be set using the ui-grid `gridOptions.columnDefs`
+         */
+        export interface IColumnDef {
+            /**
+             * Enable column moving for the column
+             */
+            enableColumnMoving?: boolean;
+        }
+
+        /**
+         * Options for configuring the move column feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * If defined, sets the default value for the colMovable flag on each individual colDefs
+             * if their individual enableColumnMoving configuration is not defined.
+             * Defaults to true.
+             * @default true
+             */
+            enableColumnMoving?: boolean;
+        }
+
+        export interface IGridMoveColumnsApi {
+            // Methods
+            /**
+             * Method can be used to change column position
+             * @param {number} originalPosition Original column position as a 0 indexed integer
+             * @param {number} newPosition New column position as a 0 indexed integer
+             */
+            moveColumn(originalPosition: number, newPosition: number): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a column is moved
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {columnPositionChangedHandler} handler Callback Function
+                 */
+                columnPositionChanged?: (scope: ng.IScope, handler: columnPositionChangedHandler) => void;
+            }
+        }
+        export interface columnPositionChangedHandler {
+            (colDef: IColumnDef, originalPosition: number, finalPosition: number): void;
+        }
+    }
+
+    export module pagination {
+        /**
+         * Pagination related grid options
+         */
+        export interface IGridOptions {
+            /**
+             * Enables pagination, defaults to true
+             * @default true
+             */
+            enablePagination?: boolean;
+            /**
+             * Enables the paginator at the bottom of the grid. Turn this off, if you want to implement your own
+             * controls outside the grid
+             */
+            enablePaginationControls?: boolean;
+            /**
+             * Current page number, defaults to 1
+             * @default 1
+             */
+            paginationCurrentPage?: number;
+            /**
+             * Page size, defaults to the first item in paginationPageSizes, or 0 if paginationPageSizes is empty
+             */
+            paginationPageSize?: number;
+            /**
+             * Array of page sizes, defaults to [250, 500, 1000]
+             * @default [250, 500, 1000]
+             */
+            paginationPageSizes?: Array<number>;
+            /**
+             * A custom template for the pager, defaults to ui-grid/pagination
+             * @default 'ui-grid/pagination'
+             */
+            paginationTemplate?: string;
+            /**
+             * Total number of items, set automatically when client side pagination,
+             * needs set by user for server side pagination
+             */
+            totalItems?: number;
+            /**
+             * Disables client side pagination. When true, handle the paginationChanged event and set data and
+             * totalItems, defaults to false
+             * @default false
+             */
+            useExternalPagination?: boolean;
+        }
+        export interface IGridPaginationApi {
+            // Methods
+            /**
+             * Get the current page
+             * @returns {number} the number of the current page
+             */
+            getPage(): number;
+            /**
+             * Get the total number of pages
+             * @returns {number} the total number of pages
+             */
+            getTotalPages(): number;
+            /**
+             * Moves to the next page if possible
+             */
+            nextPage(): void;
+            /**
+             * Moves to the previous page if we're not on the first page.
+             */
+            previousPage(): void;
+            /**
+             * Moves to the requested page
+             * @param {number} page The number of the page that should be displayed
+             */
+            seek(page: number): void;
+
+            // Events
+            on: {
+                /**
+                 * This event fires when the pageSize or currentPage changes
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {paginationChangedHandler} handler Callback
+                 */
+                paginationChanged: (scope: ng.IScope, handler: paginationChangedHandler) => void;
+            }
+        }
+
+        /**
+         * The callback for paginationChanged
+         * @param {number} newPage requested page number
+         * @param {number} pageSize requested page size
+         */
+        export interface paginationChangedHandler {
+            (newPage: number, pageSize: number): void;
+        }
+    }
+
+    export module pinning {
+        /**
+         * ColumnDef for pinning feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable pinning for the individual column.  Defaults to true
+             * @default true
+             */
+            enablePinning?: boolean;
+            /**
+             * Column is pinned left when grid is rendered.  Defaults to false
+             * @default false
+             */
+            pinnedLeft?: boolean;
+            /**
+             * Column is pinned right when grid is rendered.  Defaults to false
+             * @default false
+             */
+            pinnedRight?: boolean;
+        }
+
+        /**
+         * Pinning related grid options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable pinning for the entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enablePinning?: boolean;
+        }
+
+        export interface IGridPinningApi<TEntity> {
+            // Methods
+            /**
+             * Pin column left, right, or none
+             * @param {IGridColumn} col The column being pinned
+             * @param {string} container One of the recognized container types from uiGridPinningConstants
+             */
+            pinColumn(col: IGridColumnOf<TEntity>, container: string): void;
+
+            // Events
+            /**
+             * raised when column pin state has changed
+             * @param {ng.IScope} scope The grid scope
+             * @param {columnPinHandler} handler Callback
+             */
+            columnPin: (scope: ng.IScope, handler: columnPinHandler) => void;
+        }
+
+        export interface columnPinHandler {
+            /**
+             * Callback to columnPin event
+             * @param {IColumnDef} colDef The column that was changed
+             * @param {string} container The render container the column is in.  Options:
+             *        * uiGridPinningConstants.container.LEFT
+             *        * uiGridPinningConstants.container.RIGHT,
+             *        * uiGridPinningConstants.container.NONE
+             */
+            (colDef: IColumnDef, container: string): void;
+        }
+
+        export interface IUiGridPinningConstants {
+            container: {
+                LEFT: string;
+                RIGHT: string;
+                NONE: string;
+            }
+        }
+    }
+
+    export module resizeColumns {
+        /**
+         * ColumnDef for resizeColumns feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable column resizing on an individual column
+             * Defaults to GridOptions.enableColumnResizing
+             */
+            enableColumnResizing?: boolean;
+        }
+        /**
+         * Column Resizing Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable column resizing on the entire grid
+             * Defaults to true
+             * @default true
+             */
+            enableColumnResizing?: boolean;
+        }
+
+        /**
+         * Public Api for column resize feature
+         */
+        export interface IGridResizeColumnsApi {
+            // Events
+            on: {
+                /**
+                 * Raised when column is resized
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {columnSizeChangedHandler} handler Callback
+                 */
+                columnSizeChanged: (scope: ng.IScope, handler: columnSizeChangedHandler) => void;
+            }
+        }
+
+        export interface columnSizeChangedHandler {
+            /**
+             * Callback when column size is changed
+             * @param {IColumnDef} colDef The column that was resized
+             * @param {number} delta The change in the size of the column
+             */
+            (colDef: IColumnDef, delta: number): void;
+        }
+    }
+
+    export module rowEdit {
+        /**
+         * Row Edit Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * How long the grid should wait for another change on this row before triggering a save (in milliseconds).
+             * If set to -1, then saves are never triggered by timer
+             * (implying that the user will call flushDirtyRows() manually)
+             */
+            rowEditWaitInterval?: number;
+        }
+
+        export interface IGridRowEditApi<TEntity> {
+            // Methods
+            /**
+             * Triggers a save event for all currently dirty rows.
+             * Could be used where user presses a save button or navigates away from the page
+             * @param {IGridInstance} grid The grid
+             * @returns {ng.IPromise<Array<any>>} a promise that represents the aggregate of all of the individual save
+             *          promises.  i.e. it will be resolved when all the individual save promises have been resolved.
+             */
+            flushDirtyRows(grid?: IGridInstanceOf<TEntity>): ng.IPromise<Array<any>>;
+            /**
+             * Returns all currently dirty rows
+             * @param {IGridInstance} grid The target grid
+             * @returns {Array<IGridRow>} An array of gridRows that are currently dirty
+             */
+            getDirtyRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Returns all currently errored rows
+             * @param {IGridInstance} grid The target grid
+             * @returns {Array<IGridRow>} An array of gridRows that are currently in error
+             */
+            getErrorRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Sets each of the rows passed in dataRows to be clean,
+             * removing them from the dirty cache and the error cache,
+             * and clearing the error flag and the dirty flag
+             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set clean
+             */
+            setRowsClean(dataRows: Array<TEntity>): void;
+            /**
+             * Sets each of the rows passed in dataRows to be dirty,
+             * Note that if you have only just inserted the rows into your data,
+             * you will need to wait for a $digest cycle before the gridRows are present.  As a result, this is often
+             * wrapped with $interval or $timeout.
+             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set dirty
+             */
+            setRowsDirty(dataRows: Array<TEntity>): void;
+            /**
+             * Sets the promise associated with the row save, mandatory that the saveRow event handler calls this method
+             * somewhere before returning
+             * @param {any} rowEntity A data row from the grid for which a save has been initiated
+             * @param {ng.IPromise<any>} savePromise A promise that will be resolved when the save is successful, or
+             *        rejected if the save fails
+             */
+            setSavePromise(rowEntity: Object, savePromise: ng.IPromise<any>): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a row is ready for saving.
+                 * Once your row has saved you may need to use angular.extend to update the data entity
+                 * with any changed data from your save.
+                 * i.e. lock version information, or last update time/user information
+                 *
+                 * Your method should call setSavePromise somewhere in the body before returning control.
+                 * The feature will then wait, with the gridRow greyed out whilst this promise is being resolved.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {saveRowHandler} handler Callback
+                 */
+                saveRow: (scope: ng.IScope, handler: saveRowHandler<TEntity>) => void;
+            }
+        }
+
+        export interface saveRowHandler<TEntity> {
+            /**
+             * Callback method for save row
+             * @param {TEntity} rowEntity The options.data element that was edited
+             */
+            (rowEntity: TEntity): void;
+        }
+    }
+
+    export module saveState {
+        /**
+         * Save State Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * Save the current filter state for each column
+             * Defaults to true
+             * @default true
+             */
+            saveFilter?: boolean;
+            /**
+             * Save the current focused cell. On returning to this focused cell we'll also scroll.
+             * This option is preferred to the saveScroll option, so is set to true by default.
+             * If saveScroll is set to true then this option will be disabled.
+             *
+             * By default this option saves the current row number and column number, and returns to that row and
+             * column. However, if you define a saveRowIdentity function, then it will return you to the currently
+             * selected column within that row (in a business sense - so if some rows have been deleted, it will still
+             * find the same data, presuming it still exists in the list. If it isn't in the list then it will instead
+             * return to the same row number - i.e. scroll percentage)
+             *
+             * Note that this option will do nothing if the cellNav feature is not enabled.
+             *
+             * Defaults to true (unless saveScroll is true)
+             * @default true
+             */
+            saveFocus?: boolean;
+            /**
+             * Save the grouping configuration. If set to true and the grouping feature is not enabled then does
+             * nothing. Defaults to true
+             * @default true
+             */
+            saveGrouping?: boolean;
+            /**
+             * Save the grouping row expanded states.
+             * If set to true and the grouping feature is not enabled then does nothing.
+             *
+             * This can be quite a bit of data, in many cases you wouldn't want to save this information.
+             *
+             * Defaults to false
+             * @default false
+             */
+            saveGroupingExpandedStates?: boolean;
+            /**
+             * Restore the current column order.
+             * Note that unless you've provided the user with some way to reorder their columns
+             * (for example the move columns feature), this makes little sense.
+             * Defaults to true
+             * @default true
+             */
+            saveOrder?: boolean;
+            /**
+             * Save pinning state for columns.
+             * Defaults to true
+             * @default true
+             */
+            savePinning?: boolean;
+            /**
+             * A function that can be called, passing in a rowEntity, and that will return a unique id for that row.
+             * This might simply return the id field from that row (if you have one),
+             * or it might concatenate some fields within the row to make a unique value.
+             *
+             * This value will be used to find the same row again and set the focus to it, if it exists when we return.
+             *
+             * Defaults to undefined
+             * @default undefined
+             */
+            saveRowIdentity?: boolean;
+            /**
+             * Save the current scroll position.
+             * Note that this is saved as the percentage of the grid scrolled -
+             * so if your user returns to a grid with a significantly different number of rows
+             * (perhaps some data has been deleted) then the scroll won't actually show the same rows as before.
+             * If you want to scroll to a specific row then you should instead use the saveFocus option,
+             * which is the default.
+             *
+             * Note that this element will only be saved if the cellNav feature is enabled
+             *
+             * Defaults to false
+             * @default false
+             */
+            saveScroll?: boolean;
+            /**
+             * Save the currently selected rows.
+             * If the saveRowIdentity callback is defined, then it will save the id of the row and select that.
+             * If not, then it will attempt to select the rows by row number,
+             * which will give the wrong results if the data set has changed in the mean-time.
+             *
+             * Note that this option only does anything if the selection feature is enabled.
+             *
+             * Defaults to true
+             * @default true
+             */
+            saveSelection?: boolean;
+            /**
+             * Save the current sort state for each column
+             * Defaults to true
+             *
+             * @default true
+             */
+            saveSort?: boolean;
+            /**
+             * Save the treeView configuration. If set to true and the treeView feature is not enabled then does
+             * nothing.
+             *
+             * @default true;
+             */
+            saveTreeView?: boolean;
+            /**
+             * Save whether or not columns are visible
+             * Defaults to true
+             * @default true
+             */
+            saveVisible?: boolean;
+            /**
+             * Save the current column widths.
+             * Note that unless you've provided the user with some way to resize their columns
+             * (say the resize columns feature), then this makes little sense.
+             * Defaults to true
+             * @default true
+             */
+            saveWidths?: boolean;
+        }
+
+        export interface IGridSaveStateApi {
+            // Methods
+            /**
+             * Restores the provided state into the grid
+             * @param {ng.IScope} $scope A scope we can broadcast on
+             * @param {IGridSavedState} state The state that should ve restored into the grid
+             */
+            restore($scope: ng.IScope, state: IGridSavedState): void;
+            /**
+             * Packages the current state of the grid into an object, and provides it to the user for saving
+             * @returns {IGridSavedState} Current grid state as a POJO
+             */
+            save(): IGridSavedState;
+        }
+
+        export interface IGridSavedState {
+            columns?: Array<ISavedColumn>;
+            scrollFocus?: ISavedScrollFocus;
+            selection: Array<IRowVal>;
+            grouping: grouping.IGridGroupingConfiguration;
+            treeView: treeBase.ITreeState;
+        }
+
+        interface ISavedColumn {
+            name: string;
+            visible?: boolean;
+            width?: number;
+            sort?: ISortInfo;
+            filters?: Array<IFilterOptions>;
+            pinned?: string;
+        }
+
+        interface ISavedScrollFocus {
+            focus?: boolean;
+            colName?: string;
+            rowVal?: IRowVal;
+        }
+
+        interface IRowVal {
+            identity: boolean;
+            row: number | any;
+        }
+    }
+
+    export module selection {
+        /**
+         * GridOptions for selection feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Shows the total number of selected items in footer if true.
+             * Defaults to true.
+             * GridOptions.showGridFooter must also be set to true.
+             * @default true
+             */
+            enableFooterTotalSelected?: boolean;
+            /**
+             * Enable selection by clicking anywhere on the row.
+             * Defaults to false if enableRowHeaderSelection is true, otherwise defaults to false.
+             */
+            enableFullRowSelection?: boolean;
+            /**
+             * Enable a row header to be used for selection
+             * Defaults to true
+             * @default true
+             */
+            enableRowHeaderSelection?: boolean;
+            /**
+             * Enable row selection for entire grid.
+             * Defaults to true
+             */
+            enableRowSelection?: boolean;
+            /**
+             * Enable the select all checkbox at the top of the selectionRowHeader
+             * Defaults to true
+             * @default true
+             */
+            enableSelectAll?: boolean;
+            /**
+             * If selected rows are changed in bulk, either via the API or via the selectAll checkbox,
+             * then a separate event is fired.
+             * Setting this option to false will cause the rowSelectionChanged event to be called multiple times instead
+             * Defaults to true
+             * @default true
+             */
+            enableSelectionBatchEvent?: boolean;
+            /**
+             * Makes it possible to specify a method that evaluates for each row and sets its "enableSelection"
+             * property.
+             */
+            isRowSelectable?: boolean;
+            /**
+             * Enable multiple row selection only when using the ctrlKey or shiftKey. Requires multiSelect to be true.
+             * Defaults to false
+             * @default false
+             */
+            modifierKeysToMultiSelect?: boolean;
+            /**
+             * Enable multiple row selection for entire grid
+             * Defaults to true
+             * @default true
+             */
+            multiSelect?: boolean;
+            /**
+             * Prevent a row from being unselected.
+             * Works in conjunction with multiselect = false and gridApi.selection.selectRow() to allow you to
+             * create a single selection only grid -
+             * a row is always selected, you can only select different rows, you can't unselect the row.
+             * Defaults to false
+             * @default false
+             */
+            noUnselect?: boolean;
+            /**
+             * can be used to set a custom width for the row header selection column
+             * Defaults to 30px
+             * @default 30
+             */
+            selectionRowHeaderWidth?: number;
+        }
+        /**
+         * Selection related grid row
+         */
+        export interface IGridRow {
+            /**
+             * 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;
+            /**
+             * 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;
+        }
+        /**
+         * Public Api for selection feature
+         */
+        export interface IGridSelectionApi<TEntity> {
+            // Methods
+            /**
+             * Unselects All Rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            clearSelectedRows(event?: ng.IAngularEvent): void;
+            /**
+             * Returns whether or not the selectAll checkbox is currently ticked.
+             * The grid doesn't automatically select rows when you add extra data -
+             * so when you add data you need to explicitly check whether the selectAll is set,
+             * and then call setVisible rows if it is
+             * @returns {boolean} Whether or not selectAll checkbox is ticked
+             */
+            getSelectAllState(): boolean;
+            /**
+             * returns all selected rows as gridRows
+             * @returns {Array<IGridRow>} The selected rows
+             */
+            getSelectedGridRows(): Array<uiGrid.IGridRowOf<TEntity>>;
+            /**
+             * Gets selected rows as entities
+             * @returns {Array<TEntity>} Selected row entities
+             */
+            getSelectedRows(): Array<TEntity>;
+            /**
+             * Selects all rows.  Does nothing if multiselect = false
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectAllRows(event?: ng.IAngularEvent): void;
+            /**
+             * Selects all visible rows.  Does nothing if multiselect = false
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectAllVisibleRows(event?: ng.IAngularEvent): void;
+            /**
+             * Select row by data
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+            /**
+             * Select the specified row by visible index
+             * (i.e. if you specify row 0 you'll get the first visible row selected).
+             *
+             * In this context visible means of those rows that are theoretically visible (i.e. not filtered),
+             * rather than rows currently rendered on the screen.
+             *
+             * @param {number} index Index within rowsVisible array
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectRowByVisibleIndex(index: number, event?: ng.IAngularEvent): void;
+            /**
+             * Sets the current gridOption.modifierKeysToMultiSelect to true or false
+             * @param {boolean} multiSelect true to only allow multiple rows when using ctrlKey or shiftKey is used
+             */
+            setModifierKeysToMultiSelect(multiSelect: boolean): void;
+            /**
+             * Sets the current gridOption.multiSelect to true or false
+             * @param {boolean} multiSelect true to allow multiple rows
+             */
+            setMultiSelect(multiSelect: boolean): void;
+            /**
+             * Toggles data row as selected or unselected
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            toggleRowSelection(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+            /**
+             * UnSelect the data row
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            unSelectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+
+            // Events
+            on: {
+                /**
+                 * is raised after the row.isSelected state is changed
+                 * @param {ng.IScope} scope grid scope
+                 * @param {rowSelectionChangedHandler} handler callback
+                 */
+                rowSelectionChanged: (scope: ng.IScope, handler: rowSelectionChangedHandler<TEntity>) => void;
+                /**
+                 * is raised after the row.isSelected state is changed in bulk,
+                 * if the enableSelectionBatchEvent option is set to true (which it is by default).
+                 * This allows more efficient processing of bulk events.
+                 * @param {ng.IScope} scope grid scope
+                 * @param {rowSelectionChangedBatchHandler} handler callback
+                 */
+                rowSelectionChangedBatch: (scope: ng.IScope, handler: rowSelectionChangedBatchHandler<TEntity>) => void;
+            }
+        }
+        export interface rowSelectionChangedHandler<TEntity> {
+            /**
+             * Callback for row selection changed
+             * @param {IGridRow} row The selected rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            (row: uiGrid.IGridRowOf<TEntity>, event?: ng.IAngularEvent): void;
+        }
+
+        export interface rowSelectionChangedBatchHandler<TEntity> {
+            /**
+             * Callback for row selection changed batch
+             * @param {IGridRow} row The selected rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            (row: Array<uiGrid.IGridRowOf<TEntity>>, event?: ng.IAngularEvent): void;
+        }
+    }
+
+    export module treeBase {
+        /**
+         * ColumnDef for tree feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef<TEntity> {
+            /**
+             * A custom function that populates aggregation.rendered.
+             * This is called when a particular aggregation has been fully calculated, and we want to render the value.
+             *
+             * With the native aggregation options we just concatenate aggregation.label and aggregation.value,
+             * but if you wanted to apply a filter or otherwise manipulate the label or the value,
+             * you can do so with this function.
+             *
+             * This function will be called after the the default finalizerFn.  Defaults to undefined
+             * @default undefined
+             * @param {IGridTreeBaseAggregationObject} aggregation Aggregation object
+             */
+            customTreeAggregationFinalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
+            /**
+             * A custom function that aggregates rows into some form of total.
+             * Aggregations run row-by-row, the function needs to be capable of creating a running total.
+             *
+             * The function will be provided the aggregation item (in which you can store running totals),
+             * the row value that is to be aggregated,
+             * and that same row value converted to a number (most aggregations work on numbers)
+             * @param {IGridTreeBaseAggregationObject} aggregation
+             * @param {any} fieldValue Value of the field
+             * @param {number} numValue Numeric value of the field
+             * @param {IGridRow} row Row objet
+             */
+            customerTreeAggregationFn?: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
+                row: IGridRowOf<TEntity>) => void;
+            /**
+             * A custom label to use for this aggregation.  If providedm, we don't use native i18n
+             */
+            treeAggregationLabel?: string;
+            /**
+             * Use one of the native or grid-level aggregation methods for calculating aggregations on this column.
+             * Native method are in the constants file and include: SUM, COUNT, MIN, MAX, AVG.
+             * This may also be the name of an aggregation function defined with treeCustomAggregations.
+             *
+             * If you are using aggregations you should either:
+             * * also use grouping, in which case the aggregations are displayed in the group header, OR
+             * * use treeView, in which case you can set `treeAggregationUpdateEntity: true` in the colDef, and
+             * treeBase
+             *   will store the aggregation information in the entity, or you can set `treeAggregationUpdateEntity:
+             * false` in the colDef, and you need to manual retrieve the calculated aggregations from the
+             * row.treeNode.aggregations
+             *
+             * Takes precedence over a treeAggregationFn, the two options should not be used together.
+             * Defaults to undefined.
+             * @default undefined
+             */
+            treeAggregationType?: string;
+            /**
+             * Store calculated aggregations into the entity,
+             * allowing them to be displayed in the grid using a standard cellTemplate.
+             * This defaults to true.
+             * If you are using grouping then you shouldn't set it to false, as then the aggregations won't display.
+             *
+             * If you are using treeView in most cases you'll want to set this to true.
+             * This will result in getCellValue returning the aggregation rather than whatever was stored in the cell
+             * attribute on the entity.
+             *
+             * If you want to render the underlying entity value (and do something else with the aggregation),
+             * then you could use a custom cellTemplate to display row.entity.myAttribute, rather than using
+             * getCellValue.
+             *
+             * Defaults to true
+             * @default true
+             */
+            treeAggregationUpdateEntity?: boolean;
+        }
+
+        /**
+         * Tree Base Grid Options
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * If set to true, show the expand/collapse button even if there are no children of a node.
+             * You'd use this if you're planning to dynamically load the children
+             * Defaults to true, grouping overrides to false
+             * @default true
+             */
+            showTreeExpandNoChildren?: boolean;
+            /**
+             * If set to false, don't create the row header. Youll need to programatically control the expand states
+             * Defaults to true
+             * @default true
+             */
+            showTreeRowHeader?: boolean;
+            /**
+             * Define custom aggregation functions.
+             * The properties of this object will be aggregation types available for use on columnDef
+             * with treeAggregationType or through the column menu.
+             *
+             * If a function defined here uses the same name as one of the native aggregations,
+             * this one will take precedence
+             *
+             * The finalizerFn may be used to manipulate the value before rendering, or to apply a custom rendered
+             * value. If aggregation.rendered is left undefined, the value will be rendered. Note that the native
+             * aggregation functions use an finalizerFn to concatenate the label and the value.
+             *
+             * Defaults to {}
+             * @default {}
+             */
+            treeCustomAggregations?: { [index: string]: IGridTreeBaseCustomAggregation<TEntity>; };
+            /**
+             * Number of pixels of indent for the icon at each tree level, wider indents are visually more pleasing,
+             * but will make the tree row header wider
+             * Defaults to 10
+             *
+             * @default 10
+             */
+            treeIndent?: number;
+            /**
+             * If set to true, row header even if there are no tree nodes
+             */
+            treeRowHeaderAlwaysVisible?: boolean;
+            /**
+             * Base width of the tree header, provides for a single level of tree.
+             * This is incremented by treeIndent for each extra level
+             * Defaults to 30
+             *
+             * @default 30
+             */
+            treeRowHeaderBaseWidth?: number;
+        }
+
+        export interface IGridTreeBaseCustomAggregation<TEntity> {
+            label: string;
+            aggregationFn: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
+                row?: IGridRowOf<TEntity>) => void;
+            finalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
+        }
+        export interface IGridTreeBaseAggregationObject {
+            count: number;
+            sum: number;
+            value: number;
+            rendered?: string;
+        }
+
+        export interface IGridTreeBaseApi<TEntity> {
+            // Methods
+            /**
+             * Collapse all tree rows
+             */
+            collapseAllRows(): void;
+            /**
+             * collapse the specified row. When you expand the row again, all grandchildren will retain their state
+             * @param {IGridRow} row The row to collapse
+             */
+            collapseRow(row: IGridRowOf<TEntity>): void;
+            /**
+             * collapse all children of the specified row. When you expand the row again, all grandchildren will be
+             * collapsed
+             * @param {IGridRow} row The row to collapse children of
+             */
+            collapseRowChildren(row: IGridRowOf<TEntity>): void;
+            /**
+             * Expands all tree rows
+             */
+            expandAllRows(): void;
+            /**
+             * Expand the immediate children of the specified row
+             * @param {IGridRow} row The row to expand
+             */
+            expandRow(row: IGridRowOf<TEntity>): void;
+            /**
+             * Get the children of the specified row
+             * @param {IGridRow} row The row you want the children of
+             * @returns Array<IGridRow> Array of children rows
+             */
+            getRowChildren(row: IGridRowOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Get the tree state for this grid, used by the saveState feature Returned treeState as an object
+             * ```{ expandedState: { uid: 'expanded', uid: 'collapsed' } }```
+             * where expandedState is a hash of row uid and the current expanded state
+             * @returns {ITreeState} tree state
+             * NOTE this is an incomplete feature in uiGrid
+             */
+            getTreeState(): ITreeState;
+            /**
+             * Set the expanded states of the tree
+             * @param {ITreeState} config The config you want to apply, in the format provided by getTreeState
+             */
+            setTreeState(config: ITreeState): void;
+            /**
+             * call expand if row is collapsed, and collapse if it is expanded
+             * @param {IGridRow} row The row to toggle
+             */
+            toggleRowTreeState(row: IGridRowOf<TEntity>): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a row is collapsed.  Doesn't really have a purpose at the moment.  Included for symmetry
+                 * @param {ng.IScope} scope Grid scope
+                 * @param {rowCollapsedHandler} handler Callback
+                 */
+                rowCollapsed: (scope: ng.IScope, handler: rowCollapsedHandler<TEntity>) => void;
+                /**
+                 * Raised whenever a row is expanded.
+                 *
+                 * If you are dynamically rendering your tree,
+                 * in your callback you can retrieve the children of this row and load them into the grid data.
+                 *
+                 * When the data is loaded, the grid will automatically refresh to show these new rows.
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {rowExpandedHandler} handler Callback
+                 */
+                rowExpanded: (scope: ng.IScope, handler: rowExpandedHandler<TEntity>) => void;
+            }
+        }
+
+        export interface ITreeState {
+            expandedState: {
+                [index: string]: string
+            }
+        }
+
+        export interface rowCollapsedHandler<TEntity> {
+            /**
+             * Row Collapsed callback
+             * @param {IGridRow} row The row that was collapsed.  You can also retrieve the grid from this row with 
+             * row.grid
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+
+        export interface rowExpandedHandler<TEntity> {
+            /**
+             * Row Expanded callback
+             * @param {IGridRow} row The row that was expanded.  You can also retrieve the grid from this row with 
+             * row.grid
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+
+        /**
+         * Constants available in treeBase module.
+         *
+         * These constants are manually copied into grouping and treeView,
+         * as I haven't found a way to simply include them,
+         * and it's not worth investing time in for something that changes very infrequently.
+         */
+        export interface IUiGridTreeBaseConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export module treeView {
+        /**
+         * GridOptions for treeView feature, these are available to be set using the ui-grid gridOptions
+         *
+         * Many tree options are set on treeBase, make sure to look at that feature in conjunction with these options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable row tree view for entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enableTreeView?: boolean;
+        }
+
+        export interface IUiGridTreeViewConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export interface ISharedTreeConstants {
+        rowHeaderColName: string;
+        EXPANDED: string;
+        COLLAPSED: string;
+        aggregation: {
+            COUNT: string;
+            SUM: string;
+            MAX: string;
+            MIN: string;
+            AVG: string;
+        }
+    }
+
+    // Tree View
+
+    export interface IGridApiConstructor<TEntity> {
+        new (grid: IGridInstanceOf<TEntity>): IGridApiOf<TEntity>;
+    }
+    export type IGridApi = IGridApiOf<any>;
+    export interface IGridApiOf<TEntity> {
         /**
          * Registers a new event for the given feature. The event will get a .raise and .on prepended to it
          *
@@ -377,36 +3274,88 @@ declare module uiGrid {
         /**
          * Core Api
          */
-        core: IGridCoreApi;
+        core: IGridCoreApi<TEntity>;
 
         /**
-         * Selection api
+         * Cell Nav Api
          */
-        selection: IGridSelectionApi;
-
+        cellNav: cellNav.ICellNavApi<TEntity>;
 
         /**
-         * Pagination api
+         * Move Columns Api
          */
-        pagination: IGridPaginationApi;
-
-
-        /**
-         * Grid Row Edit Api
-         */
-        rowEdit: IGridRowEditApi;
+        colMovable: moveColumns.IGridMoveColumnsApi;
 
         /**
          * Grid row resizable Api
          */
-        colResizable: IGridRowResizableApi;
+        colResizable: resizeColumns.IGridResizeColumnsApi;
+
+        /**
+         * Edit Api
+         */
+        edit: edit.IGridEditApi<TEntity>;
+
+        /**
+         * Expandable Api
+         */
+        expandable: expandable.IGridExpandableApi<TEntity>;
+
+        /**
+         * Exporter Api
+         */
+        exporter: exporter.IGridExporterApi;
+
+        /**
+         * Grouping Api
+         */
+        grouping: grouping.IGridGroupingApi<TEntity>;
+
+        /**
+         * Importer Api
+         */
+        importer: importer.IGridImporterApi;
+
+        /**
+         * Infinite Scroll Api
+         */
+        infiniteScroll: infiniteScroll.IGridInfiniteScrollApi<TEntity>;
+
+        /**
+         * Pagination Api
+         */
+        pagination: pagination.IGridPaginationApi;
+
+        /**
+         * Pinning Api
+         */
+        pinning: pinning.IGridPinningApi<TEntity>;
+
+        /**
+         * Grid Row Edit Api
+         */
+        rowEdit: rowEdit.IGridRowEditApi<TEntity>;
+
+        /**
+         * Grid Save State Api
+         */
+        saveState: saveState.IGridSaveStateApi;
+        /**
+         * Selection Api
+         */
+        selection: selection.IGridSelectionApi<TEntity>;
+
+        /**
+         * Tree Base Api
+         */
+        treeBase: treeBase.IGridTreeBaseApi<TEntity>;
 
         /**
          * A grid instance is made available in the gridApi.
          */
-        grid: IGridInstance;
+        grid: IGridInstanceOf<TEntity>;
     }
-    export interface IGridRowConstructor {
+    export interface IGridRowConstructor<TEntity> {
         /**
          * 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.
@@ -414,13 +3363,15 @@ declare module uiGrid {
          * @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;
+        new(entity: TEntity, index: number, reference: IGridInstanceOf<TEntity>): IGridRowOf<TEntity>;
     }
-    export interface IGridRow {
+    export type IGridRow = IGridRowOf<any>;
+    export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow, 
+        selection.IGridRow {
         /** A reference to an item in gridOptions.data[] */
-        entity: any;
+        entity: TEntity;
         /** A reference back to the grid */
-        grid: IGridInstance;
+        grid: IGridInstanceOf<TEntity>;
         /**
          * height of each individual row. changing the height will flag all
          * row renderContainers to recalculate their canvas height
@@ -431,26 +3382,6 @@ declare module uiGrid {
         /** 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
@@ -458,12 +3389,6 @@ declare module uiGrid {
          * @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.
@@ -474,7 +3399,7 @@ declare module uiGrid {
          * Changed to just call the internal function row.clearThisRowInvisible().
          * @param row the row we want to clear the invisible flag
          */
-        clearRowInvisible(row: IGridRow): void;
+        clearRowInvisible(row: IGridRowOf<TEntity>): void;
         /**
          * Clears any override on the row visibility, returning it to normal visibility calculations.
          * Emits the rowsVisibleChanged event
@@ -494,13 +3419,13 @@ declare module uiGrid {
          * @param col column instance
          * @returns resulting name that can be evaluated against a row
          */
-        getEntityQualifiedColField(col: IGridColumn): string;
+        getEntityQualifiedColField(col: IGridColumnOf<TEntity>): 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;
+        getQualifiedColField(col: IGridColumnOf<TEntity>): string;
         /**
          * Sets an override on the row that forces it to always be invisible.
          * Emits the rowsVisibleChanged event if it changed the row visibility.
@@ -510,7 +3435,7 @@ declare module uiGrid {
          * Changed to just call the internal function row.setThisRowInvisible().
          * @param row the row we want to set to invisible
          */
-        setRowInvisible(row: IGridRow): void;
+        setRowInvisible(row: IGridRowOf<TEntity>): void;
         /**
          * Sets an override on the row that forces it to always be invisible.
          * Emits the rowsVisibleChanged event if it changed the row visibility
@@ -520,7 +3445,7 @@ declare module uiGrid {
         setThisRowInvisible(reason: string, fromRowsProcessor: boolean): void;
     }
 
-    export interface IGridColumnConstructor {
+    export interface IGridColumnConstructor<TEntity> {
         /**
          * Represents the viewModel for each column.
          * Any state or methods needed for a Grid Column are defined on this prototype
@@ -528,12 +3453,13 @@ declare module uiGrid {
          * @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;
+        new(gridCol: IColumnDefOf<TEntity>, index: number, grid: IGridInstanceOf<TEntity>): IGridColumnOf<TEntity>;
     }
 
-    export interface IGridColumn {
+    export type IGridColumn = IGridColumnOf<any>;
+    export interface IGridColumnOf<TEntity> {
         /** Column definition */
-        colDef: uiGrid.IColumnDef;
+        colDef: uiGrid.IColumnDefOf<TEntity>;
         /**
          * Column name that will be shown in the header.
          * If displayName is not provided then one is generated using the name.
@@ -563,7 +3489,7 @@ declare module uiGrid {
          * @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;
+        GridColumn(colDef: IColumnDefOf<TEntity>, uid: number, grid: IGridInstanceOf<TEntity>): 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.
@@ -601,7 +3527,7 @@ declare module uiGrid {
          * @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;
+        setPropertyOrDefault(colDef: IColumnDefOf<TEntity>, propName: string, defaultValue: any): void;
         /** Makes the column visible by setting colDef.visible = true */
         showColumn(): void;
         /**
@@ -610,7 +3536,7 @@ declare module uiGrid {
          * @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;
+        updateColumnDef(colDef: IColumnDefOf<TEntity>, isNew: boolean): void;
     }
 
     /**
@@ -618,7 +3544,10 @@ declare module uiGrid {
      * which would typically be one of many column definitions within the
      * gridOptions.columnDefs array
      */
-    export interface IColumnDef {
+    export type IColumnDef = IColumnDefOf<any>;
+    export interface IColumnDefOf<TEntity> extends cellNav.IColumnDef, edit.IColumnDef<TEntity>, exporter.IColumnDef,
+        grouping.IColumnDef, moveColumns.IColumnDef, pinning.IColumnDef, resizeColumns.IColumnDef, 
+        treeBase.IColumnDef<TEntity> {
         /**
          * defaults to false
          * if set to true hides the label text in the aggregation footer, so only the value is displayed.
@@ -641,7 +3570,7 @@ declare module uiGrid {
          * or it can be a function(row,rowRenderIndex, col, colRenderIndex)
          * that returns a class name
          */
-        cellClass?: string | ICellClassGetter;
+        cellClass?: string | ICellClassGetter<TEntity>;
         /** cellFilter is a filter to apply to the content of each cell */
         cellFilter?: string;
         /**
@@ -661,7 +3590,7 @@ declare module uiGrid {
          * Defaults to false
          * @default false
          */
-        cellTooltip?: boolean | string | ICellTooltipGetter;
+        cellTooltip?: boolean | string | ICellTooltipGetter<TEntity>;
         /**
          * Column name that will be shown in the header.
          * If displayName is not provided then one is generated using the name.
@@ -723,7 +3652,7 @@ declare module uiGrid {
          * 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;
+        footerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
         /** 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 */
@@ -732,7 +3661,7 @@ declare module uiGrid {
          * 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;
+        headerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
         /** 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 */
@@ -747,7 +3676,7 @@ declare module uiGrid {
          * if a static string then shows that static string.
          * @default false
          */
-        headerTooltip?: boolean | string | IHeaderTooltipGetter;
+        headerTooltip?: boolean | string | IHeaderTooltipGetter<TEntity>;
         /** sets the maximum column width */
         maxWidth?: number;
         /** used to add menu items to a column. Refer to the tutorial on this functionality */
@@ -799,18 +3728,19 @@ declare module uiGrid {
         width?: number | string;
     }
 
-    export interface ICellClassGetter {
-        (gridRow?: IGridRow, gridCol?: IGridColumn, colRenderIndex?: number): string;
+    export interface ICellClassGetter<TEntity> {
+        (gridRow?: IGridRowOf<TEntity>, gridCol?: IGridColumnOf<TEntity>, colRenderIndex?: number): string;
     }
 
-    export interface ICellTooltipGetter {
-        (gridRow: IGridRow, gridCol: IGridColumn): string;
+    export interface ICellTooltipGetter<TEntity> {
+        (gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): string;
     }
-    export interface IHeaderTooltipGetter {
-        (gridCol: IGridColumn): string;
+    export interface IHeaderTooltipGetter<TEntity> {
+        (gridCol: IGridColumnOf<TEntity>): string;
     }
-    export interface IHeaderFooterCellClassGetter {
-        (gridRow: IGridRow, rowRenderIndex: number, gridCol: IGridColumn, colRenderIndex: number): string;
+    export interface IHeaderFooterCellClassGetter<TEntity> {
+        (gridRow: IGridRowOf<TEntity>, rowRenderIndex: number, gridCol: IGridColumnOf<TEntity>, colRenderIndex: number)
+            : string;
     }
     export interface IMenuItem {
         /** controls the title that is displayed in the menu */
@@ -883,3 +3813,7 @@ declare module uiGrid {
         caseSensitive?: boolean;
     }
 }
+
+declare module 'angular-ui-grid' {
+    export = uiGrid;
+}
diff --git a/ui-router-extras/ui-router-extras-tests.ts b/ui-router-extras/ui-router-extras-tests.ts
new file mode 100644
index 000000000..a87b95863
--- /dev/null
+++ b/ui-router-extras/ui-router-extras-tests.ts
@@ -0,0 +1,48 @@
+/// <reference path="ui-router-extras.d.ts"/>
+
+var myApp = angular.module('testModule')
+
+myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: angular.ui.IStickyStateProvider) => {
+    var state: angular.ui.IStickyState = {
+		name: 'test',
+        sticky: true,
+        dsr: {
+            default: 'substate',
+            params: ['param1', 'param2'],
+            fn: function ($dsr$) {               
+
+                return $dsr$.to;
+            }            
+        },
+        onInactivate: function ($state: angular.ui.IState) {
+            var iAmInjectedByInjector = $state;
+        },
+        onReactivate: function ($state: angular.ui.IState) {
+            var iAmInjectedByInjector = $state;
+        },
+        controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService) => {
+			$previousState.memo('test-memo1');
+			$previousState.memo('test-memo2', 'test-state-name2');
+			$previousState.memo('test-memo3', 'test-state-name3', {});
+			$previousState.forget('test-memo3');
+			$previousState.go('test-memo2', {
+				location: true,
+				notify: true
+            });
+            $previousState.get();
+            $previousState.get('test-memo1');
+
+            $deepstateRedirect.reset('statename1', {
+                'stateParam1': ['value1', 'value2'],
+                'stateParam2': 'value'
+            });
+        }, 
+        views: {
+            //named views are mandatory
+            'name1': {}            
+        }
+	};
+
+	$stickyStateProvider.enableDebug(true);
+	$stateProvider.state(state);
+});
diff --git a/ui-router-extras/ui-router-extras.d.ts b/ui-router-extras/ui-router-extras.d.ts
new file mode 100644
index 000000000..1fc5846c8
--- /dev/null
+++ b/ui-router-extras/ui-router-extras.d.ts
@@ -0,0 +1,151 @@
+// Type definitions for UI-Router Extras 0.0.14+ (ct.ui.router.extras module)
+// Project: https://github.com/christopherthielen/ui-router-extras
+// Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angular-ui-router/angular-ui-router.d.ts" />
+
+// Support for AMD require
+declare module 'angular-ui-router-extras' {
+    var _: string;
+    export = _;
+}
+
+declare module angular.ui {
+
+
+    /*
+     * $deepStateRedirect
+     */
+    interface IDeepStateRedirectService {
+        /*
+         * This method resets stored $deepStateRedirect data so following transitions will behave like there have not been previous transitions.
+         * @param stateParams Can be passed in to select specific states to reset:
+         *  {
+         *    'paramName': 'paramvalue' | ['list', 'of', 'possible', 'paramvalues']
+         *  }
+         */
+        reset(stateName: string, stateParams?: { [key: string]: string | string[] }): void;
+    }
+
+    /*
+     * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
+     */
+    interface IDeepStateRedirectConfig {
+        /*
+         * If no deep state has been recorded, DSR will instead redirect to the default substate and params that you specify.
+         * If default is a string it is interpreted as the substate.
+         */
+        default?: string | IRedirectParams;
+        /*
+         * Specify params: true if your DSR state takes parameters.
+         * If only a subset of the parameters should be included in the parameter grouping for recording deep states,
+         * specify an array of parameter names.
+         */
+        params?: boolean | string[];
+        /*
+         * A callback function that determines whether or not the redirect should actually occur, or changes the redirect to some other state.
+        * Return an object: IRedirectParams to change the redirect
+         */
+        fn?($dsr$: { redirect: IRedirectParams; to: IRedirectParams }): boolean | IRedirectParams;
+    }
+
+    interface IRedirectParams {
+        state: string;
+        params?: ui.IStateParamsService;
+    }
+
+    /*
+     * Previous state
+     */
+    interface IPreviousState {
+        state: IState;
+        params?: ui.IStateParamsService;
+    }
+
+    /**
+     * Previous state service
+     */
+    interface IPreviousStateService {
+
+        /**
+         * Get a previous state
+         * @param memoName Memo name
+         * @return Previous state
+         */
+        get(memoName?: string): IPreviousState;
+
+        /**
+         * Go to a state
+         * @param memoName Memo name
+         * @param options State options
+         * @return Promise
+         */
+        go(memoName: string, options?: IStateOptions): angular.IPromise<any>;
+
+        /**
+         * Memorize a state
+         * @param memoName Memo name
+         * @param defaultStateName Default state name
+         * @param defaultStateParams Default state parameters
+         */
+        memo(memoName: string, defaultStateName?: string, defaultStateParams?: {}): void;
+
+        /**
+         * Forget a memorized name
+         * @param memoName Memo name
+         */
+        forget(memoName: string): void;
+    }
+
+    /**
+    * Sticky state
+    */
+    interface IStickyState extends angular.ui.IState {
+        /*
+        * When marking a state sticky, the state must target its own unique named ui-view.
+        * Docs: http://christopherthielen.github.io/ui-router-extras/#/sticky
+        */
+        sticky?: boolean;
+        /*
+         * The most-recently-activate substate of the DSR marked state is remembered.
+         * When the DSR marked state is transitioned to directly, UI-Router Extras will instead redirect to the remembered state and parameters.
+         * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
+         */
+        deepStateRedirect?: boolean | IDeepStateRedirectConfig;
+        /*
+         * Shortname deepStateRedirect prop
+         */
+        dsr?: boolean | IDeepStateRedirectConfig;
+        /*
+         * Function (injectable). Called when a sticky state is navigated away from (inactivated).
+         */
+        onInactivate?: Function;
+        /*
+         * Function (injectable). Called when an inactive sticky state is navigated to (reactivated).
+         */
+        onReactivate?: Function;
+        /*
+         * Note: named views are mandatory when using sticky states!
+         */
+        views?: { [name:string]: angular.ui.IState };
+    }
+
+
+    /**
+     * Sticky state service
+     */
+    interface IStickyStateService {
+        getInactiveStates(): IStickyState[];
+    }
+
+    /**
+     * Sticky state provider
+     */
+    interface IStickyStateProvider extends angular.IServiceProvider {
+        debugMode(): boolean;
+        enableDebug(enabled: boolean): boolean;
+        registerStickyState(state: IStickyState): void;
+    }
+
+}
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index f469d3bea..13410c23b 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -177,6 +177,8 @@ _.pairs({ one: 1, two: 2, three: 3 });
 _.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" });
 _.functions(_);
 _.extend({ name: 'moe' }, { age: 50 });
+_.extendOwn({ name: 'moe'}, { age: 50 });
+_.assign({ name: 'moe'}, { age: 50 });
 _.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
 _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name');
 _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 4aed7a855..7dea66a84 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -1236,6 +1236,20 @@ interface UnderscoreStatic {
 		destination: any,
 		...sources: any[]): any;
 
+	/**
+	* Like extend, but only copies own properties over to the destination object. (alias: assign)
+	*/
+	extendOwn(
+		destination: any,
+		...source: any[]): any;
+		
+	/**
+	* Like extend, but only copies own properties over to the destination object. (alias: extendOwn)
+	*/
+	assign(
+		destination: any,
+		...source: any[]): any;
+
 	/**
 	* Return a copy of the object, filtered to only have values for the whitelisted keys
 	* (or array of valid keys).
@@ -1600,13 +1614,6 @@ interface UnderscoreStatic {
 	**/
 	chain<T>(obj: T[]): _Chain<T>;
 	chain<T extends {}>(obj: T): _Chain<T>;
-
-	/**
-	* Extracts the value of a wrapped object.
-	* @param obj Wrapped object to extract the value from.
-	* @return Value of `obj`.
-	**/
-	value<T, TResult>(obj: T): TResult;
 }
 
 interface Underscore<T> {
@@ -2449,7 +2456,8 @@ interface Underscore<T> {
 
 	/**
 	* Wrapped type `any`.
-	* @see _.value
+	* Extracts the value of a wrapped object.
+	* @return Value of the wrapped object.
 	**/
 	value<TResult>(): TResult;
 }
diff --git a/undertaker/undertaker-tests.ts b/undertaker/undertaker-tests.ts
new file mode 100644
index 000000000..b40e19af1
--- /dev/null
+++ b/undertaker/undertaker-tests.ts
@@ -0,0 +1,46 @@
+/// <reference path="undertaker.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
+var fs = require('fs');
+var Undertaker = require('undertaker');
+import { Registry }  from 'undertaker';
+require('es6-promise');
+
+var taker = new Undertaker();
+
+taker.task('task1', function(cb: () => void){
+    // do things
+
+    cb(); // when everything is done
+});
+
+taker.task('task2', function(){
+    return fs.createReadStream('./myFile.js')
+        .pipe(fs.createWriteStream('./myFile.copy.js'));
+});
+
+taker.task('task3', function(){
+    return new Promise(function(resolve, reject){
+        // do things
+
+        resolve(); // when everything is done
+    });
+});
+
+taker.task('combined', taker.series('task1', 'task2'));
+
+taker.task('all', taker.parallel('combined', 'task3'));
+
+var registry: Registry;
+function CommonRegistry(options: { buildDir: string }): Registry {
+    return registry;
+}
+
+var taker = new Undertaker(CommonRegistry({ buildDir: '/dist' }));
+
+taker.task('build', taker.series('clean', function build(cb: () => void) {
+    // do things
+    cb();
+}));
+
diff --git a/undertaker/undertaker.d.ts b/undertaker/undertaker.d.ts
new file mode 100644
index 000000000..b31b6646d
--- /dev/null
+++ b/undertaker/undertaker.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for undertaker 0.12.0
+// Project: https://github.com/phated/undertaker
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "undertaker" {
+
+    export interface UndertakerStatic {
+        new(registry?: Registry): Undertaker;
+    }
+
+    export interface Undertaker {
+        task: TaskMethod;
+        /**
+         * Takes a variable amount of strings (taskName) and/or functions (fn)
+         * and returns a function of the composed tasks or functions.
+         * Any taskNames are retrieved from the registry using the get method.
+         *
+         * When the returned function is executed, the tasks or functions will be executed in series,
+         * each waiting for the prior to finish. If an error occurs, execution will stop.
+         * @param task
+         */
+        series(...tasks: (string|Task)[]): Task;
+        /**
+         * Takes a variable amount of strings (taskName) and/or functions (fn)
+         * and returns a function of the composed tasks or functions.
+         * Any taskNames are retrieved from the registry using the get method.
+         *
+         * When the returned function is executed, the tasks or functions will be executed in parallel,
+         * all being executed at the same time. If an error occurs, all execution will complete.
+         * @param tasks
+         */
+        parallel(...tasks: (string|Task)[]): Task;
+        /**
+         * Returns the current registry object.
+         */
+        registry(): Registry;
+        /**
+         * The tasks from the current registry will be transferred to it
+         * and the current registry will be replaced with the new registry.
+         * @param registry
+         */
+        registry(registry: Registry): void;
+        /**
+         * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
+         * @param options
+         */
+        tree(options?: { deep?: boolean }): Node[]|string[];
+        /**
+         * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
+         * The time will be the time the task started.  Returns undefined if the task has not been run.
+         * @param task
+         * @param timeResolution
+         */
+        lastRun(task: string, timeResolution?: number): number;
+    }
+
+    export interface Task {
+        (cb?: Function): any;
+    }
+
+    export interface TaskMethod {
+        /**
+         * Returns the registered function.
+         * @param taskName
+         */
+        (taskName: string): Task;
+        /**
+         * Register the task by the taskName.
+         * @param taskName
+         * @param fn
+         */
+        (taskName: string, fn: Task): void;
+        /**
+         * Register the task by the name property of the function.
+         * @param fn
+         */
+        (fn: Task): void;
+        /**
+         * Register the task by the displayName property of the function.
+         * @param fn
+         */
+        (fn: Task & { displayName: string }): void;
+    }
+
+    export interface Registry {
+        /**
+         * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
+         * @param taker
+         */
+        init(taker: Undertaker): void;
+        /**
+         * returns the task with that name or undefined if no task is registered with that name.
+         * @param taskName
+         */
+        get(taskName: string): Task;
+        /**
+         * add task to the registry. If set modifies a task, it should return the new task.
+         * @param taskName
+         * @param fn
+         */
+        set(taskName: string, fn: Task): void;
+        /**
+         * returns an object listing all tasks in the registry.
+         */
+        tasks(): { [taskName: string]: Task };
+    }
+
+    export interface Node {
+        label: string;
+        type: string;
+        nodes: Node[];
+    }
+
+    export default UndertakerStatic;
+}
+
diff --git a/uniq/uniq-tests.ts b/uniq/uniq-tests.ts
index b9facc8e2..1dc3d6fd8 100644
--- a/uniq/uniq-tests.ts
+++ b/uniq/uniq-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./uniq.d.ts" />
+
 import unique = require("uniq");
 var data = [1, 2, 2, 3, 4, 5, 5, 5, 6];
 var datastr = ["1", "2", "2", "3", "4", "5", "5", "5", "6"];
diff --git a/unique-random/unique-random-tests.ts b/unique-random/unique-random-tests.ts
new file mode 100644
index 000000000..428d1c77e
--- /dev/null
+++ b/unique-random/unique-random-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="./unique-random.d.ts" />
+
+import uniqueRandom = require("unique-random");
+const rand = uniqueRandom(1, 10);
+const num: number = rand();
diff --git a/unique-random/unique-random.d.ts b/unique-random/unique-random.d.ts
new file mode 100644
index 000000000..caa467bda
--- /dev/null
+++ b/unique-random/unique-random.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for unique-random
+// Project: https://github.com/sindresorhus/unique-random
+// Definitions by: Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "unique-random" {
+  function uniqueRandom(min: number, max: number): () => number;
+
+  export = uniqueRandom;
+}
diff --git a/upper-case-first/upper-case-first-tests.ts b/upper-case-first/upper-case-first-tests.ts
new file mode 100644
index 000000000..2ca02dd74
--- /dev/null
+++ b/upper-case-first/upper-case-first-tests.ts
@@ -0,0 +1,6 @@
+/// <reference path="upper-case-first.d.ts" />
+
+import upperCaseFirst = require('upper-case-first');
+
+console.log(upperCaseFirst(null));     // => ""
+console.log(upperCaseFirst('string')); // => "String"
diff --git a/upper-case-first/upper-case-first.d.ts b/upper-case-first/upper-case-first.d.ts
new file mode 100644
index 000000000..21af3d676
--- /dev/null
+++ b/upper-case-first/upper-case-first.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for upper-case-first
+// Project: https://github.com/blakeembrey/upper-case-first 
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "upper-case-first" {
+	function upperCaseFirst(string: string): string;
+	export = upperCaseFirst;
+}
diff --git a/upper-case/upper-case-tests.ts b/upper-case/upper-case-tests.ts
new file mode 100644
index 000000000..a7128bdf6
--- /dev/null
+++ b/upper-case/upper-case-tests.ts
@@ -0,0 +1,8 @@
+/// <reference path="upper-case.d.ts" />
+
+import upperCase = require('upper-case');
+
+console.log(upperCase(null));       	 // => ""
+console.log(upperCase('string'));  	 // => "STRING"
+
+console.log(upperCase({ toString: function() { return 'test' } })); // => "TEST"
diff --git a/upper-case/upper-case.d.ts b/upper-case/upper-case.d.ts
new file mode 100644
index 000000000..c59348776
--- /dev/null
+++ b/upper-case/upper-case.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for upper-case
+// Project: https://github.com/blakeembrey/upper-case 
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "upper-case" {
+	function upperCase(string: any, locale?: string): string;
+	export = upperCase;
+}
diff --git a/urbanairship-cordova/urbanairship-cordova-tests.ts b/urbanairship-cordova/urbanairship-cordova-tests.ts
new file mode 100644
index 000000000..b8665be43
--- /dev/null
+++ b/urbanairship-cordova/urbanairship-cordova-tests.ts
@@ -0,0 +1,104 @@
+/// <reference path="urbanairship-cordova.d.ts" />
+
+//#region Basic Example taken from http://docs.urbanairship.com/platform/phonegap.html#actions
+
+// Register for any Urban Airship events
+document.addEventListener("urbanairship.registration", function (event: UrbanAirshipPlugin.RegistrationEvent) {
+    if (event.error) {
+        console.log("There was an error registering for push notifications");
+    } else {
+        console.log("Registered with channel ID: " + event.channelID);
+        console.log("Registered with device token: " + event.deviceToken);
+    }
+});
+
+document.addEventListener("urbanairship.push", function (event: UrbanAirshipPlugin.PushEvent) {
+    console.log("Incoming push: " + event.message);
+});
+
+// Set tags on a device, that you can push to
+UAirship.setTags(["loves_cats", "shops_for_games"], function () {
+    UAirship.getTags(function (tags: string[]) {
+        tags.forEach(function (tag: string) {
+            console.log("Tag: " + tag);
+        });
+    });
+});
+
+// Set an alias, this lets you tie a device to a user in your system
+UAirship.setAlias("awesomeuser22", function () {
+    UAirship.getAlias(function (alias: string) {
+        console.log("The user formerly known as " + alias);
+    });
+});
+
+// Enable user notifications (will prompt the user to accept push notifications)
+UAirship.setUserNotificationsEnabled(true, function (status: string) {
+    console.log("User notifications are enabled! Fire away!");
+});
+
+//#endregion
+
+//#region Method signatures and parameter types
+
+UAirship.setUserNotificationsEnabled(true, (status: string) => {});
+UAirship.isUserNotificationsEnabled((enabled: boolean) => {});
+UAirship.getChannelID((id: string) => {});
+
+UAirship.getLaunchNotification(true, (push: UrbanAirshipPlugin.PushEvent) => {
+    var message: string = push.message;
+    var extras: { [key: string]: any; } = push.extras;
+});
+
+UAirship.setQuietTimeEnabled(true, () => {});
+UAirship.isQuietTimeEnabled((enabled: boolean) => {});
+UAirship.setQuietTime(1, 1, 1, 1, () => {});
+UAirship.getQuietTime((quietTime: UrbanAirshipPlugin.QuietTimeTimeSpan) => {});
+UAirship.isInQuietTime((inQuietTime: boolean) => {});
+
+UAirship.setNotificationTypes(UAirship.notificationType.sound, () => {});
+UAirship.setNotificationTypes(UAirship.notificationType.alert, () => {});
+UAirship.setNotificationTypes(UAirship.notificationType.badge, () => {});
+UAirship.setNotificationTypes(UAirship.notificationType.sound | UAirship.notificationType.badge, () => {});
+
+UAirship.setAutobadgeEnabled(true, () => {});
+UAirship.setBadgeNumber(1, () => {});
+UAirship.getBadgeNumber((badgeNumber: number) => {});
+UAirship.resetBadge(() => {});
+UAirship.clearNotifications(() => {});
+UAirship.setSoundEnabled(true, () => {});
+UAirship.isSoundEnabled((enabled: boolean) => { var isEnabled: boolean = enabled; });
+UAirship.setVibrateEnabled(true, () => {});
+UAirship.isVibrateEnabled((enabled: boolean) => { var isEnabled: boolean = enabled; });
+UAirship.setTags(["a", "b", "c"], () => {});
+UAirship.getTags((tags: string[]) => { var results: string[] = tags; });
+UAirship.setAlias("a", () => {});
+UAirship.getAlias((alias: string) => { var result: string = alias; })
+UAirship.setNamedUser("a", () => {});
+UAirship.getNamedUser((namedUserId: string) => { var result: string = namedUserId; });
+
+UAirship.editNamedUserTagGroups()
+        .addTags("loyalty", ["platinum-member", "gold-member"])
+        .removeTags("loyalty", ["silver-member", "bronze-member"])
+        .apply();
+
+UAirship.editChannelTagGroups()
+        .addTags("loyalty", ["platinum-member", "gold-member"])
+        .removeTags("loyalty", ["silver-member", "bronze-member"])
+        .apply();
+
+UAirship.setAnalyticsEnabled(true, () => {});
+UAirship.isAnalyticsEnabled((enabled: boolean) => { var result: boolean = enabled; });
+
+UAirship.runAction("a", "b", (result: UrbanAirshipPlugin.RunActionResult) => {
+    var error: string = result.error;
+    var value: any = result.value;
+});
+
+UAirship.setLocationEnabled(true, () => {});
+UAirship.isLocationEnabled((enabled: boolean) => { var result: boolean = enabled; });
+UAirship.setBackgroundLocationEnabled(true, () => {});
+UAirship.isBackgroundLocationEnabled(() => {});
+UAirship.recordCurrentLocation(() => {});
+
+//#endregion
\ No newline at end of file
diff --git a/urbanairship-cordova/urbanairship-cordova.d.ts b/urbanairship-cordova/urbanairship-cordova.d.ts
new file mode 100644
index 000000000..2d17721d0
--- /dev/null
+++ b/urbanairship-cordova/urbanairship-cordova.d.ts
@@ -0,0 +1,477 @@
+// Type definitions for phonegap-ua-push 3.4.1
+// Project: https://github.com/urbanairship/phonegap-ua-push
+// Definitions by: Justin Unterreiner <https://github.com/Justin-Credible>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+//#region API Types
+
+/**
+ * This is a wrapper "namespace" for the various types used by the UAirship module.
+ */
+declare module UrbanAirshipPlugin {
+
+    //#region API Definitions
+
+    interface UrbanAirshipStatic {
+
+        /**
+         * The enumeration values for use with setNotificationTypes().
+         */
+        notificationType: {
+            none: number;
+            badge: number;
+            sound: number;
+            alert: number;
+        }
+
+        /**
+         * Enables or disables user notifications on the device.
+         * This will prompt users to opt-in to notifications on iOS.
+         * 
+         * @param enabled Set to true to enable notifications, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setUserNotificationsEnabled(enabled: boolean, callback: (status: string) => void): void;
+    
+        /**
+         * Checks if user notifications are enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isUserNotificationsEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * Get the push identifier for the device. The channel ID is used to send
+         * messages to the device for testing, and is the canonical identifier for
+         * the device in Urban Airship.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getChannelID(callback: (id: string) => void): void;
+    
+        /**
+         * Returns the push message object that contains the data associated with a
+         * push notification. The extras dictionary can contain arbitrary key/value
+         * data that you use in your application.
+         * 
+         * @param clear Set to true to clear the notification.
+         * @param callback The function to call on completion.
+         */
+        getLaunchNotification(clear: boolean, callback: (push: UrbanAirshipPlugin.PushEvent) => void): void;
+    
+        /**
+         * Enables or disables quiet time.
+         * 
+         * @param enabled Set to true to enable quiet time, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setQuietTimeEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * Checks if quiet time is enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isQuietTimeEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * Set the quiet time for the device.
+         * 
+         * @param startHour The start hour for quiet time.
+         * @param startMinute The start minute for quiet time.
+         * @param endHour The end hour for quiet time.
+         * @param endMinute the end minute for quiet time.
+         * @param callback The function to call on completion.
+         */
+        setQuietTime(startHour: number, startMinute: number, endHour: number, endMinute: number, callback: () => void): void;
+    
+        /**
+         * Get the current quiet time. The quietTime object represents a timespan
+         * during which notifications should be silenced. The typical use case is
+         * to expose a preference to your users so that they can enable this setting
+         * and specify an interval during which they do not wish to be disturbed.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getQuietTime(callback: (quietTime: UrbanAirshipPlugin.QuietTimeTimeSpan) => void): void;
+    
+        /**
+         * Checks if quiet time is currently in effect.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isInQuietTime(callback: (inQuietTime: boolean) => void): void;
+    
+        /**
+         * (iOS Only)
+         * 
+         * On iOS, registration for push requires specifying what
+         * combination of badges, sound and alerts are desired. This function
+         * must be explicitly called in order to begin the registration process.
+         * 
+         * For example:
+         * 
+         * UAirship.setNotificationTypes(UAirship.notificationType.sound |
+         *                                  UAirship.notificationType.alert);
+         * 
+         * @param bitmask The notification types to set.
+         * @param callback The function to call on completion.
+         */
+        setNotificationTypes(bitmask: number, callback: () => void): void;
+    
+        /**
+         * (iOS Only)
+         * 
+         * Set whether the UA Autobadge feature is enabled.
+         * 
+         * @param enabled Set to true to enable Autobadge, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setAutobadgeEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * (iOS Only)
+         * 
+         * Set the current application badge number.
+         * 
+         * @param badge The number to use for the badge.
+         * @param callback The function to call on completion.
+         */
+        setBadgeNumber(badge: number, callback: () => void): void;
+    
+        /**
+         * (iOS Only)
+         * 
+         * Gets the current application badge number.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getBadgeNumber(callback: (badgeNumber: number) => void): void;
+    
+        /**
+         * (iOS Only)
+         * 
+         * Reset the badge number to zero.
+         * 
+         * @param callback The function to call on completion.
+         */
+        resetBadge(callback: () => void): void;
+    
+        /**
+         * (Android Only)
+         * 
+         * Clears the notifications posted by the application.
+         * 
+         * @param callback The function to call on completion.
+         */
+        clearNotifications(callback: () => void): void;
+    
+        /**
+         * (Android only, iOS sound settings come in the push)
+         * 
+         * Set whether the device makes sound on push.
+         * 
+         * @param enabled Set to true to enable sound, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setSoundEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * (Android Only)
+         * 
+         * Checks if sound is enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isSoundEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * (Android Only)
+         * 
+         * Set whether the device vibrates on push.
+         * 
+         * @param enabled Set to true to enable vibration, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setVibrateEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * (Android Only)
+         * 
+         * Checks if vibration is enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isVibrateEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * Sets tags for the device.
+         * 
+         * @param tags An array of tags.
+         * @param callback The function to call on completion.
+         */
+        setTags(tags: string[], callback: () => void): void;
+    
+        /**
+         * Returns the tags for the device.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getTags(callback: (tags: string[]) => void): void;
+    
+        /**
+         * Set alias for the device.
+         * 
+         * @param alias The alias to set for this device.
+         * @param callback The function to call on completion.
+         */
+        setAlias(alias: string, callback: () => void): void;
+    
+        /**
+         * Gets the alias for this device.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getAlias(callback: (alias: string) => void): void;
+    
+        /**
+         * Set the named user ID for this device.
+         * 
+         * @param namedUser The named user ID.
+         * @param callback The function to call on completion.
+         */
+        setNamedUser(namedUserId: string, callback: () => void): void;
+    
+        /**
+         * Gets the named user ID for this device.
+         * 
+         * @param callback The function to call on completion.
+         */
+        getNamedUser(callback: (namedUserId: string) => void): void;
+    
+        /**
+         * Fluent API to edit the named user tag groups by adding or removing
+         * tags, then applying the changes.
+         * 
+         * For example:
+         * 
+         * UAirship.editNamedUserTagGroups()
+         *      .addTags("loyalty", ["platinum-member", "gold-member"])
+         *      .removeTags("loyalty", ["silver-member", "bronze-member"])
+         *      .apply()
+         * 
+         * @returns The chainable API instance.
+         */
+        editNamedUserTagGroups(): UrbanAirshipPlugin.EditNamedUserTagGroupsApi;
+    
+        /**
+         * Fluent API to edit the channel tag groups by adding or removing tags,
+         * then applying the changes.
+         * 
+         * For exmaple:
+         * 
+         * UAirship.editChannelTagGroups()
+         *      .addTags("loyalty", ["platinum-member", "gold-member"])
+         *      .removeTags("loyalty", ["silver-member", "bronze-member"])
+         *      .apply()
+         */
+        editChannelTagGroups(): UrbanAirshipPlugin.EditChannelTagGroupsApi;
+    
+        /**
+         * Enables or disables analytics. Disabling analytics will delete any
+         * locally stored events and prevent any events from uploading. Features
+         * that depend on analytics being enabled may not work properly if it’s
+         * disabled (reports, region triggers, location segmentation, push to
+         * local time).
+         * 
+         * @param enabled Set to true to enable analytics, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setAnalyticsEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * Checks if analytics is enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isAnalyticsEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * Runs an Urban Airship action.
+         * 
+         * @param actionName The name of the action to run.
+         * @param actionValue The value for the action.
+         * @param callback The function to call on completion.
+         */
+        runAction(actionName: string, actionValue: string, callback: (result: UrbanAirshipPlugin.RunActionResult) => void): void;
+    
+        /**
+         * Enables or disables Urban Airship location services on the device.
+         * 
+         * @param enabled Set to true to enable location, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setLocationEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * Checks if location is enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isLocationEnabled(callback: (enabled: boolean) => void): void;
+    
+        /**
+         * Enables or disables background location on the device.
+         * 
+         * @param enabled Set to true to enable background location, false to disable.
+         * @param callback The function to call on completion.
+         */
+        setBackgroundLocationEnabled(enabled: boolean, callback: () => void): void;
+    
+        /**
+         * Checks if background location updates are enabled or not.
+         * 
+         * @param callback The function to call on completion.
+         */
+        isBackgroundLocationEnabled(callback: () => void): void;
+    
+        /**
+         * Records the current location of the device.
+         * 
+         * @param callback The function to call on completion.
+         */
+        recordCurrentLocation(callback: () => void): void;
+    }
+
+    /**
+     * Describes the chainable API object returned by editNamedUserTagGroups().
+     */
+    interface EditNamedUserTagGroupsApi {
+
+        /**
+         * Used to add the given tags to the given tag group.
+         * 
+         * @param tagGroup The tag group to add tags to.
+         * @param tags The tags to add to the group.
+         * 
+         * @returns The chainable API instance.
+         */
+        addTags: (tagGroup: string, tags: string[]) => EditNamedUserTagGroupsApi;
+
+        /**
+         * Used to remove the given tags from the given tag group.
+         * 
+         * @param tagGroup The tag group to remove tags from.
+         * @param tags The tags to remove from the group.
+         * 
+         * @returns The chainable API instance.
+         */
+        removeTags: (tagGroup: string, tags: string[]) => EditNamedUserTagGroupsApi;
+
+        /**
+         * Used to apply the changes from the chained API call.
+         * 
+         * @param callback The optional function to call on completion.
+         */
+        apply: (callback?: () => void) => void;
+    }
+
+    /**
+     * Describes the chainable API object returned by editChannelTagGroups().
+     */
+    interface EditChannelTagGroupsApi {
+
+        /**
+         * Used to add the given tags to the given tag group.
+         * 
+         * @param tagGroup The tag group to add tags to.
+         * @param tags The tags to add to the group.
+         * 
+         * @returns The chainable API instance.
+         */
+        addTags: (tagGroup: string, tags: string[]) => EditChannelTagGroupsApi;
+
+        /**
+         * Used to remove the given tags from the given tag group.
+         * 
+         * @param tagGroup The tag group to remove tags from.
+         * @param tags The tags to remove from the group.
+         * 
+         * @returns The chainable API instance.
+         */
+        removeTags: (tagGroup: string, tags: string[]) => EditChannelTagGroupsApi;
+
+        /**
+         * Used to apply the changes from the chained API call.
+         * 
+         * @param callback The optional function to call on completion.
+         */
+        apply: (callback?: () => void) => void;
+    }
+
+    //#endregion
+
+    //#region Data Types
+
+    interface PushEvent extends Event {
+        message: string;
+        extras: { [key: string]: any };
+    }
+
+    interface RegistrationEvent extends Event {
+
+        error: string;
+
+        /**
+         * The channel ID for the device.
+         */
+        channelID: string;
+
+        /**
+         * (iOS Only)
+         * 
+         * The push token for the device.
+         */
+        deviceToken: string;
+    }
+
+    /**
+     * Represents a timespan during which notifications should be silenced.
+     * 
+     * For example, 10PM - 6AM would be:
+     * { startHour: 22, startMinute: 0, endHour: 6, endMinute: 0 }
+     */
+    interface QuietTimeTimeSpan {
+        startHour: number,
+        startMinute: number,
+        endHour: number,
+        endMinute: number
+    }
+
+    /**
+     * The result of the runAction() call.
+     */
+    interface RunActionResult {
+        error: string;
+        value: any;
+    }
+
+    //#endregion
+}
+
+//#endregion
+
+//#region UAirship Global Variable Declaration
+
+declare var UAirship: UrbanAirshipPlugin.UrbanAirshipStatic;
+
+//#endregion
+
+//#region Additional Document Events
+
+interface Document {
+    addEventListener(type: "urbanairship.push", listener: (ev: UrbanAirshipPlugin.PushEvent) => void, useCapture?: boolean): void;
+    addEventListener(type: "urbanairship.registration", listener: (ev: UrbanAirshipPlugin.RegistrationEvent) => void, useCapture?: boolean): void;
+}
+
+//#endregion
\ No newline at end of file
diff --git a/urijs/URIjs-tests.ts b/urijs/URIjs-tests.ts
index 2dfd15618..0f529fe4a 100644
--- a/urijs/URIjs-tests.ts
+++ b/urijs/URIjs-tests.ts
@@ -34,3 +34,12 @@ URI('').setSearch('foo', 'bar');
 URI('').setSearch({ foo: 'bar' });
 
 var uri: uri.URI = $('a').uri();
+
+URI('http://example.org/foo/hello.html').segment('bar');
+URI('http://example.org/foo/hello.html').segment(0, 'bar');
+URI('http://example.org/foo/hello.html').segment(['foo', 'bar', 'foobar.html']);
+
+var withDuplicates = URI("?bar=1&bar=1")
+  .duplicateQueryParameters(true)
+  .normalizeQuery()
+  .toString();
\ No newline at end of file
diff --git a/urijs/URIjs.d.ts b/urijs/URIjs.d.ts
index 7bab32074..3bd4ba366 100644
--- a/urijs/URIjs.d.ts
+++ b/urijs/URIjs.d.ts
@@ -27,6 +27,8 @@ declare module uri {
         domain(): string;
         domain(domain: boolean): string;
         domain(domain: string): URI;
+        
+        duplicateQueryParameters(val: boolean): URI;
 
         equals(): boolean;
         equals(url: string): boolean;
@@ -95,10 +97,10 @@ declare module uri {
         search(qry: boolean): any;
         search(qry: Object): URI;
         segment(): string[];
-        segment(segments: string[]): string;
+        segment(segments: string[]): URI;
         segment(position: number): string;
-        segment(position: number, level: string): string;
-        segment(level: string): string;
+        segment(position: number, level: string): URI;
+        segment(segment: string): URI;
         setQuery(key: string, value: string): URI;
         setQuery(qry: Object): URI;
         setSearch(key: string, value: string): URI;
diff --git a/url-template/url-template-tests.ts b/url-template/url-template-tests.ts
new file mode 100644
index 000000000..f477a160a
--- /dev/null
+++ b/url-template/url-template-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="url-template.d.ts" />
+
+
+import urlTemplate = require('url-template');
+
+var emailUrl = urlTemplate.parse('/{email}/{folder}/{id}');
+
+// Returns '/user@domain/test/42'
+emailUrl.expand({
+    email: 'user@domain',
+    folder: 'test',
+    id: 42
+});
diff --git a/url-template/url-template.d.ts b/url-template/url-template.d.ts
new file mode 100644
index 000000000..6ed7f5e86
--- /dev/null
+++ b/url-template/url-template.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for url-template 2.0.6
+// Project: https://github.com/bramstein/url-template
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module UrlTemplate
+{
+    interface TemplateParser {
+        parse(template: string): Template;
+    }
+
+    interface Template {
+        expand(parameters: any): string;
+    }
+}
+
+declare module "url-template"
+{
+    var urlTemplate: UrlTemplate.TemplateParser;
+
+    export = urlTemplate;
+}
+
+
diff --git a/vega/vega-tests.ts b/vega/vega-tests.ts
index 2cbf9d7b9..00aa4122d 100644
--- a/vega/vega-tests.ts
+++ b/vega/vega-tests.ts
@@ -1,2049 +1,2023 @@
 /// <reference path="vega.d.ts" />
 
 // examples from http://trifacta.github.io/vega/editor/
-var specs: Vega.Spec[] = [
-  {
-    "name": "arc",
-    "width": 400,
-    "height": 400,
-    "data": [
-      {
-        "name": "table",
-        "values": [12, 23, 47, 6, 52, 19],
-        "transform": [
-          {"type": "pie", "value": "data"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "r",
-        "type": "sqrt",
-        "domain": {"data": "table", "field": "data"},
-        "range": [20, 100]
-      }
-    ],
-    "marks": [
-      {
-        "type": "arc",
-        "from": {"data": "table"},
-        "properties": {
-          "enter": {
-            "x": {"group": "width", "mult": 0.5},
-            "y": {"group": "height", "mult": 0.5},
-            "startAngle": {"field": "startAngle"},
-            "endAngle": {"field": "endAngle"},
-            "innerRadius": {"value": 20},
-            "outerRadius": {"scale": "r"},
-            "stroke": {"value": "#fff"}
-          },
-          "update": {
-            "fill": {"value": "#ccc"}
-          },
-          "hover": {
-            "fill": {"value": "pink"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 500,
-    "height": 200,
-    "padding": {"top": 10, "left": 30, "bottom": 30, "right": 10},
-    "data": [
-      {
-        "name": "table",
-        "values": [
-          {"x": 1,  "y": 28}, {"x": 2,  "y": 55},
-          {"x": 3,  "y": 43}, {"x": 4,  "y": 91},
-          {"x": 5,  "y": 81}, {"x": 6,  "y": 53},
-          {"x": 7,  "y": 19}, {"x": 8,  "y": 87},
-          {"x": 9,  "y": 52}, {"x": 10, "y": 48},
-          {"x": 11, "y": 24}, {"x": 12, "y": 49},
-          {"x": 13, "y": 87}, {"x": 14, "y": 66},
-          {"x": 15, "y": 17}, {"x": 16, "y": 27},
-          {"x": 17, "y": 68}, {"x": 18, "y": 16},
-          {"x": 19, "y": 49}, {"x": 20, "y": 15}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "linear",
-        "range": "width",
-        "zero": false,
-        "domain": {"data": "table", "field": "data.x"}
-      },
-      {
-        "name": "y",
-        "type": "linear",
-        "range": "height",
-        "nice": true,
-        "domain": {"data": "table", "field": "data.y"}
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "ticks": 20},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "area",
-        "from": {"data": "table"},
-        "properties": {
-          "enter": {
-            "interpolate": {"value": "monotone"},
-            "x": {"scale": "x", "field": "data.x"},
-            "y": {"scale": "y", "field": "data.y"},
-            "y2": {"scale": "y", "value": 0},
-            "fill": {"value": "steelblue"}
-          },
-          "update": {
-            "fillOpacity": {"value": 1}
-          },
-          "hover": {
-            "fillOpacity": {"value": 0.5}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 400,
-    "height": 200,
-    "padding": {"top": 10, "left": 30, "bottom": 30, "right": 10},
-    "data": [
-      {
-        "name": "table",
-        "values": [
-          {"x": 1,  "y": 28}, {"x": 2,  "y": 55},
-          {"x": 3,  "y": 43}, {"x": 4,  "y": 91},
-          {"x": 5,  "y": 81}, {"x": 6,  "y": 53},
-          {"x": 7,  "y": 19}, {"x": 8,  "y": 87},
-          {"x": 9,  "y": 52}, {"x": 10, "y": 48},
-          {"x": 11, "y": 24}, {"x": 12, "y": 49},
-          {"x": 13, "y": 87}, {"x": 14, "y": 66},
-          {"x": 15, "y": 17}, {"x": 16, "y": 27},
-          {"x": 17, "y": 68}, {"x": 18, "y": 16},
-          {"x": 19, "y": 49}, {"x": 20, "y": 15}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "ordinal",
-        "range": "width",
-        "domain": {"data": "table", "field": "data.x"}
-      },
-      {
-        "name": "y",
-        "range": "height",
-        "nice": true,
-        "domain": {"data": "table", "field": "data.y"}
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x"},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "rect",
-        "from": {"data": "table"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.x"},
-            "width": {"scale": "x", "band": true, "offset": -1},
-            "y": {"scale": "y", "field": "data.y"},
-            "y2": {"scale": "y", "value": 0}
-          },
-          "update": {
-            "fill": {"value": "steelblue"}
-          },
-          "hover": {
-            "fill": {"value": "red"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 200,
-    "height": 720,
-    "data": [
-      {
-        "name": "barley",
-        "url": "data/barley.json"
-      },
-      {
-        "name": "variety",
-        "source": "barley",
-        "transform": [
-          {"type": "facet", "keys": ["data.variety"]},
-          {"type": "stats", "value": "data.yield", "median": true},
-          {"type": "sort", "by": "-median"}
-        ]
-      },
-      {
-        "name": "site",
-        "source": "barley",
-        "transform": [
-          {"type": "facet", "keys": ["data.site"]},
-          {"type": "stats", "value": "data.yield", "median": true},
-          {"type": "sort", "by": "-median"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "g",
-        "type": "ordinal",
-        "range": "height",
-        "padding": 0.15,
-        "domain": {"data": "site", "field": "key"}
-      },
-      {
-        "name": "x",
-        "type": "linear",
-        "nice": true,
-        "range": "width",
-        "domain": {"data": "barley", "field": "data.yield"}
-      },
-      {
-        "name": "c",
-        "type": "ordinal",
-        "range": "category10"
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "offset": -12}
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "from": {"data": "site"},
-        "properties": {
-          "enter": {
-            "x": {"group": "width", "mult": 0.5},
-            "y": {"scale": "g", "field": "key", "offset": -2},
-            "fontWeight": {"value": "bold"},
-            "text": {"field": "key"},
-            "align": {"value": "center"},
-            "baseline": {"value": "bottom"},
-            "fill": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "group",
-        "from": {"data": "site"},
-        "scales": [
-          {
-            "name": "y",
-            "type": "ordinal",
-            "range": "height",
-            "points": true,
-            "padding": 1.2,
-            "domain": {"data": "variety", "field": "key"}
-          }
-        ],
-        "axes": [
-          {
-            "type": "y",
-            "scale": "y",
-            "tickSize": 0,
-            "properties": {"axis": {"stroke": {"value": "transparent"}}}
-          }
-        ],
-        "properties": {
-          "enter": {
-            "x": {"value": 0.5},
-            "y": {"scale": "g", "field": "key"},
-            "height": {"scale": "g", "band": true},
-            "width": {"group": "width"},
-            "stroke": {"value": "#ccc"}
-          }
-        },
-        "marks": [
-          {
-            "type": "symbol",
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": "data.yield"},
-                "y": {"scale": "y", "field": "data.variety"},
-                "size": {"value": 50},
-                "stroke": {"scale": "c", "field": "data.year"},
-                "strokeWidth": {"value": 2}
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "width": 960,
-    "height": 500,
-    "data": [
-      {
-        "name": "unemp",
-        "url": "data/unemployment.tsv",
-        "format": {"type": "tsv", "parse": {"rate":"number"}}
-      },
-      {
-        "name": "counties",
-        "url": "data/us-10m.json",
-        "format": {"type": "topojson", "feature": "counties"},
-        "transform": [
-          {"type": "geopath", "value": "data", "projection": "albersUsa"},
-          {
-            "type": "zip",
-            "key": "data.id",
-            "with": "unemp",
-            "withKey": "data.id",
-            "as": "value",
-            "default": null
-          },
-          {"type":"filter", "test":"d.path!=null && d.value!=null"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "color",
-        "type": "quantize",
-        "domain": [0, 0.15],
-        "range": ["#f7fbff", "#deebf7", "#c6dbef", "#9ecae1", "#6baed6",
-                  "#4292c6", "#2171b5", "#08519c", "#08306b"]
-      }
-    ],
-    "marks": [
-      {
-        "type": "path",
-        "from": {"data": "counties"},
-        "properties": {
-          "enter": { "path": {"field": "path"} },
-          "update": { "fill": {"scale":"color", "field":"value.data.rate"} },
-          "hover": { "fill": {"value": "red"} }
-        }
-      }
-    ]
-  },
-  {
-    "width": 300,
-    "height": 240,
-    "data": [
-      {
-        "name": "table",
-        "url": "data/groups.json"
-      }
-    ],
-    "scales": [
-      {
-        "name": "cat",
-        "type": "ordinal",
-        "range": "height",
-        "padding": 0.2,
-        "domain": {"data": "table", "field": "data.category"}
-      },
-      {
-        "name": "val",
-        "range": "width",
-        "round": true,
-        "nice": true,
-        "domain": {"data": "table", "field": "data.value"}
-      },
-      {
-        "name": "color",
-        "type": "ordinal",
-        "range": "category20"
-      }
-    ],
-    "axes": [
-      {"type": "y", "scale": "cat", "tickSize": 0, "tickPadding": 8},
-      {"type": "x", "scale": "val"}
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {
-          "data": "table",
-          "transform": [{"type":"facet", "keys":["data.category"]}]
-        },
-        "properties": {
-          "enter": {
-            "y": {"scale": "cat", "field": "key"},
-            "height": {"scale": "cat", "band": true}
-          }
-        },
-        "scales": [
-          {
-            "name": "pos",
-            "type": "ordinal",
-            "range": "height",
-            "domain": {"field": "data.position"}
-          }
-        ],
-        "marks": [
-          {
-            "type": "rect",
-            "properties": {
-              "enter": {
-                "y": {"scale": "pos", "field": "data.position"},
-                "height": {"scale": "pos", "band": true},
-                "x": {"scale": "val", "field": "data.value"},
-                "x2": {"scale": "val", "value": 0},
-                "fill": {"scale": "color", "field": "data.position"}
-              }
-            }
-          },
-          {
-            "type": "text",
-            "properties": {
-              "enter": {
-                "y": {"scale": "pos", "field": "data.position"},
-                "dy": {"scale": "pos", "band": true, "mult": 0.5},
-                "x": {"scale": "val", "field": "data.value", "offset": -4},
-                "fill": {"value": "white"},
-                "align": {"value": "right"},
-                "baseline": {"value": "middle"},
-                "text": {"field": "data.value"}
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "width": 400,
-    "height": 100,
-    "padding": {"top": 30, "left": 30, "bottom": 30, "right": 10},
-    "data": [
-      {
-        "name": "stats",
-        "values": [
-          {"label": "Category A", "mean": 1, "lo": 0,   "hi": 2},
-          {"label": "Category B", "mean": 2, "lo": 1.5, "hi": 2.5},
-          {"label": "Category C", "mean": 3, "lo": 1.7, "hi": 4.3},
-          {"label": "Category D", "mean": 4, "lo": 3,   "hi": 5},
-          {"label": "Category E", "mean": 5, "lo": 4.1, "hi": 5.9}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "y",
-        "type": "ordinal",
-        "range": "height",
-        "domain": {"data": "stats", "field": "index"}
-      },
-      {
-        "name": "x",
-        "range": [100, 400],
-        "nice": true,
-        "zero": true,
-        "domain": {"data": "stats", "field": "data.hi"}
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "ticks": 6}
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "from": {"data": "stats"},
-        "properties": {
-          "enter": {
-            "x": {"value": 0},
-            "y": {"scale": "y", "field": "index"},
-            "baseline": {"value": "middle"},
-            "fill": {"value": "#000"},
-            "text": {"field": "data.label"},
-            "font": {"value": "Helvetica Neue"},
-            "fontSize": {"value": 13}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "stats"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.lo"},
-            "x2": {"scale": "x", "field": "data.hi"},
-            "y": {"scale": "y", "field": "index", "offset": -1},
-            "height": {"value": 1},
-            "fill": {"value": "#888"}
-          }
-        }
-      },
-      {
-        "type": "symbol",
-        "from": {"data": "stats"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.mean"},
-            "y": {"scale": "y", "field": "index"},
-            "size": {"value": 40},
-            "fill": {"value": "#000"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "name": "force",
-    "width": 500,
-    "height": 500,
-    "padding": {"top":0, "bottom":0, "left":0, "right":0},
-    "data": [
-      {
-        "name": "edges",
-        "url": "data/miserables.json",
-        "format": {"type": "json", "property": "links"},
-        "transform": [
-          {"type": "copy", "from": "data", "fields": ["source", "target"]}
-        ]
-      },
-      {
-        "name": "nodes",
-        "url": "data/miserables.json",
-        "format": {"type": "json", "property": "nodes"},
-        "transform": [
-          {
-            "type": "force",
-            "links": "edges",
-            "linkDistance": 70,
-            "charge": -100,
-            "iterations": 1000
-          }
-        ]
-      }
-    ],
-    "marks": [
-      {
-        "type": "path",
-        "from": {
-          "data": "edges",
-          "transform": [
-            {"type": "link", "shape": "line"}
-          ]
-        },
-        "properties": {
-          "update": {
-            "path": {"field": "path"},
-            "stroke": {"value": "#ccc"},
-            "strokeWidth": {"value": 0.5}
-          }
-        }
-      },
-      {
-        "type": "symbol",
-        "from": {"data": "nodes"},
-        "properties": {
-          "enter": {
-            "fillOpacity": {"value": 0.3},
-            "stroke": {"value": "steelblue"}
-          },
-          "update": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "fill": {"value": "steelblue"}
-          },
-          "hover": {
-            "fill": {"value": "#f00"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "name": "image",
-    "width": 200,
-    "height": 200,
-    "padding": {"left":30, "top":10, "bottom":30, "right":10},
-    "data": [
-      {
-        "name": "data",
-        "values": [
-          {"x":0.5, "y":0.5, "img":"data/ffox.png"},
-          {"x":1.5, "y":1.5, "img":"data/gimp.png"},
-          {"x":2.5, "y":2.5, "img":"data/7zip.png"}
-        ]
-      }
-    ],
-    "scales": [
-      {"name": "x", "domain": [0, 3], "range": "width"},
-      {"name": "y", "domain": [0, 3], "range": "height"}
-    ],
-    "axes": [
-      {"type": "x", "scale": "x"},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "image",
-        "from": {"data": "data"},
-        "properties": {
-          "enter": {
-            "url": {"field": "data.img"},
-            "width": {"value": 50},
-            "height": {"value": 50},
-            "x": {"scale": "x", "field": "data.x"},
-            "y": {"scale": "y", "field": "data.y"},
-            "align": {"value": "center"},
-            "baseline": {"value": "middle"}
-          },
-          "update": {
-            "opacity": {"value": 1.0}
-          },
-          "hover": {
-            "opacity": {"value": 0.5}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 800,
-    "height": 500,
-    "padding": {"left": 15, "right": 65, "top": 10, "bottom": 20},
-    "data": [
-      {
-        "name": "jobs",
-        "url": "data/jobs.json"
-      },
-      {
-        "name": "series",
-        "source": "jobs",
-        "transform": [
-          {"type": "facet", "keys": ["data.job", "data.sex"]},
-          {"type": "stats", "value": "data.perc"},
-          {"type": "stack", "point": "data.year", "height": "data.perc", "order": "reverse"}
-        ]
-      },
-      {
-        "name": "stats",
-        "source": "jobs",
-        "transform": [
-          {"type": "facet", "keys": ["data.year"]},
-          {"type": "stats", "value": "data.perc"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "linear",
-        "range": "width",
-        "zero": false, "round": true,
-        "domain": {"data": "jobs", "field": "data.year"}
-      },
-      {
-        "name": "y",
-        "type": "linear",
-        "range": "height", "round": true,
-        "domain": {"data": "stats", "field": "sum"}
-      },
-      {
-        "name": "color",
-        "type": "ordinal",
-        "domain": ["men", "women"],
-        "range": ["#33f", "#f33"]
-      },
-      {
-        "name": "alpha",
-        "type": "linear",
-        "domain": {"data": "series", "field": "sum"},
-        "range": [0.4, 0.8]
-      },
-      {
-        "name": "font",
-        "type": "sqrt",
-        "range": [0,24], "round": true,
-        "domain": {"data": "stats", "field": "sum"}
-      },
-      {
-        "name": "align",
-        "type": "quantize",
-        "range": ["left", "center", "right"], "zero":false,
-        "domain": [1730, 2130]
-      },
-      {
-        "name": "offset",
-        "type": "quantize",
-        "range": [6, 0, -6], "zero":false,
-        "domain": [1730, 2130]
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "format": "d", "ticks": 15, "tickSizeEnd": 0},
-      {
-        "type": "y", "scale": "y", "format": "n", "orient": "right",
-        "grid": true, "layer": "back", "tickSize": 12,
-        "properties": {
-          "axis": {"stroke": {"value":"transparent"}},
-          "grid": {"stroke": {"value": "#ccc"}},
-          "ticks": {"stroke": {"value": "#ccc"}}
-        }
-      }
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {"data": "series"},
-        "marks": [
-          {
-            "type": "area",
-            "properties": {
-              "update": {
-                "x": {"scale": "x", "field": "data.year"},
-                "y": {"scale": "y", "field": "y"},
-                "y2": {"scale": "y", "field": "y2"},
-                "fill": {"scale": "color", "field": "data.sex"},
-                "fillOpacity": {"scale": "alpha", "group": "sum"}
-              },
-              "hover": {
-                "fillOpacity": {"value": 0.2}
-              }
-            }
-          }
-        ]
-      },
-      {
-        "type": "group",
-        "from": {"data": "series"},
-        "marks": [
-          {
-            "type": "text",
-            "from": {
-              "transform": [
-                {"type":"slice", "by":"max", "field":"data.perc"}
-              ]
-             },
-            "interactive": false,
-            "properties": {
-              "update": {
-                "x": {"scale": "x", "field": "data.year"},
-                "dx": {"scale": "offset", "field": "data.year"},
-                "y": {"scale": "y", "field": "cy"},
-                "fill": {"value": "#000"},
-                "fillOpacity": {"scale": "font", "field": "data.perc", "mult": 0.15},
-                "fontSize": {"scale": "font", "field": "data.perc", "offset": 5},
-                "text": {"field": "data.job"},
-                "align": {"scale": "align", "field": "data.year"},
-                "baseline": {"value": "middle"}
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "lifelines",
-    "width": 400,
-    "height": 100,
-    "data": [
-      {
-        "name": "people",
-        "values": [
-          {"label":"Washington", "born":-7506057600000, "died":-5366196000000, 
-           "enter":-5701424400000, "leave":-5453884800000},
-          {"label":"Adams",      "born":-7389766800000, "died":-4528285200000, 
-           "enter":-5453884800000, "leave":-5327740800000},
-          {"label":"Jefferson",  "born":-7154586000000, "died":-4528285200000, 
-           "enter":-5327740800000, "leave":-5075280000000},
-          {"label":"Madison",    "born":-6904544400000, "died":-4213184400000, 
-           "enter":-5075280000000, "leave":-4822819200000},
-          {"label":"Monroe",     "born":-6679904400000, "died":-4370518800000, 
-           "enter":-4822819200000, "leave":-4570358400000}
-        ]
-      },
-      {
-        "name": "events",
-        "format": {"type":"json", "parse":{"when":"date"}},
-        "values": [
-          {"name":"Decl. of Independence", "when":"July 4, 1776"},
-          {"name":"U.S. Constitution",     "when":"3/4/1789"},
-          {"name":"Louisiana Purchase",    "when":"April 30, 1803"},
-          {"name":"Monroe Doctrine",       "when":"Dec 2, 1823"}
-        ]
-      }
+var specs: Vega.Spec[];
 
-    ],
-    "scales": [
-      {
-        "name": "y",
-        "type": "ordinal",
-        "range": "height",
-        "domain": {"data": "people", "field": "data.label"}
-      },
-      {
-        "name": "x",
-        "type": "time",
-        "range": "width",
-        "round": true,
-        "nice": "year",
-        "domain": {"data": "people", "field": ["data.born", "data.died"]}
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x"}
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "from": {"data": "events"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.when"},
-            "y": {"value": -10},
-            "angle": {"value": -25},
-            "fill": {"value": "#000"},
-            "text": {"field": "data.name"},
-            "font": {"value": "Helvetica Neue"},
-            "fontSize": {"value": 10}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "events"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.when"},
-            "y": {"value": -8},
-            "width": {"value": 1},
-            "height": {"group": "height", "offset": 8},
-            "fill": {"value": "#888"}
-          }
-        }
-      },
-      {
-        "type": "text",
-        "from": {"data": "people"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.born"},
-            "y": {"scale": "y", "field": "data.label", "offset": -3},
-            "fill": {"value": "#000"},
-            "text": {"field": "data.label"},
-            "font": {"value": "Helvetica Neue"},
-            "fontSize": {"value": 10}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "people"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.born"},
-            "x2": {"scale": "x", "field": "data.died"},
-            "y": {"scale": "y", "field": "data.label"},
-            "height": {"value": 2},
-            "fill": {"value": "#557"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "people"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.enter"},
-            "x2": {"scale": "x", "field": "data.leave"},
-            "y": {"scale": "y", "field": "data.label", "offset":-1},
-            "height": {"value": 4},
-            "fill": {"value": "#e44"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 1920,
-    "height": 1000,
-    "viewport": [960, 500],
-    "data": [
-      {
-        "name": "world",
-        "url": "data/world-110m.json",
-        "format": {"type": "topojson", "feature": "countries"} 
-      }
-    ],
-    "marks": [
-      {
-        "type": "path",
-        "from": {
-          "data": "world",
-          "transform": [{
-            "type": "geopath",
-            "value": "data",
-            "projection": "winkel3",
-            "scale": 300,
-            "translate": [960, 500]
-          }]
+specs[0] = {
+  "name": "arc",
+  "width": 400,
+  "height": 400,
+  "data": [
+    {
+      "name": "table",
+      "values": [12, 23, 47, 6, 52, 19],
+      "transform": [
+        { "type": "pie", "value": "data" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "r",
+      "type": "sqrt",
+      "domain": { "data": "table", "field": "data" },
+      "range": [20, 100]
+    }
+  ],
+  "marks": [
+    {
+      "type": "arc",
+      "from": { "data": "table" },
+      "properties": {
+        "enter": {
+          "x": { "group": "width", "mult": 0.5 },
+          "y": { "group": "height", "mult": 0.5 },
+          "startAngle": { "field": "startAngle" },
+          "endAngle": { "field": "endAngle" },
+          "innerRadius": { "value": 20 },
+          "outerRadius": { "scale": "r" },
+          "stroke": { "value": "#fff" }
         },
-        "properties": {
-          "enter": {
-            "stroke": {"value": "#fff"},
-            "path": {"field": "path"}
-          },
-          "update": {"fill": {"value": "#ccc"}},
-          "hover": {"fill": {"value": "pink"}}
+        "update": {
+          "fill": { "value": "#ccc" }
+        },
+        "hover": {
+          "fill": { "value": "pink" }
         }
       }
-    ]
-  },
-  {
-    "width": 760,
-    "height": 260,
-    "data": [
-      {
-        "name": "temp",
-        "url": "data/napoleon.json",
-        "format": {"type": "json", "property": "temp"},
-        "transform": [
-          {"type": "formula", "field": "lat", "expr": "55"},
-          {
-            "type": "geo",
-            "lat": "lat",
-            "lon": "data.lon",
-            "center": [32.52, 53.3],
-            "scale": 3000
-          }
-        ]
-      },
-      {
-        "name": "army",
-        "url": "data/napoleon.json",
-        "format": {"type": "json", "property": "army"},
-        "transform": [
-          {
-            "type": "geo",
-            "lat": "data.lat",
-            "lon": "data.lon",
-            "center": [32.52, 53.3],
-            "scale": 3000
-          }
-        ]
-      },
-      {
-        "name": "cities",
-        "url": "data/napoleon.json",
-        "format": {"type": "json", "property": "cities"},
-        "transform": [
-          {
-            "type": "geo",
-            "lat": "data.lat",
-            "lon": "data.lon",
-            "center": [32.52, 53.3],
-            "scale": 3000
-          }
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "color",
-        "type": "ordinal",
-        "domain": {"data": "army", "field": "data.dir" },
-        "range": ["brown", "black"]
-      },
-      {
-        "name": "lw",
-        "type": "linear", "zero": false,
-        "domain": {"data": "army", "field": "data.size"},
-        "range": [1, 50]
-      }
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "properties": {
-          "enter": {
-            "x": {"value": 0},
-            "y": {"value": 200},
-            "width": {"group": "width"},
-            "height": {"value": 60}
-          }
+    }
+  ]
+}
+
+specs[1] = {
+  "width": 500,
+  "height": 200,
+  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        { "x": 1, "y": 28 }, { "x": 2, "y": 55 },
+        { "x": 3, "y": 43 }, { "x": 4, "y": 91 },
+        { "x": 5, "y": 81 }, { "x": 6, "y": 53 },
+        { "x": 7, "y": 19 }, { "x": 8, "y": 87 },
+        { "x": 9, "y": 52 }, { "x": 10, "y": 48 },
+        { "x": 11, "y": 24 }, { "x": 12, "y": 49 },
+        { "x": 13, "y": 87 }, { "x": 14, "y": 66 },
+        { "x": 15, "y": 17 }, { "x": 16, "y": 27 },
+        { "x": 17, "y": 68 }, { "x": 18, "y": 16 },
+        { "x": 19, "y": 49 }, { "x": 20, "y": 15 }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "linear",
+      "range": "width",
+      "zero": false,
+      "domain": { "data": "table", "field": "data.x" }
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "domain": { "data": "table", "field": "data.y" }
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "ticks": 20 },
+    { "type": "y", "scale": "y" }
+  ],
+  "marks": [
+    {
+      "type": "area",
+      "from": { "data": "table" },
+      "properties": {
+        "enter": {
+          "interpolate": { "value": "monotone" },
+          "x": { "scale": "x", "field": "data.x" },
+          "y": { "scale": "y", "field": "data.y" },
+          "y2": { "scale": "y", "value": 0 },
+          "fill": { "value": "steelblue" }
         },
-        "scales": [
-          {
-            "name": "y",
-            "type": "linear", "zero": false, "round": true,
-            "domain": {"data": "temp", "field": "data.temp"},
-            "range": "height"
-          }
-        ],
-        "axes": [
-          {"type": "y", "scale": "y", "ticks": 4, "orient": "right",
-           "grid": true, "layer": "back"}
-        ],
-        "marks": [
-         {
-            "type": "rule",
-            "from": {"data": "temp"},
-            "properties": {
-              "enter": {
-                "x": {"field": "x"},
-                "y1": 0,
-                "y2": {"scale": "y", "field": "data.temp"},
-                "stroke": {"value": "#ccc"}
-              }
-            }
-          },
-         {
-            "type": "line",
-            "from": {"data": "temp"},
-            "properties": {
-              "enter": {
-                "x": {"field": "x"},
-                "y": {"scale": "y", "field": "data.temp"},
-                "stroke": {"value": "#000"},
-                "strokeWidth": {"value": 2}
-              }
-            }
-          },
-          {
-            "type": "text",
-            "from": {"data": "temp"},
-            "properties": {
-              "enter": {
-                "x": {"field": "x", "offset": -2},
-                "y": {"scale": "y", "field": "data.temp", "offset": 6},
-                "fill": {"value": "#000"},
-                "text": {"field": "data.date"},
-                "font": {"value": "Georgia"},
-                "fontSize": {"value": 10},
-                "align": {"value": "center"},
-                "baseline": {"value": "top"}
-              }
+        "update": {
+          "fillOpacity": { "value": 1 }
+        },
+        "hover": {
+          "fillOpacity": { "value": 0.5 }
+        }
+      }
+    }
+  ]
+}
+
+specs[2] = {
+  "width": 200,
+  "height": 720,
+  "data": [
+    {
+      "name": "barley",
+      "url": "data/barley.json"
+    },
+    {
+      "name": "variety",
+      "source": "barley",
+      "transform": [
+        { "type": "facet", "keys": ["data.variety"] },
+        { "type": "stats", "value": "data.yield", "median": true },
+        { "type": "sort", "by": "-median" }
+      ]
+    },
+    {
+      "name": "site",
+      "source": "barley",
+      "transform": [
+        { "type": "facet", "keys": ["data.site"] },
+        { "type": "stats", "value": "data.yield", "median": true },
+        { "type": "sort", "by": "-median" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "g",
+      "type": "ordinal",
+      "range": "height",
+      "padding": 0.15,
+      "domain": { "data": "site", "field": "key" }
+    },
+    {
+      "name": "x",
+      "type": "linear",
+      "nice": true,
+      "range": "width",
+      "domain": { "data": "barley", "field": "data.yield" }
+    },
+    {
+      "name": "c",
+      "type": "ordinal",
+      "range": "category10"
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "offset": -12 }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "from": { "data": "site" },
+      "properties": {
+        "enter": {
+          "x": { "group": "width", "mult": 0.5 },
+          "y": { "scale": "g", "field": "key", "offset": -2 },
+          "fontWeight": { "value": "bold" },
+          "text": { "field": "key" },
+          "align": { "value": "center" },
+          "baseline": { "value": "bottom" },
+          "fill": { "value": "#000" }
+        }
+      }
+    },
+    {
+      "type": "group",
+      "from": { "data": "site" },
+      "scales": [
+        {
+          "name": "y",
+          "type": "ordinal",
+          "range": "height",
+          "points": true,
+          "padding": 1.2,
+          "domain": { "data": "variety", "field": "key" }
+        }
+      ],
+      "axes": [
+        {
+          "type": "y",
+          "scale": "y",
+          "tickSize": 0,
+          "properties": { "axis": { "stroke": { "value": "transparent" } } }
+        }
+      ],
+      "properties": {
+        "enter": {
+          "x": { "value": 0.5 },
+          "y": { "scale": "g", "field": "key" },
+          "height": { "scale": "g", "band": true },
+          "width": { "group": "width" },
+          "stroke": { "value": "#ccc" }
+        }
+      },
+      "marks": [
+        {
+          "type": "symbol",
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": "data.yield" },
+              "y": { "scale": "y", "field": "data.variety" },
+              "size": { "value": 50 },
+              "stroke": { "scale": "c", "field": "data.year" },
+              "strokeWidth": { "value": 2 }
             }
           }
+        }
+      ]
+    }
+  ]
+}
+
+specs[3] = {
+  "width": 960,
+  "height": 500,
+  "data": [
+    {
+      "name": "unemp",
+      "url": "data/unemployment.tsv",
+      "format": { "type": "tsv", "parse": { "rate": "number" } }
+    },
+    {
+      "name": "counties",
+      "url": "data/us-10m.json",
+      "format": { "type": "topojson", "feature": "counties" },
+      "transform": [
+        { "type": "geopath", "value": "data", "projection": "albersUsa" },
+        {
+          "type": "zip",
+          "key": "data.id",
+          "with": "unemp",
+          "withKey": "data.id",
+          "as": "value",
+          "default": null
+        },
+        { "type": "filter", "test": "d.path!=null && d.value!=null" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "color",
+      "type": "quantize",
+      "domain": [0, 0.15],
+      "range": ["#f7fbff", "#deebf7", "#c6dbef", "#9ecae1", "#6baed6",
+        "#4292c6", "#2171b5", "#08519c", "#08306b"]
+    }
+  ],
+  "marks": [
+    {
+      "type": "path",
+      "from": { "data": "counties" },
+      "properties": {
+        "enter": { "path": { "field": "path" } },
+        "update": { "fill": { "scale": "color", "field": "value.data.rate" } },
+        "hover": { "fill": { "value": "red" } }
+      }
+    }
+  ]
+}
+
+specs[4] = {
+  "width": 300,
+  "height": 240,
+  "data": [
+    {
+      "name": "table",
+      "url": "data/groups.json"
+    }
+  ],
+  "scales": [
+    {
+      "name": "cat",
+      "type": "ordinal",
+      "range": "height",
+      "padding": 0.2,
+      "domain": { "data": "table", "field": "data.category" }
+    },
+    {
+      "name": "val",
+      "range": "width",
+      "round": true,
+      "nice": true,
+      "domain": { "data": "table", "field": "data.value" }
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category20"
+    }
+  ],
+  "axes": [
+    { "type": "y", "scale": "cat", "tickSize": 0, "tickPadding": 8 },
+    { "type": "x", "scale": "val" }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "data": "table",
+        "transform": [{ "type": "facet", "keys": ["data.category"] }]
+      },
+      "properties": {
+        "enter": {
+          "y": { "scale": "cat", "field": "key" },
+          "height": { "scale": "cat", "band": true }
+        }
+      },
+      "scales": [
+        {
+          "name": "pos",
+          "type": "ordinal",
+          "range": "height",
+          "domain": { "field": "data.position" }
+        }
+      ],
+      "marks": [
+        {
+          "type": "rect",
+          "properties": {
+            "enter": {
+              "y": { "scale": "pos", "field": "data.position" },
+              "height": { "scale": "pos", "band": true },
+              "x": { "scale": "val", "field": "data.value" },
+              "x2": { "scale": "val", "value": 0 },
+              "fill": { "scale": "color", "field": "data.position" }
+            }
+          }
+        },
+        {
+          "type": "text",
+          "properties": {
+            "enter": {
+              "y": { "scale": "pos", "field": "data.position" },
+              "dy": { "scale": "pos", "band": true, "mult": 0.5 },
+              "x": { "scale": "val", "field": "data.value", "offset": -4 },
+              "fill": { "value": "white" },
+              "align": { "value": "right" },
+              "baseline": { "value": "middle" },
+              "text": { "field": "data.value" }
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
+
+specs[5] = {
+  "width": 400,
+  "height": 100,
+  "padding": { "top": 30, "left": 30, "bottom": 30, "right": 10 },
+  "data": [
+    {
+      "name": "stats",
+      "values": [
+        { "label": "Category A", "mean": 1, "lo": 0, "hi": 2 },
+        { "label": "Category B", "mean": 2, "lo": 1.5, "hi": 2.5 },
+        { "label": "Category C", "mean": 3, "lo": 1.7, "hi": 4.3 },
+        { "label": "Category D", "mean": 4, "lo": 3, "hi": 5 },
+        { "label": "Category E", "mean": 5, "lo": 4.1, "hi": 5.9 }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "y",
+      "type": "ordinal",
+      "range": "height",
+      "domain": { "data": "stats", "field": "index" }
+    },
+    {
+      "name": "x",
+      "range": [100, 400],
+      "nice": true,
+      "zero": true,
+      "domain": { "data": "stats", "field": "data.hi" }
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "ticks": 6 }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "from": { "data": "stats" },
+      "properties": {
+        "enter": {
+          "x": { "value": 0 },
+          "y": { "scale": "y", "field": "index" },
+          "baseline": { "value": "middle" },
+          "fill": { "value": "#000" },
+          "text": { "field": "data.label" },
+          "font": { "value": "Helvetica Neue" },
+          "fontSize": { "value": 13 }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "stats" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.lo" },
+          "x2": { "scale": "x", "field": "data.hi" },
+          "y": { "scale": "y", "field": "index", "offset": -1 },
+          "height": { "value": 1 },
+          "fill": { "value": "#888" }
+        }
+      }
+    },
+    {
+      "type": "symbol",
+      "from": { "data": "stats" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.mean" },
+          "y": { "scale": "y", "field": "index" },
+          "size": { "value": 40 },
+          "fill": { "value": "#000" }
+        }
+      }
+    }
+  ]
+}
+
+specs[6] = {
+  "name": "force",
+  "width": 500,
+  "height": 500,
+  "padding": { "top": 0, "bottom": 0, "left": 0, "right": 0 },
+  "data": [
+    {
+      "name": "edges",
+      "url": "data/miserables.json",
+      "format": { "type": "json", "property": "links" },
+      "transform": [
+        { "type": "copy", "from": "data", "fields": ["source", "target"] }
+      ]
+    },
+    {
+      "name": "nodes",
+      "url": "data/miserables.json",
+      "format": { "type": "json", "property": "nodes" },
+      "transform": [
+        {
+          "type": "force",
+          "links": "edges",
+          "linkDistance": 70,
+          "charge": -100,
+          "iterations": 1000
+        }
+      ]
+    }
+  ],
+  "marks": [
+    {
+      "type": "path",
+      "from": {
+        "data": "edges",
+        "transform": [
+          { "type": "link", "shape": "line" }
         ]
       },
-      {
-        "type": "group",
-        "from": {
-          "data": "army",
-          "transform": [
-            {"type": "facet", "keys": ["data.group", "data.dir"]}
-          ]
+      "properties": {
+        "update": {
+          "path": { "field": "path" },
+          "stroke": { "value": "#ccc" },
+          "strokeWidth": { "value": 0.5 }
+        }
+      }
+    },
+    {
+      "type": "symbol",
+      "from": { "data": "nodes" },
+      "properties": {
+        "enter": {
+          "fillOpacity": { "value": 0.3 },
+          "stroke": { "value": "steelblue" }
         },
-        "marks": [
-          {
-            "type": "group",
-            "from": {
-              "transform": [
-                {"type": "window", "size": 2, "step": 1}
-              ]
+        "update": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "fill": { "value": "steelblue" }
+        },
+        "hover": {
+          "fill": { "value": "#f00" }
+        }
+      }
+    }
+  ]
+};
+
+specs[7] = {
+  "name": "image",
+  "width": 200,
+  "height": 200,
+  "padding": { "left": 30, "top": 10, "bottom": 30, "right": 10 },
+  "data": [
+    {
+      "name": "data",
+      "values": [
+        { "x": 0.5, "y": 0.5, "img": "data/ffox.png" },
+        { "x": 1.5, "y": 1.5, "img": "data/gimp.png" },
+        { "x": 2.5, "y": 2.5, "img": "data/7zip.png" }
+      ]
+    }
+  ],
+  "scales": [
+    { "name": "x", "domain": [0, 3], "range": "width" },
+    { "name": "y", "domain": [0, 3], "range": "height" }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x" },
+    { "type": "y", "scale": "y" }
+  ],
+  "marks": [
+    {
+      "type": "image",
+      "from": { "data": "data" },
+      "properties": {
+        "enter": {
+          "url": { "field": "data.img" },
+          "width": { "value": 50 },
+          "height": { "value": 50 },
+          "x": { "scale": "x", "field": "data.x" },
+          "y": { "scale": "y", "field": "data.y" },
+          "align": { "value": "center" },
+          "baseline": { "value": "middle" }
+        },
+        "update": {
+          "opacity": { "value": 1.0 }
+        },
+        "hover": {
+          "opacity": { "value": 0.5 }
+        }
+      }
+    }
+  ]
+}
+
+specs[8] = {
+  "width": 800,
+  "height": 500,
+  "padding": { "left": 15, "right": 65, "top": 10, "bottom": 20 },
+  "data": [
+    {
+      "name": "jobs",
+      "url": "data/jobs.json"
+    },
+    {
+      "name": "series",
+      "source": "jobs",
+      "transform": [
+        { "type": "facet", "keys": ["data.job", "data.sex"] },
+        { "type": "stats", "value": "data.perc" },
+        { "type": "stack", "point": "data.year", "height": "data.perc", "order": "reverse" }
+      ]
+    },
+    {
+      "name": "stats",
+      "source": "jobs",
+      "transform": [
+        { "type": "facet", "keys": ["data.year"] },
+        { "type": "stats", "value": "data.perc" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "linear",
+      "range": "width",
+      "zero": false, "round": true,
+      "domain": { "data": "jobs", "field": "data.year" }
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height", "round": true,
+      "domain": { "data": "stats", "field": "sum" }
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "domain": ["men", "women"],
+      "range": ["#33f", "#f33"]
+    },
+    {
+      "name": "alpha",
+      "type": "linear",
+      "domain": { "data": "series", "field": "sum" },
+      "range": [0.4, 0.8]
+    },
+    {
+      "name": "font",
+      "type": "sqrt",
+      "range": [0, 24], "round": true,
+      "domain": { "data": "stats", "field": "sum" }
+    },
+    {
+      "name": "align",
+      "type": "quantize",
+      "range": ["left", "center", "right"], "zero": false,
+      "domain": [1730, 2130]
+    },
+    {
+      "name": "offset",
+      "type": "quantize",
+      "range": [6, 0, -6], "zero": false,
+      "domain": [1730, 2130]
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "format": "d", "ticks": 15, "tickSizeEnd": 0 },
+    {
+      "type": "y", "scale": "y", "format": "n", "orient": "right",
+      "grid": true, "layer": "back", "tickSize": 12,
+      "properties": {
+        "axis": { "stroke": { "value": "transparent" } },
+        "grid": { "stroke": { "value": "#ccc" } },
+        "ticks": { "stroke": { "value": "#ccc" } }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": { "data": "series" },
+      "marks": [
+        {
+          "type": "area",
+          "properties": {
+            "update": {
+              "x": { "scale": "x", "field": "data.year" },
+              "y": { "scale": "y", "field": "y" },
+              "y2": { "scale": "y", "field": "y2" },
+              "fill": { "scale": "color", "field": "data.sex" },
+              "fillOpacity": { "scale": "alpha", "group": "sum" }
             },
-            "marks": [
-              {
-                "type": "line",
-                "properties": {
-                  "enter": {
-                    "x": {"field": "x"},
-                    "y": {"field": "y"},
-                    "stroke": {"scale": "color", "field": "data.dir"},
-                    "strokeWidth": {"scale": "lw", "field": "data.size"},
-                    "strokeCap": {"value": "round"}
-                  }
+            "hover": {
+              "fillOpacity": { "value": 0.2 }
+            }
+          }
+        }
+      ]
+    },
+    {
+      "type": "group",
+      "from": { "data": "series" },
+      "marks": [
+        {
+          "type": "text",
+          "from": {
+            "transform": [
+              { "type": "slice", "by": "max", "field": "data.perc" }
+            ]
+          },
+          "interactive": false,
+          "properties": {
+            "update": {
+              "x": { "scale": "x", "field": "data.year" },
+              "dx": { "scale": "offset", "field": "data.year" },
+              "y": { "scale": "y", "field": "cy" },
+              "fill": { "value": "#000" },
+              "fillOpacity": { "scale": "font", "field": "data.perc", "mult": 0.15 },
+              "fontSize": { "scale": "font", "field": "data.perc", "offset": 5 },
+              "text": { "field": "data.job" },
+              "align": { "scale": "align", "field": "data.year" },
+              "baseline": { "value": "middle" }
+            }
+          }
+        }
+      ]
+    }
+  ]
+};
+
+specs[9] = {
+  "name": "lifelines",
+  "width": 400,
+  "height": 100,
+  "data": [
+    {
+      "name": "people",
+      "values": [
+        {
+          "label": "Washington", "born": -7506057600000, "died": -5366196000000,
+          "enter": -5701424400000, "leave": -5453884800000
+        },
+        {
+          "label": "Adams", "born": -7389766800000, "died": -4528285200000,
+          "enter": -5453884800000, "leave": -5327740800000
+        },
+        {
+          "label": "Jefferson", "born": -7154586000000, "died": -4528285200000,
+          "enter": -5327740800000, "leave": -5075280000000
+        },
+        {
+          "label": "Madison", "born": -6904544400000, "died": -4213184400000,
+          "enter": -5075280000000, "leave": -4822819200000
+        },
+        {
+          "label": "Monroe", "born": -6679904400000, "died": -4370518800000,
+          "enter": -4822819200000, "leave": -4570358400000
+        }
+      ]
+    },
+    {
+      "name": "events",
+      "format": { "type": "json", "parse": { "when": "date" } },
+      "values": [
+        { "name": "Decl. of Independence", "when": "July 4, 1776" },
+        { "name": "U.S. Constitution", "when": "3/4/1789" },
+        { "name": "Louisiana Purchase", "when": "April 30, 1803" },
+        { "name": "Monroe Doctrine", "when": "Dec 2, 1823" }
+      ]
+    }
+
+  ],
+  "scales": [
+    {
+      "name": "y",
+      "type": "ordinal",
+      "range": "height",
+      "domain": { "data": "people", "field": "data.label" }
+    },
+    {
+      "name": "x",
+      "type": "time",
+      "range": "width",
+      "round": true,
+      "nice": "year",
+      "domain": { "data": "people", "field": ["data.born", "data.died"] }
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x" }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "from": { "data": "events" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.when" },
+          "y": { "value": -10 },
+          "angle": { "value": -25 },
+          "fill": { "value": "#000" },
+          "text": { "field": "data.name" },
+          "font": { "value": "Helvetica Neue" },
+          "fontSize": { "value": 10 }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "events" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.when" },
+          "y": { "value": -8 },
+          "width": { "value": 1 },
+          "height": { "group": "height", "offset": 8 },
+          "fill": { "value": "#888" }
+        }
+      }
+    },
+    {
+      "type": "text",
+      "from": { "data": "people" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.born" },
+          "y": { "scale": "y", "field": "data.label", "offset": -3 },
+          "fill": { "value": "#000" },
+          "text": { "field": "data.label" },
+          "font": { "value": "Helvetica Neue" },
+          "fontSize": { "value": 10 }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "people" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.born" },
+          "x2": { "scale": "x", "field": "data.died" },
+          "y": { "scale": "y", "field": "data.label" },
+          "height": { "value": 2 },
+          "fill": { "value": "#557" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "people" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.enter" },
+          "x2": { "scale": "x", "field": "data.leave" },
+          "y": { "scale": "y", "field": "data.label", "offset": -1 },
+          "height": { "value": 4 },
+          "fill": { "value": "#e44" }
+        }
+      }
+    }
+  ]
+}
+
+specs[10] = {
+  "width": 1920,
+  "height": 1000,
+  "viewport": [960, 500],
+  "data": [
+    {
+      "name": "world",
+      "url": "data/world-110m.json",
+      "format": { "type": "topojson", "feature": "countries" }
+    }
+  ],
+  "marks": [
+    {
+      "type": "path",
+      "from": {
+        "data": "world",
+        "transform": [{
+          "type": "geopath",
+          "value": "data",
+          "projection": "winkel3",
+          "scale": 300,
+          "translate": [960, 500]
+        }]
+      },
+      "properties": {
+        "enter": {
+          "stroke": { "value": "#fff" },
+          "path": { "field": "path" }
+        },
+        "update": { "fill": { "value": "#ccc" } },
+        "hover": { "fill": { "value": "pink" } }
+      }
+    }
+  ]
+}
+
+specs[11] = {
+  "width": 760,
+  "height": 260,
+  "data": [
+    {
+      "name": "temp",
+      "url": "data/napoleon.json",
+      "format": { "type": "json", "property": "temp" },
+      "transform": [
+        { "type": "formula", "field": "lat", "expr": "55" },
+        {
+          "type": "geo",
+          "lat": "lat",
+          "lon": "data.lon",
+          "center": [32.52, 53.3],
+          "scale": 3000
+        }
+      ]
+    },
+    {
+      "name": "army",
+      "url": "data/napoleon.json",
+      "format": { "type": "json", "property": "army" },
+      "transform": [
+        {
+          "type": "geo",
+          "lat": "data.lat",
+          "lon": "data.lon",
+          "center": [32.52, 53.3],
+          "scale": 3000
+        }
+      ]
+    },
+    {
+      "name": "cities",
+      "url": "data/napoleon.json",
+      "format": { "type": "json", "property": "cities" },
+      "transform": [
+        {
+          "type": "geo",
+          "lat": "data.lat",
+          "lon": "data.lon",
+          "center": [32.52, 53.3],
+          "scale": 3000
+        }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "color",
+      "type": "ordinal",
+      "domain": { "data": "army", "field": "data.dir" },
+      "range": ["brown", "black"]
+    },
+    {
+      "name": "lw",
+      "type": "linear", "zero": false,
+      "domain": { "data": "army", "field": "data.size" },
+      "range": [1, 50]
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "properties": {
+        "enter": {
+          "x": { "value": 0 },
+          "y": { "value": 200 },
+          "width": { "group": "width" },
+          "height": { "value": 60 }
+        }
+      },
+      "scales": [
+        {
+          "name": "y",
+          "type": "linear", "zero": false, "round": true,
+          "domain": { "data": "temp", "field": "data.temp" },
+          "range": "height"
+        }
+      ],
+      "axes": [
+        {
+          "type": "y", "scale": "y", "ticks": 4, "orient": "right",
+          "grid": true, "layer": "back"
+        }
+      ],
+      "marks": [
+        {
+          "type": "rule",
+          "from": { "data": "temp" },
+          "properties": {
+            "enter": {
+              "x": { "field": "x" },
+              "y1": 0,
+              "y2": { "scale": "y", "field": "data.temp" },
+              "stroke": { "value": "#ccc" }
+            }
+          }
+        },
+        {
+          "type": "line",
+          "from": { "data": "temp" },
+          "properties": {
+            "enter": {
+              "x": { "field": "x" },
+              "y": { "scale": "y", "field": "data.temp" },
+              "stroke": { "value": "#000" },
+              "strokeWidth": { "value": 2 }
+            }
+          }
+        },
+        {
+          "type": "text",
+          "from": { "data": "temp" },
+          "properties": {
+            "enter": {
+              "x": { "field": "x", "offset": -2 },
+              "y": { "scale": "y", "field": "data.temp", "offset": 6 },
+              "fill": { "value": "#000" },
+              "text": { "field": "data.date" },
+              "font": { "value": "Georgia" },
+              "fontSize": { "value": 10 },
+              "align": { "value": "center" },
+              "baseline": { "value": "top" }
+            }
+          }
+        }
+      ]
+    },
+    {
+      "type": "group",
+      "from": {
+        "data": "army",
+        "transform": [
+          { "type": "facet", "keys": ["data.group", "data.dir"] }
+        ]
+      },
+      "marks": [
+        {
+          "type": "group",
+          "from": {
+            "transform": [
+              { "type": "window", "size": 2, "step": 1 }
+            ]
+          },
+          "marks": [
+            {
+              "type": "line",
+              "properties": {
+                "enter": {
+                  "x": { "field": "x" },
+                  "y": { "field": "y" },
+                  "stroke": { "scale": "color", "field": "data.dir" },
+                  "strokeWidth": { "scale": "lw", "field": "data.size" },
+                  "strokeCap": { "value": "round" }
                 }
               }
-            ]
-          }
-        ]
-      },
-      {
-        "type": "symbol",
-        "from": {"data": "cities"},
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "size": {"value": 25},
-            "fill": {"value": "brown"},
-            "stroke": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "text",
-        "from": {"data": "cities"},
-        "properties": {
-          "enter": {
-            "x": {"field": "x", "offset": 1},
-            "y": {"field": "y", "offset": -4},
-            "fill": {"value": "#fff"},
-            "fillOpacity": {"value": 0.8},
-            "text": {"field": "data.city"},
-            "align": {"value": "center"},
-            "baseline": {"value": "bottom"},
-            "font": {"value": "Georgia"},
-            "fontSize": {"value": 9},
-            "fontStyle": {"value": "italic"}
-          }
-        }
-      },
-      {
-        "type": "text",
-        "from": {"data": "cities"},
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y", "offset": -5},
-            "fill": {"value": "#000"},
-            "text": {"field": "data.city"},
-            "align": {"value": "center"},
-            "baseline": {"value": "bottom"},
-            "font": {"value": "Georgia"},
-            "fontSize": {"value": 9},
-            "fontStyle": {"value": "italic"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 700,
-    "height": 400,
-    "data": [
-      {
-        "name": "cars",
-        "url": "data/cars.json"
-      },
-      {
-        "name": "fields",
-        "values": ["cyl", "dsp", "lbs", "hp", "acc", "mpg", "year"]
-      }
-    ],
-    "scales": [
-      {
-        "name": "ord",
-        "type": "ordinal",
-        "range": "width", "points": true,
-        "domain": {"data": "fields", "field": "data"}
-      },    
-      {
-        "name": "cyl",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.cyl"}
-      },
-      {
-        "name": "dsp",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.dsp"}
-      },
-      {
-        "name": "lbs",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.lbs"}
-      },
-      {
-        "name": "hp",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.hp"}
-      },
-      {
-        "name": "acc",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.acc"}
-      },
-      {
-        "name": "mpg",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.mpg"}
-      },
-      {
-        "name": "year",
-        "range": "height", "zero": false, "nice": true,
-        "domain": {"data": "cars", "field": "data.year"}
-      }
-    ],
-    "axes": [
-      {"type":"y", "scale":"cyl",  "offset":{"scale":"ord", "value":"cyl"}},
-      {"type":"y", "scale":"dsp",  "offset":{"scale":"ord", "value":"dsp"}},
-      {"type":"y", "scale":"lbs",  "offset":{"scale":"ord", "value":"lbs"}},
-      {"type":"y", "scale":"hp",   "offset":{"scale":"ord", "value":"hp"}},
-      {"type":"y", "scale":"acc",  "offset":{"scale":"ord", "value":"acc"}},
-      {"type":"y", "scale":"mpg",  "offset":{"scale":"ord", "value":"mpg"}},
-      {"type":"y", "scale":"year", "offset":{"scale":"ord", "value":"year"}}
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {"data": "cars"},
-        "marks": [
-          {
-            "type": "line",
-            "from": {"data": "fields"},
-            "properties": {
-              "enter": {
-                "x": {"scale": "ord", "field": "data"},
-                "y": {"scale": {"field": "data"}, "group": "data", "field": "data"},
-                "stroke": {"value": "steelblue"},
-                "strokeWidth": {"value": 1},
-                "strokeOpacity": {"value": 0.3}
-              }
             }
-          }
-        ]
-      },
-      {
-        "type": "text",
-        "from": {"data": "fields"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "ord", "field": "data", "offset":-8},
-            "y": {"group": "height", "offset": 6},
-            "fontWeight": {"value": "bold"},
-            "fill": {"value": "black"},
-            "text": {"field": "data"},
-            "align": {"value": "right"},
-            "baseline": {"value": "top"}
-          }
-        }
-      } 
-    ]
-  },
-  {
-    "width": 700,
-    "height": 400,
-    "padding": {"top": 0, "left": 0, "bottom": 20, "right": 0},
-    "data": [
-      {
-        "name": "pop2000",
-        "url": "data/population.json",
-        "transform": [
-          {"type": "filter", "test": "d.data.year == 2000"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "g",
-        "domain": [0, 1],
-        "range": [340, 10]
-      },
-      {
-        "name": "y",
-        "type": "ordinal",
-        "range": "height",
-        "reverse": true,
-        "domain": {"data": "pop2000", "field": "data.age"}
-      },
-      {
-        "name": "c",
-        "type": "ordinal",
-        "domain": [1, 2],
-        "range": ["#1f77b4", "#e377c2"]
-      }
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "interactive": false,
-        "from": {
-          "data": "pop2000",
-          "transform": [{"type":"unique", "field":"data.age", "as":"age"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"value": 325},
-            "y": {"scale": "y", "field": "age", "offset": 11},
-            "text": {"field": "age"},
-            "baseline": {"value": "middle"},
-            "align": {"value": "center"},
-            "fill": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "group",
-        "from": {
-          "data": "pop2000",
-          "transform": [
-            {"type":"facet", "keys":["data.sex"]}
           ]
-        },
-        "properties": {
-          "update": {
-            "x": {"scale": "g", "field": "index"},
-            "y": {"value": 0},
-            "width": {"value": 300},
-            "height": {"group": "height"}
-          }
-        },
-        "scales": [
-          {
-            "name": "x",
-            "type": "linear",
-            "range": "width",
-            "reverse": {"field": "index"},
-            "nice": true,
-            "domain": {"data": "pop2000", "field": "data.people"}
-          }
-        ],
-        "axes": [
-          {"type": "x", "scale": "x", "format": "s"}
-        ],
-        "marks": [
-          {
-            "type": "rect",
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": "data.people"},
-                "x2": {"scale": "x", "value": 0},
-                "y": {"scale": "y", "field": "data.age"},
-                "height": {"scale": "y", "band": true, "offset": -1},
-                "fillOpacity": {"value": 0.6},
-                "fill": {"scale": "c", "field": "data.sex"}
-              }
+        }
+      ]
+    },
+    {
+      "type": "symbol",
+      "from": { "data": "cities" },
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "size": { "value": 25 },
+          "fill": { "value": "brown" },
+          "stroke": { "value": "#000" }
+        }
+      }
+    },
+    {
+      "type": "text",
+      "from": { "data": "cities" },
+      "properties": {
+        "enter": {
+          "x": { "field": "x", "offset": 1 },
+          "y": { "field": "y", "offset": -4 },
+          "fill": { "value": "#fff" },
+          "fillOpacity": { "value": 0.8 },
+          "text": { "field": "data.city" },
+          "align": { "value": "center" },
+          "baseline": { "value": "bottom" },
+          "font": { "value": "Georgia" },
+          "fontSize": { "value": 9 },
+          "fontStyle": { "value": "italic" }
+        }
+      }
+    },
+    {
+      "type": "text",
+      "from": { "data": "cities" },
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y", "offset": -5 },
+          "fill": { "value": "#000" },
+          "text": { "field": "data.city" },
+          "align": { "value": "center" },
+          "baseline": { "value": "bottom" },
+          "font": { "value": "Georgia" },
+          "fontSize": { "value": 9 },
+          "fontStyle": { "value": "italic" }
+        }
+      }
+    }
+  ]
+}
+
+specs[12] = {
+  "width": 700,
+  "height": 400,
+  "data": [
+    {
+      "name": "cars",
+      "url": "data/cars.json"
+    },
+    {
+      "name": "fields",
+      "values": ["cyl", "dsp", "lbs", "hp", "acc", "mpg", "year"]
+    }
+  ],
+  "scales": [
+    {
+      "name": "ord",
+      "type": "ordinal",
+      "range": "width", "points": true,
+      "domain": { "data": "fields", "field": "data" }
+    },
+    {
+      "name": "cyl",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.cyl" }
+    },
+    {
+      "name": "dsp",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.dsp" }
+    },
+    {
+      "name": "lbs",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.lbs" }
+    },
+    {
+      "name": "hp",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.hp" }
+    },
+    {
+      "name": "acc",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.acc" }
+    },
+    {
+      "name": "mpg",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.mpg" }
+    },
+    {
+      "name": "year",
+      "range": "height", "zero": false, "nice": true,
+      "domain": { "data": "cars", "field": "data.year" }
+    }
+  ],
+  "axes": [
+    { "type": "y", "scale": "cyl", "offset": { "scale": "ord", "value": "cyl" } },
+    { "type": "y", "scale": "dsp", "offset": { "scale": "ord", "value": "dsp" } },
+    { "type": "y", "scale": "lbs", "offset": { "scale": "ord", "value": "lbs" } },
+    { "type": "y", "scale": "hp", "offset": { "scale": "ord", "value": "hp" } },
+    { "type": "y", "scale": "acc", "offset": { "scale": "ord", "value": "acc" } },
+    { "type": "y", "scale": "mpg", "offset": { "scale": "ord", "value": "mpg" } },
+    { "type": "y", "scale": "year", "offset": { "scale": "ord", "value": "year" } }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": { "data": "cars" },
+      "marks": [
+        {
+          "type": "line",
+          "from": { "data": "fields" },
+          "properties": {
+            "enter": {
+              "x": { "scale": "ord", "field": "data" },
+              "y": { "scale": { "field": "data" }, "group": "data", "field": "data" },
+              "stroke": { "value": "steelblue" },
+              "strokeWidth": { "value": 1 },
+              "strokeOpacity": { "value": 0.3 }
             }
           }
-        ]
-      }
-    ]
-  },
-  {
-    "width": 200,
-    "height": 200,
-    "data": [
-      {
-        "name": "iris",
-        "url": "data/iris.json"
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "nice": true,
-        "range": "width",
-        "domain": {"data": "iris", "field": "data.sepalWidth"}
-      },
-      {
-        "name": "y",
-        "nice": true,
-        "range": "height",
-        "domain": {"data": "iris", "field": "data.petalLength"}
-      },
-      {
-        "name": "c",
-        "type": "ordinal",
-        "domain": {"data": "iris", "field": "data.species"},
-        "range": ["#800", "#080", "#008"]
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "offset": 5, "ticks": 5, "title": "Sepal Width"},
-      {"type": "y", "scale": "y", "offset": 5, "ticks": 5, "title": "Petal Length"}
-    ],
-    "legends": [
-      {
-        "fill": "c",
-        "title": "Species",
-        "offset": 0,
-        "properties": {
-          "symbols": {
-            "fillOpacity": {"value": 0.5},
-            "stroke": {"value": "transparent"}
-          }
+        }
+      ]
+    },
+    {
+      "type": "text",
+      "from": { "data": "fields" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "ord", "field": "data", "offset": -8 },
+          "y": { "group": "height", "offset": 6 },
+          "fontWeight": { "value": "bold" },
+          "fill": { "value": "black" },
+          "text": { "field": "data" },
+          "align": { "value": "right" },
+          "baseline": { "value": "top" }
         }
       }
-    ],
-    "marks": [
-      {
-        "type": "symbol",
-        "from": {"data": "iris"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "data.sepalWidth"},
-            "y": {"scale": "y", "field": "data.petalLength"},
-            "fill": {"scale": "c", "field": "data.species"},
-            "fillOpacity": {"value": 0.5}
-          },
-          "update": {
-            "size": {"value": 100},
-            "stroke": {"value": "transparent"}
-          },
-          "hover": {
-            "size": {"value": 300},
-            "stroke": {"value": "white"}
-          }
+    }
+  ]
+}
+
+specs[13] = {
+  "width": 700,
+  "height": 400,
+  "padding": { "top": 0, "left": 0, "bottom": 20, "right": 0 },
+  "data": [
+    {
+      "name": "pop2000",
+      "url": "data/population.json",
+      "transform": [
+        { "type": "filter", "test": "d.data.year == 2000" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "g",
+      "domain": [0, 1],
+      "range": [340, 10]
+    },
+    {
+      "name": "y",
+      "type": "ordinal",
+      "range": "height",
+      "reverse": true,
+      "domain": { "data": "pop2000", "field": "data.age" }
+    },
+    {
+      "name": "c",
+      "type": "ordinal",
+      "domain": [1, 2],
+      "range": ["#1f77b4", "#e377c2"]
+    }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "interactive": false,
+      "from": {
+        "data": "pop2000",
+        "transform": [{ "type": "unique", "field": "data.age", "as": "age" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "value": 325 },
+          "y": { "scale": "y", "field": "age", "offset": 11 },
+          "text": { "field": "age" },
+          "baseline": { "value": "middle" },
+          "align": { "value": "center" },
+          "fill": { "value": "#000" }
         }
       }
-    ]
-  },
-  {
-    "width": 600,
-    "height": 600,
-    "data": [
-      {
-        "name": "iris",
-        "url": "data/iris.json"
-      },
-      {
-        "name": "fields",
-        "values": ["petalLength", "petalWidth", "sepalWidth", "sepalLength"]
-      }
-    ],
-    "scales": [
-      {
-        "name": "gx",
-        "type": "ordinal",
-        "range": "width",
-        "round": true,
-        "domain": {"data": "fields", "field": "data"}
-      },
-      {
-        "name": "gy",
-        "type": "ordinal",
-        "range": "height",
-        "round": true,
-        "domain": {"data": "fields", "field": "data"}
-      },
-      {
-        "name": "c",
-        "type": "ordinal",
-        "domain": {"data": "iris", "field": "data.species"},
-        "range": ["#800", "#080", "#008"]
-      }
-    ],
-    "legends": [
-      {
-        "fill": "c",
-        "title": "Species",
-        "offset": 10,
-        "properties": {
-          "symbols": {
-            "fillOpacity": {"value": 0.5},
-            "stroke": {"value": "transparent"}
-          }
-        }
-      }
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {
-          "data": "fields",
-          "transform": [{"type": "cross"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"scale": "gx", "field": "a.data"},
-            "y": {"scale": "gy", "field": "b.data"},
-            "width": {"scale": "gx", "band": true, "offset":-35},
-            "height": {"scale": "gy", "band": true, "offset":-35},
-            "stroke": {"value": "#ddd"}
-          }
-        },
-        "scales": [
-          {
-            "name": "x",
-            "range": "width",
-            "zero": false,
-            "round": true,
-            "domain": {"data": "iris", "field": {"group": "a.data"}}
-          },
-          {
-            "name": "y",
-            "range": "height",
-            "zero": false,
-            "round": true,
-            "domain": {"data": "iris", "field": {"group": "b.data"}}
-          }
-        ],
-        "axes": [
-          {"type": "x", "scale": "x", "ticks": 5},
-          {"type": "y", "scale": "y", "ticks": 5}
-        ],
-        "marks": [
-          {
-            "type": "symbol",
-            "from": {"data": "iris"},
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": {"group": "a.data"}},
-                "y": {"scale": "y", "field": {"group": "b.data"}},
-                "fill": {"scale": "c", "field": "data.species"},
-                "fillOpacity": {"value": 0.5}
-              },
-              "update": {
-                "size": {"value": 36},
-                "stroke": {"value": "transparent"}
-              },
-              "hover": {
-                "size": {"value": 100},
-                "stroke": {"value": "white"}
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "width": 500,
-    "height": 200,
-    "padding": {"top": 10, "left": 30, "bottom": 30, "right": 10},
-    "data": [
-      {
-        "name": "table",
-        "values": [
-          {"x": 0, "y": 28, "c":0}, {"x": 0, "y": 55, "c":1},
-          {"x": 1, "y": 43, "c":0}, {"x": 1, "y": 91, "c":1},
-          {"x": 2, "y": 81, "c":0}, {"x": 2, "y": 53, "c":1},
-          {"x": 3, "y": 19, "c":0}, {"x": 3, "y": 87, "c":1},
-          {"x": 4, "y": 52, "c":0}, {"x": 4, "y": 48, "c":1},
-          {"x": 5, "y": 24, "c":0}, {"x": 5, "y": 49, "c":1},
-          {"x": 6, "y": 87, "c":0}, {"x": 6, "y": 66, "c":1},
-          {"x": 7, "y": 17, "c":0}, {"x": 7, "y": 27, "c":1},
-          {"x": 8, "y": 68, "c":0}, {"x": 8, "y": 16, "c":1},
-          {"x": 9, "y": 49, "c":0}, {"x": 9, "y": 15, "c":1}
-        ]
-      },
-      {
-        "name": "stats",
-        "source": "table",
+    },
+    {
+      "type": "group",
+      "from": {
+        "data": "pop2000",
         "transform": [
-          {"type": "facet", "keys": ["data.x"]},
-          {"type": "stats", "value": "data.y"}
+          { "type": "facet", "keys": ["data.sex"] }
         ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "linear",
-        "range": "width",
-        "zero": false,
-        "domain": {"data": "table", "field": "data.x"}
       },
-      {
-        "name": "y",
-        "type": "linear",
-        "range": "height",
-        "nice": true,
-        "domain": {"data": "stats", "field": "sum"}
+      "properties": {
+        "update": {
+          "x": { "scale": "g", "field": "index" },
+          "y": { "value": 0 },
+          "width": { "value": 300 },
+          "height": { "group": "height" }
+        }
       },
-      {
-        "name": "color",
-        "type": "ordinal",
-        "range": "category10"
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x"},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {
-          "data": "table",
-          "transform": [
-            {"type": "facet", "keys": ["data.c"]},
-            {"type": "stack", "point": "data.x", "height": "data.y"}
-          ]
-        },
-        "marks": [
-          {
-            "type": "area",
-            "properties": {
-              "enter": {
-                "interpolate": {"value": "monotone"},
-                "x": {"scale": "x", "field": "data.x"},
-                "y": {"scale": "y", "field": "y"},
-                "y2": {"scale": "y", "field": "y2"},
-                "fill": {"scale": "color", "field": "data.c"}
-              },
-              "update": {
-                "fillOpacity": {"value": 1}
-              },
-              "hover": {
-                "fillOpacity": {"value": 0.5}
-              }
+      "scales": [
+        {
+          "name": "x",
+          "type": "linear",
+          "range": "width",
+          "reverse": true,
+          "nice": true,
+          "domain": { "data": "pop2000", "field": "data.people" }
+        }
+      ],
+      "axes": [
+        { "type": "x", "scale": "x", "format": "s" }
+      ],
+      "marks": [
+        {
+          "type": "rect",
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": "data.people" },
+              "x2": { "scale": "x", "value": 0 },
+              "y": { "scale": "y", "field": "data.age" },
+              "height": { "scale": "y", "band": true, "offset": -1 },
+              "fillOpacity": { "value": 0.6 },
+              "fill": { "scale": "c", "field": "data.sex" }
             }
           }
-        ]
-      }    
-    ]
-  },
-  {
-    "width": 500,
-    "height": 200,
-    "padding": {"top": 10, "left": 30, "bottom": 30, "right": 10},
-    "data": [
-      {
-        "name": "table",
-        "values": [
-          {"x": 0, "y": 28, "c":0}, {"x": 0, "y": 55, "c":1},
-          {"x": 1, "y": 43, "c":0}, {"x": 1, "y": 91, "c":1},
-          {"x": 2, "y": 81, "c":0}, {"x": 2, "y": 53, "c":1},
-          {"x": 3, "y": 19, "c":0}, {"x": 3, "y": 87, "c":1},
-          {"x": 4, "y": 52, "c":0}, {"x": 4, "y": 48, "c":1},
-          {"x": 5, "y": 24, "c":0}, {"x": 5, "y": 49, "c":1},
-          {"x": 6, "y": 87, "c":0}, {"x": 6, "y": 66, "c":1},
-          {"x": 7, "y": 17, "c":0}, {"x": 7, "y": 27, "c":1},
-          {"x": 8, "y": 68, "c":0}, {"x": 8, "y": 16, "c":1},
-          {"x": 9, "y": 49, "c":0}, {"x": 9, "y": 15, "c":1}
-        ]
-      },
-      {
-        "name": "stats",
-        "source": "table",
-        "transform": [
-          {"type": "facet", "keys": ["data.x"]},
-          {"type": "stats", "value": "data.y"}
-        ]
+        }
+      ]
+    }
+  ]
+}
+
+specs[14] = {
+  "width": 200,
+  "height": 200,
+  "data": [
+    {
+      "name": "iris",
+      "url": "data/iris.json"
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "nice": true,
+      "range": "width",
+      "domain": { "data": "iris", "field": "data.sepalWidth" }
+    },
+    {
+      "name": "y",
+      "nice": true,
+      "range": "height",
+      "domain": { "data": "iris", "field": "data.petalLength" }
+    },
+    {
+      "name": "c",
+      "type": "ordinal",
+      "domain": { "data": "iris", "field": "data.species" },
+      "range": ["#800", "#080", "#008"]
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "offset": 5, "ticks": 5, "title": "Sepal Width" },
+    { "type": "y", "scale": "y", "offset": 5, "ticks": 5, "title": "Petal Length" }
+  ],
+  "legends": [
+    {
+      "fill": "c",
+      "title": "Species",
+      "offset": 0,
+      "properties": {
+        "symbols": {
+          "fillOpacity": { "value": 0.5 },
+          "stroke": { "value": "transparent" }
+        }
       }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "ordinal",
-        "range": "width",
-        "domain": {"data": "table", "field": "data.x"}
-      },
-      {
-        "name": "y",
-        "type": "linear",
-        "range": "height",
-        "nice": true,
-        "domain": {"data": "stats", "field": "sum"}
-      },
-      {
-        "name": "color",
-        "type": "ordinal",
-        "range": "category10"
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x"},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {
-          "data": "table",
-          "transform": [
-            {"type": "facet", "keys": ["data.c"]},
-            {"type": "stack", "point": "data.x", "height": "data.y"}
-          ]
+    }
+  ],
+  "marks": [
+    {
+      "type": "symbol",
+      "from": { "data": "iris" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "data.sepalWidth" },
+          "y": { "scale": "y", "field": "data.petalLength" },
+          "fill": { "scale": "c", "field": "data.species" },
+          "fillOpacity": { "value": 0.5 }
         },
-        "marks": [
-          {
-            "type": "rect",
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": "data.x"},
-                "width": {"scale": "x", "band": true, "offset": -1},
-                "y": {"scale": "y", "field": "y"},
-                "y2": {"scale": "y", "field": "y2"},
-                "fill": {"scale": "color", "field": "data.c"}
-              },
-              "update": {
-                "fillOpacity": {"value": 1}
-              },
-              "hover": {
-                "fillOpacity": {"value": 0.5}
-              }
-            }
-          }
-        ]
-      }    
-    ]
-  },
-  {
-    "width": 500,
-    "height": 200,
-    "data": [
-      {
-        "name": "stocks",
-        "url": "data/stocks.csv",
-        "format": {"type": "csv", "parse": {"price":"number", "date":"date"}}
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "time",
-        "range": "width",
-        "domain": {"data": "stocks", "field": "data.date"}
-      },
-      {
-        "name": "y",
-        "type": "linear",
-        "range": "height",
-        "nice": true,
-        "domain": {"data": "stocks", "field": "data.price"}
-      },
-      {
-        "name": "color", "type": "ordinal", "range": "category10"
-      }
-    ],
-    "axes": [
-      {"type": "x", "scale": "x", "tickSizeEnd": 0},
-      {"type": "y", "scale": "y"}
-    ],
-    "marks": [
-      {
-        "type": "group",
-        "from": {
-          "data": "stocks",
-          "transform": [{"type": "facet", "keys": ["data.symbol"]}]
+        "update": {
+          "size": { "value": 100 },
+          "stroke": { "value": "transparent" }
         },
-        "marks": [
-          {
-            "type": "line",
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": "data.date"},
-                "y": {"scale": "y", "field": "data.price"},
-                "stroke": {"scale": "color", "field": "data.symbol"},
-                "strokeWidth": {"value": 2}
-              }
-            }
-          },
-          {
-            "type": "text",
-            "from": {
-              "transform": [{"type": "filter", "test": "index==data.length-1"}]
+        "hover": {
+          "size": { "value": 300 },
+          "stroke": { "value": "white" }
+        }
+      }
+    }
+  ]
+}
+
+specs[15] = {
+  "width": 600,
+  "height": 600,
+  "data": [
+    {
+      "name": "iris",
+      "url": "data/iris.json"
+    },
+    {
+      "name": "fields",
+      "values": ["petalLength", "petalWidth", "sepalWidth", "sepalLength"]
+    }
+  ],
+  "scales": [
+    {
+      "name": "gx",
+      "type": "ordinal",
+      "range": "width",
+      "round": true,
+      "domain": { "data": "fields", "field": "data" }
+    },
+    {
+      "name": "gy",
+      "type": "ordinal",
+      "range": "height",
+      "round": true,
+      "domain": { "data": "fields", "field": "data" }
+    },
+    {
+      "name": "c",
+      "type": "ordinal",
+      "domain": { "data": "iris", "field": "data.species" },
+      "range": ["#800", "#080", "#008"]
+    }
+  ],
+  "legends": [
+    {
+      "fill": "c",
+      "title": "Species",
+      "offset": 10,
+      "properties": {
+        "symbols": {
+          "fillOpacity": { "value": 0.5 },
+          "stroke": { "value": "transparent" }
+        }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "data": "fields",
+        "transform": [{ "type": "cross" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "scale": "gx", "field": "a.data" },
+          "y": { "scale": "gy", "field": "b.data" },
+          "width": { "scale": "gx", "band": true, "offset": -35 },
+          "height": { "scale": "gy", "band": true, "offset": -35 },
+          "stroke": { "value": "#ddd" }
+        }
+      },
+      "scales": [
+        {
+          "name": "x",
+          "range": "width",
+          "zero": false,
+          "round": true,
+          "domain": { "data": "iris", "field": { "group": "a.data" } }
+        },
+        {
+          "name": "y",
+          "range": "height",
+          "zero": false,
+          "round": true,
+          "domain": { "data": "iris", "field": { "group": "b.data" } }
+        }
+      ],
+      "axes": [
+        { "type": "x", "scale": "x", "ticks": 5 },
+        { "type": "y", "scale": "y", "ticks": 5 }
+      ],
+      "marks": [
+        {
+          "type": "symbol",
+          "from": { "data": "iris" },
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": { "group": "a.data" } },
+              "y": { "scale": "y", "field": { "group": "b.data" } },
+              "fill": { "scale": "c", "field": "data.spec[0]ies" },
+              "fillOpacity": { "value": 0.5 }
             },
-            "properties": {
-              "enter": {
-                "x": {"scale": "x", "field": "data.date", "offset": 2},
-                "y": {"scale": "y", "field": "data.price"},
-                "fill": {"scale": "color", "field": "data.symbol"},
-                "text": {"field": "data.symbol"},
-                "baseline": {"value": "middle"}
-              }
+            "update": {
+              "size": { "value": 36 },
+              "stroke": { "value": "transparent" }
+            },
+            "hover": {
+              "size": { "value": 100 },
+              "stroke": { "value": "white" }
             }
           }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "treemap",
-    "width": 960,
-    "height": 500,
-    "padding": 2.5,
-    "data": [
-      {
-        "name": "tree",
-        "url": "data/flare.json",
-        "format": {"type": "treejson"},
+        }
+      ]
+    }
+  ]
+}
+
+specs[16] = {
+  "width": 500,
+  "height": 200,
+  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        { "x": 0, "y": 28, "c": 0 }, { "x": 0, "y": 55, "c": 1 },
+        { "x": 1, "y": 43, "c": 0 }, { "x": 1, "y": 91, "c": 1 },
+        { "x": 2, "y": 81, "c": 0 }, { "x": 2, "y": 53, "c": 1 },
+        { "x": 3, "y": 19, "c": 0 }, { "x": 3, "y": 87, "c": 1 },
+        { "x": 4, "y": 52, "c": 0 }, { "x": 4, "y": 48, "c": 1 },
+        { "x": 5, "y": 24, "c": 0 }, { "x": 5, "y": 49, "c": 1 },
+        { "x": 6, "y": 87, "c": 0 }, { "x": 6, "y": 66, "c": 1 },
+        { "x": 7, "y": 17, "c": 0 }, { "x": 7, "y": 27, "c": 1 },
+        { "x": 8, "y": 68, "c": 0 }, { "x": 8, "y": 16, "c": 1 },
+        { "x": 9, "y": 49, "c": 0 }, { "x": 9, "y": 15, "c": 1 }
+      ]
+    },
+    {
+      "name": "stats",
+      "source": "table",
+      "transform": [
+        { "type": "facet", "keys": ["data.x"] },
+        { "type": "stats", "value": "data.y" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "linear",
+      "range": "width",
+      "zero": false,
+      "domain": { "data": "table", "field": "data.x" }
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "domain": { "data": "stats", "field": "sum" }
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category10"
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x" },
+    { "type": "y", "scale": "y" }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "data": "table",
         "transform": [
-          {"type": "treemap", "value": "data.size"}
-        ]
-      }
-    ],
-    "scales": [
-      {
-        "name": "color",
-        "type": "ordinal",
-        "range": [
-          "#3182bd", "#6baed6", "#9ecae1", "#c6dbef", "#e6550d",
-          "#fd8d3c", "#fdae6b", "#fdd0a2", "#31a354", "#74c476",
-          "#a1d99b", "#c7e9c0", "#756bb1", "#9e9ac8", "#bcbddc",
-          "#dadaeb", "#636363", "#969696", "#bdbdbd", "#d9d9d9"
+          { "type": "facet", "keys": ["data.c"] },
+          { "type": "stack", "point": "data.x", "height": "data.y" }
         ]
       },
-      {
-        "name": "size",
-        "type": "ordinal",
-        "domain": [0, 1, 2, 3],
-        "range": [256, 28, 20, 14]
-      },
-      {
-        "name": "opacity",
-        "type": "ordinal",
-        "domain": [0, 1, 2, 3],
-        "range": [0.15, 0.5, 0.8, 1.0]
-      }
-    ],
-    "marks": [
-      {
-        "type": "rect",
-        "from": {
-          "data": "tree",
-          "transform": [{"type":"filter", "test":"d.values"}]
-        },
-        "interactive": false,
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "width": {"field": "width"},
-            "height": {"field": "height"},
-            "fill": {"scale": "color", "field": "data.name"}
+      "marks": [
+        {
+          "type": "area",
+          "properties": {
+            "enter": {
+              "interpolate": { "value": "monotone" },
+              "x": { "scale": "x", "field": "data.x" },
+              "y": { "scale": "y", "field": "y" },
+              "y2": { "scale": "y", "field": "y2" },
+              "fill": { "scale": "color", "field": "data.c" }
+            },
+            "update": {
+              "fillOpacity": { "value": 1 }
+            },
+            "hover": {
+              "fillOpacity": { "value": 0.5 }
+            }
           }
         }
-      },
-      {
-        "type": "rect",
-        "from": {
-          "data": "tree",
-          "transform": [{"type":"filter", "test":"!d.values"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "width": {"field": "width"},
-            "height": {"field": "height"},
-            "stroke": {"value": "#fff"}
-          },
-          "update": {
-            "fill": {"value": "rgba(0,0,0,0)"}
-          },
-          "hover": {
-            "fill": {"value": "red"}
-          }
-        }
-      },
-      {
-        "type": "text",
-        "from": {
-          "data": "tree",
-          "transform": [{"type":"filter", "test":"d.values"}]
-        },
-        "interactive": false,
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "dx": {"field": "width", "mult": 0.5},
-            "dy": {"field": "height", "mult": 0.5},
-            "font": {"value": "Helvetica Neue"},
-            "fontSize": {"scale": "size", "field": "depth"},
-            "align": {"value": "center"},
-            "baseline": {"value": "middle"},
-            "fill": {"value": "#000"},
-            "fillOpacity": {"scale": "opacity", "field": "depth"},
-            "text": {"field": "data.name"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "width": 250,
-    "height": 200,
-    "data": [
-      {
-        "name": "weather",
-        "url": "data/weather.json"
-      }
-    ],
-    "scales": [
-      {
-        "name": "x",
-        "type": "ordinal",
-        "range": "width",
-        "padding": 0.1, "round": true,
-        "domain": {"data": "weather", "field": "index"}
-      },
-      {
-        "name": "y",
-        "range": "height",
-        "nice": true, "zero": false, "round": true,
-        "domain": {
-          "data": "weather",
-          "field": ["data.record.low", "data.record.high"]
-        }
-      }
-    ],
-    "axes": [
-      { "type": "y", "scale": "y", "ticks": 3, "tickSize": 0,
-        "orient": "right", "grid": true,
-        "properties": {
-          "grid": {"stroke": {"value": "white"}, "strokeWidth": {"value": 2}},
-          "axis": {"stroke": {"value": "transparent"}}
-        }
-      }
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "from": {"data": "weather"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index"},
-            "dx": {"scale": "x", "band": true, "mult": 0.5},
-            "y": {"value": 0},
-            "fill": {"value": "#000"},
-            "text": {"field": "data.day"},
-            "align": {"value": "center"},
-            "baseline": {"value": "bottom"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "weather"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index"},
-            "width": {"scale": "x", "band": true, "offset": -1},
-            "y": {"scale": "y", "field": "data.record.low"},
-            "y2": {"scale": "y", "field": "data.record.high"},
-            "fill": {"value": "#ccc"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {"data": "weather"},
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index"},
-            "width": {"scale": "x", "band": true, "offset": -1},
-            "y": {"scale": "y", "field": "data.normal.low"},
-            "y2": {"scale": "y", "field": "data.normal.high"},
-            "fill": {"value": "#999"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {
-          "data": "weather",
-          "transform": [{"type":"filter", "test":"d.data.actual"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index", "offset": 4},
-            "width": {"scale": "x", "band": true, "offset": -8},
-            "y": {"scale": "y", "field": "data.actual.low"},
-            "y2": {"scale": "y", "field": "data.actual.high"},
-            "fill": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {
-          "data": "weather",
-          "transform": [{"type":"filter", "test":"d.data.forecast"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index", "offset": 9},
-            "width": {"scale": "x", "band": true, "offset": -18},
-            "y": {"scale": "y", "field": "data.forecast.low.low"},
-            "y2": {"scale": "y", "field": "data.forecast.high.high"},
-            "fill": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {
-          "data": "weather",
-          "transform": [{"type":"filter", "test":"d.data.forecast"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index", "offset": 4},
-            "width": {"scale": "x", "band": true, "offset": -8},
-            "y": {"scale": "y", "field": "data.forecast.low.low"},
-            "y2": {"scale": "y", "field": "data.forecast.low.high"},
-            "fill": {"value": "#000"}
-          }
-        }
-      },
-      {
-        "type": "rect",
-        "from": {
-          "data": "weather",
-          "transform": [{"type":"filter", "test":"d.data.forecast"}]
-        },
-        "properties": {
-          "enter": {
-            "x": {"scale": "x", "field": "index", "offset": 4},
-            "width": {"scale": "x", "band": true, "offset": -8},
-            "y": {"scale": "y", "field": "data.forecast.high.low"},
-            "y2": {"scale": "y", "field": "data.forecast.high.high"},
-            "fill": {"value": "#000"}
-          }
-        }
-      }
-    ]
-  },
-  {
-    "name": "wordcloud",
-    "width": 400,
-    "height": 400,
-    "padding": {"top":0, "bottom":0, "left":0, "right":0},
-    "data": [
-      {
-        "name": "table",
-        "values": [
-          {"text": "poem", "value": 80},
-          {"text": "peom", "value": 44},
-          {"text": "moep", "value": 40},
-          {"text": "meop", "value": 36},
-          {"text": "emop", "value": 32},
-          {"text": "epom", "value": 28},
-          {"text": "opem", "value": 24},
-          {"text": "omep", "value": 20},
-          {"text": "mope", "value": 56},
-          {"text": "mepo", "value": 12},
-          {"text": "pemo", "value": 10},
-          {"text": "pome", "value": 10}
-        ],
+      ]
+    }
+  ]
+}
+
+specs[17] = {
+  "width": 500,
+  "height": 200,
+  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        { "x": 0, "y": 28, "c": 0 }, { "x": 0, "y": 55, "c": 1 },
+        { "x": 1, "y": 43, "c": 0 }, { "x": 1, "y": 91, "c": 1 },
+        { "x": 2, "y": 81, "c": 0 }, { "x": 2, "y": 53, "c": 1 },
+        { "x": 3, "y": 19, "c": 0 }, { "x": 3, "y": 87, "c": 1 },
+        { "x": 4, "y": 52, "c": 0 }, { "x": 4, "y": 48, "c": 1 },
+        { "x": 5, "y": 24, "c": 0 }, { "x": 5, "y": 49, "c": 1 },
+        { "x": 6, "y": 87, "c": 0 }, { "x": 6, "y": 66, "c": 1 },
+        { "x": 7, "y": 17, "c": 0 }, { "x": 7, "y": 27, "c": 1 },
+        { "x": 8, "y": 68, "c": 0 }, { "x": 8, "y": 16, "c": 1 },
+        { "x": 9, "y": 49, "c": 0 }, { "x": 9, "y": 15, "c": 1 }
+      ]
+    },
+    {
+      "name": "stats",
+      "source": "table",
+      "transform": [
+        { "type": "facet", "keys": ["data.x"] },
+        { "type": "stats", "value": "data.y" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "ordinal",
+      "range": "width",
+      "domain": { "data": "table", "field": "data.x" }
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "domain": { "data": "stats", "field": "sum" }
+    },
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": "category10"
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x" },
+    { "type": "y", "scale": "y" }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "data": "table",
         "transform": [
-          {
-            "type": "wordcloud",
-            "text": "data.text",
-            "font": "Helvetica Neue",
-            "fontSize": "data.value",
-            "rotate": {"random": [-60,-30,0,30,60]}
-          }
+          { "type": "facet", "keys": ["data.c"] },
+          { "type": "stack", "point": "data.x", "height": "data.y" }
         ]
-      }
-    ],
-    "marks": [
-      {
-        "type": "text",
-        "from": {"data": "table"},
-        "properties": {
-          "enter": {
-            "x": {"field": "x"},
-            "y": {"field": "y"},
-            "angle": {"field": "angle"},
-            "align": {"value": "center"},
-            "baseline": {"value": "alphabetic"},
-            "font": {"field": "font"},
-            "fontSize": {"field": "fontSize"},
-            "text": {"field": "data.text"}
-          },
-          "update": {
-            "fill": {"value": "steelblue"}
-          },
-          "hover": {
-            "fill": {"value": "#f00"}
+      },
+      "marks": [
+        {
+          "type": "rect",
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": "data.x" },
+              "width": { "scale": "x", "band": true, "offset": -1 },
+              "y": { "scale": "y", "field": "y" },
+              "y2": { "scale": "y", "field": "y2" },
+              "fill": { "scale": "color", "field": "data.c" }
+            },
+            "update": {
+              "fillOpacity": { "value": 1 }
+            },
+            "hover": {
+              "fillOpacity": { "value": 0.5 }
+            }
           }
         }
+      ]
+    }
+  ]
+}
+
+specs[18] = {
+  "width": 500,
+  "height": 200,
+  "data": [
+    {
+      "name": "stocks",
+      "url": "data/stocks.csv",
+      "format": { "type": "csv", "parse": { "price": "number", "date": "date" } }
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "time",
+      "range": "width",
+      "domain": { "data": "stocks", "field": "data.date" }
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "range": "height",
+      "nice": true,
+      "domain": { "data": "stocks", "field": "data.price" }
+    },
+    {
+      "name": "color", "type": "ordinal", "range": "category10"
+    }
+  ],
+  "axes": [
+    { "type": "x", "scale": "x", "tickSizeEnd": 0 },
+    { "type": "y", "scale": "y" }
+  ],
+  "marks": [
+    {
+      "type": "group",
+      "from": {
+        "data": "stocks",
+        "transform": [{ "type": "facet", "keys": ["data.symbol"] }]
+      },
+      "marks": [
+        {
+          "type": "line",
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": "data.date" },
+              "y": { "scale": "y", "field": "data.price" },
+              "stroke": { "scale": "color", "field": "data.symbol" },
+              "strokeWidth": { "value": 2 }
+            }
+          }
+        },
+        {
+          "type": "text",
+          "from": {
+            "transform": [{ "type": "filter", "test": "index==data.length-1" }]
+          },
+          "properties": {
+            "enter": {
+              "x": { "scale": "x", "field": "data.date", "offset": 2 },
+              "y": { "scale": "y", "field": "data.price" },
+              "fill": { "scale": "color", "field": "data.symbol" },
+              "text": { "field": "data.symbol" },
+              "baseline": { "value": "middle" }
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
+
+specs[19] = {
+  "name": "treemap",
+  "width": 960,
+  "height": 500,
+  "padding": 2.5,
+  "data": [
+    {
+      "name": "tree",
+      "url": "data/flare.json",
+      "format": { "type": "treejson" },
+      "transform": [
+        { "type": "treemap", "value": "data.size" }
+      ]
+    }
+  ],
+  "scales": [
+    {
+      "name": "color",
+      "type": "ordinal",
+      "range": [
+        "#3182bd", "#6baed6", "#9ecae1", "#c6dbef", "#e6550d",
+        "#fd8d3c", "#fdae6b", "#fdd0a2", "#31a354", "#74c476",
+        "#a1d99b", "#c7e9c0", "#756bb1", "#9e9ac8", "#bcbddc",
+        "#dadaeb", "#636363", "#969696", "#bdbdbd", "#d9d9d9"
+      ]
+    },
+    {
+      "name": "size",
+      "type": "ordinal",
+      "domain": [0, 1, 2, 3],
+      "range": [256, 28, 20, 14]
+    },
+    {
+      "name": "opacity",
+      "type": "ordinal",
+      "domain": [0, 1, 2, 3],
+      "range": [0.15, 0.5, 0.8, 1.0]
+    }
+  ],
+  "marks": [
+    {
+      "type": "rect",
+      "from": {
+        "data": "tree",
+        "transform": [{ "type": "filter", "test": "d.values" }]
+      },
+      "interactive": false,
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "width": { "field": "width" },
+          "height": { "field": "height" },
+          "fill": { "scale": "color", "field": "data.name" }
+        }
       }
-    ]
-  }
-];
+    },
+    {
+      "type": "rect",
+      "from": {
+        "data": "tree",
+        "transform": [{ "type": "filter", "test": "!d.values" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "width": { "field": "width" },
+          "height": { "field": "height" },
+          "stroke": { "value": "#fff" }
+        },
+        "update": {
+          "fill": { "value": "rgba(0,0,0,0)" }
+        },
+        "hover": {
+          "fill": { "value": "red" }
+        }
+      }
+    },
+    {
+      "type": "text",
+      "from": {
+        "data": "tree",
+        "transform": [{ "type": "filter", "test": "d.values" }]
+      },
+      "interactive": false,
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "dx": { "field": "width", "mult": 0.5 },
+          "dy": { "field": "height", "mult": 0.5 },
+          "font": { "value": "Helvetica Neue" },
+          "fontSize": { "scale": "size", "field": "depth" },
+          "align": { "value": "center" },
+          "baseline": { "value": "middle" },
+          "fill": { "value": "#000" },
+          "fillOpacity": { "scale": "opacity", "field": "depth" },
+          "text": { "field": "data.name" }
+        }
+      }
+    }
+  ]
+}
+
+specs[20] = {
+  "width": 250,
+  "height": 200,
+  "data": [
+    {
+      "name": "weather",
+      "url": "data/weather.json"
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "ordinal",
+      "range": "width",
+      "padding": 0.1, "round": true,
+      "domain": { "data": "weather", "field": "index" }
+    },
+    {
+      "name": "y",
+      "range": "height",
+      "nice": true, "zero": false, "round": true,
+      "domain": {
+        "data": "weather",
+        "field": ["data.record.low", "data.record.high"]
+      }
+    }
+  ],
+  "axes": [
+    {
+      "type": "y", "scale": "y", "ticks": 3, "tickSize": 0,
+      "orient": "right", "grid": true,
+      "properties": {
+        "grid": { "stroke": { "value": "white" }, "strokeWidth": { "value": 2 } },
+        "axis": { "stroke": { "value": "transparent" } }
+      }
+    }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "from": { "data": "weather" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index" },
+          "dx": { "scale": "x", "band": true, "mult": 0.5 },
+          "y": { "value": 0 },
+          "fill": { "value": "#000" },
+          "text": { "field": "data.day" },
+          "align": { "value": "center" },
+          "baseline": { "value": "bottom" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "weather" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index" },
+          "width": { "scale": "x", "band": true, "offset": -1 },
+          "y": { "scale": "y", "field": "data.record.low" },
+          "y2": { "scale": "y", "field": "data.record.high" },
+          "fill": { "value": "#ccc" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": { "data": "weather" },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index" },
+          "width": { "scale": "x", "band": true, "offset": -1 },
+          "y": { "scale": "y", "field": "data.normal.low" },
+          "y2": { "scale": "y", "field": "data.normal.high" },
+          "fill": { "value": "#999" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": {
+        "data": "weather",
+        "transform": [{ "type": "filter", "test": "d.data.actual" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index", "offset": 4 },
+          "width": { "scale": "x", "band": true, "offset": -8 },
+          "y": { "scale": "y", "field": "data.actual.low" },
+          "y2": { "scale": "y", "field": "data.actual.high" },
+          "fill": { "value": "#000" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": {
+        "data": "weather",
+        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index", "offset": 9 },
+          "width": { "scale": "x", "band": true, "offset": -18 },
+          "y": { "scale": "y", "field": "data.forecast.low.low" },
+          "y2": { "scale": "y", "field": "data.forecast.high.high" },
+          "fill": { "value": "#000" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": {
+        "data": "weather",
+        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index", "offset": 4 },
+          "width": { "scale": "x", "band": true, "offset": -8 },
+          "y": { "scale": "y", "field": "data.forecast.low.low" },
+          "y2": { "scale": "y", "field": "data.forecast.low.high" },
+          "fill": { "value": "#000" }
+        }
+      }
+    },
+    {
+      "type": "rect",
+      "from": {
+        "data": "weather",
+        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
+      },
+      "properties": {
+        "enter": {
+          "x": { "scale": "x", "field": "index", "offset": 4 },
+          "width": { "scale": "x", "band": true, "offset": -8 },
+          "y": { "scale": "y", "field": "data.forecast.high.low" },
+          "y2": { "scale": "y", "field": "data.forecast.high.high" },
+          "fill": { "value": "#000" }
+        }
+      }
+    }
+  ]
+}
+
+specs[21] = {
+  "name": "wordcloud",
+  "width": 400,
+  "height": 400,
+  "padding": { "top": 0, "bottom": 0, "left": 0, "right": 0 },
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        { "text": "poem", "value": 80 },
+        { "text": "peom", "value": 44 },
+        { "text": "moep", "value": 40 },
+        { "text": "meop", "value": 36 },
+        { "text": "emop", "value": 32 },
+        { "text": "epom", "value": 28 },
+        { "text": "opem", "value": 24 },
+        { "text": "omep", "value": 20 },
+        { "text": "mope", "value": 56 },
+        { "text": "mepo", "value": 12 },
+        { "text": "pemo", "value": 10 },
+        { "text": "pome", "value": 10 }
+      ],
+      "transform": [
+        {
+          "type": "wordcloud",
+          "text": "data.text",
+          "font": "Helvetica Neue",
+          "fontSize": "data.value",
+          "rotate": { "random": [-60, -30, 0, 30, 60] }
+        }
+      ]
+    }
+  ],
+  "marks": [
+    {
+      "type": "text",
+      "from": { "data": "table" },
+      "properties": {
+        "enter": {
+          "x": { "field": "x" },
+          "y": { "field": "y" },
+          "angle": { "field": "angle" },
+          "align": { "value": "center" },
+          "baseline": { "value": "alphabetic" },
+          "font": { "field": "font" },
+          "fontSize": { "field": "fontSize" },
+          "text": { "field": "data.text" }
+        },
+        "update": {
+          "fill": { "value": "steelblue" }
+        },
+        "hover": {
+          "fill": { "value": "#f00" }
+        }
+      }
+    }
+  ]
+}
 
 specs.forEach(spec => {
   vg.parse.spec(spec, chart => {
-    chart({el:"#vis"}).update();
+  chart({el:"#vis"}).update();
   });
 });
\ No newline at end of file
diff --git a/vega/vega.d.ts b/vega/vega.d.ts
index ebe89da02..4441cceae 100644
--- a/vega/vega.d.ts
+++ b/vega/vega.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tom Crockett <http://github.com/pelotom>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module Vega {
+declare namespace Vega {
 
   export interface Parse {
     spec(url: string, callback: (chart: (args: ViewArgs) => View) => void): void;
@@ -113,7 +113,7 @@ declare module Vega {
     reset(): Model;
   }
 
-  export module Runtime {
+  export namespace Runtime {
     export interface DataSets {
       [name: string]: Datum[];
     }
@@ -132,19 +132,6 @@ declare module Vega {
       marks: Mark[];
     }
 
-    export interface Mark {
-      // Stuff from Spec.Mark
-      type: string;
-      name?: string;
-      description?: string;
-      from?: Mark.From;
-      key?: string;
-      delay?: Properties;
-
-      // Runtime PropertySets
-      properties?: PropertySets;
-    }
-
     export interface PropertySets {
       enter?: Properties;
       exit?: Properties;
@@ -158,7 +145,7 @@ declare module Vega {
   }
 
   export interface Node {
-    def: Runtime.Mark;
+    def: Vega.Mark;
     marktype: string;
     interactive: boolean;
     items: Node[];
@@ -220,7 +207,9 @@ declare module Vega {
     * in some cases strict padding is not possible; for example, if the axis
     * labels are much larger than the data rectangle.
     */
-    padding?: any;
+    padding?: number | string | {
+        top: number; left: number; right: number; bottom: number
+    }; // string is "auto" or "strict"
     /**
     * Definitions of data to visualize.
     */
@@ -240,7 +229,7 @@ declare module Vega {
     /**
     * Graphical mark definitions.
     */
-    marks: Mark[];
+    marks: (Mark | GroupMark)[];
   }
 
   export interface Data {
@@ -278,17 +267,51 @@ declare module Vega {
     transform?: Data.Transform[];
   }
 
-  export module Data {
-    export interface Format {
+  export namespace Data {
+    export interface FormatBase {
       /**
       * The currently supported format types are json (JavaScript Object
       * Notation), csv (comma-separated values), tsv (tab-separated values),
       * topojson, and treejson.
       */
-      type?: string;
+      type: string;
       // TODO: fields for specific formats
     }
 
+    /**
+     * The JSON property containing the desired data.
+     * This parameter can be used when the loaded JSON file may have surrounding structure or meta-data.
+     * For example "property": "values.features" is equivalent to retrieving json.values.features from the
+     * loaded JSON object.
+     */
+    export interface JsonFormat extends FormatBase {
+      type: string; // "json"
+      property?: string;
+    }
+
+    export interface CsvOrTsvFormat extends FormatBase {
+      type: string; // "csv" | "tsv"
+      parse?: {
+       [propertyName: string]: string; // "number" | "boolean" | "date"
+      }
+    }
+
+    export interface TopoJsonFormat extends FormatBase {
+      type: string; // "topojson"
+      feature?: string;
+      mesh?: string;
+    }
+
+    export interface TreeJson extends FormatBase {
+      type: string; // "treejson"
+      children?: string;
+      parse?: {
+       [propertyName: string]: string; // "number" | "boolean" | "date"
+      }
+    }
+
+    export type Format = JsonFormat | CsvOrTsvFormat | TopoJsonFormat | TreeJson;
+
     export interface Transform {
       // TODO
     }
@@ -316,7 +339,8 @@ declare module Vega {
 
     // -- Time/Quantitative scale properties
     clamp?: boolean;
-    nice?: any; // boolean for quantitative scales, string for time scales
+    /** boolean for quantitative scales, string for time scales */
+    nice?: boolean | string;
 
     // -- Quantitative scale properties
     exponent?: number;
@@ -345,9 +369,9 @@ declare module Vega {
     properties?: Axis.Properties
   }
 
-  export module Axis {
+  export namespace Axis {
     export interface Properties {
-      majorTicks?: PropertySet;
+      ticks?: PropertySet;
       minorTicks?: PropertySet;
       grid?: PropertySet;
       labels?: PropertySet;
@@ -362,23 +386,59 @@ declare module Vega {
 
   export interface Mark {
     // TODO docs
-    type: string;
+    // Stuff from Spec.Mark
+    type: string; // "rect" | "symbol" | "path" | "arc" | "area" | "line" | "rule" | "image" | "text" | "group"
     name?: string;
     description?: string;
     from?: Mark.From;
-    properties?: PropertySets;
     key?: string;
     delay?: ValueRef;
+    /**
+    * "linear-in" | "linear-out" | "linear-in-out" | "linear-out-in" | "quad-in" | "quad-out" | "quad-in-out" |
+    * "quad-out-in" | "cubic-in" | "cubic-out" | "cubic-in-out" | "cubic-out-in" | "sin-in" | "sin-out" | "sin-in-out" |
+    * "sin-out-in" | "exp-in" | "exp-out" | "exp-in-out" | "exp-out-in" | "circle-in" | "circle-out" | "circle-in-out" |
+    * "circle-out-in" | "bounce-in" | "bounce-out" | "bounce-in-out" | "bounce-out-in"
+    */
+    ease?: string;
+
+    interactive?: boolean;
+
+    // Runtime PropertySets
+    properties?: PropertySets;
   }
 
   export module Mark {
     export interface From {
       // TODO docs
       data?: string;
+      mark?: string;
       transform?: Data.Transform[];
     }
   }
 
+  export interface GroupMark extends Mark {
+    type: string; // "group"
+    /**
+     * Scale transform definitions.
+     */
+    scales?: Scale[];
+    /**
+     * Axis definitions.
+     */
+    axes?: Axis[];
+    /**
+     * Legend definitions.
+     */
+    legends?: Legend[];
+    /**
+     * Groups differ from other mark types in their ability to contain children marks.
+     * Marks defined within a group mark can inherit data from their parent group.
+     * For inheritance to work each data element for a group must contain data elements of its own.
+     * This arrangement of nested data is typically achieved by facetting the data, such that each group-level data element includes its own array of sub-elements
+     */
+    marks?: (Mark | GroupMark)[];
+  }
+
   export interface PropertySets {
     // TODO docs
     enter?: PropertySet;
@@ -453,9 +513,9 @@ declare module Vega {
   }
 }
 
-declare module vg {
+declare namespace vg {
   export var parse: Vega.Parse;
-  export module scene {
+  export namespace scene {
     export function item(mark: Vega.Node): Vega.Node;
   }
   
diff --git a/velocity-animate/velocity-animate-tests.ts b/velocity-animate/velocity-animate-tests.ts
index 96400d365..afcd8b563 100644
--- a/velocity-animate/velocity-animate-tests.ts
+++ b/velocity-animate/velocity-animate-tests.ts
@@ -293,3 +293,62 @@ function advanced_utility_function () {
 		options: { duration: 1500 }
 	});
 }
+
+function ui_pack_sequence_running() {
+	var $element1: JQuery;
+	var $element2: JQuery;
+	var $element3: JQuery;
+
+	$element1.velocity({ translateX: 100 }, 1000, function() {
+		$element2.velocity({ translateX: 200 }, 1000, function() {
+			$element3.velocity({ translateX: 300 }, 1000);
+		});
+	});
+
+	var mySequence = [
+		{ e: $element1, p: { translateX: 100 }, o: { duration: 1000 } },
+		{ e: $element2, p: { translateX: 200 }, o: { duration: 1000 } },
+		{ e: $element3, p: { translateX: 300 }, o: { duration: 1000 } }
+	];
+	$.Velocity.RunSequence(mySequence);
+
+	var mySequence2 = [
+		{ e: $element1, p: { translateX: 100 }, o: { duration: 1000 } },
+		/* The call below will run at the same time as the first call. */
+		{ e: $element2, p: { translateX: 200 }, o: { duration: 1000, sequenceQueue: false } },
+		/* As normal, the call below will run once the second call is complete. */
+		{ e: $element3, p: { translateX: 300 }, o: { duration: 1000 } }
+	];
+	$.Velocity.RunSequence(mySequence2);
+}
+
+function ui_pack_registration() {
+	var $element: JQuery;
+
+	$.Velocity.RegisterEffect("callout.pulse", {
+		defaultDuration: 900,
+		calls: [
+			[ { scaleX: 1.1 }, 0.50 ],
+			[ { scaleX: 1 }, 0.50 ]
+		]
+	});
+	$element.velocity("callout.pulse");
+
+	$.Velocity
+		.RegisterEffect("transition.flipXIn", {
+			defaultDuration: 700,
+			calls: [
+				[ { opacity: 1, rotateY: [ 0, -55 ] } ]
+			]
+		})
+		.RegisterEffect("transition.flipXOut", {
+			defaultDuration: 700,
+			calls: [
+				[ { opacity: 0, rotateY: 55 } ]
+			],
+			reset: { rotateY: 0 }
+		});
+	$element
+		.velocity("transition.flipXIn")
+		.velocity("transition.flipXOut", { delay: 1000 });
+}
diff --git a/velocity-animate/velocity-animate.d.ts b/velocity-animate/velocity-animate.d.ts
index 523098423..82cc069a1 100644
--- a/velocity-animate/velocity-animate.d.ts
+++ b/velocity-animate/velocity-animate.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Velocity 0.0.22
+// Type definitions for Velocity 1.2.2
 // Project: http://velocityjs.org/
 // Definitions by: Greg Smith <https://github.com/smrq/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -6,14 +6,13 @@
 /// <reference path="../jquery/jquery.d.ts" />
 
 interface JQuery {
-	velocity(options: {properties: Object; options: jquery.velocity.VelocityOptions}): JQuery;
-	velocity(properties: Object, options: jquery.velocity.VelocityOptions): JQuery;
-	velocity(properties: Object, duration?: number, easing?: string, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: Object, duration?: number, easing?: number[], complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: Object, duration?: number, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: Object, easing?: string, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: Object, easing?: number[], complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: Object, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(name: string, options: jquery.velocity.RegisteredEffectOptions): JQuery;
+	velocity(options: {properties: jquery.velocity.Properties; options: jquery.velocity.Options}): JQuery;
+	velocity(properties: jquery.velocity.Properties, options: jquery.velocity.Options): JQuery;
+	velocity(properties: jquery.velocity.Properties, duration: number, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, duration: number, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, complete?: jquery.velocity.ElementCallback): JQuery;
 }
 
 interface JQueryStatic {
@@ -21,45 +20,80 @@ interface JQueryStatic {
 }
 
 declare module jquery.velocity {
-	interface ElementCallback {
-		(elements: NodeListOf<HTMLElement>): void;
-	}
+	type Properties = Object;
+	type Easing = string|number[];
+	type ElementCallback = (elements: NodeListOf<HTMLElement>) => void;
+	type ProgressCallback = (elements: NodeListOf<HTMLElement>, percentComplete: number, timeRemaining: number, timeStart: number) => void;
+	type EffectCall =
+		[Properties] |
+		[Properties, number] |
+		[Properties, EffectCallOptions] |
+		[Properties, number, EffectCallOptions];
 
-	interface ProgressCallback {
-		(elements: NodeListOf<HTMLElement>, percentComplete: number, timeRemaining: number, timeStart: number): void;
-	}
-
-	interface VelocityStatic {
-		Sequences: any;
-		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 {
-		queue?: any;
-		duration?: any;
+	interface EffectCallOptions {
+		delay?: any;
 		easing?: any;
+	}
+
+	interface CommonOptions {
+		duration?: string|number;
 		begin?: ElementCallback;
 		complete?: ElementCallback;
-		progress?: ProgressCallback;
-		display?: any;
-		loop?: any;
-		delay?: any;
+		display?: string|boolean;
+		delay?: number|boolean;
 		mobileHA?: boolean;
 		_cacheValues?: boolean;
 		container?: JQuery;
 		axis?: string;
 		offset?: number;
 	}
+
+	interface Options extends CommonOptions {
+		queue?: string|boolean;
+		easing?: Easing;
+		progress?: ProgressCallback;
+		loop?: number|boolean;
+	}
+
+	interface RegisterEffectOptions {
+		defaultDuration?: number;
+		calls: EffectCall[];
+		reset?: Object;
+	}
+
+	interface RegisteredEffectOptions extends CommonOptions {
+		stagger?: number;
+		drag?: boolean;
+		backwards?: boolean;
+	}
+
+	interface SequenceCall {
+		e: HTMLElement|JQuery;
+		p: Properties;
+		o: SequenceOptions;
+	}
+
+	interface SequenceOptions extends Options {
+		sequenceQueue?: boolean;
+	}
+
+	interface VelocityStatic {
+		Sequences: any;
+		animate(options: {elements: NodeListOf<HTMLElement>; properties: Properties; options: Options}): any;
+		animate(elements: HTMLElement|NodeListOf<HTMLElement>, properties: Properties, options: Options): any;
+		RegisterEffect(name: string, options: RegisterEffectOptions): VelocityStatic;
+		RunSequence(sequence: SequenceCall[]): VelocityStatic;
+
+		/**
+		 * 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;
+	}
 }
diff --git a/vexflow/vexflow-tests.ts b/vexflow/vexflow-tests.ts
index 351ad2ee8..742e3b00f 100644
--- a/vexflow/vexflow-tests.ts
+++ b/vexflow/vexflow-tests.ts
@@ -32,7 +32,7 @@ var gracenote = new Vex.Flow.GraceNote({keys: ["e/5"], duration: "16", slash: tr
 notes1[2].addModifier(0, new Vex.Flow.GraceNoteGroup([gracenote], true).beamNotes());
 
 // Color the chord
-notes1[3].setStyle({fillStyle: "blue", strokeStyle: "blue", stemStyle: "blue"});
+notes1[3].setStyle({fillStyle: "blue", strokeStyle: "blue"});
 
 // Create a voice in 4/4 and add notes
 var voice1 = new Vex.Flow.Voice({
diff --git a/vexflow/vexflow.d.ts b/vexflow/vexflow.d.ts
index 1822c0c67..c17e96576 100644
--- a/vexflow/vexflow.d.ts
+++ b/vexflow/vexflow.d.ts
@@ -6,7 +6,7 @@
 //inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace!
 declare function sanitizeDuration(duration : string) : string; 
 
-declare module Vex {
+declare namespace Vex {
     
     function L(block : string, args : any[]) : void;
     function Merge<T extends Object>(destination : T, source : Object) : T;
@@ -90,7 +90,7 @@ declare module Vex {
         original_font_information? : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
     }
     
-    module Flow {
+    namespace Flow {
         
         const RESOLUTION : number;
         
@@ -137,10 +137,6 @@ declare module Vex {
             original_font_information : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
         }
         
-        module Accidental {
-            const CATEGORY : string;
-        }
-        
         class Accidental extends Modifier {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
             setNote(note : Note) : Modifier;
@@ -154,9 +150,7 @@ declare module Vex {
             static applyAccidentals(voices : Voice[], keySignature? : string) : void;
         }
         
-        export module Annotation {
-            const enum Justify {LEFT, CENTER, RIGHT, CENTER_STEM}
-            const enum VerticalJustify {TOP, CENTER, BOTTOM, CENTER_STEM}
+        namespace Accidental {
             const CATEGORY : string;
         }
         
@@ -172,7 +166,9 @@ declare module Vex {
             draw() : void;
         }
         
-        module Articulation {
+        namespace Annotation {
+            const enum Justify {LEFT, CENTER, RIGHT, CENTER_STEM}
+            const enum VerticalJustify {TOP, CENTER, BOTTOM, CENTER_STEM}
             const CATEGORY : string;
         }
         
@@ -183,6 +179,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace Articulation {
+            const CATEGORY : string;
+        }
+        
         class BarNote extends Note {
             static DEBUG : boolean;
             getType() : Barline.type;
@@ -193,7 +193,7 @@ declare module Vex {
             draw() : void;
         }
         
-        export module Barline {
+        namespace Barline {
             const enum type {SINGLE, DOUBLE, END, REPEAT_BEGIN, REPEAT_END, REPEAT_BOTH, NONE}
         }
         
@@ -228,10 +228,6 @@ declare module Vex {
             static generateBeams(notes : StemmableNote[], config? : {groups? : Fraction[], stem_direction? : number, beam_rests? : boolean, beam_middle_only? : boolean, show_stemlets? : boolean, maintain_stem_directions? : boolean}) : Beam[];
         }
         
-        module Bend {
-            const CATEGORY : string;
-        }
-        
         class Bend extends Modifier {
             constructor(text : string, release? : boolean, phrase? : {type : number, text : string, width : number}[]);
             static UP : number;
@@ -244,6 +240,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace Bend {
+            const CATEGORY : string;
+        }
+        
         class BoundingBox {
             constructor(x : number, y : number, w : number, h : number);
             static copy(that : BoundingBox) : BoundingBox;
@@ -354,10 +354,6 @@ declare module Vex {
             draw() : void;
         }
         
-        export module Curve {
-            const enum Position {NEAR_HEAD, NEAR_TOP}
-        }
-        
         class Curve {
             constructor(from : Note, to : Note, options? : {spacing? : number, thickness? : number, x_shift? : number, y_shift : number, position : Curve.Position, invert : boolean, cps? : {x : number, y : number}[]});
             static DEBUG : boolean;
@@ -368,8 +364,8 @@ declare module Vex {
             draw() : boolean;
         }
         
-        module Dot {
-            const CATEGORY : string;
+        namespace Curve {
+            const enum Position {NEAR_HEAD, NEAR_TOP}
         }
         
         class Dot extends Modifier {
@@ -382,6 +378,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace Dot {
+            const CATEGORY : string;
+        }
+        
         class Formatter {
             static DEBUG : boolean;
             static FormatAndDraw(ctx : IRenderContext, stave : Stave, notes : Note[], params? : {auto_beam : boolean, align_rests : boolean}) : BoundingBox; 
@@ -433,10 +433,6 @@ declare module Vex {
             parse(str : string) : Fraction;
         }
         
-        module FretHandFinger {
-            const CATEGORY : string;
-        }
-        
         class FretHandFinger extends Modifier {
             constructor(number : number);
             static format(nums : FretHandFinger[], state : {left_shift : number, right_shift : number, text_line : number}) : void;
@@ -452,6 +448,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace FretHandFinger {
+            const CATEGORY : string;
+        }
+        
         class GhostNote extends StemmableNote {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
             setStave(stave : Stave) : Note;
@@ -489,10 +489,6 @@ declare module Vex {
             draw() : void;
         }
         
-        module GraceNoteGroup {
-            const CATEGORY : string;
-        }
-        
         class GraceNoteGroup extends Modifier {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
             setWidth(width : number) : Modifier;
@@ -510,6 +506,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace GraceNoteGroup {
+            const CATEGORY : string;
+        }
+        
         class KeyManager {
             constructor(key : string);
             setKey(key : string) : KeyManager;
@@ -531,11 +531,6 @@ declare module Vex {
             convertAccLines(clef : string, type : string) : void;
         }
         
-        export module Modifier {
-            const enum Position {LEFT, RIGHT, ABOVE, BELOW}
-            const CATEGORY : string
-        }
-        
         class Modifier {
             static DEBUG : boolean;
             getCategory() : string;
@@ -557,6 +552,11 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace Modifier {
+            const enum Position {LEFT, RIGHT, ABOVE, BELOW}
+            const CATEGORY : string
+        }
+        
         class ModifierContext {
             static DEBUG : boolean;
             addModifier(modifier : Modifier) : ModifierContext;
@@ -570,20 +570,6 @@ declare module Vex {
             postFormat() : void;
         }
         
-        module Music {
-            const NUM_TONES : number;
-            const roots : string[];
-            const root_values : number[];
-            const root_indices : {[root : string] : number};
-            const canonical_notes : string[];
-            const diatonic_intervals : string[];
-            const diatonic_accidentals : {[diatonic_interval : string] : {note : number, accidental : number}};
-            const intervals : {[interval : string] : number};
-            const scales : {[scale : string] : number[]};
-            const accidentals : string[];
-            const noteValues : {[value : string] : {root_index : number, int_val : number}};
-        }
-        
         class Music {
             isValidNoteValue(note : number) : boolean;
             isValidIntervalValue(interval : number) : boolean;
@@ -600,8 +586,18 @@ declare module Vex {
             createScaleMap(keySignature : string) : {[rootName : string] : string};
         }
         
-        module Note {
-            const CATEGORY : string;
+        namespace Music {
+            const NUM_TONES : number;
+            const roots : string[];
+            const root_values : number[];
+            const root_indices : {[root : string] : number};
+            const canonical_notes : string[];
+            const diatonic_intervals : string[];
+            const diatonic_accidentals : {[diatonic_interval : string] : {note : number, accidental : number}};
+            const intervals : {[interval : string] : number};
+            const scales : {[scale : string] : number[]};
+            const accidentals : string[];
+            const noteValues : {[value : string] : {root_index : number, int_val : number}};
         }
         
         class Note implements Tickable {
@@ -664,6 +660,10 @@ declare module Vex {
             setPreFormatted(value : boolean) : void;
         }
         
+        namespace Note {
+            const CATEGORY : string;
+        }
+        
         class NoteHead extends Note {
             constructor(head_options : {x? : number, y? : number, note_type? : string, duration : string, displaced? : boolean, stem_direction? : number, line : number, x_shift : number, custom_glyph_code? : string, style? : string, slashed? : boolean, glyph_font_scale? : number});
             static DEBUG : boolean;
@@ -687,10 +687,6 @@ declare module Vex {
             draw() : void;
         }
         
-        module Ornament {
-            const CATEGORY : string;
-        }
-        
         class Ornament extends Modifier {
             constructor(type : string);
             static DEBUG : boolean;
@@ -701,9 +697,8 @@ declare module Vex {
             draw() : void;
         }
         
-        export module PedalMarking {
-            const enum Styles {TEXT, BRACKET, MIXED}
-            const GLYPHS : {[name : string] : {code : string, x_shift : number, y_shift : number}};
+        namespace Ornament {
+            const CATEGORY : string;
         }
         
         class PedalMarking {
@@ -721,6 +716,11 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace PedalMarking {
+            const enum Styles {TEXT, BRACKET, MIXED}
+            const GLYPHS : {[name : string] : {code : string, x_shift : number, y_shift : number}};
+        }
+        
         class RaphaelContext implements IRenderContext {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
             setLineWidth(width : number) : RaphaelContext;
@@ -760,11 +760,6 @@ declare module Vex {
             restore() : RaphaelContext;
         }
         
-        export module Renderer {
-            const enum Backends {CANVAS, RAPHAEL, SVG, VML}
-            const enum LineEndType {NONE, UP, DOWN}
-        }
-        
         class Renderer {
             constructor(sel : HTMLElement, backend : Renderer.Backends)
             static USE_CANVAS_PROXY : boolean;
@@ -778,8 +773,9 @@ declare module Vex {
             getContext() : IRenderContext;
         }
         
-        export module Repetition {
-            const enum type {NONE, CODA_LEFT, CODA_RIGHT, SEGNO_LEFT, SEGNO_RIGHT, DC, DC_AL_CODA, DC_AL_FINE, DS, DS_AL_CODA, DS_AL_FINE, FINE}
+        namespace Renderer {
+            const enum Backends {CANVAS, RAPHAEL, SVG, VML}
+            const enum LineEndType {NONE, UP, DOWN}
         }
         
         class Repetition extends StaveModifier {
@@ -792,6 +788,10 @@ declare module Vex {
             drawSignoFixed(stave : Stave, x : number) : Repetition; //inconsistent name: drawSignoFixed -> drawSegnoFixed
             drawSymbolText(stave : Stave, x : number, text : string, draw_coda : boolean) : Repetition;
         }
+
+        namespace Repetition {
+            const enum type { NONE, CODA_LEFT, CODA_RIGHT, SEGNO_LEFT, SEGNO_RIGHT, DC, DC_AL_CODA, DC_AL_FINE, DS, DS_AL_CODA, DS_AL_FINE, FINE }
+        }
         
         class Stave {
             constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
@@ -847,10 +847,6 @@ declare module Vex {
             setConfigForLines(lines_configuration : {visible : boolean}[]) : Stave;
         }
         
-        export module StaveConnector {
-            const enum type {SINGLE_RIGHT, SINGLE_LEFT, SINGLE, DOUBLE, BRACE, BRACKET, BOLD_DOUBLE_LEFT, BOLD_DOUBLE_RIGHT, THIN_DOUBLE}
-        }
-        
         class StaveConnector {
             constructor(top_stave : Stave, bottom_stave : Stave);
             setContext(ctx : IRenderContext) : StaveConnector;
@@ -861,9 +857,9 @@ declare module Vex {
             draw() : void;
             drawBoldDoubleLine(ctx : Object, type : StaveConnector.type, topX : number, topY : number, botY : number) : void;
         }
-        
-        export module StaveHairpin {
-            const enum type {CRESC, DECRESC}
+
+        namespace StaveConnector {
+            const enum type { SINGLE_RIGHT, SINGLE_LEFT, SINGLE, DOUBLE, BRACE, BRACKET, BOLD_DOUBLE_LEFT, BOLD_DOUBLE_RIGHT, THIN_DOUBLE }
         }
         
         class StaveHairpin {
@@ -876,10 +872,9 @@ declare module Vex {
             renderHairpin(params : {first_x : number, last_x : number, first_y : number, last_y : number, staff_height : number}) : void;
             draw() : boolean;
         }
-        
-        export module StaveLine {
-            const enum TextVerticalPosition {TOP, BOTTOM}
-            const enum TextJustification {LEFT, CENTER, RIGHT}
+
+        namespace StaveHairpin {
+            const enum type { CRESC, DECRESC }
         }
         
         class StaveLine {
@@ -896,6 +891,11 @@ declare module Vex {
             render_options : {padding_left : number, padding_right : number, line_width : number, line_dash : number[], rounded_end : boolean, color : string, draw_start_arrow : boolean, draw_end_arrow : boolean, arrowhead_length : number, arrowhead_angle : number, text_position_vertical : StaveLine.TextVerticalPosition, text_justification : StaveLine.TextJustification};
         }
         
+        namespace StaveLine {
+            const enum TextVerticalPosition { TOP, BOTTOM }
+            const enum TextJustification { LEFT, CENTER, RIGHT }
+        }
+
         class StaveModifier {
             getCategory() : string;
             makeSpacer(padding : number) : {getContext: Function, setStave: Function, renderToStave: Function, getMetrics: Function};
@@ -907,12 +907,6 @@ declare module Vex {
             addEndModifier() : void;
         }
         
-        module StaveNote {
-            const STEM_UP : number;
-            const STEM_DOWN : number;
-            const CATEGORY : string;
-        }
-        
         class StaveNote extends StemmableNote {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes and/or inconsistencies mentioned below are fixed
             buildStem() : StemmableNote;            
@@ -972,6 +966,12 @@ declare module Vex {
             drawStem(struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
             draw() : void;
         }
+
+        namespace StaveNote {
+            const STEM_UP: number;
+            const STEM_DOWN: number;
+            const CATEGORY: string;
+        }
         
         class StaveSection extends Modifier {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
@@ -1019,11 +1019,6 @@ declare module Vex {
             draw() : boolean;
         }
         
-        module Stem {
-            const UP : number;
-            const DOWN : number;
-        }
-        
         class Stem {
             constructor(options : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number});
             static DEBUG : boolean;
@@ -1044,6 +1039,11 @@ declare module Vex {
             //inconsistent API: this should be set via the options object in the constructor
             hide : boolean;
         }
+
+        namespace Stem {
+            const UP: number;
+            const DOWN: number;
+        }
         
         class StemmableNote extends Note {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
@@ -1071,10 +1071,6 @@ declare module Vex {
             drawStem(stem_struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
         }
         
-        module StringNumber {
-            const CATEGORY : string;
-        }
-        
         class StringNumber extends Modifier {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
             setNote(note : Note) : StringNumber;
@@ -1095,10 +1091,9 @@ declare module Vex {
             setDashed(dashed : boolean) : StringNumber;
             draw() : void;
         }
-        
-        export module Stroke {
-            const enum Type {BRUSH_DOWN, BRUSH_UP, ROLL_DOWN, ROLL_UP, RASQUEDO_DOWN, RASQUEDO_UP}
-            const CATEGORY : string;
+
+        namespace StringNumber {
+            const CATEGORY: string;
         }
         
         class Stroke extends Modifier {
@@ -1109,6 +1104,11 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace Stroke {
+            const enum Type {BRUSH_DOWN, BRUSH_UP, ROLL_DOWN, ROLL_UP, RASQUEDO_DOWN, RASQUEDO_UP}
+            const CATEGORY : string;
+        }
+
         class SVGContext implements IRenderContext {
             constructor(element : HTMLElement);
             iePolyfill() : boolean;
@@ -1175,11 +1175,6 @@ declare module Vex {
             draw() : void;
         }
         
-        module TabSlide {
-            const SLIDE_UP : number;
-            const SLIDE_DOWN : number;
-        }
-        
         class TabSlide extends TabTie {
             constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, direction? : number);
             static createSlideUp(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabSlide;
@@ -1187,6 +1182,11 @@ declare module Vex {
             renderTie(params : {first_ys : number[], last_ys : number[], last_x_px : number, first_x_px : number, direction : number}) : void;
         }
         
+        namespace TabSlide {
+            const SLIDE_UP : number;
+            const SLIDE_DOWN : number;
+        }
+        
         class TabStave extends Stave {
             constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
             getYForGlyphs() : number;
@@ -1200,10 +1200,6 @@ declare module Vex {
             draw() : boolean;
         }
         
-        export module TextBracket {
-            const enum Positions {TOP, BOTTOM}
-        }
-        
         class TextBracket {
             constructor(bracket_data : {start : Note, stop : Note, text? : string, superscript? : string, position? : TextBracket.Positions});
             static DEBUG : boolean;
@@ -1215,6 +1211,10 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace TextBracket {
+            const enum Positions {TOP, BOTTOM}
+        }
+        
         class TextDynamics extends Note {
             constructor(text_struct : {duration : string, text : string, line? : number});
             static DEBUG : boolean;
@@ -1222,11 +1222,6 @@ declare module Vex {
             preFormat() : TextDynamics;
             draw() : void;
         }
-        
-        export module TextNote {
-            const enum Justification {LEFT, CENTER, RIGHT}
-            const GLYPHS : {[name : string] : {code : string, point : number, x_shift : number, y_shift : number}}
-        }
 
         class TextNote extends Note {
             constructor(text_struct : {duration : string, text? : string, superscript? : boolean, subscript? : boolean, glyph? : string, font? : {family : string, size : number, weight : string}, line? : number, smooth? : boolean, ignore_ticks? : boolean});
@@ -1236,6 +1231,11 @@ declare module Vex {
             draw() : void;
         }
         
+        namespace TextNote {
+            const enum Justification {LEFT, CENTER, RIGHT}
+            const GLYPHS : {[name : string] : {code : string, point : number, x_shift : number, y_shift : number}}
+        }
+        
         interface Tickable {
             setContext(context : IRenderContext) : void;
             getBoundingBox() : BoundingBox;
@@ -1286,10 +1286,6 @@ declare module Vex {
             static getNextContext(tContext : TickContext) : TickContext;
         }
         
-        module TimeSignature {
-            const glyphs : {[name : string] : {code : string, point : number, line : number}};
-        }
-        
         class TimeSignature extends StaveModifier {
              //TODO remove the following lines once TypeScript allows subclass overrides with type changes
             addModifier() : void;
@@ -1303,6 +1299,10 @@ declare module Vex {
             addEndModifier(stave : Stave) : void;
         }
         
+        namespace TimeSignature {
+            const glyphs : {[name : string] : {code : string, point : number, line : number}};
+        }
+        
         class TimeSigNote extends Note {
             //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
             setStave(stave : Stave) : Note;
@@ -1321,10 +1321,6 @@ declare module Vex {
             draw() : void;
         }
         
-        module Tuning {
-            const names : {[name : string] : string};
-        }
-        
         class Tuning {
             constructor(tuningString? : string);
             noteToInteger(noteString : string) : number;
@@ -1334,9 +1330,8 @@ declare module Vex {
             getNoteForFret(fretNum : string, stringNum : string) : string; 
         }
         
-        module Tuplet {
-            const LOCATION_TOP : number;
-            const LOCATION_BOTTOM : number;            
+        namespace Tuning {
+            const names: { [name: string]: string };
         }
         
         class Tuplet {
@@ -1354,9 +1349,10 @@ declare module Vex {
             resolveGlyphs() : void;
             draw() : void;
         }
-        
-        module Vibrato {
-            const CATEGORY : string;
+
+        namespace Tuplet {
+            const LOCATION_TOP : number;
+            const LOCATION_BOTTOM : number;            
         }
         
         class Vibrato extends Modifier {
@@ -1366,8 +1362,8 @@ declare module Vex {
             draw() : void;            
         }
         
-        export module Voice {
-            const enum Mode {STRICT, SOFT, FULL}
+        namespace Vibrato {
+            const CATEGORY : string;
         }
         
         class Voice {
@@ -1393,21 +1389,25 @@ declare module Vex {
             draw(context : IRenderContext, stave? : Stave) : void;
         }
         
+        namespace Voice {
+            const enum Mode {STRICT, SOFT, FULL}
+        }
+        
         class VoiceGroup {
             getVoices() : Voice[];
             getModifierContexts() : ModifierContext[];
             addVoice(voice : Voice) : void;
         }
         
-        export module Volta {
-            const enum type {NONE, BEGIN, MID, END, BEGIN_END}
-        }
-        
         class Volta extends StaveModifier {
             constructor(type : Volta.type, number : number, x : number, y_shift : number);
             getCategory() : string;
             setShiftY(y : number) : Volta;
             draw(stave : Stave, x : number) : Volta;
         }
+        
+        namespace Volta {
+            const enum type {NONE, BEGIN, MID, END, BEGIN_END}
+        }
     }
 }
\ No newline at end of file
diff --git a/victor/victor.d.ts b/victor/victor.d.ts
index 4206ffeb6..7812abcee 100644
--- a/victor/victor.d.ts
+++ b/victor/victor.d.ts
@@ -353,3 +353,7 @@ declare class Victor
     verticalAngleDeg():number;
 
 }
+
+declare module "victor" {
+	export = Victor;
+}
diff --git a/videojs/videojs.d.ts b/videojs/videojs.d.ts
index f6897627a..e29f3b43d 100644
--- a/videojs/videojs.d.ts
+++ b/videojs/videojs.d.ts
@@ -12,6 +12,10 @@ interface VideoJSOptions {
 	height?: number;
 	defaultVolume?: number;
 	children?: Object;
+	controls?: boolean;
+	src?: string;
+	autoplay?: boolean;
+	preload?: string;
 }
 
 interface VideoJSSource {
diff --git a/vinyl-buffer/vinyl-buffer-tests.ts b/vinyl-buffer/vinyl-buffer-tests.ts
new file mode 100644
index 000000000..6a36d0f52
--- /dev/null
+++ b/vinyl-buffer/vinyl-buffer-tests.ts
@@ -0,0 +1,14 @@
+/// <reference path="vinyl-buffer.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../browserify/browserify.d.ts" />
+
+import buffer = require('vinyl-buffer');
+import gulp = require('gulp')
+import browserify = require('browserify');
+
+gulp.task('build', function() {
+    return browserify('./index.js')
+        .bundle()
+        .pipe(buffer())
+        .pipe(gulp.dest('dist/'));
+});
diff --git a/vinyl-buffer/vinyl-buffer.d.ts b/vinyl-buffer/vinyl-buffer.d.ts
new file mode 100644
index 000000000..b6edbb1aa
--- /dev/null
+++ b/vinyl-buffer/vinyl-buffer.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for vinyl-buffer
+// Project: https://github.com/hughsk/vinyl-buffer
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "vinyl-buffer" {
+    namespace buffer {
+        interface Buffer {
+            (): NodeJS.ReadWriteStream;
+        }
+    }
+
+    var buffer: buffer.Buffer;
+
+    export = buffer;
+}
+
diff --git a/vinyl-fs/vinyl-fs-tests.ts b/vinyl-fs/vinyl-fs-tests.ts
index 9fbc45faf..c8ca09070 100644
--- a/vinyl-fs/vinyl-fs-tests.ts
+++ b/vinyl-fs/vinyl-fs-tests.ts
@@ -229,7 +229,7 @@ var dataWrap = function (fn: any) {
 };
 
 var realMode = function (n: any) {
-   return n & 07777;
+   return n & parseInt("07777", 8);
 };
 
 describe('dest stream', function () {
@@ -372,14 +372,14 @@ describe('dest stream', function () {
       var expectedContents = fs.readFileSync(inputPath);
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, "./out-fixtures");
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var expectedFile = new File({
          base: inputBase,
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <fs.Stats>{
             mode: expectedMode
          }
       });
@@ -412,7 +412,7 @@ describe('dest stream', function () {
       var expectedContents = fs.readFileSync(inputPath);
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, "./out-fixtures");
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var contentStream = through.obj();
       var expectedFile = new File({
@@ -420,7 +420,7 @@ describe('dest stream', function () {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: {
+         stat: <fs.Stats>{
             mode: expectedMode
          }
       });
@@ -456,14 +456,14 @@ describe('dest stream', function () {
       var expectedPath = path.join(__dirname, "./out-fixtures/test");
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, "./out-fixtures");
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var expectedFile = new File({
          base: inputBase,
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: {
+         stat: <fs.Stats>{
             isDirectory: function () {
                return true;
             },
@@ -555,7 +555,7 @@ var dataWrap = function (fn: any) {
 };
 
 var realMode = function (n: any) {
-   return n & 07777;
+   return n & parseInt("07777", 8);
 };
 
 describe('symlink stream', function () {
@@ -706,14 +706,14 @@ describe('symlink stream', function () {
       var expectedContents = fs.readFileSync(inputPath);
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, './out-fixtures');
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var expectedFile = new File({
          base: inputBase,
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <fs.Stats>{
             mode: expectedMode
          }
       });
@@ -746,7 +746,7 @@ describe('symlink stream', function () {
       var expectedContents = fs.readFileSync(inputPath);
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, './out-fixtures');
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var contentStream = through.obj();
       var expectedFile = new File({
@@ -754,7 +754,7 @@ describe('symlink stream', function () {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: {
+         stat: <fs.Stats>{
             mode: expectedMode
          }
       });
@@ -790,14 +790,14 @@ describe('symlink stream', function () {
       var expectedPath = path.join(__dirname, './out-fixtures/wow');
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, './out-fixtures');
-      var expectedMode = 0655;
+      var expectedMode = parseInt("0655", 8);
 
       var expectedFile = new File({
          base: inputBase,
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: {
+         stat: <fs.Stats>{
             isDirectory: function () {
                return true;
             },
@@ -830,8 +830,8 @@ describe('symlink stream', function () {
       var inputBase = path.join(__dirname, './fixtures');
       var inputPath = path.join(__dirname, './fixtures/wow/suchempty');
       var expectedBase = path.join(__dirname, './out-fixtures/wow');
-      var expectedDirMode = 0755;
-      var expectedFileMode = 0655;
+      var expectedDirMode = parseInt("0755", 8);
+      var expectedFileMode = parseInt("0655", 8);
 
       var firstFile = new File({
          base: inputBase,
@@ -867,14 +867,14 @@ describe('symlink stream', function () {
       var expectedContents = fs.readFileSync(inputPath);
       var expectedCwd = __dirname;
       var expectedBase = path.join(__dirname, './out-fixtures');
-      var expectedMode = 0722;
+      var expectedMode = parseInt("0722", 8);
 
       var expectedFile = new File({
          base: inputBase,
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: {
+         stat: <fs.Stats>{
             mode: expectedMode
          }
       });
diff --git a/vinyl-fs/vinyl-fs.d.ts b/vinyl-fs/vinyl-fs.d.ts
index 98bb34339..70fc32aba 100644
--- a/vinyl-fs/vinyl-fs.d.ts
+++ b/vinyl-fs/vinyl-fs.d.ts
@@ -21,7 +21,7 @@ declare module "vinyl-fs" {
       cwd?: string;
 
       /**
-      * Specifies the folder relative to the cwd 
+      * Specifies the folder relative to the cwd
       * This is used to determine the file names when saving in .dest()
       * Default is where the glob begins
       */
@@ -34,16 +34,16 @@ declare module "vinyl-fs" {
       */
       buffer?: boolean;
 
-      /** 
+      /**
       * Setting this to false will ignore the contents of the file and disable writing to disk to speed up operations
-      * Defaults to true 
+      * Defaults to true
       */
       read?: boolean;
 
       /**  Only find files that have been modified since the time specified */
       since?: Date|number;
 
-      /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files. 
+      /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files.
       * Defaults to false */
       passthrough?: boolean;
 
@@ -63,7 +63,7 @@ declare module "vinyl-fs" {
 
    /**
    * This is just a glob-watcher
-   * 
+   *
    * @param globs Takes a glob string or an array of glob strings as the first argument
    * Globs are executed in order, so negations should follow positive globs
    * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
@@ -72,7 +72,7 @@ declare module "vinyl-fs" {
 
    /**
    * This is just a glob-watcher
-   * 
+   *
    * @param globs Takes a glob string or an array of glob strings as the first argument
    * Globs are executed in order, so negations should follow positive globs
    * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
@@ -89,8 +89,8 @@ declare module "vinyl-fs" {
    * @param folder destination folder
    */
    function dest(folder: string, opt?: {
-      /** Specify the working directory the folder is relative to 
-      * Default is process.cwd() 
+      /** Specify the working directory the folder is relative to
+      * Default is process.cwd()
       */
       cwd?: string;
 
@@ -125,14 +125,17 @@ declare module "vinyl-fs" {
    * cwd, base, and path will be overwritten to match the folder
    */
    function symlink(folder: string, opts?: {
-      /** 
-      * Specify the working directory the folder is relative to 
+      /**
+      * Specify the working directory the folder is relative to
       * Default is process.cwd()
       */
       cwd?: string;
 
-      /** 
-      * Specify the mode the directory should be created with 
+      /** Specify the mode the directory should be created with. Default is the process mode */
+      mode?: number|string;
+
+      /**
+      * Specify the mode the directory should be created with
       * Default is the process mode
       */
       dirMode?: number
@@ -146,14 +149,14 @@ declare module "vinyl-fs" {
    */
    function symlink(getFolderPath: (File: File) => string, opts?:
       {
-         /** 
-         * Specify the working directory the folder is relative to 
+         /**
+         * Specify the working directory the folder is relative to
          * Default is process.cwd()
          */
          cwd?: string;
 
-         /** 
-         * Specify the mode the directory should be created with 
+         /**
+         * Specify the mode the directory should be created with
          * Default is the process mode
          */
          dirMode?: number
diff --git a/vinyl-paths/vinyl-paths-tests.ts b/vinyl-paths/vinyl-paths-tests.ts
new file mode 100644
index 000000000..e369dcb64
--- /dev/null
+++ b/vinyl-paths/vinyl-paths-tests.ts
@@ -0,0 +1,26 @@
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../del/del.d.ts" />
+/// <reference path="vinyl-paths.d.ts" />
+
+import gulp = require('gulp');
+import del = require('del');
+import paths = require('vinyl-paths');
+
+gulp.task('delete', function () {
+    return gulp.src('app/*')
+        .pipe(paths(del));
+});
+
+// or if you need to use the paths after the pipeline
+gulp.task('delete2', function (cb: Function) {
+    var vp = paths();
+
+    gulp.src('app/*')
+        .pipe(vp)
+        .pipe(gulp.dest('dist'))
+        .on('end', function () {
+            del(vp.paths, cb);
+        });
+});
+
+
diff --git a/vinyl-paths/vinyl-paths.d.ts b/vinyl-paths/vinyl-paths.d.ts
new file mode 100644
index 000000000..fabc2c667
--- /dev/null
+++ b/vinyl-paths/vinyl-paths.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for vinyl-paths
+// Project: https://github.com/sindresorhus/vinyl-paths
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "vinyl-paths" {
+
+    namespace paths {
+        interface Paths extends NodeJS.ReadWriteStream {
+            paths: string[];
+        }
+
+        interface PathsStatic {
+            /**
+             * Use the file paths from a gulp pipeline in vanilla node module
+             * @param callback The optionally supplied callback will get a file path for every file and is expected
+             * to call the callback when done. An array of the file paths so far is available as a paths property
+             * on the stream.
+             */
+            (callback?: Callback): Paths;
+        }
+
+        interface Callback {
+            //TODO: Function is gulp.ITaskCallback, which is currently invisible
+            (path: string, callback: Function): any;
+        }
+    }
+
+    var paths: paths.PathsStatic;
+    export = paths;
+}
+
diff --git a/vinyl/vinyl-tests.ts b/vinyl/vinyl-tests.ts
index eb203bdae..cb1ceaea6 100644
--- a/vinyl/vinyl-tests.ts
+++ b/vinyl/vinyl-tests.ts
@@ -73,7 +73,7 @@ describe('File', () => {
 
 		it('should set stat to given value', done => {
 			var val = {};
-			var file = new File({stat: val});
+			var file = new File(<fs.Stats><any>{stat: val});
 			file.stat.should.equal(val);
 			done();
 		});
@@ -150,8 +150,8 @@ describe('File', () => {
 	});
 
 	describe('isDirectory()', () => {
-		var fakeStat = {
-			isDirectory: () => {
+		var fakeStat = <fs.Stats>{
+			isDirectory() {
 				return true;
 			}
 		};
@@ -191,8 +191,20 @@ describe('File', () => {
 			file2.cwd.should.equal(file.cwd);
 			file2.base.should.equal(file.base);
 			file2.path.should.equal(file.path);
-			file2.contents.should.not.equal(file.contents, 'buffer ref should be different');
-			file2.contents.toString('utf8').should.equal(file.contents.toString('utf8'));
+
+			let fileContents = file.contents;
+			let file2Contents = file2.contents;
+
+			file2Contents.should.not.equal(fileContents, 'buffer ref should be different');
+
+			let fileUtf8Contents = fileContents instanceof Buffer ?
+				fileContents.toString('utf8') :
+				(<NodeJS.ReadableStream>fileContents).toString();
+			let file2Utf8Contents = file2Contents instanceof Buffer ?
+				file2Contents.toString('utf8') :
+				(<NodeJS.ReadableStream>file2Contents).toString();
+
+			file2Utf8Contents.should.equal(fileUtf8Contents);
 			done();
 		});
 
@@ -294,7 +306,10 @@ describe('File', () => {
 			var ret = file.pipe(stream);
 			ret.should.equal(stream, 'should return the stream');
 
-			file.contents.write(testChunk);
+			let fileContents = file.contents;
+			if (fileContents instanceof Buffer) {
+				fileContents.write(testChunk.toString());
+			}
 		});
 
 		it('should do nothing with null', done => {
@@ -360,7 +375,10 @@ describe('File', () => {
 			var ret = file.pipe(stream, {end: false});
 			ret.should.equal(stream, 'should return the stream');
 
-			file.contents.write(testChunk);
+			let fileContents = file.contents;
+			if (fileContents instanceof Buffer) {
+				fileContents.write(testChunk.toString());
+			}
 		});
 
 		it('should do nothing with null', done => {
@@ -475,7 +493,7 @@ describe('File', () => {
 			var val = "test";
 			var file = new File();
 			try {
-				file.contents = val;
+				file.contents = new Buffer(val);
 			} catch (err) {
 				should.exist(err);
 				done();
diff --git a/vinyl/vinyl.d.ts b/vinyl/vinyl.d.ts
index 81aa781f9..b41a8151b 100644
--- a/vinyl/vinyl.d.ts
+++ b/vinyl/vinyl.d.ts
@@ -27,9 +27,18 @@ declare module 'vinyl' {
 			*/
 			path?: string;
 			/**
-			* Type: Buffer|Stream|null (Default: null)
+			* Path history. Has no effect if options.path is passed.
 			*/
-			contents?: any;
+			history?: string[];
+			/**
+			* The result of an fs.stat call. See fs.Stats for more information.
+			*/
+			stat?: fs.Stats;
+			/**
+			* File contents.
+			* Type: Buffer, Stream, or null
+			*/
+			contents?: Buffer | NodeJS.ReadWriteStream;
 		});
 
 		/**
@@ -48,7 +57,7 @@ declare module 'vinyl' {
 		/**
 		* Type: Buffer|Stream|null (Default: null)
 		*/
-		public contents: any;
+		public contents: Buffer | NodeJS.ReadableStream;
 		/**
 		* Returns path.relative for the file base and file path.
 		* Example:
diff --git a/vortex-web-client/vortex-web-client-tests.ts b/vortex-web-client/vortex-web-client-tests.ts
index 216e268c5..bf6f72bbc 100644
--- a/vortex-web-client/vortex-web-client-tests.ts
+++ b/vortex-web-client/vortex-web-client-tests.ts
@@ -7,7 +7,7 @@ var tqos = new dds.TopicQos();
 var chatTopic = new dds.Topic(0, 'ChatMessage', tqos);
 runtime.registerTopic(chatTopic);
 
-var writerQos = new dds.DataWriterQos();
+var writerQos = new dds.DataWriterQos(dds.Partition("chatroom"), dds.Reliability.Reliable, dds.Durability.Persistent);
 var writer = new dds.DataWriter(runtime, chatTopic, writerQos);
 
 writer.write({
@@ -15,7 +15,7 @@ writer.write({
 	msg : "Hello World!"
 });
 
-var readerQos = new dds.DataReaderQos();
+var readerQos = new dds.DataReaderQos(dds.Partition("chatroom"), dds.Reliability.Reliable, dds.Durability.Persistent);
 var reader = new dds.DataReader(runtime, chatTopic, readerQos);
 
 reader.addListener(function(msg) {
diff --git a/vortex-web-client/vortex-web-client.d.ts b/vortex-web-client/vortex-web-client.d.ts
index de665c780..b432eff3f 100644
--- a/vortex-web-client/vortex-web-client.d.ts
+++ b/vortex-web-client/vortex-web-client.d.ts
@@ -39,11 +39,11 @@ declare module DDS {
 		/**
 		 * KeepAll - KEEP_ALL qos policy
 		 */
-		KeepAll:any;
+		static KeepAll:any;
 		/**
 		 * KeepLast - KEEP_LAST qos policy
 		 */
-		KeepLast:any;
+		static KeepLast:any;
 	}
 
 	/**
@@ -62,51 +62,37 @@ declare module DDS {
 		/**
 		 * Reliable - 'Reliable' reliability policy
 		 */
-		Reliable:any;
+		static Reliable:any;
 		/**
 		 * BestEffort - 'BestEffort' reliability policy
 		 */
-		BestEffort:any;
+		static BestEffort:any;
 	}
 
 	/**
-	 * Partition policy
+	 * Create new partition policy
+	 *
+	 * @param policies - partition names
+	 * @example var qos = Partition('p1', 'p2')
 	 */
-	export class Partition implements Policy {
-		/**
-		 * Create new partition policy
-		 *
-		 * @param policies - partition names
-		 * @example var qos = Partition('p1', 'p2')
-		 */
-		constructor(...policies:string[]);
-	}
+	export function Partition(...policies:string[]):Policy;
 
 	/**
-	 * Content Filter policy
+	 * Create new content filter policy
+	 *
+	 * @param expr - filter expression
+	 * @example var filter = ContentFilter("x>10 AND y<50")
 	 */
-	export class ContentFilter implements Policy {
-		/**
-		 * Create new content filter policy
-		 *
-		 * @param expr - filter expression
-		 * @example var filter = ContentFilter("x>10 AND y<50")
-		 */
-		constructor(expr:string);
-	}
+	export function ContentFilter(expr:string):Policy;
+
 
 	/**
-	 * Time Filter policy
+	 * Create new time filter policy
+	 *
+	 * @param period - time duration (unit ?)
+	 * @example var filter = TimeFilter(100)
 	 */
-	export class TimeFilter implements Policy {
-		/**
-		 * Create new content filter policy
-		 *
-		 * @param period - time duration (unit ?)
-		 * @example var filter = TimeFilter(100)
-		 */
-		constructor(period:number);
-	}
+	export function TimeFilter(period:number):Policy;
 
 	/**
 	 * Durability Policy
@@ -125,19 +111,19 @@ declare module DDS {
 		/**
 		 * Volatile - Volatile durability policy
 		 */
-		Volatile:any;
+		static Volatile:any;
 		/**
 		 * TransientLocal - TransientLocal durability policy
 		 */
-		TransientLocal:any;
+		static TransientLocal:any;
 		/**
 		 * Transient - Transient durability policy
 		 */
-		Transient:any;
+		static Transient:any;
 		/**
 		 * Persistent - Persistent durability policy
 		 */
-		Persistent:any;
+		static Persistent:any;
 	}
 
 
@@ -473,7 +459,7 @@ declare module DDS {
 
 	export var runtime:{
 		Runtime : Runtime;
-	}
+	};
 
 	export var VERSION:string;
 }
@@ -482,7 +468,4 @@ declare module DDS {
  * Defines the core Vortex-Web-Client javascript library. It includes the JavaScript API for DDS. This API allows
  * web applications to share data among them as well as with native DDS applications.
  */
-declare
-var dds:typeof DDS;
-
-
+declare var dds:typeof DDS;
diff --git a/vue/vue.d.ts b/vue/vue.d.ts
index 109f81762..cb707348a 100644
--- a/vue/vue.d.ts
+++ b/vue/vue.d.ts
@@ -65,8 +65,8 @@ declare module vuejs {
      * http://vuejs.org/api/instance-properties.html
      */
     $el: HTMLElement;
-    $data: {};
-    $options: {};
+    $data: any;
+    $options: any;
     $parent: Vue;
     $root: Vue;
     $: {};
diff --git a/webcl/webcl-tests.ts b/webcl/webcl-tests.ts
new file mode 100644
index 000000000..34c3841dd
--- /dev/null
+++ b/webcl/webcl-tests.ts
@@ -0,0 +1,626 @@
+/// <reference path="webcl.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+class CLHException {
+    constructor(
+        public message: string
+        ) { }
+}
+
+class PlatformInfo {
+    EXTENTION: string;
+    NAME: string;
+    PROFILE: string;
+    VENDOR: string;
+    VERSION: string;
+
+    constructor(
+        public platform: WEBCL.WebCLPlatform,
+        public deviceInfos: DeviceInfo[]= new Array<DeviceInfo>()
+        ) {
+        this.PROFILE = platform.getInfo(WEBCL.PlatformInfo.PLATFORM_PROFILE);
+        this.VERSION = platform.getInfo(WEBCL.PlatformInfo.PLATFORM_VERSION);
+        this.NAME = platform.getInfo(WEBCL.PlatformInfo.PLATFORM_NAME);
+        this.VENDOR = platform.getInfo(WEBCL.PlatformInfo.PLATFORM_VENDOR);
+        this.EXTENTION = platform.getInfo(WEBCL.PlatformInfo.PLATFORM_EXTENSIONS);
+    }
+}
+
+class DeviceInfo {
+    ADDRESS_BITS: number;
+    AVAILABLE: boolean;
+    COMPILER_AVAILABLE: boolean;
+    DRIVER_VERSION: string;
+    ENDIAN_LITTLE: boolean;
+    ERROR_CORRECTION_SUPPORT: boolean;
+    EXECUTION_CAPABILITIES: WEBCL.DeviceExecCapabilitiesBits;
+    EXTENSIONS: string;
+    GLOBAL_MEM_CACHE_SIZE: number;
+    GLOBAL_MEM_CACHE_TYPE: WEBCL.DeviceMemCacheType;
+    GLOBAL_MEM_CACHELINE_SIZE: number;
+    GLOBAL_MEM_SIZE: number;
+    HOST_UNIFIED_MEMORY: boolean;
+    IMAGE_SUPPORT: boolean;
+    IMAGE2D_MAX_HEIGHT: number;
+    IMAGE2D_MAX_WIDTH: number;
+    IMAGE3D_MAX_DEPTH: number;
+    IMAGE3D_MAX_HEIGHT: number;
+    IMAGE3D_MAX_WIDTH: number;
+    LOCAL_MEM_SIZE: number;
+    LOCAL_MEM_TYPE: WEBCL.DeviceLocalMemType;
+    MAX_CLOCK_FREQUENCY: number;
+    MAX_COMPUTE_UNITS: number;
+    MAX_CONSTANT_ARGS: number;
+    MAX_CONSTANT_BUFFER_SIZE: number;
+    MAX_MEM_ALLOC_SIZE: number;
+    MAX_PARAMETER_SIZE: number;
+    MAX_READ_IMAGE_ARGS: number;
+    MAX_SAMPLERS: number;
+    MAX_WORK_GROUP_SIZE: number;
+    MAX_WORK_ITEM_DIMENSIONS: number;
+    MAX_WORK_ITEM_SIZES: number;
+    MAX_WRITE_IMAGE_ARGS: number;
+    MEM_BASE_ADDR_ALIGN: number;
+    NAME: string;
+    NATIVE_VECTOR_WIDTH_CHAR: number;
+    NATIVE_VECTOR_WIDTH_FLOAT: number;
+    NATIVE_VECTOR_WIDTH_INT: number;
+    NATIVE_VECTOR_WIDTH_LONG: number;
+    NATIVE_VECTOR_WIDTH_SHORT: number;
+    OPENCL_C_VERSION: string;
+    PLATFORM: WEBCL.WebCLPlatform;
+    PlatformInfo: PlatformInfo;
+    PREFERRED_VECTOR_WIDTH_CHAR: number;
+    PREFERRED_VECTOR_WIDTH_FLOAT: number;
+    PREFERRED_VECTOR_WIDTH_INT: number;
+    PREFERRED_VECTOR_WIDTH_LONG: number;
+    PREFERRED_VECTOR_WIDTH_SHORT: number;
+    PROFILE: string;
+    PROFILING_TIMER_RESOLUTION: number;
+    QUEUE_PROPERTIES: WEBCL.CommandQueueProperties;
+    SINGLE_FP_CONFIG: WEBCL.DeviceFPConfigBits;
+    TYPE: WEBCL.DeviceTypeBits;
+    VENDOR: string;
+    VENDOR_ID: number;
+    VERSION: string;
+
+    constructor(public device: WEBCL.WebCLDevice, platformInfo: PlatformInfo) {
+        this.ADDRESS_BITS = device.getInfo(WEBCL.DeviceInfo.DEVICE_ADDRESS_BITS);
+        this.AVAILABLE = device.getInfo(WEBCL.DeviceInfo.DEVICE_AVAILABLE);
+        this.COMPILER_AVAILABLE = device.getInfo(WEBCL.DeviceInfo.DEVICE_COMPILER_AVAILABLE);
+        this.DRIVER_VERSION = device.getInfo(WEBCL.DeviceInfo.DRIVER_VERSION);
+        this.ENDIAN_LITTLE = device.getInfo(WEBCL.DeviceInfo.DEVICE_ENDIAN_LITTLE);
+        this.ERROR_CORRECTION_SUPPORT = device.getInfo(WEBCL.DeviceInfo.DEVICE_ERROR_CORRECTION_SUPPORT);
+        this.EXECUTION_CAPABILITIES = device.getInfo(WEBCL.DeviceInfo.DEVICE_EXECUTION_CAPABILITIES);
+        this.EXTENSIONS = device.getInfo(WEBCL.DeviceInfo.DEVICE_EXTENSIONS);
+        this.GLOBAL_MEM_CACHE_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_GLOBAL_MEM_CACHE_SIZE);
+        this.GLOBAL_MEM_CACHE_TYPE = device.getInfo(WEBCL.DeviceInfo.DEVICE_GLOBAL_MEM_CACHE_TYPE);
+        this.GLOBAL_MEM_CACHELINE_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_GLOBAL_MEM_CACHELINE_SIZE);
+        this.GLOBAL_MEM_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_GLOBAL_MEM_SIZE);
+        this.HOST_UNIFIED_MEMORY = device.getInfo(WEBCL.DeviceInfo.DEVICE_HOST_UNIFIED_MEMORY);
+        this.IMAGE_SUPPORT = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE_SUPPORT);
+        this.IMAGE2D_MAX_HEIGHT = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE2D_MAX_HEIGHT);
+        this.IMAGE2D_MAX_WIDTH = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE2D_MAX_WIDTH);
+        this.IMAGE3D_MAX_DEPTH = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE3D_MAX_DEPTH);
+        this.IMAGE3D_MAX_HEIGHT = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE3D_MAX_HEIGHT);
+        this.IMAGE3D_MAX_WIDTH = device.getInfo(WEBCL.DeviceInfo.DEVICE_IMAGE3D_MAX_WIDTH);
+        this.LOCAL_MEM_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_LOCAL_MEM_SIZE);
+        this.LOCAL_MEM_TYPE = device.getInfo(WEBCL.DeviceInfo.DEVICE_LOCAL_MEM_TYPE);
+        this.MAX_CLOCK_FREQUENCY = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_CLOCK_FREQUENCY);
+        this.MAX_COMPUTE_UNITS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_COMPUTE_UNITS);
+        this.MAX_CONSTANT_ARGS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_CONSTANT_ARGS);
+        this.MAX_CONSTANT_BUFFER_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_CONSTANT_BUFFER_SIZE);
+        this.MAX_MEM_ALLOC_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_MEM_ALLOC_SIZE);
+        this.MAX_PARAMETER_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_PARAMETER_SIZE);
+        this.MAX_READ_IMAGE_ARGS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_READ_IMAGE_ARGS);
+        this.MAX_SAMPLERS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_SAMPLERS);
+        this.MAX_WORK_GROUP_SIZE = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_WORK_GROUP_SIZE);
+        this.MAX_WORK_ITEM_DIMENSIONS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_WORK_ITEM_DIMENSIONS);
+        this.MAX_WORK_ITEM_SIZES = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_WORK_ITEM_SIZES);
+        this.MAX_WRITE_IMAGE_ARGS = device.getInfo(WEBCL.DeviceInfo.DEVICE_MAX_WRITE_IMAGE_ARGS);
+        this.MEM_BASE_ADDR_ALIGN = device.getInfo(WEBCL.DeviceInfo.DEVICE_MEM_BASE_ADDR_ALIGN);
+        this.NAME = device.getInfo(WEBCL.DeviceInfo.DEVICE_NAME);
+        this.NATIVE_VECTOR_WIDTH_CHAR = device.getInfo(WEBCL.DeviceInfo.DEVICE_NATIVE_VECTOR_WIDTH_CHAR);
+        this.NATIVE_VECTOR_WIDTH_FLOAT = device.getInfo(WEBCL.DeviceInfo.DEVICE_NATIVE_VECTOR_WIDTH_FLOAT);
+        this.NATIVE_VECTOR_WIDTH_INT = device.getInfo(WEBCL.DeviceInfo.DEVICE_NATIVE_VECTOR_WIDTH_INT);
+        this.NATIVE_VECTOR_WIDTH_LONG = device.getInfo(WEBCL.DeviceInfo.DEVICE_NATIVE_VECTOR_WIDTH_LONG);
+        this.NATIVE_VECTOR_WIDTH_SHORT = device.getInfo(WEBCL.DeviceInfo.DEVICE_NATIVE_VECTOR_WIDTH_SHORT);
+        this.OPENCL_C_VERSION = device.getInfo(WEBCL.DeviceInfo.DEVICE_OPENCL_C_VERSION);
+        this.PLATFORM = device.getInfo(WEBCL.DeviceInfo.DEVICE_PLATFORM);
+        this.PlatformInfo = platformInfo;
+        this.PREFERRED_VECTOR_WIDTH_CHAR = device.getInfo(WEBCL.DeviceInfo.DEVICE_PREFERRED_VECTOR_WIDTH_CHAR);
+        this.PREFERRED_VECTOR_WIDTH_FLOAT = device.getInfo(WEBCL.DeviceInfo.DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT);
+        this.PREFERRED_VECTOR_WIDTH_INT = device.getInfo(WEBCL.DeviceInfo.DEVICE_PREFERRED_VECTOR_WIDTH_INT);
+        this.PREFERRED_VECTOR_WIDTH_LONG = device.getInfo(WEBCL.DeviceInfo.DEVICE_PREFERRED_VECTOR_WIDTH_LONG);
+        this.PREFERRED_VECTOR_WIDTH_SHORT = device.getInfo(WEBCL.DeviceInfo.DEVICE_PREFERRED_VECTOR_WIDTH_SHORT);
+        this.PROFILE = device.getInfo(WEBCL.DeviceInfo.DEVICE_PROFILE);
+        this.PROFILING_TIMER_RESOLUTION = device.getInfo(WEBCL.DeviceInfo.DEVICE_PROFILING_TIMER_RESOLUTION);
+        this.QUEUE_PROPERTIES = device.getInfo(WEBCL.DeviceInfo.DEVICE_QUEUE_PROPERTIES);
+        this.SINGLE_FP_CONFIG = device.getInfo(WEBCL.DeviceInfo.DEVICE_SINGLE_FP_CONFIG);
+        this.TYPE = device.getInfo(WEBCL.DeviceInfo.DEVICE_TYPE);
+        this.VENDOR = device.getInfo(WEBCL.DeviceInfo.DEVICE_VENDOR);
+        this.VENDOR_ID = device.getInfo(WEBCL.DeviceInfo.DEVICE_VENDOR_ID);
+        this.VERSION = device.getInfo(WEBCL.DeviceInfo.DEVICE_VERSION);
+    }
+}
+
+class ContextInfo {
+    DEVICES: WEBCL.WebCLDevice[];
+
+    constructor(
+        public context: WEBCL.WebCLContext
+        ) {
+        this.DEVICES = context.getInfo(WEBCL.ContextInfo.CONTEXT_DEVICES);
+    }
+}
+
+class KernelWorkGroupInfo {
+    KERNEL_COMPILE_WORK_GROUP_SIZE: number;
+    KERNEL_LOCAL_MEM_SIZE: number;
+    KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE: number;
+    KERNEL_PRIVATE_MEM_SIZE: number;
+    KERNEL_WORK_GROUP_SIZE: number;
+
+    constructor(kernel: WEBCL.WebCLKernel, device: WEBCL.WebCLDevice) {
+        this.KERNEL_COMPILE_WORK_GROUP_SIZE = kernel.getWorkGroupInfo(device, WEBCL.KernelWorkGroupInfo.KERNEL_COMPILE_WORK_GROUP_SIZE);
+        this.KERNEL_LOCAL_MEM_SIZE = kernel.getWorkGroupInfo(device, WEBCL.KernelWorkGroupInfo.KERNEL_LOCAL_MEM_SIZE);
+        this.KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE = kernel.getWorkGroupInfo(device, WEBCL.KernelWorkGroupInfo.KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE);
+        this.KERNEL_PRIVATE_MEM_SIZE = kernel.getWorkGroupInfo(device, WEBCL.KernelWorkGroupInfo.KERNEL_PRIVATE_MEM_SIZE);
+        this.KERNEL_WORK_GROUP_SIZE = kernel.getWorkGroupInfo(device, WEBCL.KernelWorkGroupInfo.KERNEL_WORK_GROUP_SIZE);
+    }
+}
+
+class CommandQueueInfo {
+    CONTEXT: WEBCL.WebCLContext;
+    DEVICE: WEBCL.WebCLDevice;
+    PROPERTIES: WEBCL.CommandQueueProperties;
+
+    constructor(
+        public queue: WEBCL.WebCLCommandQueue
+        ) {
+        this.CONTEXT = queue.getInfo(WEBCL.ContextProperties.QUEUE_CONTEXT);
+        this.DEVICE = queue.getInfo(WEBCL.ContextProperties.QUEUE_DEVICE);
+        this.PROPERTIES = queue.getInfo(WEBCL.ContextProperties.QUEUE_PROPERTIES);
+    }
+}
+
+class MemoryObjectInfo {
+    TYPE: WEBCL.MemObjectType;
+    FLAGS: WEBCL.MemFlagsBits;
+    SIZE: number;
+    CONTEXT: WEBCL.WebCLContext;
+    ASSOCIATED_MEMOBJECT: WEBCL.WebCLBuffer;
+    OFFSET: number;
+
+    constructor(
+        public memoryObj: WEBCL.WebCLMemoryObject
+        ) {
+        this.TYPE = memoryObj.getInfo(WEBCL.MemInfo.MEM_TYPE);
+        this.FLAGS = memoryObj.getInfo(WEBCL.MemInfo.MEM_FLAGS);
+        this.SIZE = memoryObj.getInfo(WEBCL.MemInfo.MEM_SIZE);
+        this.CONTEXT = memoryObj.getInfo(WEBCL.MemInfo.MEM_CONTEXT);
+        this.ASSOCIATED_MEMOBJECT = memoryObj.getInfo(WEBCL.MemInfo.MEM_ASSOCIATED_MEMOBJECT);
+        this.OFFSET = memoryObj.getInfo(WEBCL.MemInfo.MEM_OFFSET);
+    }
+}
+
+class DeviceContext {
+    deviceInfo: DeviceInfo;
+    context: WEBCL.WebCLContext;
+
+    constructor(public device?: WEBCL.WebCLDevice) {
+        if (!device) {
+            this.context = window.webcl.createContext();
+            this.device = this.context.getInfo(WEBCL.ContextInfo.CONTEXT_DEVICES)[0];       // just use the first default device
+        }
+        else {
+            this.context = window.webcl.createContext(device);      // use the specified device
+        }
+        this.deviceInfo = new DeviceInfo(this.device, undefined);       // save all the info about the device
+    }
+}
+
+/**
+* just enough for kernel args that are one of the
+* UInt8Array, UInt16Array, etc. interfaces because they already the extra
+* members.
+* They will be used as
+* either WEBCLBuffers or ArrayBufferViews
+* TODO: How to handle WEBCLImages and WEBCLSamples
+*/
+interface KernelArgArrayBufferView extends ArrayBufferView {
+    BYTES_PER_ELEMENT: number;
+    length: number;
+}
+
+/**
+* This holds the information for an argument
+* passed as a WEBCLBuffer.
+* This holds the original host buffer as a convenience if the
+* same buffer is used for multiple calls.
+* Multiple kernels can use the same arguments
+*/
+class ArgCLBuffer {
+    public buffer: WEBCL.WebCLBuffer;
+
+    constructor(
+        public helper: WebCLHelper,
+        public hostArray: KernelArgArrayBufferView,     // NOTE: this can just be a UInt8Array, UInt16Array, etc.
+        public cpu2gpu: boolean,
+        public gpu2cpu: boolean
+        ) {
+        this.makeCLBuffer(this.helper.devContext);     // make it as a buffer with the host array as the template
+    }
+
+    makeCLBuffer(context: DeviceContext): void {
+        var rwflag: WEBCL.MemFlagsBits;
+        if (this.cpu2gpu) {
+            if (this.gpu2cpu) {
+                rwflag = WEBCL.MemFlagsBits.MEM_READ_WRITE;
+            }
+            else {
+                rwflag = WEBCL.MemFlagsBits.MEM_READ_ONLY;
+            }
+        }
+        else {
+            rwflag = WEBCL.MemFlagsBits.MEM_WRITE_ONLY;
+        }
+
+        this.buffer = context.context.createBuffer(rwflag, this.hostArray.length * this.hostArray.BYTES_PER_ELEMENT,
+            this.hostArray);        // make the CLBuffer for the host array
+    }
+
+    queueGPU2CPU() {
+        if (this.gpu2cpu) {
+            this.helper.queue.enqueueReadBuffer(this.buffer, false, 0, this.hostArray.length * this.hostArray.BYTES_PER_ELEMENT,
+                this.hostArray);       // queue up a write from the host mem to the GPU mem
+        }
+    }
+
+    queueCPU2GPU() {
+        if (this.cpu2gpu) {
+            this.helper.queue.enqueueWriteBuffer(this.buffer, false, 0, this.hostArray.length * this.hostArray.BYTES_PER_ELEMENT,
+                this.hostArray);       // queue up a write from the host mem to the GPU mem
+        }
+    }
+}
+
+/**
+* Holder for a single kernel
+*/
+class Kernel {
+    argCount: number = 0;
+    CLBuffers: ArgCLBuffer[] = [];       // the read and write buffers for the kernel
+    localWS: number[] = [];
+    globalWS: number[] = [];
+    bufferOffsets: number[] = [];
+    clEvent: WEBCL.WebCLEvent;
+    public executionTime: number;
+
+    constructor(
+        public helper: WebCLHelper,
+        public name: string,
+        public kernel: WEBCL.WebCLKernel,
+        public workGroupInfo?: KernelWorkGroupInfo
+        ) { }
+
+    addArg(arg: ArgCLBuffer): number;
+    addArg(arg: ArrayBufferView): number;
+    addArg(arg: number): number;
+    addArg(value: any): number {
+        if (typeof (value) === "number") {          // integer values
+            this.kernel.setArg(this.argCount, new Int32Array([<number>value]));
+        } else if (value instanceof ArgCLBuffer) {      // clBuffer
+            this.kernel.setArg(this.argCount,(<ArgCLBuffer> value).buffer);   // use the CLBuffer
+            this.CLBuffers.push(<ArgCLBuffer> value);           // add to buffer array
+        } else {                // all ArrayBufferView types
+           this.kernel.setArg(this.argCount, value);
+        }
+        this.argCount += 1;
+        return this.argCount - 1;
+    }
+
+    replaceArg(argIdx: number, arg: ArgCLBuffer): void;
+    replaceArg(argIdx: number, arg: number): void;
+    replaceArg(argIdx: number, arg: ArrayBufferView): void;
+    replaceArg(argIdx: number, value: any): void {
+        if (typeof (value) === "number") {
+            this.kernel.setArg(argIdx, new Uint32Array([<number>value]));
+        } else if (value instanceof ArgCLBuffer) {
+            this.kernel.setArg(argIdx, (<ArgCLBuffer> value).buffer);   // use the CLBuffer
+            this.CLBuffers[argIdx] = <ArgCLBuffer> value;           // replace entry is buffer array
+        }
+        else {
+           this.kernel.setArg(this.argCount, value);
+        }
+    }
+
+    setWorkSections(globalThreads: number[], localThreads?: number[], offsets?: number[]) {
+        this.globalWS = globalThreads;
+
+        if (localThreads) {
+            this.localWS = [];
+            localThreads.forEach((count, index) => {
+                this.localWS.push(count);
+                this.globalWS[index] = Math.ceil(globalThreads[index] / count) * count;
+            });
+
+        }
+        else {
+            this.localWS = undefined;
+        }
+
+        if (offsets) {
+            this.bufferOffsets = offsets;
+        }
+        else {
+            this.bufferOffsets = [];
+            globalThreads.forEach(() => {
+                this.bufferOffsets.push(0);
+            });
+        }
+    }
+
+    /**
+    * Queue the transfers from CPU to GPU memory
+    */
+    queueCPU2GPUBuffers(whichBuffers?: ArgCLBuffer[]) {
+        var buffers: ArgCLBuffer[];         // which to use
+        if (whichBuffers) {
+            buffers = whichBuffers;         // just the passed in ones
+        } else {                        // use all of them
+            buffers = this.CLBuffers;
+        }
+
+        buffers.forEach((value, idx) => {
+            if (value.cpu2gpu) {
+                value.queueCPU2GPU();
+            }
+        });     // load up all the GPU memory from the host for all the read arrays
+
+    }
+
+    /**
+    * Queue the transfers from GPU to CPU memory
+    */
+    queueGPU2CPUBuffers(whichBuffers?: ArgCLBuffer[]) {
+        var buffers: ArgCLBuffer[];         // which to use
+        if (whichBuffers) {
+            buffers = whichBuffers;         // just the passed in ones
+        } else {                        // use all of them
+            buffers = this.CLBuffers;
+        }
+
+        buffers.forEach((value, idx) => {
+            if (value.gpu2cpu) {
+                value.queueGPU2CPU();
+            }
+        });     // load up all the host arrays from the gpu memory for all the write arrays
+
+    }
+
+    /*
+    * add this kernel to the queue for execution
+    */
+    queueExecution() {
+        this.clEvent = new WebCLEvent();
+        this.helper.queue.enqueueNDRangeKernel(this.kernel, this.globalWS.length, this.bufferOffsets, this.globalWS, this.localWS, undefined, this.clEvent);  // the kernel
+    }
+
+    /**
+    * Load up all the GPU memory, queue the kernel,
+    * read the GPU memory back into the CPU memory
+    */
+    queueBuffersAndExecute() {
+        this.queueCPU2GPUBuffers();     // load up all the GPU memory from the host for all the read arrays
+
+        this.queueExecution();
+
+        this.queueGPU2CPUBuffers();
+
+        this.helper.finishQueue();
+
+        this.calcExecutionTime();
+
+    }
+
+    calcExecutionTime() {
+        if (this.helper.profileFlag && this.clEvent) {
+            var startTime: number;
+            var endTime: number;
+
+            startTime = this.clEvent.getProfilingInfo(WEBCL.ProfilingInfo.PROFILING_COMMAND_START);
+            endTime = this.clEvent.getProfilingInfo(WEBCL.ProfilingInfo.PROFILING_COMMAND_END);
+            this.executionTime = endTime - startTime;
+        }
+        else {
+            this.executionTime = undefined;
+        }
+    }
+}
+
+/**
+* This holds all the information and setup for a platform and device
+* for a program. Multiple kernels and arguments can be created which are
+* passed back to the user to manage.
+*/
+
+class WebCLHelper {
+    platforms: PlatformInfo[] = new Array<PlatformInfo>();
+    devContext: DeviceContext;         // context or undefined if released
+    queue: WEBCL.WebCLCommandQueue;     // the command queue for the device
+    programCode: string;                // the code for this progam
+    program: WEBCL.WebCLProgram;
+
+    // Create the helper and load up all the platforms and devices
+    constructor(public profileFlag: boolean = false) {
+        if (window.webcl == undefined) {
+            throw (new CLHException("Webcl not found"));
+        }
+        else {
+//            try {
+                var platforms = window.webcl.getPlatforms();
+                if (platforms.length < 1) {
+                    throw (new CLHException("WEBCL there but no platforms"));
+                }
+                else {
+                    var devicesCount = 0;       // keep track of total devices
+                    platforms.forEach(
+                        (platform) => {             // setup info for platform and get all of its devices
+                            var platformInfo = new PlatformInfo(platform);
+                            var devices = platform.getDevices();
+                            devicesCount += devices.length;
+                            devices.forEach(
+                                (device) => {
+                                    var deviceInfo = new DeviceInfo(device, platformInfo);     // get the info
+                                    platformInfo.deviceInfos.push(deviceInfo);      // add to this platform's devices
+                                });
+                            this.platforms.push(platformInfo);
+                        });
+
+                }
+                if (devicesCount < 1) {
+                    throw (new CLHException("Webcl there with " + this.platforms.length + " platforms, but no devices"));
+                }
+                this.setDeviceContext();        // set the device context using the default, can explicitly set if desired.
+/*            }
+            catch (ex) {
+                throw (ex)
+            }
+*/
+        }
+    }
+
+
+    /**
+    * Set a context for a particular device type using a list of types
+    * in preferred order. Normally this wouldn't be used since the helper constructor
+    * sets the default device as the context.
+    */
+    setDeviceContext(deviceTypes: WEBCL.DeviceTypeBits[]= [WEBCL.DeviceTypeBits.DEVICE_TYPE_DEFAULT] // optional, if empty default
+        ): DeviceContext {
+        var device: DeviceInfo;
+
+        deviceTypes.some((type) => {            // go through the input types in preference order
+            if ((type & WEBCL.DeviceTypeBits.DEVICE_TYPE_DEFAULT) != 0) {
+                device = null;
+                return true;
+            }
+            else {
+                device = this.platforms.reduce<DeviceInfo>((targetdevice, platform, index, array) => {
+                    if (!targetdevice) {
+                        platform.deviceInfos.some((deviceInfo: DeviceInfo) => {
+                            if ((deviceInfo.TYPE & type) != 0) {
+                                targetdevice = deviceInfo;
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
+                        });
+                    }
+                    return targetdevice;
+                }, undefined);
+                return (device != undefined);
+            }              // find the first device of the specified type
+        });
+
+        if (device === undefined) {
+            throw ("No device found");
+        }
+        else {
+            if (this.devContext) {
+                this.devContext.context.release();
+                this.devContext = undefined;
+            }
+            if (device === null) {
+                this.devContext = new DeviceContext();     // get the default context
+            }
+            else {              // use a specific one
+                this.devContext = new DeviceContext(device.device);        // get the context for the device
+            }
+            if (this.queue) {
+                this.queue.release();
+                this.queue = undefined;
+            }
+
+            this.queue = this.devContext.context.createCommandQueue(this.devContext.device, this.profileFlag ? WEBCL.CommandQueueProperties.QUEUE_PROFILING_ENABLE : undefined);
+
+            return this.devContext;
+        }
+    }
+
+    /*
+    * finish the queue
+    */
+    finishQueue() {
+        if (this.queue) {
+            this.queue.finish();
+        }
+    }
+
+    /*
+    * Set context, GPU preferred
+    * Only used if the default device as set in the constructor isn't correct
+    */
+    setGPUcontext(): DeviceContext {
+        return this.setDeviceContext([WEBCL.DeviceTypeBits.DEVICE_TYPE_GPU, WEBCL.DeviceTypeBits.DEVICE_TYPE_CPU]);
+    }
+
+    /*
+    * Set context, CPU preferred
+    * Only used if the default device as set in the constructor isn't correct
+    */
+    setCPUcontext(): DeviceContext {
+        return this.setDeviceContext([WEBCL.DeviceTypeBits.DEVICE_TYPE_CPU, WEBCL.DeviceTypeBits.DEVICE_TYPE_GPU]);
+    }
+
+    /**
+    * release the current context
+    */
+    releaseContext() {
+        if (this.devContext != undefined) {
+            this.devContext.context.releaseAll;
+            this.devContext = undefined;
+            this.queue = undefined;
+        }
+    }
+
+    createProgramFromElement(htmlID: string, options: string = undefined) {
+        var element: JQuery = jQuery("#" + htmlID);                  //x_Utilities.JQueryUtils.tryJQuery(() => jQuery("#" + htmlID));      // get the kernel code item
+        this.createProgram(element.text(), options);
+    }
+
+    createProgram(code: string, options: string = undefined) {
+        this.programCode = code;
+        this.program = this.devContext.context.createProgram(this.programCode);
+        this.program.build([this.devContext.device], options);
+    }
+
+    createKernelFromString(programSource: string, kernelName: string, options: string = undefined): Kernel {
+        this.createProgram(programSource, options);
+        return this.createKernel(kernelName);
+    }
+
+    createKernelFromElement(htmlID: string, kernelName: string, options: string = undefined) : Kernel {
+        this.createProgramFromElement(htmlID, options);
+        return this.createKernel(kernelName);
+    }
+
+    createKernel(kernelName: string): Kernel {
+        var kernel: WEBCL.WebCLKernel = this.program.createKernel(kernelName);      // create the kernel
+        var info: KernelWorkGroupInfo = new KernelWorkGroupInfo(kernel, this.devContext.device);        // get the info about it's workgroup
+        return new Kernel(this, kernelName, kernel, info);       // create and return the kernel holder
+    }
+
+    executeKernel(kernel: Kernel) {
+        kernel.queueBuffersAndExecute ();
+    }
+
+    createBufferArg(hostBuffer: KernelArgArrayBufferView, cpu2gpu: boolean, gpu2cpu: boolean): ArgCLBuffer {
+        return new ArgCLBuffer(this, hostBuffer, cpu2gpu, gpu2cpu);
+    }
+
+
+}
+
diff --git a/webcl/webcl.d.ts b/webcl/webcl.d.ts
new file mode 100644
index 000000000..7bd6a4e1c
--- /dev/null
+++ b/webcl/webcl.d.ts
@@ -0,0 +1,706 @@
+// Type definitions for WebCL 1.0
+// Project: https://www.khronos.org/registry/webcl/specs/1.0.0/
+// Definitions by: Ralph Brown <https://github.com/NCARalph>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// Version 1.3 - Changed enums to static enums for TS 1.5
+// Version 1.2 - Fixed some more bugs, added WebCLEvent
+// Version 1.1 - Minor fixes to get more enums in place and fix some argument interface types
+// Version 1.0 - Initial version
+
+interface Window {
+    webcl: WEBCL.WebCL;
+}
+
+declare var WebCLEvent: { new (): WEBCL.WebCLEvent; };
+
+declare module WEBCL {
+    // 3.6.1
+    interface WebCLBuffer extends WebCLMemoryObject {
+        createSubBuffer(memFlags: MemFlagsBits, origin: number, sizeInBytes: number): WebCLBuffer;
+    }
+
+    //2.5
+    interface WebCLCallback { (event: WebCLEvent): void }
+
+
+    // 3.5
+    interface WebCLCommandQueue {
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Copying: Buffer <-> Buffer, Image <-> Image, Buffer <-> Image
+        //
+
+        enqueueCopyBuffer(
+            srcBuffer: WebCLBuffer,
+            dstBuffer: WebCLBuffer,
+            srcOffset: number,
+            dstOffset: number,
+            numBytes: number,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueCopyBufferRect(
+            srcBuffer: WebCLBuffer,
+            dstBuffer: WebCLBuffer,
+            srcOrigin: number[],
+            dstOrigin: number[],
+            region: number[],
+            srcRowPitch: number,
+            srcSlicePitch: number,
+            dstRowPitch: number,
+            dstSlicePitch: number,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueCopyImage(
+            srcImage: WebCLImage,
+            dstImage: WebCLImage,
+            srcOrigin: number[],
+            dstOrigin: number[],
+            region: number[],
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueCopyImageToBuffer(
+            srcImage: WebCLImage,
+            dstBuffer: WebCLBuffer,
+            srcOrigin: number[],
+            srcRegion: number[],
+            dstOffset: number,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueCopyBufferToImage(
+            srcBuffer: WebCLBuffer,
+            dstImage: WebCLImage,
+            srcOffset: number,
+            dstOrigin: number[],
+            dstRegion: number[],
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Reading: Buffer -> Host, Image -> Host
+        //
+
+        enqueueReadBuffer(
+            buffer: WebCLBuffer,
+            blockingRead: boolean,
+            bufferOffset: number,
+            numBytes: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueReadBufferRect(
+            buffer: WebCLBuffer,
+            blockingRead: boolean,
+            bufferOrigin: number[],
+            hostOrigin: number[],
+            region: number[],
+            bufferRowPitch: number,
+            bufferSlicePitch: number,
+            hostRowPitch: number,
+            hostSlicePitch: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueReadImage(
+            image: WebCLImage,
+            blockingRead: boolean,
+            origin: number[],
+            region: number[],
+            hostRowPitch: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Writing: Host -> Buffer, Host -> Image
+        //
+
+        enqueueWriteBuffer(
+            buffer: WebCLBuffer,
+            blockingWrite: boolean,
+            bufferOffset: number,
+            numBytes: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueWriteBufferRect(
+            buffer: WebCLBuffer,
+            blockingWrite: boolean,
+            bufferOrigin: number[],
+            hostOrigin: number[],
+            region: number[],
+            bufferRowPitch: number,
+            bufferSlicePitch: number,
+            hostRowPitch: number,
+            hostSlicePitch: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        enqueueWriteImage(
+            image: WebCLImage,
+            blockingWrite: boolean,
+            origin: number[],
+            region: number[],
+            hostRowPitch: number,
+            hostPtr: ArrayBufferView,
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Executing kernels
+        //
+
+        enqueueNDRangeKernel(
+            kernel: WebCLKernel,
+            workDim: number,
+            globalWorkOffset: number[],
+            globalWorkSize: number[],
+            localWorkSize?: number[],
+            eventWaitList?: WebCLEvent[],
+            event?: WebCLEvent): void;
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Synchronization
+        //
+
+        enqueueMarker(event: WebCLEvent): void;
+
+        enqueueBarrier(): void;
+
+        enqueueWaitForEvents(eventWaitList: WebCLEvent[]): void;
+
+        finish(whenFinished?: WebCLCallback): void;
+
+        flush(): void;
+
+        ////////////////////////////////////////////////////////////////////////////
+        //
+        // Querying command queue information
+        //
+
+        getInfo(name: ContextProperties): any;
+
+        release(): void;
+    }
+
+    //3.4
+    interface WebCLContext {
+
+        createBuffer(memFlags: MemFlagsBits, sizeInBytes: number, hostPtr?: ArrayBufferView): WebCLBuffer;
+
+        createCommandQueue(device: WebCLDevice, properties?: CommandQueueProperties): WebCLCommandQueue;
+
+        createImage(memFlags: MemFlagsBits,
+            descriptor: WebCLImageDescriptor,
+            hostPtr?: ArrayBufferView): WebCLImage;
+
+        createProgram(source: string): WebCLProgram;
+
+        createSampler(normalizedCoords: number,
+            addressingMode: AddressingMode,
+            filterMode: FilterMode): WebCLSampler;
+
+        createUserEvent(): WebCLUserEvent;
+
+        getInfo(name: ContextInfo): any;
+
+        getSupportedImageFormats(memFlags?: MemFlagsBits): WebCLImageDescriptor[];
+
+        release(): void;
+
+        releaseAll(): void;
+    }
+
+    // 3.3
+    interface WebCLDevice {
+        getInfo(name: DeviceInfo): any;
+        getSupportedExtensions(): string[];
+        enableExtension(extensionName: string): boolean;
+    }
+
+    // 3.10
+    interface WebCLEvent {
+        getInfo(name: EventInfo): any;
+        getProfilingInfo(name: ProfilingInfo): number;
+        setCallback(commandExecCallbackType: CommandExecutionStatus, notify: WebCLCallback): void;
+        release(): void;
+    }
+
+    interface WebCLException extends DOMException {
+        name: string;              // A string representation of the numeric error code, e.g. "INVALID_VALUE"
+        message: string;         // An implementation-specific description of what caused the exception
+    }
+
+    // 3.6.2
+    interface WebCLImage extends WebCLMemoryObject {
+        getInfo(): WebCLImageDescriptor;
+    }
+
+    // 3.4.1
+    interface WebCLImageDescriptor {
+        channelOrder: ChannelOrder;
+        channelType: ChannelType;
+        width: number;
+        height: number;
+        rowPitch: number;
+    }
+
+    // 3.9
+    interface WebCLKernel {
+        getInfo(name: KernelInfo): any;
+        getWorkGroupInfo(device: WebCLDevice, name: KernelWorkGroupInfo): any;
+        getArgInfo(index: number): WebCLKernelArgInfo;
+        setArg(index: number, buffer: WebCLBuffer): void;
+        setArg(index: number, image: WebCLImage): void;
+        setArg(index: number, value: WebCLSampler): void;
+        setArg(index: number, value: ArrayBufferView): void;
+        release(): void;
+    }
+
+    // 3.9.1
+    interface WebCLKernelArgInfo {
+        name: string;
+        typeName: string;         // 'char', 'float', 'uint4', 'image2d_t', 'sampler_t', etc.
+        addressQualifier: string; // 'global', 'local', 'constant', or 'private'
+        accessQualifier: string;  // 'read_only', 'write_only', or 'none'
+    }
+
+    // 3.6
+    interface WebCLMemoryObject {
+        getInfo(name: MemInfo): any;
+        release(): void;
+    }
+
+    // 3.2
+    interface WebCLPlatform {
+        getInfo(name: PlatformInfo): any;
+        getDevices(deviceType?: DeviceTypeBits): WebCLDevice[];
+        getSupportedExtensions(): string[];
+        enableExtension(extensionName: string): boolean;
+    }
+
+    //3.8
+    interface WebCLProgram {
+        getInfo(name: ProgramInfo): any;
+
+        getBuildInfo(device: WebCLDevice, name: ProgramBuildInfo): any;
+
+        build(devices?: WebCLDevice[],
+            options?: string,
+            whenFinished?: WebCLCallback): void;
+
+        createKernel(kernelName: string): WebCLKernel;
+
+        createKernelsInProgram(): WebCLKernel[];
+
+        release(): void;
+    }
+
+    // 3.7
+    interface WebCLSampler {
+        getInfo(name: SamplerInfo): any;
+        release(): void;
+    }
+
+    // 3.10.1
+    interface WebCLUserEvent extends WebCLEvent {
+        setStatus(executionStatus: CommandExecutionStatus): void;
+    }
+
+    /* Error Codes */
+    const enum ErrorCodes {
+        SUCCESS = 0,
+        DEVICE_NOT_FOUND = -1,
+        DEVICE_NOT_AVAILABLE = -2,
+        COMPILER_NOT_AVAILABLE = -3,
+        MEM_OBJECT_ALLOCATION_FAILURE = -4,
+        OUT_OF_RESOURCES = -5,
+        OUT_OF_HOST_MEMORY = -6,
+        PROFILING_INFO_NOT_AVAILABLE = -7,
+        MEM_COPY_OVERLAP = -8,
+        IMAGE_FORMAT_MISMATCH = -9,
+        IMAGE_FORMAT_NOT_SUPPORTED = -10,
+        BUILD_PROGRAM_FAILURE = -11,
+        MAP_FAILURE = -12,
+        MISALIGNED_SUB_BUFFER_OFFSET = -13,
+        EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST = -14,
+        INVALID_VALUE = -30,
+        INVALID_DEVICE_TYPE = -31,
+        INVALID_PLATFORM = -32,
+        INVALID_DEVICE = -33,
+        INVALID_CONTEXT = -34,
+        INVALID_QUEUE_PROPERTIES = -35,
+        INVALID_COMMAND_QUEUE = -36,
+        INVALID_HOST_PTR = -37,
+        INVALID_MEM_OBJECT = -38,
+        INVALID_IMAGE_FORMAT_DESCRIPTOR = -39,
+        INVALID_IMAGE_SIZE = -40,
+        INVALID_SAMPLER = -41,
+        INVALID_BINARY = -42,
+        INVALID_BUILD_OPTIONS = -43,
+        INVALID_PROGRAM = -44,
+        INVALID_PROGRAM_EXECUTABLE = -45,
+        INVALID_KERNEL_NAME = -46,
+        INVALID_KERNEL_DEFINITION = -47,
+        INVALID_KERNEL = -48,
+        INVALID_ARG_INDEX = -49,
+        INVALID_ARG_VALUE = -50,
+        INVALID_ARG_SIZE = -51,
+        INVALID_KERNEL_ARGS = -52,
+        INVALID_WORK_DIMENSION = -53,
+        INVALID_WORK_GROUP_SIZE = -54,
+        INVALID_WORK_ITEM_SIZE = -55,
+        INVALID_GLOBAL_OFFSET = -56,
+        INVALID_EVENT_WAIT_LIST = -57,
+        INVALID_EVENT = -58,
+        INVALID_OPERATION = -59,
+        //INVALID_GL_OBJECT                         = -60, // moved to extension
+        INVALID_BUFFER_SIZE = -61,
+        //INVALID_MIP_LEVEL                         = -62, // moved to extension
+        INVALID_GLOBAL_WORK_SIZE = -63,
+        INVALID_PROPERTY = -64,
+    }
+
+    /* cl_bool */
+    const enum Bool {
+        FALSE = 0,
+        TRUE = 1,
+    }
+
+    /* cl_platforinfo */
+    const enum PlatformInfo {
+        PLATFORM_PROFILE = 0x0900,
+        PLATFORM_VERSION = 0x0901,
+        PLATFORM_NAME = 0x0902,
+        PLATFORM_VENDOR = 0x0903,
+        PLATFORM_EXTENSIONS = 0x0904,
+    }
+    /* cl_device_type - bitfield */
+    const enum DeviceTypeBits {
+        DEVICE_TYPE_DEFAULT = 0x1,
+        DEVICE_TYPE_CPU = 0x2,
+        DEVICE_TYPE_GPU = 0x4,
+        DEVICE_TYPE_ACCELERATOR = 0x8,
+        DEVICE_TYPE_ALL = 0xFFFFFFFF,
+    }
+    /* cl_device_info */
+    const enum DeviceInfo {
+        DEVICE_TYPE = 0x1000,
+        DEVICE_VENDOR_ID = 0x1001,
+        DEVICE_MAX_COMPUTE_UNITS = 0x1002,
+        DEVICE_MAX_WORK_ITEM_DIMENSIONS = 0x1003,
+        DEVICE_MAX_WORK_GROUP_SIZE = 0x1004,
+        DEVICE_MAX_WORK_ITEM_SIZES = 0x1005,
+        DEVICE_PREFERRED_VECTOR_WIDTH_CHAR = 0x1006,
+        DEVICE_PREFERRED_VECTOR_WIDTH_SHORT = 0x1007,
+        DEVICE_PREFERRED_VECTOR_WIDTH_INT = 0x1008,
+        DEVICE_PREFERRED_VECTOR_WIDTH_LONG = 0x1009,
+        DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT = 0x100A,
+        //DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE      = 0x100B, // moved to extension
+        DEVICE_MAX_CLOCK_FREQUENCY = 0x100C,
+        DEVICE_ADDRESS_BITS = 0x100D,
+        DEVICE_MAX_READ_IMAGE_ARGS = 0x100E,
+        DEVICE_MAX_WRITE_IMAGE_ARGS = 0x100F,
+        DEVICE_MAX_MEM_ALLOC_SIZE = 0x1010,
+        DEVICE_IMAGE2D_MAX_WIDTH = 0x1011,
+        DEVICE_IMAGE2D_MAX_HEIGHT = 0x1012,
+        DEVICE_IMAGE3D_MAX_WIDTH = 0x1013,
+        DEVICE_IMAGE3D_MAX_HEIGHT = 0x1014,
+        DEVICE_IMAGE3D_MAX_DEPTH = 0x1015,
+        DEVICE_IMAGE_SUPPORT = 0x1016,
+        DEVICE_MAX_PARAMETER_SIZE = 0x1017,
+        DEVICE_MAX_SAMPLERS = 0x1018,
+        DEVICE_MEM_BASE_ADDR_ALIGN = 0x1019,
+        //DEVICE_MIN_DATA_TYPE_ALIGN_SIZE           = 0x101A, // removed, deprecated in Open1.2
+        DEVICE_SINGLE_FP_CONFIG = 0x101B,
+        DEVICE_GLOBAL_MEM_CACHE_TYPE = 0x101C,
+        DEVICE_GLOBAL_MEM_CACHELINE_SIZE = 0x101D,
+        DEVICE_GLOBAL_MEM_CACHE_SIZE = 0x101E,
+        DEVICE_GLOBAL_MEM_SIZE = 0x101F,
+        DEVICE_MAX_CONSTANT_BUFFER_SIZE = 0x1020,
+        DEVICE_MAX_CONSTANT_ARGS = 0x1021,
+        DEVICE_LOCAL_MEM_TYPE = 0x1022,
+        DEVICE_LOCAL_MEM_SIZE = 0x1023,
+        DEVICE_ERROR_CORRECTION_SUPPORT = 0x1024,
+        DEVICE_PROFILING_TIMER_RESOLUTION = 0x1025,
+        DEVICE_ENDIAN_LITTLE = 0x1026,
+        DEVICE_AVAILABLE = 0x1027,
+        DEVICE_COMPILER_AVAILABLE = 0x1028,
+        DEVICE_EXECUTION_CAPABILITIES = 0x1029,
+        DEVICE_QUEUE_PROPERTIES = 0x102A,
+        DEVICE_NAME = 0x102B,
+        DEVICE_VENDOR = 0x102C,
+        DRIVER_VERSION = 0x102D,
+        DEVICE_PROFILE = 0x102E,
+        DEVICE_VERSION = 0x102F,
+        DEVICE_EXTENSIONS = 0x1030,
+        DEVICE_PLATFORM = 0x1031,
+        //DEVICE_DOUBLE_FP_CONFIG                   = 0x1032, // moved to extension
+        //DEVICE_HALF_FP_CONFIG                     = 0x1033, // moved to extension
+        //DEVICE_PREFERRED_VECTOR_WIDTH_HALF        = 0x1034, // moved to extension
+        DEVICE_HOST_UNIFIED_MEMORY = 0x1035,
+        DEVICE_NATIVE_VECTOR_WIDTH_CHAR = 0x1036,
+        DEVICE_NATIVE_VECTOR_WIDTH_SHORT = 0x1037,
+        DEVICE_NATIVE_VECTOR_WIDTH_INT = 0x1038,
+        DEVICE_NATIVE_VECTOR_WIDTH_LONG = 0x1039,
+        DEVICE_NATIVE_VECTOR_WIDTH_FLOAT = 0x103A,
+        //DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE         = 0x103B, // moved to extension
+        //DEVICE_NATIVE_VECTOR_WIDTH_HALF           = 0x103C, // moved to extension
+        DEVICE_OPENCL_C_VERSION = 0x103D,
+    }
+    /* cl_device_fp_config - bitfield */
+    const enum DeviceFPConfigBits {
+        FP_DENORM = 0x1,
+        FP_INF_NAN = 0x2,
+        FP_ROUND_TO_NEAREST = 0x4,
+        FP_ROUND_TO_ZERO = 0x8,
+        FP_ROUND_TO_INF = 0x10,
+        FP_FMA = 0x20,
+        FP_SOFT_FLOAT = 0x40,
+    }
+    /* cl_device_MEM_CACHE_type */
+    const enum DeviceMemCacheType {
+        NONE = 0x0,
+        READ_ONLY_CACHE = 0x1,
+        READ_WRITE_CACHE = 0x2,
+    }
+    /* cl_device_local_mem_type */
+    const enum DeviceLocalMemType {
+        LOCAL = 0x1,
+        GLOBAL = 0x2,
+    }
+    /* cl_device_exec_capabilities - bitfield */
+    const enum DeviceExecCapabilitiesBits {
+        EXEC_KERNEL = 0x1,
+        //EXEC_NATIVE_KERNEL                        = 0x2, // disallowed
+    }
+    /* cl_command_queue_properties - bitfield */
+    const enum CommandQueueProperties {
+        QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE = 0x1,
+        QUEUE_PROFILING_ENABLE = 0x2,
+    }
+    /* cl_context_info  */
+    const enum ContextInfo {
+        //CONTEXT_REFERENCE_COUNT                   = 0x1080, // disallowed
+        CONTEXT_DEVICES = 0x1081,
+        //CONTEXT_PROPERTIES                        = 0x1082, // disallowed, no context properties in WebCONTEXT_NUM_DEVICES = 0x1083,
+    }
+    /* cl_context_properties */
+    const enum ContextProperties {
+        //CONTEXT_PLATFORM                          = 0x1084, // disallowed, no context properties in Web /* cl_command_queue_info */
+        QUEUE_CONTEXT = 0x1090,
+        QUEUE_DEVICE = 0x1091,
+        //QUEUE_REFERENCE_COUNT                     = 0x1092, // disallowed
+        QUEUE_PROPERTIES = 0x1093,
+    }
+    /* cl_mem_flags - bitfield */
+    const enum MemFlagsBits {
+        MEM_READ_WRITE = 0x1,
+        MEM_WRITE_ONLY = 0x2,
+        MEM_READ_ONLY = 0x4,
+    }
+    /* cl_channel_order */
+    const enum ChannelOrder {
+        R = 0x10B0,
+        A = 0x10B1,
+        RG = 0x10B2,
+        RA = 0x10B3,
+        RGB = 0x10B4,
+        RGBA = 0x10B5,
+        BGRA = 0x10B6,
+        ARGB = 0x10B7,
+        INTENSITY = 0x10B8,
+        LUMINANCE = 0x10B9,
+        Rx = 0x10BA,
+        RGx = 0x10BB,
+        RGBx = 0x10BC,
+    }
+    /* cl_channel_type */
+    const enum ChannelType {
+        SNORM_INT8 = 0x10D0,
+        SNORM_INT16 = 0x10D1,
+        UNORM_INT8 = 0x10D2,
+        UNORM_INT16 = 0x10D3,
+        UNORM_SHORT_565 = 0x10D4,
+        UNORM_SHORT_555 = 0x10D5,
+        UNORM_INT_101010 = 0x10D6,
+        SIGNED_INT8 = 0x10D7,
+        SIGNED_INT16 = 0x10D8,
+        SIGNED_INT32 = 0x10D9,
+        UNSIGNED_INT8 = 0x10DA,
+        UNSIGNED_INT16 = 0x10DB,
+        UNSIGNED_INT32 = 0x10DC,
+        HALF_FLOAT = 0x10DD,
+        FLOAT = 0x10DE,
+    }
+    /* cl_meobject_type */
+    const enum MemObjectType {
+        MEM_OBJECT_BUFFER = 0x10F0,
+        MEM_OBJECT_IMAGE2D = 0x10F1,
+        MEM_OBJECT_IMAGE3D = 0x10F2,
+    }
+    /* cl_meinfo */
+    const enum MemInfo {
+        MEM_TYPE = 0x1100,
+        MEM_FLAGS = 0x1101,
+        MEM_SIZE = 0x1102,
+        //MEM_HOST_PTR                              = 0x1103, // disallowed
+        //MEM_MAP_COUNT                             = 0x1104, // disallowed
+        //MEM_REFERENCE_COUNT                       = 0x1105, // disallowed
+        MEM_CONTEXT = 0x1106,
+        MEM_ASSOCIATED_MEMOBJECT = 0x1107,
+        MEM_OFFSET = 0x1108,
+    }
+    /* cl_image_info */
+    const enum ImageInfo {
+        IMAGE_FORMAT = 0x1110,
+        IMAGE_ELEMENT_SIZE = 0x1111,
+        IMAGE_ROW_PITCH = 0x1112,
+        IMAGE_WIDTH = 0x1114,
+        IMAGE_HEIGHT = 0x1115,
+    }
+    /* cl_addressing_mode */
+    const enum AddressingMode {
+        //ADDRESS_NONE                              = 0x1130, // disallowed
+        ADDRESS_CLAMP_TO_EDGE = 0x1131,
+        ADDRESS_CLAMP = 0x1132,
+        ADDRESS_REPEAT = 0x1133,
+        ADDRESS_MIRRORED_REPEAT = 0x1134,
+    }
+    /* cl_filter_mode */
+    const enum FilterMode {
+        FILTER_NEAREST = 0x1140,
+        FILTER_LINEAR = 0x1141,
+    }
+    /* cl_sampler_info */
+    const enum SamplerInfo {
+        //SAMPLER_REFERENCE_COUNT                   = 0x1150, // disallowed
+        SAMPLER_CONTEXT = 0x1151,
+        SAMPLER_NORMALIZED_COORDS = 0x1152,
+        SAMPLER_ADDRESSING_MODE = 0x1153,
+        SAMPLER_FILTER_MODE = 0x1154,
+    }
+    /* cl_map_flags - bitfield */
+    //MAP_READ                                  = 0x1, // disallowed
+    //MAP_WRITE                                 = 0x2, // disallowed
+
+    /* cl_prograinfo */
+    const enum ProgramInfo {
+        //PROGRAM_REFERENCE_COUNT                   = 0x1160, // disallowed
+        PROGRAM_CONTEXT = 0x1161,
+        PROGRAM_NUM_DEVICES = 0x1162,
+        PROGRAM_DEVICES = 0x1163,
+        PROGRAM_SOURCE = 0x1164,
+        //PROGRAM_BINARY_SIZES                      = 0x1165, // disallowed
+        //PROGRAM_BINARIES                          = 0x1166, // disallowed
+    }
+    /* cl_program_build_info */
+    const enum ProgramBuildInfo {
+        PROGRAM_BUILD_STATUS = 0x1181,
+        PROGRAM_BUILD_OPTIONS = 0x1182,
+        PROGRAM_BUILD_LOG = 0x1183,
+    }
+    /* cl_build_status */
+    const enum BuildStatus {
+        BUILD_SUCCESS = 0,
+        BUILD_NONE = -1,
+        BUILD_ERROR = -2,
+        BUILD_IN_PROGRESS = -3,
+    }
+    /* cl_kernel_info */
+    const enum KernelInfo {
+        KERNEL_FUNCTION_NAME = 0x1190,
+        KERNEL_NUM_RGS = 0x1191,
+        //KERNEL_REFERENCE_COUNT                    = 0x1192, // disallowed
+        KERNEL_CONTEXT = 0x1193,
+        KERNEL_PROGRAM = 0x1194,
+    }
+    /* cl_kernel_work_group_info */
+    const enum KernelWorkGroupInfo {
+        KERNEL_WORK_GROUP_SIZE = 0x11B0,
+        KERNEL_COMPILE_WORK_GROUP_SIZE = 0x11B1,
+        KERNEL_LOCAL_MEM_SIZE = 0x11B2,
+        KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE = 0x11B3,
+        KERNEL_PRIVATE_MEM_SIZE = 0x11B4,
+    }
+    /* cl_event_info  */
+    const enum EventInfo {
+        EVENT_COMMAND_QUEUE = 0x11D0,
+        EVENT_COMMAND_TYPE = 0x11D1,
+        //EVENT_REFERENCE_COUNT                     = 0x11D2, // disallowed
+        EVENT_COMMAND_EXECUTION_STATUS = 0x11D3,
+        EVENT_CONTEXT = 0x11D4,
+    }
+    /* cl_command_type */
+    const enum CommandType {
+        COMMAND_NDRANGE_KERNEL = 0x11F0,
+        COMMAND_TASK = 0x11F1,
+        //COMMAND_NATIVE_KERNEL                     = 0x11F2, // disallowed
+        COMMAND_READ_BUFFER = 0x11F3,
+        COMMAND_WRITE_BUFFER = 0x11F4,
+        COMMAND_COPY_BUFFER = 0x11F5,
+        COMMAND_READ_IMAGE = 0x11F6,
+        COMMAND_WRITE_IMAGE = 0x11F7,
+        COMMAND_COPY_IMAGE = 0x11F8,
+        COMMAND_COPY_IMAGE_TO_BUFFER = 0x11F9,
+        COMMAND_COPY_BUFFER_TO_IMAGE = 0x11FA,
+        //COMMAND_MAP_BUFFER                        = 0x11FB, // disallowed
+        //COMMAND_MAP_IMAGE                         = 0x11FC, // disallowed
+        //COMMAND_UNMAP_MEM_OBJECT                  = 0x11FD, // disallowed
+        COMMAND_MARKER = 0x11FE,
+        //COMMAND_ACQUIRE_GL_OBJECTS                = 0x11FF, // moved to extension
+        //COMMAND_RELEASE_GL_OBJECTS                = 0x1200, // moved to extension
+        COMMAND_READ_BUFFER_RECT = 0x1201,
+        COMMAND_WRITE_BUFFER_RECT = 0x1202,
+        COMMAND_COPY_BUFFER_RECT = 0x1203,
+        COMMAND_USER = 0x1204,
+    }
+    /* command execution status */
+    const enum CommandExecutionStatus {
+        COMPLETE = 0x0,
+        RUNNING = 0x1,
+        SUBMITTED = 0x2,
+        QUEUED = 0x3,
+    }
+    /* cl_profiling_info  */
+    const enum ProfilingInfo {
+        PROFILING_COMMAND_QUEUED = 0x1280,
+        PROFILING_COMMAND_SUBMIT = 0x1281,
+        PROFILING_COMMAND_START = 0x1282,
+        PROFILING_COMMAND_END = 0x1283,
+    }
+
+    interface WebCL {
+        getPlatforms(): WebCLPlatform[];
+
+        createContext(deviceType?: DeviceTypeBits): WebCLContext;
+
+        createContext(platform: WebCLPlatform, deviceType?: DeviceTypeBits): WebCLContext;
+
+        createContext(device: WebCLDevice): WebCLContext;
+
+        createContext(devices: WebCLDevice[]): WebCLContext;
+
+        getSupportedExtensions(): string[];
+
+        enableExtension(extensionName: string): boolean;
+
+        waitForEvents(eventWaitList: WebCLEvent[],
+            whenFinished?: WebCLCallback): void;
+
+        releaseAll(): void;
+    }
+}
diff --git a/webgl-ext/webgl-ext-tests.ts b/webgl-ext/webgl-ext-tests.ts
new file mode 100644
index 000000000..9ddcd22f9
--- /dev/null
+++ b/webgl-ext/webgl-ext-tests.ts
@@ -0,0 +1,102 @@
+/// <reference path="webgl-ext.d.ts" />
+
+var canvas = document.createElement("canvas");
+var gl = canvas.getContext("webgl");
+var ext: any;
+var t: any;
+
+if (ext = gl.getExtension("ANGLE_instanced_arrays")) {
+	t = ext.VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE;
+}
+
+if (ext = gl.getExtension("EXT_blend_minmax")) {
+	t = ext.MIN_EXT;
+}
+
+if (ext = gl.getExtension("EXT_color_buffer_half_float")) {
+	t = ext.FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT;
+}
+
+if (ext = gl.getExtension("EXT_frag_depth")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("EXT_sRGB")) {
+	t = ext.SRGB8_ALPHA8_EXT;
+}
+
+if (ext = gl.getExtension("EXT_shader_texture_lod")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("EXT_texture_filter_anisotropic")) {
+	t = ext.MAX_TEXTURE_MAX_ANISOTROPY_EXT;
+}
+
+if (ext = gl.getExtension("OES_element_index_uint")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("OES_standard_derivatives")) {
+	t = ext.FRAGMENT_SHADER_DERIVATIVE_HINT_OES;
+}
+
+if (ext = gl.getExtension("OES_texture_float")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("OES_texture_float_linear")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("OES_texture_half_float")) {
+	t = ext.HALF_FLOAT_OES;
+}
+
+if (ext = gl.getExtension("OES_texture_half_float_linear")) {
+	// no fields
+}
+
+if (ext = gl.getExtension("OES_vertex_array_object")) {
+	t = ext.createVertexArrayOES;  // just get fn ref, don't call
+}
+
+if (ext = gl.getExtension("WEBGL_color_buffer_float")) {
+	t = ext.FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT;
+}
+
+if (ext = gl.getExtension("WEBGL_compressed_texture_atc")) {
+	t = ext.COMPRESSED_RGB_ATC_WEBGL;
+}
+
+if (ext = gl.getExtension("WEBGL_compressed_texture_etc1")) {
+	t = ext.COMPRESSED_RGB_ETC1_WEBGL;
+}
+
+if (ext = gl.getExtension("WEBGL_compressed_texture_pvrtc")) {
+	t = ext.COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
+}
+
+if (ext = gl.getExtension("WEBGL_compressed_texture_s3tc")) {
+	t = ext.COMPRESSED_RGBA_S3TC_DXT5_EXT;
+}
+
+if (ext = gl.getExtension("WEBGL_debug_renderer_info")) {
+	t = ext.UNMASKED_VENDOR_WEBGL;
+}
+
+if (ext = gl.getExtension("WEBGL_debug_shaders")) {
+	t = ext.getTranslatedShaderSource; // just get fn ref, don't call
+}
+
+if (ext = gl.getExtension("WEBGL_depth_texture")) {
+	t = ext.UNSIGNED_INT_24_8_WEBGL;
+}
+
+if (ext = gl.getExtension("WEBGL_draw_buffers")) {
+	t = ext.MAX_COLOR_ATTACHMENTS_WEBGL;
+}
+
+if (ext = gl.getExtension("WEBGL_lose_context")) {
+	t = ext.loseContext; // just get fn ref, don't call
+}
diff --git a/webgl-ext/webgl-ext.d.ts b/webgl-ext/webgl-ext.d.ts
new file mode 100644
index 000000000..c6a8cb34a
--- /dev/null
+++ b/webgl-ext/webgl-ext.d.ts
@@ -0,0 +1,214 @@
+// Type definitions for WebGL Extensions
+// Project: http://webgl.org/
+// Definitions by: Arthur Langereis <https://github.com/zenmumbler/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped/webgl-ext
+
+// These definitions go beyond those already defined in TS 1.6.2 stdlib
+// All non-draft WebGL 1.0 extensions and prefixed extension names are
+// covered.
+
+interface HTMLCanvasElement {
+	getContext(contextId: "webgl"): WebGLRenderingContext;
+}
+
+interface WebGLRenderingContext {
+	getExtension(name: "ANGLE_instanced_arrays"): ANGLEInstancedArrays;
+
+	getExtension(name: "EXT_blend_minmax"): EXTBlendMinMax;
+	getExtension(name: "EXT_color_buffer_half_float"): EXTColorBufferHalfFloat;
+	getExtension(name: "EXT_frag_depth"): EXTFragDepth;
+	getExtension(name: "EXT_sRGB"): EXTsRGB;
+	getExtension(name: "EXT_shader_texture_lod"): EXTShaderTextureLOD;
+	getExtension(name: "EXT_texture_filter_anisotropic"): EXTTextureFilterAnisotropic;
+
+	getExtension(name: "OES_element_index_uint"): OESElementIndexUint;
+	getExtension(name: "OES_standard_derivatives"): OESStandardDerivatives;
+	getExtension(name: "OES_texture_float"): OESTextureFloat;
+	getExtension(name: "OES_texture_float_linear"): OESTextureFloatLinear;
+	getExtension(name: "OES_texture_half_float"): OESTextureHalfFloat;
+	getExtension(name: "OES_texture_half_float_linear"): OESTextureHalfFloatLinear;
+	getExtension(name: "OES_vertex_array_object"): OESVertexArrayObject;
+
+	getExtension(name: "WEBGL_color_buffer_float"): WebGLColorBufferFloat;
+	getExtension(name: "WEBGL_compressed_texture_atc"): WebGLCompressedTextureATC;
+	getExtension(name: "WEBGL_compressed_texture_etc1"): WebGLCompressedTextureETC1;
+	getExtension(name: "WEBGL_compressed_texture_pvrtc"): WebGLCompressedTexturePVRTC;
+	getExtension(name: "WEBGL_compressed_texture_s3tc"): WebGLCompressedTextureS3TC;
+	getExtension(name: "WEBGL_debug_renderer_info"): WebGLDebugRendererInfo;
+	getExtension(name: "WEBGL_debug_shaders"): WebGLDebugShaders;
+	getExtension(name: "WEBGL_depth_texture"): WebGLDepthTexture;
+	getExtension(name: "WEBGL_draw_buffers"): WebGLDrawBuffers;
+	getExtension(name: "WEBGL_lose_context"): WebGLLoseContext;
+
+	// Prefixed versions appearing in the wild as per September 2015
+
+	getExtension(name: "WEBKIT_EXT_texture_filter_anisotropic"): EXTTextureFilterAnisotropic;
+	getExtension(name: "WEBKIT_WEBGL_compressed_texture_atc"): WebGLCompressedTextureATC;
+	getExtension(name: "WEBKIT_WEBGL_compressed_texture_pvrtc"): WebGLCompressedTexturePVRTC;
+	getExtension(name: "WEBKIT_WEBGL_compressed_texture_s3tc"): WebGLCompressedTextureS3TC;
+	getExtension(name: "WEBKIT_WEBGL_depth_texture"): WebGLDepthTexture;
+	getExtension(name: "WEBKIT_WEBGL_lose_context"): WebGLLoseContext;
+
+	getExtension(name: "MOZ_WEBGL_compressed_texture_s3tc"): WebGLCompressedTextureS3TC;
+	getExtension(name: "MOZ_WEBGL_depth_texture"): WebGLDepthTexture;
+	getExtension(name: "MOZ_WEBGL_lose_context"): WebGLLoseContext;
+}
+
+interface ANGLEInstancedArrays {
+	VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+
+	drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
+	drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
+	vertexAttribDivisorANGLE(index: number, divisor: number): void;
+}
+
+interface EXTBlendMinMax {
+	MIN_EXT: number;
+	MAX_EXT: number;
+}
+
+interface EXTColorBufferHalfFloat {
+	RGBA16F_EXT: number;
+	RGB16F_EXT: number;
+	FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT: number;
+	UNSIGNED_NORMALIZED_EXT: number;
+}
+
+interface EXTFragDepth {
+}
+
+interface EXTsRGB {
+	SRGB_EXT: number;
+	SRGB_ALPHA_EXT: number;
+	SRGB8_ALPHA8_EXT: number;
+	FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT: number;
+}
+
+interface EXTShaderTextureLOD {
+}
+
+interface EXTTextureFilterAnisotropic {
+	TEXTURE_MAX_ANISOTROPY_EXT: number;
+	MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+}
+
+interface OESElementIndexUint {
+}
+
+interface OESStandardDerivatives {
+	FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+}
+
+interface OESTextureFloat {
+}
+
+interface OESTextureFloatLinear {
+}
+
+interface OESTextureHalfFloat {
+	HALF_FLOAT_OES: number;
+}
+
+interface OESTextureHalfFloatLinear {
+}
+
+interface WebGLVertexArrayObjectOES extends WebGLObject {
+}
+
+interface OESVertexArrayObject {
+	VERTEX_ARRAY_BINDING_OES: number;
+
+	createVertexArrayOES(): WebGLVertexArrayObjectOES;
+	deleteVertexArrayOES(arrayObject: WebGLVertexArrayObjectOES): void;
+	isVertexArrayOES(arrayObject: WebGLVertexArrayObjectOES): boolean;
+	bindVertexArrayOES(arrayObject: WebGLVertexArrayObjectOES): void;
+}
+
+interface WebGLColorBufferFloat {
+	RGBA32F_EXT: number;
+	FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT: number;
+	UNSIGNED_NORMALIZED_EXT: number;
+}
+
+interface WebGLCompressedTextureATC {
+	COMPRESSED_RGB_ATC_WEBGL: number;
+	COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL: number;
+	COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL: number;
+}
+
+interface WebGLCompressedTextureETC1 {
+	COMPRESSED_RGB_ETC1_WEBGL: number;
+}
+
+interface WebGLCompressedTexturePVRTC {
+	COMPRESSED_RGB_PVRTC_4BPPV1_IMG: number;
+	COMPRESSED_RGB_PVRTC_2BPPV1_IMG: number;
+	COMPRESSED_RGBA_PVRTC_4BPPV1_IMG: number;
+	COMPRESSED_RGBA_PVRTC_2BPPV1_IMG: number;
+}
+
+interface WebGLCompressedTextureS3TC {
+	COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+	COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+	COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+	COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+}
+
+interface WebGLDebugRendererInfo {
+	UNMASKED_VENDOR_WEBGL: number;
+	UNMASKED_RENDERER_WEBGL: number;
+}
+
+interface WebGLDebugShaders {
+	getTranslatedShaderSource(shader: WebGLShader): string;
+}
+
+interface WebGLDepthTexture {
+	UNSIGNED_INT_24_8_WEBGL: number;
+}
+
+interface WebGLDrawBuffers {
+	COLOR_ATTACHMENT0_WEBGL: number;
+	COLOR_ATTACHMENT1_WEBGL: number;
+	COLOR_ATTACHMENT2_WEBGL: number;
+	COLOR_ATTACHMENT3_WEBGL: number;
+	COLOR_ATTACHMENT4_WEBGL: number;
+	COLOR_ATTACHMENT5_WEBGL: number;
+	COLOR_ATTACHMENT6_WEBGL: number;
+	COLOR_ATTACHMENT7_WEBGL: number;
+	COLOR_ATTACHMENT8_WEBGL: number;
+	COLOR_ATTACHMENT9_WEBGL: number;
+	COLOR_ATTACHMENT10_WEBGL: number;
+	COLOR_ATTACHMENT11_WEBGL: number;
+	COLOR_ATTACHMENT12_WEBGL: number;
+	COLOR_ATTACHMENT13_WEBGL: number;
+	COLOR_ATTACHMENT14_WEBGL: number;
+	COLOR_ATTACHMENT15_WEBGL: number;
+
+	DRAW_BUFFER0_WEBGL: number;
+	DRAW_BUFFER1_WEBGL: number;
+	DRAW_BUFFER2_WEBGL: number;
+	DRAW_BUFFER3_WEBGL: number;
+	DRAW_BUFFER4_WEBGL: number;
+	DRAW_BUFFER5_WEBGL: number;
+	DRAW_BUFFER6_WEBGL: number;
+	DRAW_BUFFER7_WEBGL: number;
+	DRAW_BUFFER8_WEBGL: number;
+	DRAW_BUFFER9_WEBGL: number;
+	DRAW_BUFFER10_WEBGL: number;
+	DRAW_BUFFER11_WEBGL: number;
+	DRAW_BUFFER12_WEBGL: number;
+	DRAW_BUFFER13_WEBGL: number;
+	DRAW_BUFFER14_WEBGL: number;
+	DRAW_BUFFER15_WEBGL: number;
+
+	MAX_COLOR_ATTACHMENTS_WEBGL: number;
+	MAX_DRAW_BUFFERS_WEBGL: number;
+
+	drawBuffersWEBGL(buffers: number[]): void;
+}
+
+interface WebGLLoseContext {
+	loseContext(): void;
+	restoreContext(): void;
+}
diff --git a/webpack/webpack-env-tests.ts b/webpack/webpack-env-tests.ts
new file mode 100644
index 000000000..b4a9693ec
--- /dev/null
+++ b/webpack/webpack-env-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="./webpack-env.d.ts" />
+
+interface SomeModule {
+    someMethod(): void;
+}
+
+let someModule = require<SomeModule>('./someModule');
+someModule.someMethod();
+
+let context = require.context('./somePath', true);
+let contextModule = context<SomeModule>('./someModule');
+
+require(['./someModule', './otherModule'], (someModule: SomeModule, otherModule: any) => {
+
+});
diff --git a/webpack/webpack-env.d.ts b/webpack/webpack-env.d.ts
new file mode 100644
index 000000000..01ea6e404
--- /dev/null
+++ b/webpack/webpack-env.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for webpack 1.12.2 (module API)
+// Project: https://github.com/webpack/webpack
+// Definitions by: use-strict <https://github.com/use-strict>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/**
+ * Webpack module API - variables and global functions available inside modules
+ */
+
+declare namespace __WebpackModuleApi {
+    interface RequireContext {
+        keys(): string[];
+        <T>(id: string): T;
+        resolve(id: string): string;
+    }
+
+    interface RequireFunction {
+        /**
+         * Returns the exports from a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
+         */
+        <T>(path: string): T;
+        /**
+         * Behaves similar to require.ensure, but the callback is called with the exports of each dependency in the paths array. There is no option to provide a chunk name.
+         */
+        (paths: string[], callback: (...modules: any[]) => void): void;
+        /**
+         * Download additional dependencies on demand. The paths array lists modules that should be available. When they are, callback is called. If the callback is a function expression, dependencies in that source part are extracted and also loaded on demand. A single request is fired to the server, except if all modules are already available.
+         *
+         * This creates a chunk. The chunk can be named. If a chunk with this name already exists, the dependencies are merged into that chunk and that chunk is used.
+         */
+        ensure: (paths: string[], callback: (require: <T>(path: string) => T) => void) => void;
+        context: (path: string, deep?: boolean, filter?: RegExp) => RequireContext;
+        /**
+         * Returns the module id of a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
+         *
+         * The module id is a number in webpack (in contrast to node.js where it is a string, the filename).
+         */
+        resolve(path: string): number;
+        /**
+         * Like require.resolve, but doesn’t include the module into the bundle. It’s a weak dependency.
+         */
+        resolveWeak(path: string): number;
+        /**
+         * Ensures that the dependency is available, but don’t execute it. This can be use for optimizing the position of a module in the chunks.
+         */
+        include(path: string): void;
+        /**
+         * Multiple requires to the same module result in only one module execution and only one export. Therefore a cache in the runtime exists. Removing values from this cache cause new module execution and a new export. This is only needed in rare cases (for compatibility!).
+         */
+        cache: {
+            [id: string]: any;
+        }
+    }
+}
+
+declare var require: __WebpackModuleApi.RequireFunction;
+
+/**
+ * The resource query of the current module.
+ *
+ * e.g. __resourceQuery === "?test" // Inside "file.js?test"
+ */
+declare var __resourceQuery: string;
+
+/**
+ * Equals the config options output.publicPath.
+ */
+declare var __webpack_public_path__: string;
+
+/**
+ * The raw require function. This expression isn’t parsed by the Parser for dependencies.
+ */
+declare var __webpack_require__: any;
+
+/**
+ * The internal chunk loading function
+ *
+ * @param chunkId The id for the chunk to load.
+ * @param callback A callback function called once the chunk is loaded.
+ */
+declare var __webpack_chunk_load__: (chunkId: any, callback: (require: (id: string) => any) => void) => void;
+
+/**
+ * Access to the internal object of all modules.
+ */
+declare var __webpack_modules__: any[];
+
+/**
+ * Access to the hash of the compilation.
+ *
+ * Only available with the HotModuleReplacementPlugin or the ExtendedAPIPlugin
+ */
+declare var __webpack_hash__: any;
+
+/**
+ * Generates a require function that is not parsed by webpack. Can be used to do cool stuff with a global require function if available.
+ */
+declare var __non_webpack_require__: any;
+
+/**
+ * Equals the config option debug
+ */
+declare var DEBUG: boolean;
\ No newline at end of file
diff --git a/webpack/webpack-tests.ts b/webpack/webpack-tests.ts
new file mode 100644
index 000000000..27a4a5385
--- /dev/null
+++ b/webpack/webpack-tests.ts
@@ -0,0 +1,388 @@
+/// <reference path="webpack.d.ts" />
+
+import * as webpack from 'webpack';
+
+var configuration: webpack.Configuration;
+var loader: webpack.Loader;
+var plugin: webpack.Plugin;
+declare var __dirname: string;
+
+//
+// https://webpack.github.io/docs/using-loaders.html
+//
+
+configuration = {
+    module: {
+        loaders: [
+            { test: /\.jade$/, loader: "jade" },
+            // => "jade" loader is used for ".jade" files
+
+            { test: /\.css$/, loader: "style!css" },
+            // => "style" and "css" loader is used for ".css" files
+            // Alternative syntax:
+            { test: /\.css$/, loaders: ["style", "css"] },
+        ]
+    }
+};
+
+loader = { test: /\.png$/, loader: "url-loader?mimetype=image/png" };
+
+loader = {
+    test: /\.png$/,
+    loader: "url-loader",
+    query: { mimetype: "image/png" }
+};
+
+//
+// https://webpack.github.io/docs/using-plugins.html
+//
+
+configuration = {
+    plugins: [
+        new webpack.ResolverPlugin([
+            new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin("bower.json", ["main"])
+        ], ["normal", "loader"])
+    ]
+};
+
+//
+// http://webpack.github.io/docs/tutorials/getting-started/
+//
+
+configuration = {
+    entry: "./entry.js",
+    output: {
+        path: __dirname,
+        filename: "bundle.js"
+    },
+    module: {
+        loaders: [
+            { test: /\.css$/, loader: "style!css" }
+        ]
+    }
+};
+
+//
+// https://webpack.github.io/docs/code-splitting.html
+//
+
+configuration = {
+    entry: {
+        app: "./app.js",
+        vendor: ["jquery", "underscore"],
+    },
+    output: {
+        filename: "bundle.js"
+    },
+    plugins: [
+        new webpack.optimize.CommonsChunkPlugin(/* chunkName= */"vendor", /* filename= */"vendor.bundle.js")
+    ]
+};
+
+configuration =  {
+    entry: { a: "./a", b: "./b" },
+    output: { filename: "[name].js" },
+    plugins: [ new webpack.optimize.CommonsChunkPlugin("init.js") ]
+};
+
+//
+// https://webpack.github.io/docs/stylesheets.html
+//
+
+configuration = {
+    // ...
+    module: {
+        loaders: [
+            { test: /\.css$/, loader: "style-loader!css-loader" }
+        ]
+    }
+};
+
+class ExtractTextPlugin implements webpack.Plugin {
+    static extract(...loaders: string[]): string { return null; }
+    constructor(...args: any[]) {}
+}
+
+configuration = {
+    // The standard entry point and output config
+    entry: {
+        posts: "./posts",
+        post: "./post",
+        about: "./about"
+    },
+    output: {
+        filename: "[name].js",
+        chunkFilename: "[id].js"
+    },
+    module: {
+        loaders: [
+            // Extract css files
+            {
+                test: /\.css$/,
+                loader: ExtractTextPlugin.extract("style-loader", "css-loader")
+            },
+            // Optionally extract less files
+            // or any other compile-to-css language
+            {
+                test: /\.less$/,
+                loader: ExtractTextPlugin.extract("style-loader", "css-loader!less-loader")
+            }
+            // You could also use other loaders the same way. I. e. the autoprefixer-loader
+        ]
+    },
+    // Use the plugin to specify the resulting filename (and add needed behavior to the compiler)
+    plugins: [
+        new ExtractTextPlugin("[name].css")
+    ]
+};
+
+configuration = {
+    // ...
+    plugins: [
+        new ExtractTextPlugin("style.css", {
+            allChunks: true
+        })
+    ]
+};
+
+configuration = {
+    // ...
+    plugins: [
+        new webpack.optimize.CommonsChunkPlugin("commons", "commons.js"),
+        new ExtractTextPlugin("[name].css")
+    ]
+};
+
+//
+// https://webpack.github.io/docs/optimization.html
+//
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    },
+    output: {
+        filename: "[name].entry.chunk.js"
+    }
+};
+
+let CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    },
+    output: {
+        filename: "[name].entry.chunk.js"
+    },
+    plugins: [
+        new CommonsChunkPlugin("commons.chunk.js")
+    ]
+};
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3",
+        ap1: "./admin/page1",
+        ap2: "./admin/page2"
+    },
+    output: {
+        filename: "[name].js"
+    },
+    plugins: [
+        new CommonsChunkPlugin("admin-commons.js", ["ap1", "ap2"]),
+        new CommonsChunkPlugin("commons.js", ["p1", "p2", "admin-commons.js"])
+    ]
+};
+// <script>s required:
+// page1.html: commons.js, p1.js
+// page2.html: commons.js, p2.js
+// page3.html: p3.js
+// admin-page1.html: commons.js, admin-commons.js, ap1.js
+// admin-page2.html: commons.js, admin-commons.js, ap2.js
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        commons: "./entry-for-the-commons-chunk"
+    },
+    plugins: [
+        new CommonsChunkPlugin("commons", "commons.js")
+    ]
+};
+
+//
+// https://webpack.github.io/docs/long-term-caching.html
+//
+
+configuration = {
+    output: {
+        path: path.join(__dirname, "assets", "[hash]"),
+        publicPath: "assets/[hash]/",
+        filename: "output.[hash].bundle.js",
+        chunkFilename: "[id].[hash].bundle.js"
+    }
+};
+
+configuration = { output: { chunkFilename: "[chunkhash].bundle.js" } };
+
+declare var require: any;
+declare var path: any;
+configuration = {
+    plugins: [
+        function() {
+            this.plugin("done", function(stats: any) {
+                require("fs").writeFileSync(
+                    path.join(__dirname, "...", "stats.json"),
+                    JSON.stringify(stats.toJson()));
+            });
+        }
+    ]
+};
+
+//
+// https://webpack.github.io/docs/list-of-plugins.html
+//
+
+var plugin: webpack.Plugin;
+var resourceRegExp: any;
+var newResource: any;
+var contextRegExp: any;
+var newContentResource: any;
+var newContentRecursive: any;
+var newContentRegExp: any;
+var requestRegExp: any;
+var options: any;
+var definitions: any;
+var paths: any;
+var preferEntry = true;
+var context: any;
+var request: any;
+var types: any;
+var banner: any;
+var plugins: webpack.Plugin[];
+
+plugin = new webpack.NormalModuleReplacementPlugin(resourceRegExp, newResource);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource,
+    newContentRecursive,
+    newContentRegExp);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource,
+    newContentRecursive);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource);
+plugin = new webpack.ContextReplacementPlugin(resourceRegExp);
+plugin = new webpack.IgnorePlugin(requestRegExp);
+plugin = new webpack.IgnorePlugin(requestRegExp, contextRegExp);
+
+plugin = new webpack.PrefetchPlugin(context, request);
+plugin = new webpack.PrefetchPlugin(request);
+plugin = new webpack.ResolverPlugin(plugins, types);
+plugin = new webpack.ResolverPlugin(plugins);
+plugin = new webpack.ResolverPlugin([
+    new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin("bower.json", ["main"])
+], ["normal", "loader"]);
+plugin = new webpack.ResolverPlugin([
+    new webpack.ResolverPlugin.FileAppendPlugin(['/dist/compiled-moduled.js'])
+]);
+plugin = new webpack.BannerPlugin(banner, options);
+plugin = new webpack.optimize.DedupePlugin();
+plugin = new webpack.optimize.LimitChunkCountPlugin(options);
+plugin = new webpack.optimize.MinChunkSizePlugin(options);
+plugin = new webpack.optimize.OccurenceOrderPlugin(preferEntry);
+plugin = new webpack.optimize.UglifyJsPlugin(options);
+plugin = new webpack.optimize.UglifyJsPlugin();
+plugin = new webpack.optimize.UglifyJsPlugin({
+    compress: {
+        warnings: false
+    }
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    mangle: {
+        except: ['$super', '$', 'exports', 'require']
+    }
+});
+plugin = new webpack.optimize.CommonsChunkPlugin(options);
+plugin = new CommonsChunkPlugin({
+    name: "commons",
+    // (the commons chunk name)
+
+    filename: "commons.js",
+    // (the filename of the commons chunk)
+
+    // minChunks: 3,
+    // (Modules must be shared between 3 entries)
+
+    // chunks: ["pageA", "pageB"],
+    // (Only use these entries)
+});
+plugin = new CommonsChunkPlugin({
+    // names: ["app", "subPageA"]
+    // (choose the chunks, or omit for all chunks)
+
+    children: true,
+    // (select all children of chosen chunks)
+
+    // minChunks: 3,
+    // (3 children must share the module before it's moved)
+});
+plugin = new CommonsChunkPlugin({
+    // names: ["app", "subPageA"]
+    // (choose the chunks, or omit for all chunks)
+
+    children: true,
+    // (use all children of the chunk)
+
+    async: true,
+    // (create an async commons chunk)
+
+    // minChunks: 3,
+    // (3 children must share the module before it's separated)
+});
+plugin = new webpack.optimize.AggressiveMergingPlugin(options);
+plugin = new webpack.dependencies.LabeledModulesPlugin();
+plugin = new webpack.DefinePlugin(definitions);
+plugin = new webpack.DefinePlugin({
+    VERSION: JSON.stringify("5fa3b9"),
+    BROWSER_SUPPORTS_HTML5: true,
+    TWO: "1+1",
+    "typeof window": JSON.stringify("object")
+});
+plugin = new webpack.ProvidePlugin(definitions);
+plugin = new webpack.ProvidePlugin({
+    $: "jquery"
+});
+plugin = new webpack.SourceMapDevToolPlugin({
+    //// asset matching
+    //test: string | RegExp | Array,
+    //include: string | RegExp | Array,
+    //exclude: string | RegExp | Array,
+    //
+    //// file and reference
+    //filename: string,
+    //append: bool | string,
+    //
+    //// sources naming
+    //moduleFilenameTemplate: string,
+    //fallbackModuleFilenameTemplate: string,
+    //
+    //// quality/performance
+    //module: bool,
+    //columns: bool,
+    //lineToLine: bool | object
+});
+plugin = new webpack.HotModuleReplacementPlugin();
+plugin = new webpack.ExtendedAPIPlugin();
+plugin = new webpack.NoErrorsPlugin();
+plugin = new webpack.WatchIgnorePlugin(paths);
+
diff --git a/webpack/webpack.d.ts b/webpack/webpack.d.ts
new file mode 100644
index 000000000..f2049bbc9
--- /dev/null
+++ b/webpack/webpack.d.ts
@@ -0,0 +1,261 @@
+// Type definitions for webpack 1.12.2
+// Project: https://github.com/webpack/webpack
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "webpack" {
+    namespace webpack {
+        interface Configuration {
+            entry?: string|Entry;
+            output?: Output;
+            module?: Module;
+            plugins?: (Plugin|Function)[];
+        }
+
+        interface Entry {
+            [name: string]: string|string[];
+        }
+
+        interface Output {
+            path?: string;
+            filename?: string;
+            chunkFilename?: string;
+            publicPath?: string;
+        }
+
+        interface Module {
+            loaders?: Loader[];
+        }
+
+        interface Loader {
+            test: RegExp;
+            loader?: string;
+            loaders?: string[];
+            query?: {
+                [name: string]: any;
+            }
+        }
+
+        interface Plugin { }
+
+        interface Webpack {
+            /**
+             * optimize namespace
+             */
+            optimize: Optimize;
+            /**
+             * dependencies namespace
+             */
+            dependencies: Dependencies;
+            /**
+             * Replace resources that matches resourceRegExp with newResource.
+             * If newResource is relative, it is resolve relative to the previous resource.
+             * If newResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+             */
+            NormalModuleReplacementPlugin: NormalModuleReplacementPluginStatic;
+            /**
+             * Replaces the default resource, recursive flag or regExp generated by parsing with newContentResource,
+             * newContentRecursive resp. newContextRegExp if the resource (directory) matches resourceRegExp.
+             * If newContentResource is relative, it is resolve relative to the previous resource.
+             * If newContentResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+             */
+            ContextReplacementPlugin: ContextReplacementPluginStatic;
+            /**
+             * Don’t generate modules for requests matching the provided RegExp.
+             */
+            IgnorePlugin: IgnorePluginStatic;
+            /**
+             * A request for a normal module, which is resolved and built even before a require to it occurs.
+             * This can boost performance. Try to profile the build first to determine clever prefetching points.
+             */
+            PrefetchPlugin: PrefetchPluginStatic;
+            /**
+             * Apply a plugin (or array of plugins) to one or more resolvers (as specified in types).
+             */
+            ResolverPlugin: ResolverPluginStatic;
+            /**
+             * Adds a banner to the top of each generated chunk.
+             */
+            BannerPlugin: BannerPluginStatic;
+            /**
+             * Define free variables. Useful for having development builds with debug logging or adding global constants.
+             */
+            DefinePlugin: DefinePluginStatic;
+            /**
+             * Automatically loaded modules.
+             * Module (value) is loaded when the identifier (key) is used as free variable in a module.
+             * The identifier is filled with the exports of the loaded module.
+             */
+            ProvidePlugin: ProvidePluginStatic;
+            /**
+             * Adds SourceMaps for assets.
+             */
+            SourceMapDevToolPlugin: SourceMapDevToolPluginStatic;
+            /**
+             * Enables Hot Module Replacement. (This requires records data if not in dev-server mode, recordsPath)
+             * Generates Hot Update Chunks of each chunk in the records.
+             * It also enables the API and makes __webpack_hash__ available in the bundle.
+             */
+            HotModuleReplacementPlugin: HotModuleReplacementPluginStatic;
+            /**
+             * Adds useful free vars to the bundle.
+             */
+            ExtendedAPIPlugin: ExtendedAPIPluginStatic;
+            /**
+             * When there are errors while compiling this plugin skips the emitting phase (and recording phase),
+             * so there are no assets emitted that include errors. The emitted flag in the stats is false for all assets.
+             */
+            NoErrorsPlugin: NoErrorsPluginStatic;
+            /**
+             * Does not watch specified files matching provided paths or RegExps.
+             */
+            WatchIgnorePlugin: WatchIgnorePluginStatic;
+        }
+
+        interface Optimize {
+            /**
+             * Search for equal or similar files and deduplicate them in the output.
+             * This comes with some overhead for the entry chunk, but can reduce file size effectively.
+             * This is experimental and may crash, because of some missing implementations. (Report an issue)
+             */
+            DedupePlugin: optimize.DedupePluginStatic;
+            /**
+             * Limit the chunk count to a defined value. Chunks are merged until it fits.
+             */
+            LimitChunkCountPlugin: optimize.LimitChunkCountPluginStatic;
+            /**
+             * Merge small chunks that are lower than this min size (in chars). Size is approximated.
+             */
+            MinChunkSizePlugin: optimize.MinChunkSizePluginStatic;
+            /**
+             * Assign the module and chunk ids by occurrence count. Ids that are used often get lower (shorter) ids.
+             * This make ids predictable, reduces to total file size and is recommended.
+             */
+            OccurenceOrderPlugin: optimize.OccurenceOrderPluginStatic;
+            /**
+             * Minimize all JavaScript output of chunks. Loaders are switched into minimizing mode.
+             * You can pass an object containing UglifyJs options.
+             */
+            UglifyJsPlugin: optimize.UglifyJsPluginStatic;
+            CommonsChunkPlugin: optimize.CommonsChunkPluginStatic;
+            /**
+             * A plugin for a more aggressive chunk merging strategy.
+             * Even similar chunks are merged if the total size is reduced enough.
+             * As an option modules that are not common in these chunks can be moved up the chunk tree to the parents.
+             */
+            AggressiveMergingPlugin: optimize.AggressiveMergingPluginStatic;
+        }
+
+        interface Dependencies {
+            /**
+             * Support Labeled Modules.
+             */
+            LabeledModulesPlugin: dependencies.LabeledModulesPluginStatic;
+        }
+
+        interface DirectoryDescriptionFilePluginStatic {
+            new(file: string, files: string[]): Plugin;
+        }
+
+        interface NormalModuleReplacementPluginStatic {
+            new(resourceRegExp: any, newResource: any): Plugin;
+        }
+
+        interface ContextReplacementPluginStatic {
+            new(resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any): Plugin
+        }
+
+        interface IgnorePluginStatic {
+            new(requestRegExp: any, contextRegExp?: any): Plugin;
+        }
+
+        interface PrefetchPluginStatic {
+            new(context: any, request: any): Plugin;
+            new(request: any): Plugin;
+        }
+
+        interface ResolverPluginStatic {
+            new(plugins: Plugin[], files?: string[]): Plugin;
+            DirectoryDescriptionFilePlugin: DirectoryDescriptionFilePluginStatic;
+            /**
+             * This plugin will append a path to the module directory to find a match,
+             * which can be useful if you have a module which has an incorrect “main” entry in its package.json/bower.json etc (e.g. "main": "Gruntfile.js").
+             * You can use this plugin as a special case to load the correct file for this module. Example:
+             */
+            FileAppendPlugin: FileAppendPluginStatic;
+        }
+
+        interface FileAppendPluginStatic {
+            new(files: string[]): Plugin;
+        }
+
+        interface BannerPluginStatic {
+            new(banner: any, options: any): Plugin;
+        }
+
+        interface DefinePluginStatic {
+            new(definitions: any): Plugin;
+        }
+
+        interface ProvidePluginStatic {
+            new(definitions: any): Plugin;
+        }
+
+        interface SourceMapDevToolPluginStatic {
+            new(options: any): Plugin;
+        }
+
+        interface HotModuleReplacementPluginStatic {
+            new(): Plugin;
+        }
+
+        interface ExtendedAPIPluginStatic {
+            new(): Plugin;
+        }
+
+        interface NoErrorsPluginStatic {
+            new(): Plugin;
+        }
+
+        interface WatchIgnorePluginStatic {
+            new(paths: RegExp[]): Plugin;
+        }
+
+        namespace optimize {
+            interface DedupePluginStatic {
+                new(): Plugin;
+            }
+            interface LimitChunkCountPluginStatic {
+                new(options: any): Plugin
+            }
+            interface MinChunkSizePluginStatic {
+                new(options: any): Plugin;
+            }
+            interface OccurenceOrderPluginStatic {
+                new(preferEntry: boolean): Plugin;
+            }
+            interface UglifyJsPluginStatic {
+                new(options?: any): Plugin;
+            }
+            interface CommonsChunkPluginStatic {
+                new(chunkName: string, filenames?: string|string[]): Plugin;
+                new(options?: any): Plugin;
+            }
+            interface AggressiveMergingPluginStatic {
+                new(options: any): Plugin;
+            }
+        }
+
+        namespace dependencies {
+            interface LabeledModulesPluginStatic {
+                new(): Plugin;
+            }
+        }
+    }
+
+    var webpack: webpack.Webpack;
+
+    //export default webpack;
+    export = webpack;
+}
+
diff --git a/webrtc/MediaStream.d.ts b/webrtc/MediaStream.d.ts
index f52551a14..fc88469f0 100644
--- a/webrtc/MediaStream.d.ts
+++ b/webrtc/MediaStream.d.ts
@@ -188,6 +188,14 @@ interface Navigator {
 
 interface MediaDevices {
     getSupportedConstraints(): MediaTrackSupportedConstraints;
-    
+
     getUserMedia(constraints: MediaStreamConstraints): Promise<MediaStream>;
+    enumerateDevices(): Promise<MediaDeviceInfo[]>;
+}
+
+interface MediaDeviceInfo {
+    label: string;
+    id: string;
+    kind: string;
+    facing: string;
 }
diff --git a/webrtc/RTCPeerConnection.d.ts b/webrtc/RTCPeerConnection.d.ts
index 9e96a86c8..0e186fd27 100644
--- a/webrtc/RTCPeerConnection.d.ts
+++ b/webrtc/RTCPeerConnection.d.ts
@@ -360,5 +360,4 @@ interface Window{
   RTCIceCandidate: RTCIceCandidate;
   webkitRTCIceCandidate: webkitRTCIceCandidate;
   mozRTCIceCandidate: mozRTCIceCandidate;
-  URL: URL;
 }
diff --git a/whatwg-fetch/whatwg-fetch-tests.ts b/whatwg-fetch/whatwg-fetch-tests.ts
index 5248f5d1d..b6bae3066 100644
--- a/whatwg-fetch/whatwg-fetch-tests.ts
+++ b/whatwg-fetch/whatwg-fetch-tests.ts
@@ -6,7 +6,10 @@ function test_fetchUrlWithOptions() {
 	headers.append("Content-Type", "application/json");
 	var requestOptions: RequestInit = {
 		method: "POST",
-		headers: headers
+		headers: headers,
+		mode: 'same-origin',
+		credentials: 'omit',
+		cache: 'default'
 	};
 	handlePromise(window.fetch("http://www.andlabs.net/html5/uCOR.php", requestOptions));
 }
@@ -25,8 +28,22 @@ function test_fetchUrl() {
 	handlePromise(window.fetch("http://www.andlabs.net/html5/uCOR.php"));
 }
 
+function test_fetchUrlWithRequestObject() {
+	var requestOptions: RequestInit = {
+		method: "POST",
+		headers: {
+			'Content-Type': 'application/json'
+		}
+	};
+	var request: Request = new Request("http://www.andlabs.net/html5/uCOR.php", requestOptions);
+	handlePromise(window.fetch(request));
+}
+
 function handlePromise(promise: Promise<Response>) {
 	promise.then((response) => {
+		if (response.type === 'basic') {
+			// for test only
+		}
 		return response.text();
 	}).then((text) => {
 		console.log(text);
diff --git a/whatwg-fetch/whatwg-fetch.d.ts b/whatwg-fetch/whatwg-fetch.d.ts
index 9efd039b4..c6d95e87a 100644
--- a/whatwg-fetch/whatwg-fetch.d.ts
+++ b/whatwg-fetch/whatwg-fetch.d.ts
@@ -5,25 +5,25 @@
 
 /// <reference path="../es6-promise/es6-promise.d.ts" />
 
-declare class Request {
+declare class Request extends Body {
 	constructor(input: string|Request, init?:RequestInit);
 	method: string;
 	url: string;
 	headers: Headers;
-	context: RequestContext;
+	context: string|RequestContext;
 	referrer: string;
-	mode: RequestMode;
-	credentials: RequestCredentials;
-	cache: RequestCache;
+	mode: string|RequestMode;
+	credentials: string|RequestCredentials;
+	cache: string|RequestCache;
 }
 
 interface RequestInit {
 	method?: string;
 	headers?: HeaderInit|{ [index: string]: string };
 	body?: BodyInit;
-	mode?: RequestMode;
-	credentials?: RequestCredentials;
-	cache?: RequestCache;
+	mode?: string|RequestMode;
+	credentials?: string|RequestCredentials;
+	cache?: string|RequestCache;
 }
 
 declare enum RequestContext {
@@ -52,13 +52,14 @@ declare class Body {
 	blob(): Promise<Blob>;
 	formData(): Promise<FormData>;
 	json(): Promise<any>;
+	json<T>(): Promise<T>;
 	text(): Promise<string>;
 }
 declare class Response extends Body {
 	constructor(body?: BodyInit, init?: ResponseInit);
 	error(): Response;
 	redirect(url: string, status: number): Response;
-	type: ResponseType;
+	type: string|ResponseType;
 	url: string;
 	status: number;
 	ok: boolean;
@@ -69,10 +70,10 @@ declare class Response extends Body {
 
 declare enum ResponseType { "basic", "cors", "default", "error", "opaque" }
 
-declare class ResponseInit {
+interface ResponseInit {
 	status: number;
-	statusText: string;
-	headers: HeaderInit;
+	statusText?: string;
+	headers?: HeaderInit;
 }
 
 declare type HeaderInit = Headers|Array<string>;
@@ -80,5 +81,5 @@ declare type BodyInit = Blob|FormData|string;
 declare type RequestInfo = Request|string;
 
 interface Window {
-	fetch(url: string, init?: RequestInit): Promise<Response>;
+	fetch(url: string|Request, init?: RequestInit): Promise<Response>;
 }
diff --git a/when/when-tests.ts b/when/when-tests.ts
index 6ed82dd32..7cd7e8e45 100644
--- a/when/when-tests.ts
+++ b/when/when-tests.ts
@@ -101,6 +101,21 @@ when.settle<number>([when(1), when(2), when.reject(new Error("Foo"))]).then(desc
 	return descriptors.filter(d => d.state === 'rejected').reduce((r, d) => r + d.value, 0);
 });
 
+/* when.iterate(f, predicate, handler, seed) */
+
+when.iterate(function (x) {
+	return x + 1;
+}, function (x) {
+	// Stop when x >= 100000000000
+	return x >= 100000000000;
+}, function (x) {
+	console.log(x);
+}, 0).done(function (x) {
+	console.log(x === 100000000000);
+}, function (err) {
+	console.log(err);
+});
+
 /* when.promise(resolver) */
 
 promise = when.promise<number>(resolve => resolve(5));
diff --git a/when/when.d.ts b/when/when.d.ts
index 7ec721390..432a76b36 100644
--- a/when/when.d.ts
+++ b/when/when.d.ts
@@ -127,6 +127,20 @@ declare module When {
      */
     function settle<T>(promisesOrValues: any[]): Promise<Descriptor<T>[]>;
 
+    /**
+     * Generates a potentially infinite stream of promises by repeatedly calling f until predicate becomes true.
+     * @memberOf when
+     * @param f function that, given a seed, returns the next value or a promise for it.
+     * @param predicate function that receives the current iteration value, and should return truthy when the iterating should stop
+     * @param handler function that receives each value as it is produced by f. It may return a promise to delay the next iteration.
+     * @param seed initial value provided to the handler, and first f invocation. May be a promise.
+     */
+    function iterate<U>(f: (seed: U) => U | Promise<U>,
+                        predicate: (value: U) => boolean,
+                        handler: (value: U) => Promise<any> | void,
+                        seed: U | Promise<U>): Promise<U>;
+
+
     /**
      * Creates a {promise, resolver} pair, either or both of which
      * may be given out safely to consumers.
diff --git a/winrt/winrt.d.ts b/winrt/winrt.d.ts
index b8b40f7cd..63b438fb4 100644
--- a/winrt/winrt.d.ts
+++ b/winrt/winrt.d.ts
@@ -91,8 +91,8 @@ declare module Windows {
                 every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: T, index: number, array: T[]) => boolean): boolean;
                 some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: T, index: number, array: T[]) => void ): void;
-                forEach(callbackfn: (value: T, index: number, array: T[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: T, index: number, array: T[]) => void): void;
+                forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg: any): void;
                 map(callbackfn: (value: T, index: number, array: T[]) => any): any[];
                 map(callbackfn: (value: T, index: number, array: T[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: T, index: number, array: T[]) => boolean): T[];
@@ -138,8 +138,8 @@ declare module Windows {
                 every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: T, index: number, array: T[]) => boolean): boolean;
                 some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: T, index: number, array: T[]) => void ): void;
-                forEach(callbackfn: (value: T, index: number, array: T[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: T, index: number, array: T[]) => void): void;
+                forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg: any): void;
                 map(callbackfn: (value: T, index: number, array: T[]) => any): any[];
                 map(callbackfn: (value: T, index: number, array: T[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: T, index: number, array: T[]) => boolean): T[];
@@ -238,8 +238,8 @@ declare module Windows {
             every(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => boolean, thisArg: any): boolean;
             some(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => boolean): boolean;
             some(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => boolean, thisArg: any): boolean;
-            forEach(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => void ): void;
-            forEach(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => void , thisArg: any): void;
+            forEach(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => void): void;
+            forEach(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => void, thisArg: any): void;
             map(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => any): any[];
             map(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => any, thisArg: any): any[];
             filter(callbackfn: (value: Windows.Foundation.IWwwFormUrlDecoderEntry, index: number, array: Windows.Foundation.IWwwFormUrlDecoderEntry[]) => boolean): Windows.Foundation.IWwwFormUrlDecoderEntry[];
@@ -516,7 +516,7 @@ declare module Windows {
             then<U>(success?: () => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
             then<U>(success?: () => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
             then<U>(success?: () => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
-            done? <U>(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
+            done?<U>(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 
             cancel(): void;
 
@@ -1541,6 +1541,24 @@ declare module Windows {
                 device,
                 printTaskSettings,
                 cameraSettings,
+                restrictedLaunch,
+                appointmentsProvider,
+                contact,
+                lockScreenCall,
+                voiceCommand,
+                lockScreen,
+                pickerReturned,
+                walletAction,
+                pickFileContinuation,
+                pickSaveFileContinuation,
+                pickFolderContinuation,
+                webAuthenticationBrokerContinuation,
+                webAccountProvider,
+                componentUI,
+                protocolForResults,
+                toastNotification,
+                print3DWorkflow,
+                dialReceiver
             }
             export interface IActivatedEventArgs {
                 kind: Windows.ApplicationModel.Activation.ActivationKind;
@@ -1784,31 +1802,31 @@ declare module Windows {
         }
         export interface IPackage {
             dependencies: Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package>;
-			description: string;
-			displayName: string;
+            description: string;
+            displayName: string;
             id: Windows.ApplicationModel.PackageId;
             installedLocation: Windows.Storage.StorageFolder;
-			isBundle: boolean;
-			isDevelopmentMode: boolean;
+            isBundle: boolean;
+            isDevelopmentMode: boolean;
             isFramework: boolean;
-			isResourcePackage: boolean;
-			logo: Windows.Foundation.Uri;
-			publisherDisplayName: string;
+            isResourcePackage: boolean;
+            logo: Windows.Foundation.Uri;
+            publisherDisplayName: string;
         }
         export class Package implements Windows.ApplicationModel.IPackage {
-			static current: Windows.ApplicationModel.Package;
+            static current: Windows.ApplicationModel.Package;
 
             dependencies: Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package>;
-			description: string;
-			displayName: string;
+            description: string;
+            displayName: string;
             id: Windows.ApplicationModel.PackageId;
             installedLocation: Windows.Storage.StorageFolder;
-			isBundle: boolean;
-			isDevelopmentMode: boolean;
+            isBundle: boolean;
+            isDevelopmentMode: boolean;
             isFramework: boolean;
-			isResourcePackage: boolean;
-			logo: Windows.Foundation.Uri;
-			publisherDisplayName: string;
+            isResourcePackage: boolean;
+            logo: Windows.Foundation.Uri;
+            publisherDisplayName: string;
         }
         export interface IPackageStatics {
             current: Windows.ApplicationModel.Package;
@@ -2015,8 +2033,8 @@ declare module Windows {
                     every(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => boolean): boolean;
                     some(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => void ): void;
-                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => void): void;
+                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => void, thisArg: any): void;
                     map(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => any): any[];
                     map(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceQualifier, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceQualifier[]) => boolean): Windows.ApplicationModel.Resources.Core.ResourceQualifier[];
@@ -2054,8 +2072,8 @@ declare module Windows {
                     every(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => boolean): boolean;
                     some(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => void ): void;
-                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => void): void;
+                    forEach(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => void, thisArg: any): void;
                     map(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => any): any[];
                     map(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: Windows.ApplicationModel.Resources.Core.ResourceCandidate, index: number, array: Windows.ApplicationModel.Resources.Core.ResourceCandidate[]) => boolean): Windows.ApplicationModel.Resources.Core.ResourceCandidate[];
@@ -2093,8 +2111,8 @@ declare module Windows {
                     every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: string, index: number, array: string[]) => boolean): boolean;
                     some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: string, index: number, array: string[]) => void ): void;
-                    forEach(callbackfn: (value: string, index: number, array: string[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: string, index: number, array: string[]) => void): void;
+                    forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg: any): void;
                     map(callbackfn: (value: string, index: number, array: string[]) => any): any[];
                     map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: string, index: number, array: string[]) => boolean): string[];
@@ -2346,8 +2364,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => void): void;
+                forEach(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => any): any[];
                 map(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Data.Json.IJsonValue, index: number, array: Windows.Data.Json.IJsonValue[]) => boolean): Windows.Data.Json.IJsonValue[];
@@ -2492,8 +2510,8 @@ declare module Windows {
                     every(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean): boolean;
                     some(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void ): void;
-                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void): void;
+                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void, thisArg: any): void;
                     map(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any): any[];
                     map(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean): Windows.Data.Xml.Dom.IXmlNode[];
@@ -2538,8 +2556,8 @@ declare module Windows {
                     every(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean): boolean;
                     some(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void ): void;
-                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void): void;
+                    forEach(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => void, thisArg: any): void;
                     map(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any): any[];
                     map(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: Windows.Data.Xml.Dom.IXmlNode, index: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => boolean): Windows.Data.Xml.Dom.IXmlNode[];
@@ -2548,7 +2566,7 @@ declare module Windows {
                     reduce(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any, initialValue: any): any;
                     reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any): any;
                     reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: Windows.Data.Xml.Dom.IXmlNode[]) => any, initialValue: any): any;
-                 }
+                }
                 export class XmlDocument implements Windows.Data.Xml.Dom.IXmlDocument, Windows.Data.Xml.Dom.IXmlNode, Windows.Data.Xml.Dom.IXmlNodeSelector, Windows.Data.Xml.Dom.IXmlNodeSerializer, Windows.Data.Xml.Dom.IXmlDocumentIO {
                     doctype: Windows.Data.Xml.Dom.XmlDocumentType;
                     documentElement: Windows.Data.Xml.Dom.XmlElement;
@@ -3230,11 +3248,11 @@ declare module Windows {
                 getResults(): void;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<any>;
                     getResults(): any;
@@ -3248,11 +3266,11 @@ declare module Windows {
                 getResults(): void;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: any) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<any>;
                     getResults(): any;
@@ -3266,11 +3284,11 @@ declare module Windows {
                 getResults(): Windows.Devices.Sms.ISmsMessage;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: Windows.Devices.Sms.ISmsMessage) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Sms.ISmsMessage>;
                     getResults(): Windows.Devices.Sms.ISmsMessage;
@@ -3285,11 +3303,11 @@ declare module Windows {
                 getResults(): Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     progress: Windows.Foundation.AsyncOperationProgressHandler<Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>, number>;
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Devices.Sms.ISmsMessage>>;
@@ -3344,7 +3362,7 @@ declare module Windows {
                 then<U>(success?: () => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
                 then<U>(success?: () => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
                 then<U>(success?: () => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
-                done<U>(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void ;
+                done<U>(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<any>;
                     getResults(): any;
@@ -3385,11 +3403,11 @@ declare module Windows {
                 getResults(): Windows.Devices.Sms.SmsDevice;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: Windows.Devices.Sms.SmsDevice) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Sms.SmsDevice>;
                     getResults(): Windows.Devices.Sms.SmsDevice;
@@ -3509,8 +3527,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => void): void;
+                forEach(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => any): any[];
                 map(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Devices.Enumeration.DeviceInformation, index: number, array: Windows.Devices.Enumeration.DeviceInformation[]) => boolean): Windows.Devices.Enumeration.DeviceInformation[];
@@ -3636,8 +3654,8 @@ declare module Windows {
                     every(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => boolean, thisArg: any): boolean;
                     some(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => boolean): boolean;
                     some(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => boolean, thisArg: any): boolean;
-                    forEach(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => void ): void;
-                    forEach(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => void , thisArg: any): void;
+                    forEach(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => void): void;
+                    forEach(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => void, thisArg: any): void;
                     map(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => any): any[];
                     map(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => any, thisArg: any): any[];
                     filter(callbackfn: (value: Windows.Devices.Enumeration.Pnp.PnpObject, index: number, array: Windows.Devices.Enumeration.Pnp.PnpObject[]) => boolean): Windows.Devices.Enumeration.Pnp.PnpObject[];
@@ -4849,8 +4867,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => void): void;
+                forEach(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => any): any[];
                 map(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Globalization.Collation.CharacterGrouping, index: number, array: Windows.Globalization.Collation.CharacterGrouping[]) => boolean): Windows.Globalization.Collation.CharacterGrouping[];
@@ -8410,11 +8428,11 @@ declare module Windows {
                     getResults(): Windows.Security.Authentication.OnlineId.UserIdentity;
                     cancel(): void;
                     close(): void;
-                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                    done<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                    then<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                    done<U>(success?: (value: Windows.Security.Authentication.OnlineId.UserIdentity) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                     operation: {
                         completed: Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Authentication.OnlineId.UserIdentity>;
                         getResults(): Windows.Security.Authentication.OnlineId.UserIdentity;
@@ -8489,11 +8507,17 @@ declare module Windows {
                 export interface IWebAuthenticationBrokerStatics {
                     authenticateAsync(options: Windows.Security.Authentication.Web.WebAuthenticationOptions, requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri): Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.Web.WebAuthenticationResult>;
                     authenticateAsync(options: Windows.Security.Authentication.Web.WebAuthenticationOptions, requestUri: Windows.Foundation.Uri): Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.Web.WebAuthenticationResult>;
+                    authenticateAndContinue(requestUri: Windows.Foundation.Uri): void;
+                    authenticateAndContinue(requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri): void;
+                    authenticateAndContinue(requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri, continuationData: Windows.Foundation.Collections.ValueSet, options: Windows.Security.Authentication.Web.WebAuthenticationOptions): void;
                     getCurrentApplicationCallbackUri(): Windows.Foundation.Uri;
                 }
                 export class WebAuthenticationBroker {
                     static authenticateAsync(options: Windows.Security.Authentication.Web.WebAuthenticationOptions, requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri): Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.Web.WebAuthenticationResult>;
                     static authenticateAsync(options: Windows.Security.Authentication.Web.WebAuthenticationOptions, requestUri: Windows.Foundation.Uri): Windows.Foundation.IAsyncOperation<Windows.Security.Authentication.Web.WebAuthenticationResult>;
+                    static authenticateAndContinue(requestUri: Windows.Foundation.Uri): void;
+                    static authenticateAndContinue(requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri): void;
+                    static authenticateAndContinue(requestUri: Windows.Foundation.Uri, callbackUri: Windows.Foundation.Uri, continuationData: Windows.Foundation.Collections.ValueSet, options: Windows.Security.Authentication.Web.WebAuthenticationOptions): void;
                     static getCurrentApplicationCallbackUri(): Windows.Foundation.Uri;
                 }
             }
@@ -9263,11 +9287,11 @@ declare module Windows {
                 getResults(): number;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: number) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: number) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<number>;
                     getResults(): number;
@@ -9343,11 +9367,11 @@ declare module Windows {
                 getResults(): number;
                 cancel(): void;
                 close(): void;
-                then<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
-                done<U>(success?: (value: number) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
+                then<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                then<U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>;
+                done<U>(success?: (value: number) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
                 operation: {
                     completed: Windows.Foundation.AsyncOperationCompletedHandler<number>;
                     getResults(): number;
@@ -10589,8 +10613,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => void): void;
+                forEach(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => any): any[];
                 map(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Storage.Search.SortEntry, index: number, array: Windows.Storage.Search.SortEntry[]) => boolean): Windows.Storage.Search.SortEntry[];
@@ -10641,8 +10665,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => void): void;
+                forEach(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => any): any[];
                 map(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Storage.AccessCache.AccessListEntry, index: number, array: Windows.Storage.AccessCache.AccessListEntry[]) => boolean): Windows.Storage.AccessCache.AccessListEntry[];
@@ -10919,8 +10943,8 @@ declare module Windows {
                 every(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => boolean): boolean;
                 some(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => void ): void;
-                forEach(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => void): void;
+                forEach(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => void, thisArg: any): void;
                 map(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => any): any[];
                 map(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: Windows.Storage.StorageFile, index: number, array: Windows.Storage.StorageFile[]) => boolean): Windows.Storage.StorageFile[];
@@ -10976,8 +11000,8 @@ declare module Windows {
                 every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg: any): boolean;
                 some(callbackfn: (value: string, index: number, array: string[]) => boolean): boolean;
                 some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg: any): boolean;
-                forEach(callbackfn: (value: string, index: number, array: string[]) => void ): void;
-                forEach(callbackfn: (value: string, index: number, array: string[]) => void , thisArg: any): void;
+                forEach(callbackfn: (value: string, index: number, array: string[]) => void): void;
+                forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg: any): void;
                 map(callbackfn: (value: string, index: number, array: string[]) => any): any[];
                 map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg: any): any[];
                 filter(callbackfn: (value: string, index: number, array: string[]) => boolean): string[];
@@ -11581,12 +11605,12 @@ declare module Windows {
 				/**
 				 * Gets the window (app view) for the current app.
 				**/
-				static getForCurrentView(): ApplicationView;
+                static getForCurrentView(): ApplicationView;
 				
 				/**
 				 * Attempts to unsnap a previously snapped app. This call will only succeed when the app is running in the foreground.
 				**/
-				static tryUnsnap(): boolean;
+                static tryUnsnap(): boolean;
 				
 				/**
 				 * Gets the state of the current app view.
@@ -11596,55 +11620,60 @@ declare module Windows {
 				/**
 				 * Indicates whether the app terminates when the last window is closed.
 				**/
-				static terminateAppOnFinalViewClose: boolean;
+                static terminateAppOnFinalViewClose: boolean;
 
 				/**
 				 * Gets the current orientation of the window (app view) with respect to the display.
 				**/
-				orientation: ApplicationViewOrientation;
+                orientation: ApplicationViewOrientation;
 
 				/**
 				 * Gets or sets the displayed title of the window.
 				**/
-				title: string;
+                title: string;
 
 				/**
 				 * Gets or sets whether screen capture is enabled for the window (app view).
 				**/
-				isScreenCaptureEnabled: boolean;
+                isScreenCaptureEnabled: boolean;
 
 				/**
 				 * Gets whether the window (app view) is on the Windows lock screen.
 				**/
-				isOnLockScreen: boolean;
+                isOnLockScreen: boolean;
 
 				/**
 				 * Gets whether the window(app view) is full screen or not.
 				**/
-				isFullScreen: boolean;
+                isFullScreen: boolean;
 
 				/**
 				 * Gets the current ID of the window (app view) .
 				**/
-				id: number;
+                id: number;
 
 				/**
 				 * Gets whether the current window (app view) is adjacent to the right edge of the screen.
 				**/
-				adjacentToRightDisplayEdge: boolean;
+                adjacentToRightDisplayEdge: boolean;
 
 				/**
 				 * Gets whether the current window (app view) is adjacent to the left edge of the screen.
 				**/
-				adjacentToLeftDisplayEdge: number;
-			}
+                adjacentToLeftDisplayEdge: number;
+                
+                /**
+                 * Gets the title bar of the app.
+                **/
+                titleBar: ApplicationViewTitleBar;
+            }
 
 			/**
 			 * Defines the set of display orientation modes for a window (app view).
 			**/
-			export enum ApplicationViewOrientation {
-				landscape,
-				portrait
+            export enum ApplicationViewOrientation {
+                landscape,
+                portrait
             }
             export interface IInputPaneVisibilityEventArgs {
                 ensuredFocusedElementInView: boolean;
@@ -14762,10 +14791,10 @@ declare module Windows {
 }
 declare module Windows.Foundation {
     export interface IPromise<T> {
-        then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): IPromise<U>;
-        then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise<U>;
-        then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): IPromise<U>;
-        then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise<U>;
+        then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
+        then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
+        then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
+        then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
         done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 
         cancel(): void;
@@ -14775,4 +14804,57 @@ declare module Windows.Foundation {
         dispatchEvent?(type: string, details: any): boolean;
         removeEventListener?(eventType: string, listener: Function, capture?: boolean): void;
     }
+}
+
+declare module Windows.UI.ViewManagement {
+    export class ApplicationViewTitleBar {
+        /**
+         * Gets or sets the color of the title bar background.
+        **/
+        backgroundColor: Color;
+        /**
+         * Gets or sets the background color of the title bar buttons.
+        **/
+        buttonBackgroundColor: Color;
+        /**
+         * Gets or sets the foreground color of the title bar buttons.
+        **/
+        buttonForegroundColor: Color;
+        /**
+         * Gets or sets the background color of a title bar button when the pointer is over it.
+        **/
+        buttonHoverBackgroundColor: Color;
+        /**
+         * Gets or sets the foreground color of a title bar button when the pointer is over it.
+        **/
+        buttonHoverForegroundColor: Color;
+        /**
+         * Gets or sets the background color of a title bar button when it's inactive.
+        **/
+        buttonInactiveBackgroundColor: Color;
+        /**
+         * Gets or sets the foreground color of a title bar button when it's inactive.
+        **/
+        buttonInactiveForegroundColor: Color;
+        /**
+         * Gets or sets the background color of a title bar button when it's pressed.
+        **/
+        buttonPressedBackgroundColor: Color;
+        /**
+         * Gets or sets the foreground color of a title bar button when it's pressed.
+        **/
+        buttonPressedForegroundColor: Color;
+        /**
+         * Gets or sets the color of the title bar foreground.
+        **/
+        foregroundColor: Color;
+        /**
+         * Gets or sets the color of the title bar background when it's inactive.
+        **/
+        inactiveBackgroundColor: Color;
+        /**
+         * Gets or sets the color of the title bar foreground when it's inactive.
+        **/
+        inactiveForegroundColor: Color;
+    }
 }
\ No newline at end of file
diff --git a/winston/winston-tests.ts b/winston/winston-tests.ts
index 3bfd0d5a5..7157fb742 100644
--- a/winston/winston-tests.ts
+++ b/winston/winston-tests.ts
@@ -165,25 +165,46 @@ var logger: winston.LoggerInstance = new (winston.Logger)({
     new (winston.transports.Console)({
       level: str,
       silent: bool,
+      json: bool,
       colorize: bool,
       timestamp: bool,
+      showLevel: bool,
+      label: str,
+      logstash: bool,
+      debugStdout: bool,
+      depth: num,
     }),
     new (winston.transports.DailyRotateFile)({
       level: str,
       silent: bool,
+      json: bool,
       colorize: bool,
       maxsize: num,
       maxFiles: num,
+      maxRetries: num,
       prettyPrint: bool,
       timestamp: bool,
       filename: str,
       dirname: str,
-      datePattern: str
+      datePattern: str,
+      eol: str,
+      stream: writeableStream,
     }),
     new (winston.transports.File)({
       level: str,
       silent: bool,
+      json: bool,
+      colorize: bool,
+      prettyPrint: bool,
       timestamp: bool,
+      showLevel: bool,
+      logstash: bool,
+      rotationFormat: bool,
+      depth: num,
+      zippedArchive: bool,
+      eol: str,
+      tailable: bool,
+      maxRetries: num,
       filename: str,
       maxsize: num,
       maxFiles: num,
@@ -195,7 +216,7 @@ var logger: winston.LoggerInstance = new (winston.Logger)({
       port: num,
       path: str,
       auth: { username: str, password: str },
-      ssl: {},
+      ssl: bool,
     }),
     new (winston.transports.Loggly)({
       level: str,
@@ -206,6 +227,10 @@ var logger: winston.LoggerInstance = new (winston.Logger)({
     }),
     new (winston.transports.Memory)({
       level: str,
+      json: bool,
+      colorize: bool,
+      showLevel: bool,
+      depth: num,
       timestamp: bool,
       label: str,
     }),
@@ -217,7 +242,7 @@ var logger: winston.LoggerInstance = new (winston.Logger)({
       method: str,
       path: str,
       auth: { username: str, password: str },
-      ssl: {},
+      ssl: {ca: {}},
     }),
   ]
 });
diff --git a/winston/winston.d.ts b/winston/winston.d.ts
index 954e3358b..30ca71268 100644
--- a/winston/winston.d.ts
+++ b/winston/winston.d.ts
@@ -8,7 +8,6 @@
 /// <reference path="../node/node.d.ts" />
 
 declare module "winston" {
-
   export var transports: Transports;
   export var Transport: TransportStatic;
   export var Logger: LoggerStatic;
@@ -98,6 +97,11 @@ declare module "winston" {
      * @type {(boolean|(err: Error) => void)}
      */
     exitOnError?: any;
+
+    // TODO: Need to make instances specific,
+    //       and need to get options for each instance.
+    //       Unfortunately, the documentation is unhelpful.
+    [optionName: string]: any;
   }
 
   export interface TransportStatic {
@@ -105,10 +109,38 @@ declare module "winston" {
   }
 
   export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
-    formatQuery(query: any): any;
+    formatQuery(query: (string|Object)): (string|Object);
     normalizeQuery(options: QueryOptions): QueryOptions;
-    formatResults(results: any, options: any): any;
-    logException(msg: string, meta: any, callback: () => void): void;
+    formatResults(results: (Object|Array<any>), options?: Object): (Object|Array<any>);
+    logException(msg: string, meta: Object, callback: () => void): void;
+  }
+
+  export interface ConsoleTransportInstance extends TransportInstance {
+    new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
+  }
+
+  export interface DailyRotateFileTransportInstance extends TransportInstance {
+    new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
+  }
+
+  export interface FileTransportInstance extends TransportInstance {
+    new (options?: FileTransportOptions): FileTransportInstance;
+  }
+
+  export interface HttpTransportInstance extends TransportInstance {
+    new (options?: HttpTransportOptions): HttpTransportInstance;
+  }
+
+  export interface MemoryTransportInstance extends TransportInstance {
+    new (options?: MemoryTransportOptions): MemoryTransportInstance;
+  }
+
+  export interface WebhookTransportInstance extends TransportInstance {
+    new (options?: WebhookTransportOptions): WebhookTransportInstance;
+  }
+
+  export interface WinstonModuleTrasportInstance extends TransportInstance {
+    new (options?: WinstonMoudleTransportOptions): WinstonModuleTrasportInstance;
   }
 
   export interface ContainerStatic {
@@ -126,13 +158,13 @@ declare module "winston" {
   }
 
   export interface Transports {
-    File: TransportInstance;
-    Console: TransportInstance;
-    Loggly: TransportInstance;
-    DailyRotateFile: TransportInstance;
-    Http: TransportInstance;
-    Memory: TransportInstance;
-    Webhook: TransportInstance;
+    File: FileTransportInstance;
+    Console: ConsoleTransportInstance;
+    Loggly: WinstonModuleTrasportInstance;
+    DailyRotateFile: DailyRotateFileTransportInstance;
+    Http: HttpTransportInstance;
+    Memory: MemoryTransportInstance;
+    Webhook: WebhookTransportInstance;
   }
 
   export interface TransportOptions {
@@ -140,7 +172,111 @@ declare module "winston" {
     silent?: boolean;
     raw?: boolean;
     name?: string;
+    formatter?: Function;
     handleExceptions?: boolean;
+    exceptionsLevel?: string;
+    humanReadableUnhandledException?: boolean;
+  }
+
+  export interface ConsoleTransportOptions extends TransportOptions {
+    json?: boolean;
+    colorize?: boolean;
+    prettyPrint?: boolean;
+    timestamp?: (Function|boolean);
+    showLevel?: boolean;
+    label?: string;
+    logstash?: boolean;
+    debugStdout?: boolean;
+    depth?: number;
+  }
+
+  export interface DailyRotateFileTransportOptions extends TransportOptions {
+    json?: boolean;
+    colorize?: boolean;
+    prettyPrint?: boolean;
+    timestamp?: (Function|boolean);
+    showLevel?: boolean;
+    label?: string;
+    logstash?: boolean;
+    depth?: number;
+    maxsize?: number;
+    maxFiles?: number;
+    eol?: string;
+    maxRetries?: number;
+    datePattern?: string;
+    filename?: string;
+    dirname?: string;
+    options?: {
+      flags?: string;
+      highWaterMark?: number;
+    }
+    stream?: NodeJS.WritableStream;
+  }
+
+  export interface FileTransportOptions extends TransportOptions {
+    json?: boolean;
+    colorize?: boolean;
+    prettyPrint?: boolean;
+    timestamp?: (Function|boolean);
+    showLevel?: boolean;
+    label?: string;
+    logstash?: boolean;
+    depth?: number;
+    maxsize?: number;
+    rotationFormat?: boolean;
+    zippedArchive?: boolean;
+    maxFiles?: number;
+    eol?: string;
+    tailable?: boolean;
+    maxRetries?: number;
+    filename?: string;
+    dirname?: string;
+    options?: {
+      flags?: string;
+      highWaterMark?: number;
+    }
+    stream?: NodeJS.WritableStream;
+  }
+
+  export interface HttpTransportOptions extends TransportOptions {
+    ssl?: boolean;
+    host?: string;
+    port?: number;
+    auth?: {
+      username: string;
+      password: string;
+    };
+    path?: string;
+  }
+
+  export interface MemoryTransportOptions extends TransportOptions {
+    json?: boolean;
+    colorize?: boolean;
+    prettyPrint?: boolean;
+    timestamp?: (Function|boolean);
+    showLevel?: boolean;
+    label?: string;
+    depth?: number;
+  }
+
+  export interface WebhookTransportOptions extends TransportOptions {
+    host?: string;
+    port?: number;
+    method?: string;
+    path?: string;
+    auth?: {
+      username?: string;
+      password?: string;
+    };
+    ssl?: {
+      key?: any;
+      cert?: any;
+      ca: any;
+    };
+  }
+
+  export interface WinstonMoudleTransportOptions extends TransportOptions {
+    [optionName: string]: any;
   }
 
   export interface QueryOptions {
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index 99983df85..321e0ec96 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -6,9 +6,9 @@
 /// <reference path="../node/node.d.ts" />
 
 declare module "ws" {
-    import events = require('events');
-    import http   = require('http');
-    import net    = require('net');
+    import * as events from 'events';
+    import * as http from 'http';
+    import * as net from 'net';
 
     class WebSocket extends events.EventEmitter {
         static CONNECTING: number;
diff --git a/xml-parser/xml-parser-tests.ts b/xml-parser/xml-parser-tests.ts
new file mode 100644
index 000000000..81518cd28
--- /dev/null
+++ b/xml-parser/xml-parser-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="../node/node.d.ts"/>
+/// <reference path="xml-parser.d.ts"/>
+
+import assert = require('assert');
+import parse = require('xml-parser');
+
+var doc: parse.Document = parse(
+  '<?xml version="1.0" encoding="utf-8"?>' +
+    '<mydoc><child a="1">foo</child><child/></mydoc>');
+var declaration: parse.Declaration = doc.declaration;
+assert.equal(declaration.attributes['version'], '1.0');
+assert.equal(declaration.attributes['encoding'], 'utf-8');
+var root: parse.Node = doc.root;
+assert.equal(root.name, 'mydoc');
+var children: parse.Node[] = root.children;
+assert.equal(children.length, 2);
+var child1: parse.Node = children[0];
+assert.equal(child1.name, 'child');
+assert.equal(child1.attributes['a'], '1');
+assert.equal(child1.content, 'foo');
diff --git a/xml-parser/xml-parser.d.ts b/xml-parser/xml-parser.d.ts
new file mode 100644
index 000000000..2bb25fc8f
--- /dev/null
+++ b/xml-parser/xml-parser.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for xml-parser 1.2.1
+// Project: https://github.com/segmentio/xml-parser
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'xml-parser' {
+
+  function parse(xml: string): parse.Document;
+
+  module parse {
+    export interface Document {
+      declaration: Declaration;
+      root: Node;
+    }
+
+    export interface Declaration {
+      attributes: Attributes;
+    }
+
+    export interface Node {
+      name: string;
+      attributes: Attributes;
+      children: Node[];
+      content?: string;
+    }
+
+    export interface Attributes {
+      [name: string]: string;
+    }
+  }
+
+  export = parse;
+}
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index 10b75382b..f20254990 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -134,6 +134,49 @@ function Argv$options() {
 	;
 }
 
+function command() {
+	var argv = yargs
+		.usage('npm <command>')
+		.command('install', 'tis a mighty fine package to install')
+		.command('publish', 'shiver me timbers, should you be sharing all that', yargs => {
+			argv = yargs.option('f', {
+				alias: 'force',
+				description: 'yar, it usually be a bad idea'
+			})
+			.help('help')
+			.argv;
+		})
+		.help('help')
+		.argv;
+}
+
+function completion_sync() {
+	var argv = yargs
+		.completion('completion', (current, argv) => {
+			// 'current' is the current command being completed.
+			// 'argv' is the parsed arguments so far.
+			// simply return an array of completions.
+			return [
+				'foo',
+				'bar'
+			];
+		})
+		.argv;
+}
+
+function completion_async() {
+	var argv = yargs
+		.completion('completion', (current, argv, done) => {
+			setTimeout(function() {
+				done([
+					'apple',
+					'banana'
+				]);
+			}, 500);
+		})
+		.argv;
+}
+
 function Argv$help() {
 	var yargs1 = yargs
 		.usage("$0 -operand1 number -operand2 number -operation [add|subtract]");
diff --git a/yargs/yargs.d.ts b/yargs/yargs.d.ts
index 0e42090fc..03b7c05dc 100644
--- a/yargs/yargs.d.ts
+++ b/yargs/yargs.d.ts
@@ -54,6 +54,12 @@ declare module "yargs" {
 			usage(options?: { [key: string]: Options }): Argv;
 
 			command(command: string, description: string): Argv;
+			command(command: string, description: string, fn: (args: Argv) => void): Argv;
+
+			completion(cmd: string, fn?: SyncCompletionFunction): Argv;
+			completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
+			completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
+			completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
 
 			example(command: string, description: string): Argv;
 
@@ -110,6 +116,9 @@ declare module "yargs" {
 			desc?: any;
 			requiresArg?: any;
 		}
+
+		type SyncCompletionFunction = (current: string, argv: any) => string[];
+		type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
 	}
 
 	var yargs: yargs.Argv;
diff --git a/ydn-db/ydn-db-tests.ts b/ydn-db/ydn-db-tests.ts
new file mode 100644
index 000000000..95279b831
--- /dev/null
+++ b/ydn-db/ydn-db-tests.ts
@@ -0,0 +1,82 @@
+/// <reference path="ydn-db.d.ts" />
+
+var schema = {
+  stores: [{
+    name: 'todo',
+    keyPath: "timeStamp"
+  }]
+};
+
+
+/**
+ * Create and initialize the database. Depending on platform, this will
+ * create IndexedDB or WebSql or even localStorage storage mechanism.
+ * @type {ydn.db.Storage}
+ */
+var db = new ydn.db.Storage('todo_2', schema);
+
+var deleteTodo = function(id: any) {
+  db.remove('todo', id).fail(function(e) {
+    console.error(e);
+  });
+
+  getAllTodoItems();
+};
+
+var getAllTodoItems = function() {
+  var todos = document.getElementById("todoItems");
+  todos.innerHTML = "";
+
+  var df = db.values('todo');
+
+  df.done(function(items) {
+    var n = items.length;
+    for (var i = 0; i < n; i++) {
+      renderTodo(items[i]);
+    }
+  });
+
+  df.fail(function(e) {
+    console.error(e);
+  })
+};
+
+var renderTodo = function(row: any) {
+  var todos = document.getElementById("todoItems");
+  var li = document.createElement("li");
+  var a = document.createElement("a");
+  var t = document.createTextNode(row.text);
+
+  a.addEventListener("click", function() {
+    deleteTodo(row.timeStamp);
+  }, false);
+
+  a.textContent = " [Delete]";
+  li.appendChild(t);
+  li.appendChild(a);
+  todos.appendChild(li)
+};
+
+var addTodo = function() {
+  var todo = <HTMLInputElement>document.getElementById("todo");
+
+  var data = {
+    "text": todo.value,
+    "timeStamp": new Date().getTime()
+  };
+  db.put('todo', data).fail(function(e) {
+    console.error(e);
+  });
+
+  todo.value = "";
+
+  getAllTodoItems();
+};
+
+function init() {
+  getAllTodoItems();
+}
+
+db.onReady(function() {
+  init();
+});
diff --git a/ydn-db/ydn-db.d.ts b/ydn-db/ydn-db.d.ts
new file mode 100644
index 000000000..564c8ad4c
--- /dev/null
+++ b/ydn-db/ydn-db.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for YDN-DB version 1
+// Project: http://dev.yathit.com/ydn-db/index.html
+// Definitions by: Kyaw Tun <https://github.com/yathit>, Gabriel Monteagudo <https://github.com/gabrielmaldi>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface FullTextSource {
+  storeName: string;
+  keyPath: string;
+  weight?: number;
+}
+
+interface FullTextCatalog {
+  name: string;
+  lang: string;
+  sources: FullTextSource[];
+}
+
+interface IndexSchemaJson {
+  name?: string;
+  keyPath: string|string[];
+  type?: string;
+  unique?: boolean;
+  multiEntry?: boolean;
+}
+
+interface StoreSchemaJson {
+  autoIncrement?: boolean;
+  dispatchEvents?: boolean;
+  name?: string;
+  indexes?: IndexSchemaJson[];
+  keyPath?: string;
+  type?: string;
+}
+
+interface DatabaseSchemaJson {
+  version?: number;
+  stores: StoreSchemaJson[];
+  fullTextCatalogs?: FullTextCatalog;
+}
+
+interface StorageOptions {
+  mechanisms?: string[];
+  size?: number;
+  autoSchema?: boolean;
+  isSerial?: boolean;
+  requestType?: string;
+}
+
+declare module ydn.db {
+  export class Request {
+    abort(): any;
+    always(callback: (data: any) => void): any;
+    done(callback: (data: any) => void): any;
+    fail(callback: (data: any) => void): any;
+    then(success_callback: (data: any) => any, error_callback: (data: Error) => any): any;
+    canAbort(): boolean;
+  }
+
+  export function cmp(first: any, second: any): number;
+
+  export function deleteDatabase(db_name: string, type?: string): void;
+
+  export class Key {
+    constructor(json: Object);
+    constructor(key_string: string);
+    constructor(store_name: string, id: any, parent_key?: Key);
+  }
+
+  export class Iterator {
+    join(peer_store_name: string, peer_field_name?: string, value?: any): any;
+    getKey(): any;
+    getPrimaryKey(): any;
+    reset(): Iterator;
+    restrict(peer_field_name: string, value: any): any;
+    resume(key: any, index_key: any): Iterator;
+    reverse(key: any, index_key: any): Iterator;
+  }
+
+  enum EventType {
+    created,
+    deleted,
+    error,
+    fail,
+    ready,
+    updated
+  }
+
+  enum Policy {
+    all,
+    atomic,
+    multi,
+    repeat,
+    single
+  }
+
+  enum TransactionMode {
+    readonly,
+    readwrite
+  }
+
+  enum Op {
+        ">", "<", "=", ">=", "<=", "^"
+  }
+
+  export class IndexKeyIterator extends Iterator {
+    constructor(store_name: string, index_name: string, key_range?: any, reverse?: boolean);
+
+    static where(store_name: string, index_name: string, op: Op, value: any, op2: Op, value2: any): any;
+
+  }
+
+  export class KeyIterator extends Iterator {
+    constructor(store_name: string, key_range?: any, reverse?: boolean);
+
+    static where(store_name: string, op: Op, value: any, op2: Op, value2: any): any;
+
+  }
+
+  export class ValueIterator extends Iterator {
+    constructor(store_name: string, key_range?: any, reverse?: boolean);
+
+    static where(store_name: string, op: Op, value: any, op2: Op, value2: any): any;
+
+  }
+
+  export class IndexValueIterator extends Iterator {
+    constructor(store_name: string, index_name: string, key_range?: any, reverse?: boolean);
+
+    static where(store_name: string, index_name: string, op: Op, value: any, op2: Op, value2: any): any;
+
+  }
+
+  export class Streamer {
+    constructor(storage: ydn.db.Storage, store_name: string, opt_field_name?: string);
+
+    push(key: any, value?: any): any;
+
+    collect(callback: (values: any[]) => void): any;
+
+    setSink(callback: (key: any, value: any, toWait: () => boolean) => void): any;
+  }
+
+  export class ICursor {
+    getKey(i?: number): any;
+    getPrimaryKey(i?: number): any;
+    getValue(i?: number): any;
+    clear(i?: number): Request;
+    update(value: Object, i?: number): Request;
+  }
+
+  export class Query {
+    count(): Request;
+    open(callback: (ICursor: any) => void, Iterator: any, TransactionMode: any): Request;
+    patch(Object: any): Request;
+    patch(field_name: string, value: any): Request;
+    patch(field_names: string[], value: any[]): Request;
+    order(field_name: string): Query;
+    order(field_name: string, descending: boolean): Query;
+    order(field_names: string[]): Query;
+    order(field_names: string[], descending: boolean): Query;
+    reverse(): Query;
+    list(): Request;
+    list(limit: number): Request;
+    where(field_name: string, op: Op, value: any): any;
+    where(field_name: string, op: Op, value: any, op2: Op, value2: any): any;
+  }
+
+  export class DbOperator {
+
+    add(store_name: string, value: any, key: any): Request;
+    add(store_name: string, value: any): Request;
+
+    clear(store_name: string, key_or_key_range: any): Request;
+    clear(store_name: string): Request;
+    clear(store_names: string[]): Request;
+
+    count(store_name: string, key_range?: any): Request;
+    count(store_name: string, index_name: string, key_range: any): Request;
+    count(store_names: string[]): Request;
+
+    executeSql(sql: string, params?: any[]): Request;
+
+    from(store_name: string): Query;
+    from(store_name: string, op: Op, value: any): Query;
+    from(store_name: string, op: Op, value: any, op2: Op, value2: any): Query;
+
+    get(store_name: string, key: any): Request;
+
+    keys(iter: Iterator, limit?: number): Request;
+    keys(store_name: string, key_range?: Object, limit?: number, offset?: number, reverse?: boolean): Request;
+    keys(store_name: string, index_name: string, key_range?: Object, limit?: number, offset?: number, reverse?: boolean): Request;
+    keys(store_name: string, limit?: boolean, offset?: number): Request;
+
+    open(next_callback: (cursor: ICursor) => any, iterator: Iterator, mode: TransactionMode): Request;
+
+    put(store_name: string, value: any, key: any): Request;
+    put(store_name: string, value: any[], key: any[]): Request;
+    put(store_name: string, value: any): Request;
+    put(store_name: string, value: any[]): Request;
+
+    remove(store_name: string, id_or_key_range: any): Request;
+    remove(store_name: string, index_name: string, id_or_key_range: any): Request;
+    clear(store_name: string, key_or_key_range: any): Request;
+
+    scan(solver: (keys: any[], values: any[]) => any, iterators: Iterator[]): Request;
+
+    values(iter: Iterator, limit?: number): Request;
+    values(store_name: string, key_range?: Object, limit?: number, offset?: number, reverse?: boolean): Request;
+    values(store_name: string, index_name: string, key_range?: Object, limit?: number, offset?: number, reverse?: boolean): Request;
+    values(store_name: string, ids?: Array<any>): Request;
+    values(keys?: Array<any>): Request;
+  }
+
+  export class Storage extends DbOperator {
+
+    constructor(db_name?: string, schema?: DatabaseSchemaJson, options?: StorageOptions);
+
+    addEventListener(type: EventType, handler: (event: any) => void, capture?: boolean): any;
+    addEventListener(type: EventType[], handler: (event: any) => void, capture?: boolean): any;
+
+    branch(thread: Policy, isSerial: boolean, scope: string[], mode: TransactionMode, maxRequest: number): DbOperator;
+
+    close(): any;
+
+    get(store_name: string, key: any): Request;
+
+    getName(callback: any): string;
+
+    getSchema(callback: any): DatabaseSchemaJson;
+
+    getType(): string;
+
+    onReady(Error?: any): any;
+
+    removeEventListener(type: EventType, handler: (event: any) => void, capture?: boolean): any;
+    removeEventListener(type: EventType[], handler: (event: any) => void, capture?: boolean): any;
+
+    run(callback: (iStorage: ydn.db.Storage) => void, store_names: string[], mode: TransactionMode): Request;
+
+    search(catalog_name: string): Request;
+
+    setName(name: string): any;
+
+    transaction(callback: (tx: any) => void, store_names: string[], mode: TransactionMode, completed_handler: (type: string, e?: Error) => void): any;
+
+  }
+}
+
+declare module ydb.db.algo {
+
+  export class Solver {
+
+  }
+
+  export class NestedLoop extends Solver {
+    constructor(out: { push: (value: any) => void }, limit?: number);
+  }
+
+  export class SortedMerge extends Solver {
+    constructor(out: { push: (value: any) => void }, limit?: number);
+  }
+
+  export class ZigzagMerge extends Solver {
+    constructor(out: { push: (value: any) => void }, limit?: number);
+  }
+
+}
+
+declare module ydn.db.events {
+
+  export class Event {
+
+    name: string;
+
+    type: ydn.db.EventType;
+  }
+
+  export class RecordEvent extends Event {
+
+    getStoreName(): string;
+
+    getKey(): any;
+
+    getValue(): any;
+  }
+
+
+  export class StorageEvent extends Event {
+
+    getError(): Error;
+
+    getVersion(): number;
+
+    getOldVersion(): number;
+  }
+
+
+  export class StoreEvent extends Event {
+
+    getStoreName(): string;
+
+    getKeys(): any[];
+
+    getValues(): any[];
+  }
+}